Merge remote-tracking branch 'origin/java_omega' into java_omega

# Conflicts:
#	build.gradle
#	coreSubProjects
#	fabric/build.gradle
#	forge/build.gradle

.gitignore

@@ -34,6 +34,9 @@ build.properties
 
 # Sqlite databases
 *.sqlite
+*.sqlite-journal
+*.sqlite-shm
+*.sqlite-wal
 
-# Don't add access transformers to git as it's dynamically generated
+# Don't add access transformers to git as they're dynamically generated
 accesstransformer.cfg

.gitlab-ci.yml

@@ -1,6 +1,6 @@
 # use Eclipse's JDK
 # The ci should always use a unix(-like) OS to work
-image: eclipse-temurin:17
+image: eclipse-temurin:21
 
 # all stages need to be defined here
 # TODO: Make stages depend on what is in versionProperties
@@ -30,7 +30,7 @@ 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"]
+      - 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"]
   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/;

Readme.md

@@ -1,18 +1,16 @@
 # <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
+_See farther without turning your game into a slide show._
 
-> A mod that adds a Level of Detail System to Minecraft
+<br>
-
 
 # What is Distant Horizons?
 
-Distant Horizons is a Minecraft mod that adds a Level Of Detail (LOD) system to\
+Distant Horizons is a mod which implements a [Level of Detail](https://en.wikipedia.org/wiki/Level_of_detail_(computer_graphics)) system to Minecraft.\
-render simplified chunks outside the normal render distance\
+This allows for far greater render distances without harming performance by gradually lowering the quality of distant terrain.
-allowing for an increased view distance without harming performance.
 
-In other words: this mod lets you see farther without turning your game into a slide show.\
+Below is a video demonstrating the system:
-If you want to see a quick demo, check out a video covering the mod here:
 
-<a href="https://youtu.be/_04BZ8W2bDM" target="_blank">![Minecraft Level Of Detail (LOD) mod - Alpha 1.6.3](https://cdn.ko-fi.com/cdn/useruploads/png_ef4d209d-50d9-462f-b31f-92e42ec3e260cover.jpg?v=c1097a5b-029c-4484-bec3-80ff58c5d239)</a>
+<a href="https://youtu.be/SxQdbtjGEsc" target="_blank">![Distant Horizons - Alpha 2.0](https://i.ytimg.com/vi/SxQdbtjGEsc/hqdefault.jpg)</a>
 
 <br>
 
@@ -81,7 +79,8 @@ Modmenu: 1.16.22
 - 1.18.1, 1.18
 - 1.19.1, 1.19
 - 1.19.3
-<br><br>
+
+<br>
 
 ### Plugin and Library versions
 
@@ -101,7 +100,7 @@ Java Preprocessor plugin: Manifold Preprocessor
   Visit https://www.oracle.com/java/technologies/downloads/ for installers.
 * Git or someway to clone git projects. <br> 
   Visit https://git-scm.com/ for installers.
-* (Not required) Any Java IDE with plugins that support Manifold, for example Intellij IDEA.
+* (Not required) Any Java IDE with plugins that support Manifold, for example IntelliJ IDEA.
 
 **If using IntelliJ:**
 1. Install the Manifold plugin
@@ -114,17 +113,14 @@ Java Preprocessor plugin: Manifold Preprocessor
 3. Make sure eclipse has the JDK 17 installed. (This is needed so that eclipse can run minecraft)
 4. Import the project into eclipse
 
-
+<br>
 
 ## Switching Versions
 
 To switch between different Minecraft versions, change `mcVer=1.?` in the `gradle.properties` file.
 
-If running in an IDE, to ensure the IDE noticed the version change, run any gradle command to refresh gradle. (In IntellJ you will also need to do a gradle sync if it didn't happen automatically.)
+If running in an IDE, to ensure the IDE noticed the version change, run any gradle command to refresh gradle.\
->Note: There may be a `java.nio.file.FileSystemException` thrown when running the command after switching versions. To fix it, either restart your IDE (as your IDE is probably locking a file) or use a tool like LockHunter to unlock the linked file(s). (Generally it is a lib file under `common\build\lib`, `forge\build\lib`, or `fabric\build\lib`). \
+In IntelliJ, you will also need to do a gradle sync if it didn't happen automatically.
-> If anyone knows how to solve this issue please let us know here: \
-> https://gitlab.com/jeseibel/distant-horizons/-/issues/233
-
 
 <br>
 
@@ -138,21 +134,20 @@ From the File Explorer:
 2. Download the core from https://gitlab.com/jeseibel/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 wih `./gradlew mergeJars`
+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`
-2. `cd minecraft-lod-mod`
+2. `cd distant-horizons`
 3. `./gradlew assemble`
 4. `./gradlew mergeJars`
 5. The compiled jar file will be in the folder `Merged`
 
 Run tests with: `./gradlew test`
 
->Note: You can add the arg: `-PmcVer=?` to tell gradle to build a selected MC version instead of having to modify the `gradle.properties` file. \
+>Note: You can add the argument `-PmcVer=?` to tell gradle to build a selected MC version instead of having to modify the `gradle.properties` file.\
-> Example: `./gradlew assemble -PmcVer=1.18.2`
+> For example: `./gradlew assemble -PmcVer=1.18.2`
-
 
 <br>
 
@@ -162,7 +157,6 @@ Run tests with: `./gradlew test`
 
 You can also locally compile the DH jars without a Java environment by using Docker. Where `<version>` is the version of Minecraft to compile for (ie `1.20.1`), or the keyword `all`. See [Versions](#minecraft-and-library-versions) for a list of all supported values.
 
-
 <br>
 
 ## Other commands
@@ -171,6 +165,7 @@ You can also locally compile the DH jars without a Java environment by using Doc
 
 `./gradlew clean` to delete any compiled code.
 
+<br>
 
 ## Note to self
 
@@ -178,7 +173,7 @@ The Minecraft source code is NOT added to your workspace in an editable way. Min
 
 Source code uses Mojang mappings & [Parchment](https://parchmentmc.org/) mappings.
 
-To generate the source code run `./gradlew genSources`\
+To generate the source code run `./gradlew genSources` <br>
 If your IDE fails to auto-detect the source jars when browsing Minecraft classes; manually select the JAR file ending with -sources.jar when prompted by your IDE. <br>
 (In IntelliJ it's at the top where it says "choose sources" when browsing a Minecraft class)
 
@@ -186,12 +181,12 @@ If your IDE fails to auto-detect the source jars when browsing Minecraft classes
 
 ## Other Useful commands
 
-Run the standalone jar: `./gradlew run`\
+Run the standalone jar: `./gradlew run` <br>
-Build the standalone jar: `./gradlew core:build`\
+Build the standalone jar: `./gradlew core:build` <br>
-Only build Fabric: `./gradlew fabric:assemble` or `./gradlew fabric:build`\
+Only build Fabric: `./gradlew fabric:assemble` or `./gradlew fabric:build` <br>
-Only build Forge: `./gradlew fabric:assemble` or `./gradlew forge:build`\
+Only build Forge: `./gradlew forge:assemble` or `./gradlew forge:build` <br>
-Run the Fabric client (for debugging): `./gradlew fabric:runClient`\
+Run the Fabric client (for debugging): `./gradlew fabric:runClient` <br>
-Run the Forge client (for debugging): `./gradlew forge:runClient`
+Run the Forge client (for debugging): `./gradlew forge:runClient` <br>
 
 To build all versions: `./buildAll` (all builds will end up in the `Merged` folder)
 
@@ -205,7 +200,7 @@ https://github.com/PacifistMC/Forgix
 LZ4 for Java (data compression)\
 https://github.com/lz4/lz4-java
 
-NightConfig for Json & Toml (config handling)\
+NightConfig for JSON & TOML (config handling)\
 https://github.com/TheElectronWill/night-config
 
 SVG Salamander for SVG support (not being used atm)\

build.gradle

@@ -2,21 +2,18 @@ plugins {
     id "java"
 
     // Plugin to put dependencies inside our final jar
-    id "com.github.johnrengelman.shadow" version '7.1.2' apply false
+    id "com.github.johnrengelman.shadow" version '8.1.1' apply false
 
     // Plugin to create merged jars
-    id "io.github.pacifistmc.forgix" version "1.2.6"
+    id "io.github.pacifistmc.forgix" version "1.2.9"
 
-    // Unimined is our all in one solution to minecraft loaders
+    // Manifold preprocessor
-//    id "xyz.wagyourtail.unimined" version "1.2.0-SNAPSHOT" apply false // Unstable Release (TODO: Check back to see when the unstable branch fixes forge run without the jank)
+    id "systems.manifold.manifold-gradle-plugin" version "0.0.2-alpha"
-    id "xyz.wagyourtail.unimined" version "1.1.2-SNAPSHOT" apply false // LTS Release
-}
 
+    // Architectury is used here only as a replacement for forge's own loom
+    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
 
-// Transfers the values set in settings.gradle to the rest of the project
+    id 'xyz.wagyourtail.jvmdowngrader' version '0.9.1' apply true
-project.gradle.ext.getProperties().each { prop ->
-    rootProject.ext.set(prop.key, prop.value)
-//    println "Added prop [key:" + prop.key + ", value:" + prop.value + "]"
 }
 
 
@@ -54,6 +51,14 @@ def writeBuildGradlePredefine(List<String> mcVers, int mcIndex)
 
     new File(projectDir, "build.properties").text = sb.toString()
 }
+
+
+// Transfers the values set in settings.gradle to the rest of the project
+project.gradle.ext.getProperties().each { prop ->
+    rootProject.ext.set(prop.key, prop.value)
+    //println "Added prop [key:" + prop.key + ", value:" + prop.value + "]"
+}
+// Sets up manifold stuff
 writeBuildGradlePredefine(rootProject.mcVers, rootProject.mcIndex)
 
 
@@ -61,7 +66,6 @@ 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"
@@ -92,7 +96,7 @@ forgix {
 }
 
 subprojects { p ->
-    // Does the same as "p == project(":common") || p == project(":fabric") || p == project(":forge") || p == project("WhateverLoaderWeAddLaterOn")"
+    // Does the same as "p == project(":common") || p == project(":fabric") || p == project(":quilt")  || p == project(":forge") || p == project("WhateverWeAddLaterOn")"
     // Useful later on so we dont have duplicated code
     def isMinecraftSubProject = p != project(":core") && p != project(":api")
 
@@ -100,78 +104,70 @@ subprojects { p ->
     // Apply plugins
     apply plugin: "java"
     apply plugin: "com.github.johnrengelman.shadow"
-    if (p == project(":core")) 
+    apply plugin: "xyz.wagyourtail.jvmdowngrader"
-        apply plugin: "application"
+    if (isMinecraftSubProject)
+        apply plugin: "systems.manifold.manifold-gradle-plugin"
 
-    if (isMinecraftSubProject) {
+    // Apply forge's loom
-        apply plugin: "xyz.wagyourtail.unimined"
+    if ( (findProject(":forge") && p == project(":forge")) || (findProject(":neoforge") && p == project(":neoforge")) )
+        apply plugin: "dev.architectury.loom"
 
-        unimined.minecraft(sourceSets.main, true) {
-            version = rootProject.minecraft_version
 
-            def parchmentVersionParts = rootProject.parchment_version.split(":")
+    // Set the manifold version (may not be required tough)
-            mappings {
+    manifold {
-                mojmap()
+        manifoldVersion = rootProject.manifold_version
-                parchment(parchmentVersionParts[0], parchmentVersionParts[1])
-                devNamespace "mojmap"
-            }
-            
-            runs {
-                config("client") {
-                    workingDir = rootProject.file("run")
-                }
-                config("server") {
-                    workingDir = rootProject.file("run") // TODO: When running the server, would it be a better idea to change this to a different dir?
-                    disabled = true // TODO: Once server-side support is added, remove this
-                }
-            }
-        }
-
-        if (p != project(":common")) {
-            tasks.withType(JavaCompile).configureEach {
-                source(project(":common").sourceSets.main.java)
-                source(project(":api").sourceSets.main.java)
-                source(project(":core").sourceSets.main.java)
-            }
-        }
-    }
-
-    tasks.withType(GenerateModuleMetadata) {
-        enabled = false
-    }
-    
-    // Disable testing for projects that aren't the core or api project.
-    // If not done compiling will fail due to an issue with Manifold
-    if (isMinecraftSubProject) {
-        test {
-            enabled = false
-        }
-        compileTestJava {
-            enabled = false
-        }
     }
 
 
     // set up custom configurations (configurations are a way to handle dependencies) 
     configurations {
         // extends the shadowJar configuration
-        shadowMc // Configuration that doesn't contain coreProjects
+        shadowMe
-        
         // have implemented dependencies automatically embedded in the final jar
-        implementation.extendsFrom(shadowMc)
+        implementation.extendsFrom(shadowMe)
 
-        // Add shaded libraries very early in the classpath (excluding coreProjects as that's added in a different way)
+        // Configuration fpr core & api
-        minecraftLibraries.extendsFrom(shadowMc)
+        coreProjects
-    }
+        shadowMe.extendsFrom(coreProjects)
 
 
-    // Let the application plugin know where the main class is
+        // FIXME this additional configuration is necessary because forge 
-    // (This will point to a non-existent class in all sub-projects except "Core")
+        //  needs forgeRuntimeLibrary, although adding it to shadowMe
-    if (p == project(":core")) {
+        //  causes runtime issues where the libraries aren't properly added
-        application {
+        forgeShadowMe
-            mainClass.set("com.seibel.distanthorizons.core.jar.JarMain")
+        // this should match shadowMe pretty closely
+        implementation.extendsFrom(forgeShadowMe)
+        shadowMe.extendsFrom(forgeShadowMe)
+        forgeRuntimeLibrary.extendsFrom(forgeShadowMe)
+
+
+        if (isMinecraftSubProject && p != project(":common")) {
+            // Shadow common
+            common
+            shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
+            compileClasspath.extendsFrom common
+            runtimeClasspath.extendsFrom common
+            if (findProject(":forge"))
+                developmentForge.extendsFrom common
+            if (findProject(":neoforge"))
+                developmentNeoForge.extendsFrom common
+            compileClasspath.extendsFrom coreProjects
+            runtimeClasspath.extendsFrom coreProjects
+            if (findProject(":forge"))
+                developmentForge.extendsFrom coreProjects
+            if (findProject(":neoforge"))
+                developmentNeoForge.extendsFrom coreProjects
+
+            if (findProject(":fabricLike") && p != project(":fabricLike")) {
+                // Shadow fabricLike
+                fabricLike
+                shadowFabricLike
+                compileClasspath.extendsFrom fabricLike
+                runtimeClasspath.extendsFrom fabricLike
             }
         }
+    }
+
 
     dependencies {
         //=====================//
@@ -184,41 +180,48 @@ subprojects { p ->
         }
 
         // Log4j
-        // TODO: Change to shadowCore later to work in the standalone jar
+        // TODO: Change to shadowMe later to work in the standalone jar
         // We cannot do this now as it would break Quilt
         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")
+            forgeShadowMe("org.joml:joml:${rootProject.joml_version}")
+        else
+            implementation("org.joml:joml:${rootProject.joml_version}")
+
         // JUnit tests
         implementation("org.junit.jupiter:junit-jupiter:5.8.2")
         implementation("org.junit.jupiter:junit-jupiter-engine:5.8.2")
         implementation("junit:junit:4.13")
 
-        // JOML
+        // FastUtil
-        if (project.hasProperty("embed_joml") && embed_joml == "true")
+        // Note: MC 1.16 uses 8.2.1, and versions after use 8.5.12
-            shadowMc("org.joml:joml:${rootProject.joml_version}")
+        // We cannot relocate this library since we call some MC classes that reference it
-        else
+        implementation("it.unimi.dsi:fastutil:${rootProject.fastutil_version}")
-            implementation("org.joml:joml:${rootProject.joml_version}")
+
 
         // Compression
-        shadowMc("org.lz4:lz4-java:${rootProject.lz4_version}")
+        forgeShadowMe("org.lz4:lz4-java:${rootProject.lz4_version}") // LZ4
+        forgeShadowMe("org.tukaani:xz:${rootProject.xz_version}") // LZMA
 
         // Sqlite Database
-        shadowMc("org.xerial:sqlite-jdbc:${rootProject.sqlite_jdbc_version}")
+        forgeShadowMe("org.xerial:sqlite-jdbc:${rootProject.sqlite_jdbc_version}")
 
         // NightConfig (includes Toml & Json)
-        shadowMc("com.electronwill.night-config:toml:${rootProject.nightconfig_version}")
+        forgeShadowMe("com.electronwill.night-config:toml:${rootProject.nightconfig_version}")
-        shadowMc("com.electronwill.night-config:json:${rootProject.nightconfig_version}")
+        forgeShadowMe("com.electronwill.night-config:json:${rootProject.nightconfig_version}")
 
         // SVG (not needed atm)
-        //shadowMc("com.formdev:svgSalamander:${rootProject.svgSalamander_version}")
+//        forgeShadowMe("com.formdev:svgSalamander:${rootProject.svgSalamander_version}")
 
         // Netty
         // Breaks 1.16.5
-        //shadowMc("io.netty:netty-all:${rootProject.netty_version}")
+        //forgeShadowMe("io.netty:netty-all:${rootProject.netty_version}")
 
         // Remember, for lwjgl dependencies that arent included in Minecraft, you need to also need to add it to the ShadowJar thing
-        shadowMc("org.lwjgl:lwjgl-jawt:${rootProject.lwjgl_version}") {
+        forgeShadowMe("org.lwjgl:lwjgl-jawt:${rootProject.lwjgl_version}") {
             exclude group: "org.lwjgl", module: "lwjgl" // This module is imported by Minecraft so exclude it
         }
 
@@ -231,12 +234,11 @@ subprojects { p ->
 
         // Add core
         if (isMinecraftSubProject) {
-            compileOnly(project(":core")) {
+            coreProjects(project(":core")) {
                 // Remove Junit test libraries
                 exclude group: "org.junit.jupiter", module: "junit-jupiter"
                 exclude group: "org.junit.jupiter", module: "junit-jupiter-engine"
                 exclude group: "junit", module: "junit"
-
                 // Removed dependencies
                 transitive false
             }
@@ -244,12 +246,11 @@ subprojects { p ->
 
         // Add the api
         if (p != project(":api")) {
-            implementation(project(":api")) {
+            coreProjects(project(":api")) {
                 // Remove Junit test libraries
                 exclude group: "org.junit.jupiter", module: "junit-jupiter"
                 exclude group: "org.junit.jupiter", module: "junit-jupiter-engine"
                 exclude group: "junit", module: "junit"
-
                 // Removed dependencies
                 transitive false
             }
@@ -258,20 +259,30 @@ subprojects { p ->
         // Add common
         if (isMinecraftSubProject && p != project(":common")) {
             // Common
-            compileOnly(project(":common")) { transitive false }
+            common(project(":common")) { transitive false }
+            shadowCommon(project(":common")) { transitive false }
+
+            // FabricLike
+            if (findProject(":fabricLike") && p != project(":fabricLike")) {
+                fabricLike(project(path: ":fabricLike")) { transitive false }
+                shadowFabricLike(project(path: ":fabricLike")) { transitive false }
+            }
         }
     }
 
 
     shadowJar {
-        configurations = [project.configurations.shadowMc]
+        configurations = [project.configurations.shadowMe]
-        
         if (isMinecraftSubProject && p != project(":common")) {
+            configurations.push(project.configurations.shadowCommon) // Shadow the common subproject
             relocate "com.seibel.distanthorizons.common", "loaderCommon.${p.name}.com.seibel.distanthorizons.common" // Move the loader files to a different location
+
+            if (findProject(":fabricLike") && p != project(":fabricLike")) {
+                configurations.push(project.configurations.shadowFabricLike) // Shadow the fabricLike subproject
+                relocate "com.seibel.distanthorizons.fabriclike", "loaderCommon.${p.name}.com.seibel.distanthorizons.fabriclike" // Move the loader files to a different location
             }
-        
+        }
-        
+        def librariesLocation = "DistantHorizons.libraries"
-        def librariesLocation = "distanthorizons.libraries"
 
         // LWJGL
         // Only ever shadow the dependencies we use otherwise some stuff would break when running on an external client
@@ -299,26 +310,26 @@ subprojects { p ->
 
         mergeServiceFiles()
     }
-    // Using jar.finalizedBy(shadowJar) causes issues so we do this scuffed bypass
+
-    jar.dependsOn(shadowJar)
+    // For downgrading the Java version of our project to match the minimum Java version required by the selected Minecraft version.
+    task jarDowngrade(type: xyz.wagyourtail.jvmdg.gradle.task.DowngradeJar) {
+        inputFile = tasks.shadowJar.archiveFile
+        downgradeTo = JavaVersion.toVersion(rootProject.java_version as Integer)
+        archiveClassifier = "downgraded-${rootProject.java_version}"
+    }
+    task apiDowngrade(type: xyz.wagyourtail.jvmdg.gradle.task.ShadeJar) {
+        inputFile = jarDowngrade.archiveFile
+        downgradeTo = JavaVersion.toVersion(rootProject.java_version as Integer)
+        archiveClassifier = "downgraded-${rootProject.java_version}-shaded-java-api"
+    }
+    // We're using a custom downgrade task so we disable the original downgrade tasks
+    downgradeJar.enabled = false
+    shadeDowngradedApi.enabled = false
 
 
     // Put stuff from gradle.properties into the mod info
     processResources {
-        duplicatesStrategy = DuplicatesStrategy.WARN
+        def resourceTargets = [ // Location of where to inject the properties
-        // Include all the resources
-        from project(":common").sourceSets.main.resources
-        from project(":core").sourceSets.main.resources
-        from project(":api").sourceSets.main.resources
-        
-        // Copy accessWideners
-        // FIXME: remove copyCommonLoaderResources and use this instead (and if you are removing that task, also remove copyCoreResources while your at it)
-//        from project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener")
-//        into(file(p.file("build/resources/main")))
-        rename "${accessWidenerVersion}.distanthorizons.accesswidener", "distanthorizons.accesswidener"
-
-        // Location of where to inject the properties
-        def resourceTargets = [
                                 // Holds info like git commit
                                 // TODO: For some reason this script doesnt work with the core project
                                 "build_info.json",
@@ -327,11 +338,12 @@ subprojects { p ->
                                 "fabric.mod.json",
                                 "quilt.mod.json",
                                 "META-INF/mods.toml",
+                                "META-INF/neoforge.mods.toml",
 
                                 // The mixins for each of the loaders
                                 "DistantHorizons."+ p.name +".fabricLike.mixins.json"
         ]
-        def buildResourceTargets = ["$buildDir/resources/main/"] // Location of the built resources folder
+        def intoTargets = ["$buildDir/resources/main/"] // Location of the built resources folder
 
         // Fix forge version numbering system as it is weird
         // For whatever reason forge uses [1.18, 1.18.1, 1.18.2) instead of the standard ["1.18", "1.18.1", "1.18.2"]
@@ -339,7 +351,7 @@ subprojects { p ->
 //        println compatible_forgemc_versions
 
         // Quilt's custom contributors system
-        // has to be in the format:
+        // This has to be like
         // "Person": "Developer", "Another person": "Developer"
         def quilt_contributors = []
         def mod_author_list = mod_authors.replaceAll("\"", "").replace("[", "").replace("]", "").split(",")
@@ -391,14 +403,12 @@ subprojects { p ->
 
         // replace any properties in the sub-projects with the values defined here
         inputs.properties replaceProperties
-        replaceProperties.put("project", project)
+        replaceProperties.put "project", project
         filesMatching(resourceTargets) {
             expand replaceProperties
         }
 
-        
+        intoTargets.each { target ->
-        // copy all our resources into the loader specific resource directory
-        buildResourceTargets.each { target ->
             if (file(target).exists()) {
                 copy {
                     from(sourceSets.main.resources) {
@@ -524,14 +534,16 @@ allprojects { p ->
             }
         }
 
-        // Required for ModMenu
+        // VanillaGradle and Mixins in common
-        maven { url "https://maven.terraformersmc.com/" }
-
-        // Required for Mixins & VanillaGradle
         maven { url "https://repo.spongepowered.org/maven/" }
 
-        // Required for Canvas (mod)
+        // Canvas mod
         maven { url "https://maven.vram.io/" }
+        // ModMenu mod
+        maven { url "https://maven.terraformersmc.com/" }
+
+        // neoforge
+        maven { url "https://maven.neoforged.net/releases/" }
         
         // These 3 are for importing mods that arnt on CursedForge, Modrinth, GitHub, GitLab or anywhere opensource
         flatDir {
@@ -555,73 +567,38 @@ allprojects { p ->
         // TODO: If neoforged is ever needed, should we use that, or call it a forge mod?
     }
 
-    // Adds some dependencies that are in vanilla but not in core
-    if (p == project(":core")) {
-        OperatingSystem os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem;
-
-        // Set the OS lwjgl is using to the current os
-        project.ext.lwjglNatives = "natives-" + os.toFamilyName()
-
-        // TODO: Include Minecraft in core-projects but dont include MC code stuff
-        dependencies { // All of these dependencies are in Vanilla Minecraft, but we need to depend on it as we arent importing Minecraft in the core
-            // Imports most of lwjgl's libraries (well, only the ones that we need)
-            implementation platform("org.lwjgl:lwjgl-bom:${rootProject.lwjgl_version}") // TODO: Use Minecraft's version for lwjgl_version (which changes in nearly every version) instead of a hard defined version for all versions
-
-            // REMEMBER: Dont shadow stuff here, these are just the libs that are included in Minecraft so that the core can use
-            implementation "org.lwjgl:lwjgl"
-            implementation "org.lwjgl:lwjgl-assimp"
-            implementation "org.lwjgl:lwjgl-glfw"
-            implementation "org.lwjgl:lwjgl-openal"
-            implementation "org.lwjgl:lwjgl-opengl"
-            implementation "org.lwjgl:lwjgl-stb"
-            implementation "org.lwjgl:lwjgl-tinyfd"
-            runtimeOnly "org.lwjgl:lwjgl::$lwjglNatives"
-            runtimeOnly "org.lwjgl:lwjgl-assimp::$lwjglNatives"
-            runtimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives"
-            runtimeOnly "org.lwjgl:lwjgl-openal::$lwjglNatives"
-            runtimeOnly "org.lwjgl:lwjgl-opengl::$lwjglNatives"
-            runtimeOnly "org.lwjgl:lwjgl-stb::$lwjglNatives"
-            runtimeOnly "org.lwjgl:lwjgl-tinyfd::$lwjglNatives"
-            implementation "org.joml:joml:${rootProject.joml_version}"
-
-
-            // Some other dependencies
-            implementation("org.jetbrains:annotations:16.0.2")
-            implementation("com.google.code.findbugs:jsr305:3.0.2")
-            implementation("com.google.common:google-collect:0.5")
-            implementation("com.google.guava:guava:31.1-jre")
-            implementation("it.unimi.dsi:fastutil:8.5.11")
-        }
-    }
-
-
-    // TODO: Remove this as no loader needs this
-    //  - Fabric can rename which aw they use
-    //  - (Neo)Forge converts the aw to their own at, which is stored at a different place
     task copyCommonLoaderResources(type: Copy) {
         from project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener")
         into(file(p.file("build/resources/main")))
         rename "${accessWidenerVersion}.distanthorizons.accesswidener", "distanthorizons.accesswidener"
+
+
+        // Move the fabricLike mixin to its different places for each subproject
+        if (findProject(":fabricLike")) {
+            from project(":fabricLike").file("src/main/resources/DistantHorizons.fabricLike.mixins.json")
+            into(file(p.file("build/resources/main")))
+            rename "DistantHorizons.fabricLike.mixins.json", "DistantHorizons." + p.name + ".fabricLike.mixins.json"
+        }
     }
 
-    // TODO: Remove this later as we no longer need this. We are now including the resources in the processResources section
     task copyCoreResources(type: Copy) {
         from fileTree(project(":core").file("src/main/resources"))
         into p.file("build/resources/main")
     }
 
-    compileJava {
+    tasks.withType(JavaCompile) {
         if (isMinecraftSubProject) {
-            options.release = rootProject.java_version as Integer
+            options.release = rootProject.java_version as Integer // Neoforge complains without this
             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
         }
         options.encoding = "UTF-8"
     }
 
+    // Sets the project's actual Java version (it's recommended to use this over the `options.release` method above)
     java {
+        sourceCompatibility = rootProject.java_version
+        targetCompatibility = rootProject.java_version
+
         withSourcesJar()
     }
 }

common/build.gradle

@@ -1,16 +1,39 @@
-// Use Unimined's implimentation for MC as we can use Parchment mappings in common now! :tada:
-// With Sponge's vanilla gradle, we cannot change the mappings to anything out of mojmaps 
-unimined.minecraft {
-    fabric { // TODO: Find a way to only include the mc stuff, not fabric's loader
-        loader rootProject.fabric_loader_version
-        accessWidener(project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener"))
 
-        skipInsertAw = true
+// temporary fix for broken spongepowered version
+buildscript {
+    configurations.configureEach {
+        resolutionStrategy {
+            force 'org.spongepowered:vanillagradle:0.2.1-20240507.024226-82'
         }
+    }
+}
 
-    defaultRemapJar = false
+plugins {
+    id "org.spongepowered.gradle.vanilla" version "0.2.1-SNAPSHOT"
+}
+
+minecraft {
+    accessWideners(project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener"))
+    version(rootProject.minecraft_version)
 }
 
 dependencies {
-    
+    // So mixins can be written in common
+    compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5'
 }
+
+
+publishing {
+    publications {
+        mavenCommon(MavenPublication) {
+            artifactId = rootProject.mod_readable_name
+            from components.java
+        }
+    }
+
+    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+    repositories {
+        // Add repositories to publish to here.
+    }
+}
+

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

@@ -103,7 +103,7 @@ public abstract class AbstractModInitializer
 		LOGGER.info(ModInfo.READABLE_NAME + " Initialized");
 		ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null);
 		
-		this.subscribeRegisterCommandsEvent(dispatcher -> { this.commandDispatcher = dispatcher; });
+		this.subscribeRegisterCommandsEvent(dispatcher -> this.commandDispatcher = dispatcher);
 		
 		this.subscribeServerStartingEvent(server -> 
 		{
@@ -166,10 +166,7 @@ public abstract class AbstractModInitializer
 		LOGGER.info("Mod Post-Initialized");
 	}
 	
-	private void initCommands()
+	private void initCommands() { /* currently unimplemented */ }
-	{
-		// TODO
-	}
 	
 	
 	

common/src/main/java/com/seibel/distanthorizons/common/rendering/SeamlessOverdraw.java

@@ -1,94 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 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.rendering;
-
-#if MC_VER < MC_1_19_4
-import com.mojang.math.Matrix4f;
-#else
-import org.joml.Matrix4f;
-#endif
-import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.util.RenderUtil;
-import com.seibel.distanthorizons.coreapi.util.math.Mat4f;
-import org.lwjgl.opengl.GL15;
-
-import java.nio.FloatBuffer;
-
-public class SeamlessOverdraw
-{
-	/**
-	 * Proof-of-concept experimental option, not intended for normal use. <br>
-	 * (Poorly) replaces Minecraft's far clip plane so it lines up with DH's near clip plane.
-	 */
-	public static float[] overwriteMinecraftNearFarClipPlanes(Matrix4f minecraftProjectionMatrix, float previousPartialTicks)
-	{
-		float[] matrixFloatArray;
-		
-		#if MC_VER < MC_1_19_4
-		FloatBuffer matrixFloatBuffer = FloatBuffer.allocate(16);
-		minecraftProjectionMatrix.store(matrixFloatBuffer);
-		matrixFloatArray = matrixFloatBuffer.array();
-		#else
-		// Passing float buffers in caused native code crashes, so we are passing in a float array instead			
-		matrixFloatArray = new float[16];
-		minecraftProjectionMatrix.get(matrixFloatArray);
-		#endif
-		
-		return overwriteMinecraftNearFarClipPlanes(matrixFloatArray, previousPartialTicks);
-	}
-	
-	public static float[] overwriteMinecraftNearFarClipPlanes(Mat4f minecraftProjectionMatrix, float previousPartialTicks)
-	{
-		return overwriteMinecraftNearFarClipPlanes(minecraftProjectionMatrix.getValuesAsArray(), previousPartialTicks);
-	}
-	
-	private static float[] overwriteMinecraftNearFarClipPlanes(float[] projectionMatrixFloatArray, float previousPartialTicks)
-	{
-		float dhFarClipPlane = RenderUtil.getNearClipPlaneDistanceInBlocks(previousPartialTicks);
-		
-		// works for fabric, bad not for forge for some reason :/
-		float farClip = dhFarClipPlane * 5.1f; // magic number found via trial and error, James has no idea what it represents, except that it makes the seam between DH and vanilla rendering pretty close
-		float nearClip = 0.5f; // this causes issues with some vanilla rendering, specifically the wireframe around selected blocks is slightly off. Unfortunately the ratio between the near and far clip plane can't be easily modified without completely screwing up the rendering. 
-		
-		// these may be the wrong index locations in any version of MC other than 1.18.2
-		projectionMatrixFloatArray[10] = -((farClip + nearClip) / (farClip - nearClip)); // near clip plane
-		projectionMatrixFloatArray[11] = -((2 * farClip * nearClip) / (farClip - nearClip)); // far clip plane
-		
-		
-		return projectionMatrixFloatArray;
-	}
-	
-	
-	
-	//================//
-	// helper methods //
-	//================//
-	
-	public static void applyLegacyProjectionMatrix(float[] projectionMatrixFloatArray)
-	{
-		int glMatrixMode = GL15.glGetInteger(GL15.GL_MATRIX_MODE);
-		GL15.glMatrixMode(GL15.GL_PROJECTION);
-		
-		GL15.glLoadMatrixf(projectionMatrixFloatArray);
-		
-		GL15.glMatrixMode(glMatrixMode);
-	}
-	
-}

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

@@ -26,6 +26,6 @@ public class DependencySetupDoneCheck
 	// TODO move to DependencySetup
 	public static boolean isDone = false;
 	// TODO why is this here and what is its purpose?
-	public static Supplier<Boolean> getIsCurrentThreadDistantGeneratorThread = (() -> { return false; });
+	public static Supplier<Boolean> getIsCurrentThreadDistantGeneratorThread = (() -> false);
 	
 }

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

@@ -26,7 +26,7 @@ import java.util.function.Consumer;
 import com.seibel.distanthorizons.core.enums.EDhDirection;
 import com.seibel.distanthorizons.core.pos.DhBlockPos;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
-import com.seibel.distanthorizons.coreapi.util.math.Mat4f;
+import com.seibel.distanthorizons.core.util.math.Mat4f;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -102,31 +102,15 @@ public class McObjectConverter
 		lodDirections = new EDhDirection[lodDirs.length];
 		for (EDhDirection lodDir : lodDirs)
 		{
-			Direction dir;
+			Direction dir = switch (lodDir.name().toUpperCase()) {
-			switch (lodDir.name().toUpperCase())
+                case "DOWN" -> Direction.DOWN;
-			{
+                case "UP" -> Direction.UP;
-				case "DOWN":
+                case "NORTH" -> Direction.NORTH;
-					dir = Direction.DOWN;
+                case "SOUTH" -> Direction.SOUTH;
-					break;
+                case "WEST" -> Direction.WEST;
-				case "UP":
+                case "EAST" -> Direction.EAST;
-					dir = Direction.UP;
+                default -> null;
-					break;
+            };
-				case "NORTH":
-					dir = Direction.NORTH;
-					break;
-				case "SOUTH":
-					dir = Direction.SOUTH;
-					break;
-				case "WEST":
-					dir = Direction.WEST;
-					break;
-				case "EAST":
-					dir = Direction.EAST;
-					break;
-				default:
-					dir = null;
-					break;
-			}
 
             if (dir == null)
 			{

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

@@ -32,6 +32,7 @@ import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.core.level.IDhLevel;
 import com.seibel.distanthorizons.core.level.IDhServerLevel;
+import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
@@ -54,9 +55,6 @@ import java.util.HashSet;
 
 /**
  * This handles creating abstract wrapper objects.
- *
- * @author James Seibel
- * @version 2022-12-5
  */
 public class WrapperFactory implements IWrapperFactory
 {
@@ -81,17 +79,56 @@ public class WrapperFactory implements IWrapperFactory
 		}
 	}
 	
+	@Override
+	public IDhApiBiomeWrapper getBiomeWrapper(String resourceLocationString, IDhApiLevelWrapper levelWrapper) throws IOException, ClassCastException
+	{
+		if (!(levelWrapper instanceof ILevelWrapper))
+		{
+			throw new ClassCastException("levelWrapper must be returned by DH and of type ["+ILevelWrapper.class.getName()+"].");
+		}
+		
+		return BiomeWrapper.deserialize(resourceLocationString, (ILevelWrapper)levelWrapper); 
+	}
+	@Override
+	public IDhApiBlockStateWrapper getDefaultBlockStateWrapper(String resourceLocationString, IDhApiLevelWrapper levelWrapper) throws IOException, ClassCastException
+	{
+		if (!(levelWrapper instanceof ILevelWrapper))
+		{
+			throw new ClassCastException("Invalid ["+IDhApiLevelWrapper.class.getSimpleName()+"] value given. Level wrapper object must be one given by the DH API (it can't be a custom implementation), specifically of type ["+ILevelWrapper.class.getName()+"].");
+		}
+		
+		return BlockStateWrapper.deserialize(resourceLocationString, (ILevelWrapper)levelWrapper); 
+	}
+	
 	@Override
 	public IBiomeWrapper deserializeBiomeWrapper(String str, ILevelWrapper levelWrapper) throws IOException { return BiomeWrapper.deserialize(str, levelWrapper); }
+	@Override 
+	public IBiomeWrapper getPlainsBiomeWrapper(ILevelWrapper levelWrapper) // TODO is there a way we could get this without the levelWrapper? it isn't necessary but would clean up the code a bit
+	{
+		try
+		{
+			return BiomeWrapper.deserialize(BiomeWrapper.PLAINS_RESOURCE_LOCATION_STRING, levelWrapper);
+		}
+		catch (IOException e) 
+		{
+			throw new LodUtil.AssertFailureException("Unable to parse plains resource string ["+BiomeWrapper.PLAINS_RESOURCE_LOCATION_STRING+"], error:\n " + e.getMessage());
+		}
+	}
 	
 	@Override
 	public IBlockStateWrapper deserializeBlockStateWrapper(String str, ILevelWrapper levelWrapper) throws IOException { return BlockStateWrapper.deserialize(str, levelWrapper); }
-	
 	@Override
 	public IBlockStateWrapper getAirBlockStateWrapper() { return BlockStateWrapper.AIR; }
 	
 	@Override
 	public HashSet<IBlockStateWrapper> getRendererIgnoredBlocks(ILevelWrapper levelWrapper) { return BlockStateWrapper.getRendererIgnoredBlocks(levelWrapper); }
+	@Override
+	public HashSet<IBlockStateWrapper> getRendererIgnoredCaveBlocks(ILevelWrapper levelWrapper) { return BlockStateWrapper.getRendererIgnoredCaveBlocks(levelWrapper); }
+	
+	@Override
+	public void resetRendererIgnoredCaveBlocks() { BlockStateWrapper.clearRendererIgnoredCaveBlocks(); }
+	@Override
+	public void resetRendererIgnoredBlocksSet() { BlockStateWrapper.clearRendererIgnoredBlocks(); }
 	
 	
 	/**
@@ -118,25 +155,23 @@ public class WrapperFactory implements IWrapperFactory
 			}
 		}
 		
-		#if MC_VER <= MC_1_20_4
+		#if MC_VER <= MC_1_21
 		else if (objectArray.length == 2)
 		{
 			// correct number of parameters from the API
 			
 			// chunk
-			if (!(objectArray[0] instanceof ChunkAccess))
+			if (!(objectArray[0] instanceof ChunkAccess chunk))
 			{
 				throw new ClassCastException(createChunkWrapperErrorMessage(objectArray));
 			}
-			ChunkAccess chunk = (ChunkAccess) objectArray[0];
 			
 			// level / light source
-			if (!(objectArray[1] instanceof Level))
+			if (!(objectArray[1] instanceof Level level))
 			{
 				throw new ClassCastException(createChunkWrapperErrorMessage(objectArray));
 			}
 			// the level is needed for the DH level wrapper...
-			Level level = (Level) objectArray[1];
 			// ...the LevelReader is needed for chunk lighting
 			LevelReader lightSource = level;
 			
@@ -183,7 +218,7 @@ public class WrapperFactory implements IWrapperFactory
 	{
 		String[] expectedClassNames;
 		
-		#if MC_VER <= MC_1_20_4
+		#if MC_VER <= MC_1_21
 		expectedClassNames = new String[] 
 		{
 			ChunkAccess.class.getName(),
@@ -208,11 +243,10 @@ public class WrapperFactory implements IWrapperFactory
 	public IDhApiBiomeWrapper getBiomeWrapper(Object[] objectArray, IDhApiLevelWrapper levelWrapper) 
 	{
 		// confirm the API level wrapper is also a Core wrapper 
-		if (!(levelWrapper instanceof ILevelWrapper))
+		if (!(levelWrapper instanceof ILevelWrapper coreLevelWrapper))
 		{
-			throw new ClassCastException("Unable to cast... only DH provided IDhApiLevelWrapper's can be used."); // TODO
+			throw new ClassCastException("Invalid ["+IDhApiLevelWrapper.class.getSimpleName()+"] value given. Level wrapper object must be one given by the DH API (it can't be a custom implementation), specifically of type ["+ILevelWrapper.class.getName()+"].");
 		}
-		ILevelWrapper coreLevelWrapper = (ILevelWrapper) levelWrapper;
 		
 		
 		
@@ -231,7 +265,7 @@ public class WrapperFactory implements IWrapperFactory
 		
 		Biome biome = (Biome) objectArray[0];
 		return BiomeWrapper.getBiomeWrapper(biome, coreLevelWrapper);
-		#elif MC_VER <= MC_1_20_4
+		#elif MC_VER <= MC_1_21
 		if (!(objectArray[0] instanceof Holder) || !(((Holder<?>) objectArray[0]).value() instanceof Biome))
 		{
 			throw new ClassCastException(createBiomeWrapperErrorMessage(objectArray));
@@ -254,7 +288,7 @@ public class WrapperFactory implements IWrapperFactory
 		
 		#if MC_VER < MC_1_18_2
 		expectedClassNames = new String[] { Biome.class.getName() };
-		#elif MC_VER <= MC_1_20_4
+		#elif MC_VER <= MC_1_21
 		expectedClassNames = new String[] { Holder.class.getName()+"<"+Biome.class.getName()+">" };
 		#else
 			// See preprocessor comment in createChunkWrapper() for full documentation
@@ -267,25 +301,23 @@ public class WrapperFactory implements IWrapperFactory
 	public IDhApiBlockStateWrapper getBlockStateWrapper(Object[] objectArray, IDhApiLevelWrapper levelWrapper)
 	{
 		// confirm the API level wrapper is also a Core wrapper 
-		if (!(levelWrapper instanceof ILevelWrapper))
+		if (!(levelWrapper instanceof ILevelWrapper coreLevelWrapper))
 		{
-			throw new ClassCastException("Unable to cast... only DH provided IDhApiLevelWrapper's can be used."); // TODO
+			throw new ClassCastException("Invalid ["+IDhApiLevelWrapper.class.getSimpleName()+"] value given. Level wrapper object must be one given by the DH API (it can't be a custom implementation), specifically of type ["+ILevelWrapper.class.getName()+"].");
 		}
-		ILevelWrapper coreLevelWrapper = (ILevelWrapper) levelWrapper;
 		
 		
 		
-		#if MC_VER <= MC_1_20_4
+		#if MC_VER <= MC_1_21
 		if (objectArray.length != 1)
 		{
 			throw new ClassCastException(createBlockStateWrapperErrorMessage(objectArray));
 		}
-		if (!(objectArray[0] instanceof BlockState))
+		if (!(objectArray[0] instanceof BlockState blockState))
 		{
 			throw new ClassCastException(createBlockStateWrapperErrorMessage(objectArray));
 		}
 		
-		BlockState blockState = (BlockState) objectArray[0];
 		return BlockStateWrapper.fromBlockState(blockState, coreLevelWrapper);
 		#else
 		// See preprocessor comment in createChunkWrapper() for full documentation (not a typo, check createChunkWrapper()'s else statement for full documentation)
@@ -302,7 +334,7 @@ public class WrapperFactory implements IWrapperFactory
 		
 		#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
 		expectedClassNames = new String[] { Biome.class.getName() };
-		#elif MC_VER <= MC_1_20_4
+		#elif MC_VER <= MC_1_21
 		expectedClassNames = new String[] { Holder.class.getName()+"<"+Biome.class.getName()+">" };
 		#else
 		// See preprocessor comment in createChunkWrapper() for full documentation

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

@@ -32,8 +32,6 @@ import org.apache.logging.log4j.Logger;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
 
-import net.minecraft.client.Minecraft;
-
 #if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
 import net.minecraft.core.Registry;
 #elif MC_VER == MC_1_18_2 || MC_VER == MC_1_19_2
@@ -56,16 +54,22 @@ import net.minecraft.world.level.biome.Biomes;
 /** This class wraps the minecraft BlockPos.Mutable (and BlockPos) class */
 public class BiomeWrapper implements IBiomeWrapper
 {
+	// must be defined before AIR, otherwise a null pointer will be thrown
 	private static final Logger LOGGER = LogManager.getLogger();
 	
+	
 	#if MC_VER < MC_1_18_2
 	public static final ConcurrentMap<Biome, BiomeWrapper> WRAPPER_BY_BIOME = new ConcurrentHashMap<>();
 	#else
 	public static final ConcurrentMap<Holder<Biome>, BiomeWrapper> WRAPPER_BY_BIOME = new ConcurrentHashMap<>();
     #endif
 	
-	public static final String EMPTY_STRING = "EMPTY";
+	public static final ConcurrentHashMap<String, BiomeWrapper> WRAPPER_BY_RESOURCE_LOCATION = new ConcurrentHashMap<>();
-	public static final BiomeWrapper EMPTY_WRAPPER = new BiomeWrapper();
+	
+	public static final String EMPTY_BIOME_STRING = "EMPTY";
+	public static final BiomeWrapper EMPTY_WRAPPER = new BiomeWrapper(null, null);
+	
+	public static final String PLAINS_RESOURCE_LOCATION_STRING = "minecraft:plains";
 	
 	/** keep track of broken biomes so we don't log every time */
 	private static final HashSet<String> brokenResourceLocationStrings = new HashSet<>();
@@ -88,7 +92,8 @@ public class BiomeWrapper implements IBiomeWrapper
     #endif
 	
 	/** technically final, but since it requires a method call to generate it can't be marked as such */
-	private String serialString = null;
+	private String serialString;
+	private final int hashCode;
 	
 	
 	
@@ -119,14 +124,17 @@ public class BiomeWrapper implements IBiomeWrapper
 	{
 		this.biome = biome;
 		this.serialString = this.serialize(levelWrapper);
-		LOGGER.trace("Created BiomeWrapper ["+this.serialString+"] for ["+biome+"]");
+		this.hashCode = Objects.hash(this.serialString);
+		
+		//LOGGER.trace("Created BiomeWrapper ["+this.serialString+"] for ["+biome+"]");
 	}
 	
 	/** should only be used to create {@link BiomeWrapper#EMPTY_WRAPPER} */
 	private BiomeWrapper()
 	{
 		this.biome = null;
-		this.serialString = EMPTY_STRING;
+		this.serialString = EMPTY_BIOME_STRING;
+		this.hashCode = Objects.hash(this.serialString);
 	}
 	
 	
@@ -140,7 +148,7 @@ public class BiomeWrapper implements IBiomeWrapper
 	{
 		if (this == EMPTY_WRAPPER)
 		{
-			return EMPTY_STRING;
+			return EMPTY_BIOME_STRING;
 		}
 		
         #if MC_VER < MC_1_18_2
@@ -168,7 +176,7 @@ public class BiomeWrapper implements IBiomeWrapper
 	}
 	
 	@Override
-	public int hashCode() { return Objects.hash(this.getSerialString()); }
+	public int hashCode() { return this.hashCode; }
 	
 	@Override
 	public String getSerialString() { return this.serialString; }
@@ -187,29 +195,31 @@ public class BiomeWrapper implements IBiomeWrapper
 	
 	public String serialize(ILevelWrapper levelWrapper)
 	{
-		if (this.serialString != null)
+		if (this.biome == null)
 		{
-			return this.serialString;
+			return EMPTY_BIOME_STRING;
 		}
 		
 		
+		
 		// we can't generate a serial string if the level is null
 		if (levelWrapper == null)
 		{
 			if (!emptyLevelSerializeFailLogged)
 			{
 				emptyLevelSerializeFailLogged = true;
-				LOGGER.warn("Unable to serialize biome: ["+this.biome+"] because the passed in level wrapper is null. Future errors won't be logged.");
+				LOGGER.warn("Unable to serialize biome: [" + this.biome + "] because the passed in level wrapper is null. Future errors of this type won't be logged.");
 			}
 			
-			return EMPTY_STRING;
+			return EMPTY_BIOME_STRING;
 		}
 		
 		
 		
 		// generate the serial string //
 		
-		net.minecraft.core.RegistryAccess registryAccess = Minecraft.getInstance().level.registryAccess();
+		Level level = (Level)levelWrapper.getWrappedMcObject();
+		net.minecraft.core.RegistryAccess registryAccess = level.registryAccess();
 		
 		ResourceLocation resourceLocation;
 		#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
@@ -241,37 +251,63 @@ public class BiomeWrapper implements IBiomeWrapper
 		return this.serialString;
 	}
 	
+	// TODO would it be worth while to cache these objects in a ConcurrentHashMap<string, IBiomeWrapper>?
 	public static IBiomeWrapper deserialize(String resourceLocationString, ILevelWrapper levelWrapper) throws IOException
 	{
-		if (resourceLocationString.equals(EMPTY_STRING))
+		// we need the final string for the concurrent hash map later
+		final String finalResourceStateString = resourceLocationString;
+		
+		if (resourceLocationString.equals(EMPTY_BIOME_STRING))
 		{
 			if (!emptyStringWarningLogged)
 			{
 				emptyStringWarningLogged = true;
-				LOGGER.warn("[" + EMPTY_STRING + "] biome string deserialized. This may mean the level was null when a save was attempted, a file saving error, or a biome saving error. Future errors will not be logged.");
+				LOGGER.warn("[" + EMPTY_BIOME_STRING + "] biome string deserialized. This may mean the level was null when a save was attempted, a file saving error, or a biome saving error. Future errors will not be logged.");
 			}
 			return EMPTY_WRAPPER;
 		}
-		else if (resourceLocationString.trim().isEmpty() || resourceLocationString.equals(""))
+		else if (resourceLocationString.trim().isEmpty() || resourceLocationString.isEmpty())
 		{
 			LOGGER.warn("Null biome string deserialized.");
 			return EMPTY_WRAPPER;
 		}
 		
+		if (WRAPPER_BY_RESOURCE_LOCATION.containsKey(finalResourceStateString))
+		{
+			return WRAPPER_BY_RESOURCE_LOCATION.get(finalResourceStateString);
+		}
 		
 		
+		
+		// if no wrapper is found, default to the empty wrapper
+		BiomeWrapper foundWrapper = EMPTY_WRAPPER;
+		try
+		{
 			// parse the resource location
 			int separatorIndex = resourceLocationString.indexOf(":");
 			if (separatorIndex == -1)
 			{
 				throw new IOException("Unable to parse resource location string: [" + resourceLocationString + "].");
 			}
-		ResourceLocation resourceLocation = new ResourceLocation(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1));
+			
+			ResourceLocation resourceLocation;
+			try
+			{
+				#if MC_VER < MC_1_21
+				resourceLocation = new ResourceLocation(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1));
+				#else
+				resourceLocation = ResourceLocation.fromNamespaceAndPath(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1));
+				#endif
+			}
+			catch (Exception e)
+			{
+				throw new IOException("No Resource Location found for the string: [" + resourceLocationString + "] Error: [" + e.getMessage() + "].");
+			}
 			
 			
 			try
 			{
-			Level level = (Level)levelWrapper.getWrappedMcObject();
+				Level level = (Level) levelWrapper.getWrappedMcObject();
 				net.minecraft.core.RegistryAccess registryAccess = level.registryAccess();
 				
 				boolean success;
@@ -300,11 +336,18 @@ public class BiomeWrapper implements IBiomeWrapper
 					return EMPTY_WRAPPER;
 				}
 				
-			return getBiomeWrapper(biome, levelWrapper);
+				
+				foundWrapper = (BiomeWrapper) getBiomeWrapper(biome, levelWrapper);
+				return foundWrapper;
 			}
 			catch (Exception e)
 			{
-			throw new IOException("Failed to deserialize the string [" + resourceLocationString + "] into a BiomeWrapper: " + e.getMessage(), e);
+				throw new IOException("Failed to deserialize the string [" + finalResourceStateString + "] into a BiomeWrapper: " + e.getMessage(), e);
+			}
+		}
+		finally
+		{
+			WRAPPER_BY_RESOURCE_LOCATION.putIfAbsent(finalResourceStateString, foundWrapper);
 		}
 	}
 	

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

@@ -19,7 +19,12 @@
 
 package com.seibel.distanthorizons.common.wrappers.block;
 
+import com.seibel.distanthorizons.api.enums.rendering.EDhApiBlockMaterial;
+import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.config.types.ConfigEntry;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.util.ColorUtil;
+import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
@@ -29,10 +34,13 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.Property;
 import org.apache.logging.log4j.Logger;
 
+import java.awt.*;
 import java.io.IOException;
 import java.util.*;
+import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
 #if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
@@ -65,13 +73,15 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
     public static final ConcurrentHashMap<BlockState, BlockStateWrapper> WRAPPER_BY_BLOCK_STATE = new ConcurrentHashMap<>();
+    public static final ConcurrentHashMap<String, BlockStateWrapper> WRAPPER_BY_RESOURCE_LOCATION = new ConcurrentHashMap<>();
 	
 	public static final String AIR_STRING = "AIR";
 	public static final BlockStateWrapper AIR = new BlockStateWrapper(null, null);
 	
-	// TODO: Make this changeable through the config
+	public static final String DIRT_RESOURCE_LOCATION_STRING = "minecraft:dirt";
-	public static final String[] RENDERER_IGNORED_BLOCKS_RESOURCE_LOCATIONS = { AIR_STRING, "minecraft:barrier", "minecraft:structure_void", "minecraft:light", "minecraft:tripwire" };
+	
 	public static HashSet<IBlockStateWrapper> rendererIgnoredBlocks = null;
+	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<>();
@@ -83,13 +93,19 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	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;
 	/** 
 	 * Cached opacity value, -1 if not populated. <br>
-	 * Should be between {@link IBlockStateWrapper#FULLY_OPAQUE} and {@link IBlockStateWrapper#FULLY_OPAQUE}
+	 * 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 irisBlockMaterialId = 0;
+	private byte blockMaterialId = 0;
+	
+	private final boolean isBeaconBlock; 
+	private final boolean isBeaconBaseBlock; 
+	private final boolean isGlassBlock; 
+	private final Color mapColor;
 	
 	
 	
@@ -121,15 +137,47 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	{
 		this.blockState = blockState;
 		this.serialString = this.serialize(levelWrapper);
-		this.irisBlockMaterialId = this.calculateIrisBlockMaterialId();
+		this.hashCode = Objects.hash(this.serialString);
-		LOGGER.trace("Created BlockStateWrapper ["+this.serialString+"] for ["+blockState+"] with material ID ["+this.irisBlockMaterialId+"]");
+		this.blockMaterialId = this.calculateEDhApiBlockMaterialId().index;
+		
+		String lowercaseSerial = this.serialString.toLowerCase();
+		boolean isBeaconBaseBlock = false;
+		for (int i = 0; i < LodUtil.BEACON_BASE_BLOCK_NAME_LIST.size(); i++)
+		{
+			String baseBlockName = LodUtil.BEACON_BASE_BLOCK_NAME_LIST.get(i);
+			if (lowercaseSerial.contains(baseBlockName))
+			{
+				isBeaconBaseBlock = true;
+				break;
+			}
+		}
+		this.isBeaconBaseBlock = isBeaconBaseBlock;
+		this.isBeaconBlock = lowercaseSerial.contains("minecraft:beacon");
+		this.isGlassBlock = lowercaseSerial.contains("glass");
+		
+		int mcColor = 0;
+		if (this.blockState != null)
+		{
+			#if MC_VER < MC_1_20_1
+			mcColor = this.blockState.getMaterial().getColor().col;
+	        #else
+			mcColor = this.blockState.getMapColor(EmptyBlockGetter.INSTANCE, BlockPos.ZERO).col;
+            #endif
+			this.mapColor = ColorUtil.toColorObjRGB(mcColor);
+		}
+		else
+		{
+			this.mapColor = new Color(0,0,0,0);
+		}
+		
+		//LOGGER.trace("Created BlockStateWrapper ["+this.serialString+"] for ["+blockState+"] with material ID ["+this.EDhApiBlockMaterialId+"]");
 	}
 	
 	
 	
-	//================//
+	//====================//
-	// helper methods //
+	// LodBuilder methods //
-	//================//
+	//====================//
 	
 	/** 
 	 * Requires a {@link ILevelWrapper} since {@link BlockStateWrapper#deserialize(String,ILevelWrapper)} also requires one. 
@@ -143,37 +191,104 @@ public class BlockStateWrapper implements IBlockStateWrapper
 			return rendererIgnoredBlocks;
 		}
 		
+		HashSet<String> baseIgnoredBlock = new HashSet<>();
+		baseIgnoredBlock.add(AIR_STRING);
+		rendererIgnoredBlocks = getBlockWrappers(Config.Client.Advanced.LodBuilding.ignoredRenderBlockCsv, baseIgnoredBlock, levelWrapper);
+		return rendererIgnoredBlocks;
+	}
+	/**
+	 * Requires a {@link ILevelWrapper} since {@link BlockStateWrapper#deserialize(String,ILevelWrapper)} also requires one. 
+	 * This way the method won't accidentally be called before the deserialization can be completed.
+	 */
+	public static HashSet<IBlockStateWrapper> getRendererIgnoredCaveBlocks(ILevelWrapper levelWrapper)
+	{
+		// use the cached version if possible
+		if (rendererIgnoredCaveBlocks != null)
+		{
+			return rendererIgnoredCaveBlocks;
+		}
 		
+		HashSet<String> baseIgnoredBlock = new HashSet<>();
+		baseIgnoredBlock.add(AIR_STRING);
+		rendererIgnoredCaveBlocks = getBlockWrappers(Config.Client.Advanced.LodBuilding.ignoredRenderCaveBlockCsv, baseIgnoredBlock, levelWrapper);
+		return rendererIgnoredCaveBlocks;
+	}
+	
+	public static void clearRendererIgnoredBlocks() { rendererIgnoredBlocks = null; }
+	public static void clearRendererIgnoredCaveBlocks() { rendererIgnoredCaveBlocks = null; }
+	
+	
+	
+	// lod builder helpers //
+	
+	private static HashSet<IBlockStateWrapper> getBlockWrappers(ConfigEntry<String> config, HashSet<String> baseResourceLocations, ILevelWrapper levelWrapper)
+	{
+		// get the base blocks 
+		HashSet<String> blockStringList = new HashSet<>();
+		if (baseResourceLocations != null)
+		{
+			blockStringList.addAll(baseResourceLocations);	
+		}
+		
+		// get the config blocks
+		String ignoreBlockCsv = config.get();
+		if (ignoreBlockCsv != null)
+		{
+			blockStringList.addAll(List.of(ignoreBlockCsv.split(",")));
+		}
+		
+		return getBlockWrappers(blockStringList, levelWrapper);
+	}
+	private static HashSet<IBlockStateWrapper> getBlockWrappers(HashSet<String> blockResourceLocationSet, ILevelWrapper levelWrapper)
+	{
 		// deserialize each of the given resource locations
 		HashSet<IBlockStateWrapper> blockStateWrappers = new HashSet<>();
-		for (String blockResourceLocation : RENDERER_IGNORED_BLOCKS_RESOURCE_LOCATIONS)
+		for (String blockResourceLocation : blockResourceLocationSet)
 		{
 			try
 			{
-				BlockStateWrapper DefaultBlockStateToIgnore = (BlockStateWrapper) deserialize(blockResourceLocation, levelWrapper);
+				if (blockResourceLocation == null)
-				blockStateWrappers.add(DefaultBlockStateToIgnore);
+				{
-				
+					// shouldn't happen, but just in case
-				if (DefaultBlockStateToIgnore == AIR)
+					continue;
+				}
+				String cleanedResourceLocation = blockResourceLocation.trim();
+				if (cleanedResourceLocation.length() == 0)
 				{
 					continue;
 				}
 				
+				
+				BlockStateWrapper defaultBlockStateToIgnore = (BlockStateWrapper) deserialize(cleanedResourceLocation, levelWrapper);
+				blockStateWrappers.add(defaultBlockStateToIgnore);
+				
+				if (defaultBlockStateToIgnore != AIR)
+				{
 					// add all possible blockstates (to account for light blocks with different light values and such)
-				List<BlockState> blockStatesToIgnore = DefaultBlockStateToIgnore.blockState.getBlock().getStateDefinition().getPossibleStates();
+					List<BlockState> blockStatesToIgnore = defaultBlockStateToIgnore.blockState.getBlock().getStateDefinition().getPossibleStates();
 					for (BlockState blockState : blockStatesToIgnore)
 					{
 						BlockStateWrapper newBlockToIgnore = BlockStateWrapper.fromBlockState(blockState, levelWrapper);
 						blockStateWrappers.add(newBlockToIgnore);
 					}
 				}
+				else
+				{
+					// air is a special case so it must be handled separately
+					blockStateWrappers.add(AIR);
+				}
+			}
 			catch (IOException e)
 			{
-				LOGGER.warn("Unable to deserialize rendererIgnoredBlock with the resource location: ["+blockResourceLocation+"]. Error: "+e.getMessage(), e);
+				LOGGER.warn("Unable to deserialize block with the resource location: ["+blockResourceLocation+"]. Error: "+e.getMessage(), e);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warn("Unexpected error deserializing block with the resource location: ["+blockResourceLocation+"]. Error: "+e.getMessage(), e);
 			}
 		}
 		
-		rendererIgnoredBlocks = blockStateWrappers;
+		return blockStateWrappers;
-		return rendererIgnoredBlocks;
 	}
 	
 	
@@ -196,23 +311,23 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		int opacity;
 		if (this.isAir())
 		{
-			opacity = FULLY_TRANSPARENT;
+			opacity = LodUtil.BLOCK_FULLY_TRANSPARENT;
 		}
 		else if (this.isLiquid() && !this.blockState.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 = FULLY_TRANSPARENT + 1;
+			opacity = LodUtil.BLOCK_FULLY_TRANSPARENT + 1;
 		}
 		else if (this.blockState.propagatesSkylightDown(EmptyBlockGetter.INSTANCE, BlockPos.ZERO))
 		{
-			opacity = FULLY_TRANSPARENT;
+			opacity = LodUtil.BLOCK_FULLY_TRANSPARENT;
 		}
 		else
 		{
 			// default for all other blocks
-			opacity = FULLY_OPAQUE;
+			opacity = LodUtil.BLOCK_FULLY_OPAQUE;
 		}
 		
 		
@@ -245,7 +360,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	}
 	
 	@Override
-	public int hashCode() { return Objects.hash(this.getSerialString()); }
+	public int hashCode() { return this.hashCode; } 
 	
 	
 	@Override
@@ -281,7 +396,17 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	}
 	
 	@Override
-	public byte getIrisBlockMaterialId() { return this.irisBlockMaterialId; }
+	public boolean isBeaconBlock() { return this.isBeaconBlock; }
+	@Override
+	public boolean isBeaconBaseBlock() { return this.isBeaconBaseBlock; }
+	@Override
+	public boolean isGlassBlock() { return this.isGlassBlock; }
+	
+	@Override
+	public Color getMapColor() { return this.mapColor; }
+	
+	@Override
+	public byte getMaterialId() { return this.blockMaterialId; }
 	
 	@Override
 	public String toString() { return this.getSerialString(); }
@@ -334,13 +459,26 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	/** will only work if a level is currently loaded */
 	public static IBlockStateWrapper deserialize(String resourceStateString, ILevelWrapper levelWrapper) throws IOException
 	{
-		if (resourceStateString.equals(AIR_STRING) || resourceStateString.equals("")) // the empty string shouldn't normally happen, but just in case
+		// we need the final string for the concurrent hash map later
+		final String finalResourceStateString = resourceStateString;
+		
+		if (finalResourceStateString.equals(AIR_STRING) || finalResourceStateString.isEmpty()) // the empty string shouldn't normally happen, but just in case
 		{
 			return AIR;
 		}
 		
+		// attempt to use the existing wrapper
+		if (WRAPPER_BY_RESOURCE_LOCATION.containsKey(finalResourceStateString))
+		{
+			return WRAPPER_BY_RESOURCE_LOCATION.get(finalResourceStateString);
+		}
 		
 		
+		
+		// if no wrapper is found, default to air
+		BlockStateWrapper foundWrapper = AIR;
+		try
+		{
 			// try to parse out the BlockState
 			String blockStatePropertiesString = null; // will be null if no properties were included
 			int stateSeparatorIndex = resourceStateString.indexOf(STATE_STRING_SEPARATOR);
@@ -352,12 +490,25 @@ public class BlockStateWrapper implements IBlockStateWrapper
 			}
 			
 			// parse the resource location
-		int resourceSeparatorIndex = resourceStateString.indexOf(RESOURCE_LOCATION_SEPARATOR);
+			int separatorIndex = resourceStateString.indexOf(RESOURCE_LOCATION_SEPARATOR);
-		if (resourceSeparatorIndex == -1)
+			if (separatorIndex == -1)
 			{
 				throw new IOException("Unable to parse Resource Location out of string: [" + resourceStateString + "].");
 			}
-		ResourceLocation resourceLocation = new ResourceLocation(resourceStateString.substring(0, resourceSeparatorIndex), resourceStateString.substring(resourceSeparatorIndex + 1));
+			
+			ResourceLocation resourceLocation;
+			try
+			{
+				#if MC_VER < MC_1_21
+				resourceLocation = new ResourceLocation(resourceStateString.substring(0, separatorIndex), resourceStateString.substring(separatorIndex + 1));
+				#else
+				resourceLocation = ResourceLocation.fromNamespaceAndPath(resourceStateString.substring(0, separatorIndex), resourceStateString.substring(separatorIndex + 1));
+				#endif
+			}
+			catch (Exception e)
+			{
+				throw new IOException("No Resource Location found for the string: [" + resourceStateString + "] Error: [" + e.getMessage() + "].");
+			}
 			
 			
 			
@@ -367,7 +518,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 				
 				#if MC_VER > MC_1_17_1
 				// use the given level if possible, otherwise try using the currently loaded one 
-			Level level = (levelWrapper != null ? (Level)levelWrapper.getWrappedMcObject() : null);
+				Level level = (levelWrapper != null ? (Level) levelWrapper.getWrappedMcObject() : null);
 				level = (level == null ? Minecraft.getInstance().level : level);
 				#endif
 				
@@ -391,6 +542,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 						BrokenResourceLocations.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.");
 					}
+					
 					return AIR;
 				}
 				
@@ -426,11 +578,20 @@ public class BlockStateWrapper implements IBlockStateWrapper
 					
 					foundState = block.defaultBlockState();
 				}
-			return new BlockStateWrapper(foundState, levelWrapper);
+				
+				foundWrapper = new BlockStateWrapper(foundState, levelWrapper);
+				return foundWrapper;
 			}
 			catch (Exception e)
 			{
-			throw new IOException("Failed to deserialize the string [" + resourceStateString + "] into a BlockStateWrapper: " + e.getMessage(), e);
+				throw new IOException("Failed to deserialize the string [" + finalResourceStateString + "] into a BlockStateWrapper: " + e.getMessage(), e);
+			}
+		}
+		finally
+		{
+			// put if absent in case two threads deserialize at the same time
+			// unfortunately we can't put everything in a computeIfAbsent() since we also throw exceptions
+			WRAPPER_BY_RESOURCE_LOCATION.putIfAbsent(finalResourceStateString, foundWrapper);
 		}
 	}
 	
@@ -442,7 +603,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		
 		// alphabetically sort the list so they are always in the same order
 		List<net.minecraft.world.level.block.state.properties.Property<?>> sortedBlockPropteryList = new ArrayList<>(blockPropertyCollection);
-		sortedBlockPropteryList.sort((a, b) -> a.getName().compareTo(b.getName()));
+		sortedBlockPropteryList.sort(Comparator.comparing(Property::getName));
 		
 		
 		StringBuilder stringBuilder = new StringBuilder();
@@ -470,11 +631,11 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	// Iris methods //
 	//==============//
 	
-	private byte calculateIrisBlockMaterialId() 
+	private EDhApiBlockMaterial calculateEDhApiBlockMaterialId() 
 	{
 		if (this.blockState == null)
 		{
-			return IrisBlockMaterial.AIR;
+			return EDhApiBlockMaterial.AIR;
 		}
 		
 		
@@ -487,15 +648,15 @@ public class BlockStateWrapper implements IBlockStateWrapper
 			|| serialString.contains("mushroom")
 			) 
 		{
-			return IrisBlockMaterial.LEAVES;
+			return EDhApiBlockMaterial.LEAVES;
 		}
 		else if (this.blockState.is(Blocks.LAVA))
 		{
-			return IrisBlockMaterial.LAVA;
+			return EDhApiBlockMaterial.LAVA;
 		}
 		else if (this.isLiquid() || this.blockState.is(Blocks.WATER))
 		{
-			return IrisBlockMaterial.WATER;
+			return EDhApiBlockMaterial.WATER;
 		}
 		else if (this.blockState.getSoundType() == SoundType.WOOD
 				|| serialString.contains("root")
@@ -504,7 +665,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 				#endif
 				) 
 		{
-			return IrisBlockMaterial.WOOD;
+			return EDhApiBlockMaterial.WOOD;
 		}
 		else if (this.blockState.getSoundType() == SoundType.METAL
 				#if MC_VER >= MC_1_19_2
@@ -516,18 +677,21 @@ public class BlockStateWrapper implements IBlockStateWrapper
 				#endif
 				) 
 		{
-			return IrisBlockMaterial.METAL;
+			return EDhApiBlockMaterial.METAL;
+		}
+		else if (serialString.contains("grass_block"))
+		{
+			return EDhApiBlockMaterial.GRASS;
 		}
 		else if (
 			serialString.contains("dirt")
-			|| serialString.contains("grass_block")
 			|| serialString.contains("gravel")
 			|| serialString.contains("mud")
 			|| serialString.contains("podzol")
 			|| serialString.contains("mycelium")
 			)
 		{
-			return IrisBlockMaterial.DIRT;
+			return EDhApiBlockMaterial.DIRT;
 		}
 		#if MC_VER >= MC_1_17_1
 		else if (this.blockState.getSoundType() == SoundType.DEEPSLATE
@@ -536,37 +700,37 @@ public class BlockStateWrapper implements IBlockStateWrapper
 				|| this.blockState.getSoundType() == SoundType.POLISHED_DEEPSLATE
 				|| serialString.contains("deepslate") ) 
 		{
-			return IrisBlockMaterial.DEEPSLATE;
+			return EDhApiBlockMaterial.DEEPSLATE;
 		} 
 		#endif
 		else if (this.serialString.contains("snow"))
 		{
-			return IrisBlockMaterial.SNOW;
+			return EDhApiBlockMaterial.SNOW;
 		} 
 		else if (serialString.contains("sand"))
 		{
-			return IrisBlockMaterial.SAND;
+			return EDhApiBlockMaterial.SAND;
 		}
 		else if (serialString.contains("terracotta"))
 		{
-			return IrisBlockMaterial.TERRACOTTA;
+			return EDhApiBlockMaterial.TERRACOTTA;
 		} 
 		else if (this.blockState.is(BlockTags.BASE_STONE_NETHER)) 
 		{
-			return IrisBlockMaterial.NETHER_STONE;
+			return EDhApiBlockMaterial.NETHER_STONE;
 		} 
 		else if (serialString.contains("stone")
 				|| serialString.contains("ore")) 
 		{
-			return IrisBlockMaterial.STONE;
+			return EDhApiBlockMaterial.STONE;
 		}
 		else if (this.blockState.getLightEmission() > 0) 
 		{
-			return IrisBlockMaterial.ILLUMINATED;
+			return EDhApiBlockMaterial.ILLUMINATED;
 		}
 		else
 		{
-			return IrisBlockMaterial.UNKOWN;
+			return EDhApiBlockMaterial.UNKNOWN;
 		}
 	}
 	

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

@@ -19,14 +19,20 @@
 
 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;
 
 #if MC_VER >= MC_1_18_2
@@ -35,18 +41,54 @@ import net.minecraft.core.Holder;
 
 public class TintWithoutLevelOverrider implements BlockAndTintGetter
 {
-	final BiomeWrapper biome;
+	/** 
+	 * This will only ever be null if there was an issue with {@link IClientLevelWrapper#getPlainsBiomeWrapper()}
+	 * but {@link Nullable} is there just in case. 
+	 */
+	@Nullable
+	private final Biome biome;
 	
-	public TintWithoutLevelOverrider(BiomeWrapper biome)
+	
+	
+	public TintWithoutLevelOverrider(BiomeWrapper biomeWrapper, IClientLevelWrapper clientLevelWrapper)
 	{
-		this.biome = biome;
+		// try to get the wrapped biome
+		Biome unwrappedBiome = null;
+		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);
+			}
+		}
+		
+		this.biome = unwrappedBiome;
+	}
+	
+	
+	
 	@Override
-	public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver)
+	public int getBlockTint(@NotNull BlockPos blockPos, @NotNull ColorResolver colorResolver) 
 	{ 
-		return colorResolver.getColor(_unwrap(biome.biome), blockPos.getX(), blockPos.getZ());
+		if (this.biome != null)
+		{
+			return colorResolver.getColor(this.biome, blockPos.getX(), blockPos.getZ());
 		}
-	private Biome _unwrap(#if MC_VER >= MC_1_18_2 Holder<Biome> #else Biome #endif biome)
+		else
+		{
+			// hopefully unneeded debug color
+			return ColorUtil.CYAN;
+		}
+	}
+	
+	private static Biome unwrap(#if MC_VER >= MC_1_18_2 Holder<Biome> #else Biome #endif biome)
 	{
 		#if MC_VER >= MC_1_18_2
 		return biome.value();
@@ -55,30 +97,36 @@ public class TintWithoutLevelOverrider implements BlockAndTintGetter
 		#endif
 	}
 	
+	
+	
+	//================//
+	// unused methods //
+	//================//
+	
 	@Override
-	public float getShade(Direction direction, boolean shade)
+	public float getShade(@NotNull Direction direction, boolean shade)
 	{
 		throw new UnsupportedOperationException("ERROR: getShade() called on TintWithoutLevelOverrider. Object is for tinting only.");
 	}
 	@Override
-	public LevelLightEngine getLightEngine()
+	public @NotNull LevelLightEngine getLightEngine()
 	{
 		throw new UnsupportedOperationException("ERROR: getLightEngine() called on TintWithoutLevelOverrider. Object is for tinting only.");
 	}
 	@Nullable
 	@Override
-	public BlockEntity getBlockEntity(BlockPos pos)
+	public BlockEntity getBlockEntity(@NotNull BlockPos pos)
 	{
 		throw new UnsupportedOperationException("ERROR: getBlockEntity() called on TintWithoutLevelOverrider. Object is for tinting only.");
 	}
 	
 	@Override
-	public BlockState getBlockState(BlockPos pos)
+	public @NotNull BlockState getBlockState(@NotNull BlockPos pos)
 	{
 		throw new UnsupportedOperationException("ERROR: getBlockState() called on TintWithoutLevelOverrider. Object is for tinting only.");
 	}
 	@Override
-	public FluidState getFluidState(BlockPos pos)
+	public @NotNull FluidState getFluidState(@NotNull BlockPos pos)
 	{
 		throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelOverrider. Object is for tinting only.");
 	}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/cache/ClientBlockStateCache.java

@@ -54,7 +54,6 @@ import java.util.List;
  */
 public class ClientBlockStateCache
 {
-	
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	private static final HashSet<BlockState> BLOCK_STATES_THAT_NEED_LEVEL = new HashSet<>();
@@ -66,15 +65,20 @@ public class ClientBlockStateCache
 	public static final RandomSource random = RandomSource.create();
 	#endif
 	
+	public final IClientLevelWrapper levelWrapper;
 	public final BlockState blockState;
 	public final LevelReader level;
 	public final BlockPos pos;
+	
+	
+	
 	public ClientBlockStateCache(BlockState blockState, IClientLevelWrapper samplingLevel, DhBlockPos samplingPos)
 	{
 		this.blockState = blockState;
-		level = (LevelReader) samplingLevel.getWrappedMcObject();
+		this.levelWrapper = samplingLevel;
-		pos = McObjectConverter.Convert(samplingPos);
+		this.level = (LevelReader) samplingLevel.getWrappedMcObject();
-		resolveColors();
+		this.pos = McObjectConverter.Convert(samplingPos);
+		this.resolveColors();
 		//LOGGER.info("ClientBlocKCache created for {}", blockState);
 	}
 	
@@ -92,16 +96,94 @@ public class ClientBlockStateCache
 		Default,
 		Flower,
 		Leaves,
-		Chisel;
+		Chisel,
+		Glass;
 		static ColorMode getColorMode(Block b)
 		{
 			if (b instanceof LeavesBlock) return Leaves;
 			if (b instanceof FlowerBlock) return Flower;
+			if (b.toString().contains("glass")) return Glass;
 			if (b.toString().equals("Block{chiselsandbits:chiseled}")) return Chisel;
 			return Default;
 		}
 	}
 
+	//Way to efficiently do this was suggested by IMS from sodium. This is where those numbers and support code was lifted from.
+	private static final int MIN_BITS = 0x39000000; // 2^(-13)
+	private static final int MAX_BITS = 0x3f7fffff; // 1.0 - f32::EPSILON
+	private static final float MIN_BOUND = Float.intBitsToFloat(MIN_BITS);
+	private static final float MAX_BOUND = Float.intBitsToFloat(MAX_BITS);
+
+	private static final int[] linearToSrgbTable = new int[] {
+			0x0073000d, 0x007a000d, 0x0080000d, 0x0087000d, 0x008d000d, 0x0094000d, 0x009a000d, 0x00a1000d,
+			0x00a7001a, 0x00b4001a, 0x00c1001a, 0x00ce001a, 0x00da001a, 0x00e7001a, 0x00f4001a, 0x0101001a,
+			0x010e0033, 0x01280033, 0x01410033, 0x015b0033, 0x01750033, 0x018f0033, 0x01a80033, 0x01c20033,
+			0x01dc0067, 0x020f0067, 0x02430067, 0x02760067, 0x02aa0067, 0x02dd0067, 0x03110067, 0x03440067,
+			0x037800ce, 0x03df00ce, 0x044600ce, 0x04ad00ce, 0x051400ce, 0x057b00c5, 0x05dd00bc, 0x063b00b5,
+			0x06970158, 0x07420142, 0x07e30130, 0x087b0120, 0x090b0112, 0x09940106, 0x0a1700fc, 0x0a9500f2,
+			0x0b0f01cb, 0x0bf401ae, 0x0ccb0195, 0x0d950180, 0x0e56016e, 0x0f0d015e, 0x0fbc0150, 0x10630143,
+			0x11070264, 0x1238023e, 0x1357021d, 0x14660201, 0x156601e9, 0x165a01d3, 0x174401c0, 0x182401af,
+			0x18fe0331, 0x1a9602fe, 0x1c1502d2, 0x1d7e02ad, 0x1ed4028d, 0x201a0270, 0x21520256, 0x227d0240,
+			0x239f0443, 0x25c003fe, 0x27bf03c4, 0x29a10392, 0x2b6a0367, 0x2d1d0341, 0x2ebe031f, 0x304d0300,
+			0x31d105b0, 0x34a80555, 0x37520507, 0x39d504c5, 0x3c37048b, 0x3e7c0458, 0x40a8042a, 0x42bd0401,
+			0x44c20798, 0x488e071e, 0x4c1c06b6, 0x4f76065d, 0x52a50610, 0x55ac05cc, 0x5892058f, 0x5b590559,
+			0x5e0c0a23, 0x631c0980, 0x67db08f6, 0x6c55087f, 0x70940818, 0x74a007bd, 0x787d076c, 0x7c330723,
+	};
+	
+	private static final float[] srgbToLinearTable = new float[] {
+		0.0f, 0.000303527f, 0.000607054f, 0.00091058103f, 0.001214108f, 0.001517635f, 0.0018211621f, 0.002124689f,
+		0.002428216f, 0.002731743f, 0.00303527f, 0.0033465356f, 0.003676507f, 0.004024717f, 0.004391442f,
+		0.0047769533f, 0.005181517f, 0.0056053917f, 0.0060488326f, 0.006512091f, 0.00699541f, 0.0074990317f,
+		0.008023192f, 0.008568125f, 0.009134057f, 0.009721218f, 0.010329823f, 0.010960094f, 0.011612245f,
+		0.012286487f, 0.012983031f, 0.013702081f, 0.014443844f, 0.015208514f, 0.015996292f, 0.016807375f,
+		0.017641952f, 0.018500218f, 0.019382361f, 0.020288562f, 0.02121901f, 0.022173883f, 0.023153365f,
+		0.02415763f, 0.025186857f, 0.026241222f, 0.027320892f, 0.028426038f, 0.029556843f, 0.03071345f, 0.03189604f,
+		0.033104774f, 0.03433981f, 0.035601325f, 0.036889452f, 0.038204376f, 0.039546248f, 0.04091521f, 0.042311423f,
+		0.043735042f, 0.045186214f, 0.046665095f, 0.048171833f, 0.049706575f, 0.051269468f, 0.052860655f, 0.05448028f,
+		0.056128494f, 0.057805434f, 0.05951124f, 0.06124607f, 0.06301003f, 0.06480328f, 0.06662595f, 0.06847818f,
+		0.07036011f, 0.07227186f, 0.07421358f, 0.07618539f, 0.07818743f, 0.08021983f, 0.082282715f, 0.084376216f,
+		0.086500466f, 0.088655606f, 0.09084173f, 0.09305898f, 0.095307484f, 0.09758736f, 0.09989874f, 0.10224175f,
+		0.10461649f, 0.10702311f, 0.10946172f, 0.111932434f, 0.11443538f, 0.116970696f, 0.11953845f, 0.12213881f,
+		0.12477186f, 0.12743773f, 0.13013652f, 0.13286836f, 0.13563336f, 0.13843165f, 0.14126332f, 0.1441285f,
+		0.1470273f, 0.14995982f, 0.15292618f, 0.1559265f, 0.15896086f, 0.16202943f, 0.16513224f, 0.16826946f,
+		0.17144115f, 0.17464745f, 0.17788847f, 0.1811643f, 0.18447503f, 0.1878208f, 0.19120172f, 0.19461787f,
+		0.19806935f, 0.2015563f, 0.20507877f, 0.2086369f, 0.21223079f, 0.21586053f, 0.21952623f, 0.22322798f,
+		0.22696589f, 0.23074007f, 0.23455065f, 0.23839766f, 0.2422812f, 0.2462014f, 0.25015837f, 0.25415218f,
+		0.2581829f, 0.26225072f, 0.26635566f, 0.27049786f, 0.27467737f, 0.27889434f, 0.2831488f, 0.2874409f,
+		0.2917707f, 0.29613832f, 0.30054384f, 0.30498737f, 0.30946895f, 0.31398875f, 0.31854683f, 0.32314324f,
+		0.32777813f, 0.33245158f, 0.33716366f, 0.34191445f, 0.3467041f, 0.3515327f, 0.35640025f, 0.36130688f,
+		0.3662527f, 0.37123778f, 0.37626222f, 0.3813261f, 0.38642952f, 0.39157256f, 0.3967553f, 0.40197787f,
+		0.4072403f, 0.4125427f, 0.41788515f, 0.42326775f, 0.42869055f, 0.4341537f, 0.43965724f, 0.44520125f,
+		0.45078585f, 0.45641106f, 0.46207705f, 0.46778384f, 0.47353154f, 0.47932023f, 0.48514998f, 0.4910209f,
+		0.49693304f, 0.5028866f, 0.50888145f, 0.5149178f, 0.5209957f, 0.52711535f, 0.5332766f, 0.5394797f,
+		0.5457247f, 0.5520116f, 0.5583406f, 0.5647117f, 0.57112503f, 0.57758063f, 0.5840786f, 0.590619f, 0.597202f,
+		0.60382754f, 0.61049575f, 0.61720675f, 0.62396055f, 0.63075733f, 0.637597f, 0.6444799f, 0.6514058f,
+		0.65837497f, 0.66538745f, 0.67244333f, 0.6795426f, 0.68668544f, 0.69387203f, 0.70110214f, 0.70837605f,
+		0.7156938f, 0.72305536f, 0.730461f, 0.7379107f, 0.7454045f, 0.75294244f, 0.76052475f, 0.7681514f, 0.77582246f,
+		0.78353804f, 0.79129815f, 0.79910296f, 0.8069525f, 0.8148468f, 0.822786f, 0.8307701f, 0.83879924f, 0.84687346f,
+		0.8549928f, 0.8631574f, 0.87136734f, 0.8796226f, 0.8879232f, 0.89626956f, 0.90466136f, 0.913099f, 0.92158204f,
+		0.93011117f, 0.9386859f, 0.9473069f, 0.9559735f, 0.9646866f, 0.9734455f, 0.98225087f, 0.9911022f, 1.0f
+    };
+
+	private static int linearToSrgb(float c) {
+		if (!(c > MIN_BOUND)) {
+			c = MIN_BOUND;
+		}
+
+		if (c > MAX_BOUND) {
+			c = MAX_BOUND;
+		}
+		int inputBits = Float.floatToRawIntBits(c);
+		int entry = linearToSrgbTable[((inputBits - MIN_BITS) >> 20)];
+
+		int bias = (entry >>> 16) << 9;
+		int scale = entry & 0xffff;
+		int t = (inputBits >>> 12) & 0xff;
+
+		return (bias + (scale * t)) >>> 16;
+	}
+	//////////////
+	
 	private static int getWidth(TextureAtlasSprite texture)
 	{
         #if MC_VER < MC_1_19_4
@@ -120,20 +202,23 @@ public class ClientBlockStateCache
         #endif
 	}
 
+	
 	//TODO: Perhaps make this not just use the first frame?
 	private static int calculateColorFromTexture(TextureAtlasSprite texture, ColorMode colorMode)
 	{
 		int count = 0;
-		double alpha = 0;
+		int alpha = 0;
 		double red = 0;
 		double green = 0;
 		double blue = 0;
 		int tempColor;
+		//make Chiseled block not render. Since ColorMode is set per block, you only need to check it once
+		if (colorMode != ColorMode.Chisel)
 		{
 			// textures normally use u and v instead of x and y
-			for (int u = 0; u < getWidth(texture); u++)
-			{
 			for (int v = 0; v < getHeight(texture); v++)
+			{
+				for (int u = 0; u < getWidth(texture); u++)
 				{
 					//note: Minecraft color format is: 0xAA BB GG RR
 					//________ DH mod color format is: 0xAA RR GG BB
@@ -141,40 +226,45 @@ public class ClientBlockStateCache
 					//_ OpenGL RGBA format Java Order: 0xAA BB GG RR
 					tempColor = TextureAtlasSpriteWrapper.getPixelRGBA(texture, 0, u, v);
 					
-					double r = ((tempColor & 0x000000FF)) / 255.;
+					int r = (tempColor & 0x000000FF);
-					double g = ((tempColor & 0x0000FF00) >>> 8) / 255.;
+					int g = (tempColor & 0x0000FF00) >>> 8;
-					double b = ((tempColor & 0x00FF0000) >>> 16) / 255.;
+					int b = (tempColor & 0x00FF0000) >>> 16;
-					double a = ((tempColor & 0xFF000000) >>> 24) / 255.;
+					int a = (tempColor & 0xFF000000) >>> 24;
 					int scale = 1;
-					
 					if (colorMode == ColorMode.Leaves)
 					{
-						r *= a;
+						//switch (//FIXME add config option)
-						g *= a;
+						//	case BLACK:
-						b *= a;
+						//	a = 255; //simulate black background of fast leaves
-						a = 1.;
+						//		break;
+						//	case IGNORE:
+							if (a == 0) {
+								continue; //same long grass
 							}
-					else if (a == 0.)
+							else
+							{
+								a = 255; //just in case there are semi transparent pixels
+							}					
+						//		break;
+						//	case TRANSPARENT:
+						//		break; //do nothing, let it count towards transparency
+						
+					}
+					else if (a == 0 && colorMode != ColorMode.Glass)
 					{
 						continue;
 					}
-					else if (colorMode == ColorMode.Flower && (g + 0.1 < b || g + 0.1 < r))
+					else if (colorMode == ColorMode.Flower && (g + 25 < b || g + 25 < r))
 					{
 						scale = FLOWER_COLOR_SCALE;
 					}
-					//make Chiseled block not render
-					else if (colorMode == ColorMode.Chisel)
-					{
-						r = 0;
-						g = 0;
-						b = 0;
-						a = 0;
-					}
 					count += scale;
-					alpha += a * a * scale;
+					//apparently alpha is linear
-					red += r * r * scale;
+					alpha += a * scale;
-					green += g * g * scale;
+					//gamma correction is complicated
-					blue += b * b * scale;
+					red += srgbToLinearTable[r] * a * scale;
+					green += srgbToLinearTable[g] * a * scale;
+					blue += srgbToLinearTable[b] * a * scale;
 				}
 			}
 		}
@@ -186,10 +276,16 @@ public class ClientBlockStateCache
 		{
 			// determine the average color
 			tempColor = ColorUtil.rgbToInt(
-					(int) (Math.sqrt(alpha / count) * 255.),
+					alpha / count,
-					(int) (Math.sqrt(red / count) * 255.),
+					linearToSrgb((float) (red / (double) alpha)),
-					(int) (Math.sqrt(green / count) * 255.),
+					linearToSrgb((float) (green / (double) alpha)),
-					(int) (Math.sqrt(blue / count) * 255.));
+					linearToSrgb((float) (blue / (double) alpha)));
+		}
+		//check if not missing texture
+		if (tempColor == ColorUtil.rgbToInt(255, 182, 0, 182))
+		{
+			//make it not render at all
+			tempColor = ColorUtil.rgbToInt(0, 255, 255, 255);
 		}
 		return tempColor;
 	}
@@ -204,7 +300,7 @@ public class ClientBlockStateCache
 			for (Direction direction : DIRECTION_ORDER)
 			{
 				quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
-						getBlockModel(blockState).getQuads(blockState, direction, random);
+						getBlockModel(blockState).getQuads(blockState, direction, random); // TODO getQuads sometimes throws a "makeThreadingException", is there anything we can do about that? Note: this isn't a critical issue, it just prints an ugly error and the render data will need to be regenered.
 				if (quads != null && !quads.isEmpty() &&
 						!(blockState.getBlock() instanceof RotatedPillarBlock && direction == Direction.UP))
 					break;
@@ -216,12 +312,12 @@ public class ClientBlockStateCache
 			}
 			if (quads != null && !quads.isEmpty())
 			{
-				needPostTinting = quads.get(0).isTinted();
+				needPostTinting = quads.getFirst().isTinted();
-				needShade = quads.get(0).isShade();
+				needShade = quads.getFirst().isShade();
-				tintIndex = quads.get(0).getTintIndex();
+				tintIndex = quads.getFirst().getTintIndex();
 				baseColor = calculateColorFromTexture(
                         #if MC_VER < MC_1_17_1 quads.get(0).sprite,
-						#else quads.get(0).getSprite(), #endif
+						#else quads.getFirst().getSprite(), #endif
 						ColorMode.getColorMode(blockState.getBlock()));
 			}
 			else
@@ -271,7 +367,7 @@ public class ClientBlockStateCache
 				try
 				{
 					tintColor = Minecraft.getInstance().getBlockColors()
-							.getColor(this.blockState, new TintWithoutLevelOverrider(biome), McObjectConverter.Convert(pos), this.tintIndex);
+							.getColor(this.blockState, new TintWithoutLevelOverrider(biome, this.levelWrapper), McObjectConverter.Convert(pos), this.tintIndex);
 				}
 				catch (UnsupportedOperationException e)
 				{

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

@@ -1,216 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 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.chunk;
-
-import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-/**
- * Compact, efficient storage for light levels. 
- * all blocks only take up 4 bits in total, 
- * and if a 16x16x16 area is detected to have the same light level in all positions,
- * then we store a single byte for that light level, instead of 2 kilobytes.
- * 
- * @author Builderb0y
-*/
-public class ChunkLightStorage 
-{
-	/** the minimum Y level in the chunk which this storage is storing light levels for (inclusive). */
-	public int minY;
-	/** the maximum Y level in the chunk which this storage is storing light levels for (exclusive). */
-	public int maxY;
-	
-	/** the data stored in this storage, split up into 16x16x16 areas. */
-	public LightSection[] lightSections;
-	
-	
-	
-	public ChunkLightStorage(int minY, int maxY) 
-	{
-		this.minY = minY;
-		this.maxY = maxY;
-	}
-	
-	
-	
-	public int get(int x, int y, int z)
-	{
-		if (y < this.minY)
-		{
-			return 0;
-		}	
-		if (y >= this.maxY)
-		{
-			return 15;
-		}
-		
-		if (this.lightSections != null)
-		{
-			LightSection lightSection = this.lightSections[BitShiftUtil.divideByPowerOfTwo(y - this.minY, 4)];
-			if (lightSection != null)
-			{
-				return lightSection.get(x, y, z);
-			}
-		}
-		
-		return 0;
-	}
-	
-	public void set(int x, int y, int z, int lightLevel)
-	{
-		if (y < this.minY || y >= this.maxY)
-		{
-			return;
-		}
-		
-		//populate array if it doesn't exist.
-		if (this.lightSections == null)
-		{
-			this.lightSections = new LightSection[BitShiftUtil.divideByPowerOfTwo(this.maxY - this.minY, 4)];
-		}
-		
-		int index = (y - this.minY) >> 4;
-		LightSection lightSection = this.lightSections[index];
-		
-		//populate lightSection in array if it doesn't exist.
-		if (lightSection == null)
-		{
-			lightSection = new LightSection(0);
-			this.lightSections[index] = lightSection;
-		}
-		lightSection.set(x, y, z, lightLevel);
-	}
-	
-	
-	
-	//================//
-	// helper classes //
-	//================//
-	
-	public static class LightSection
-	{
-		public byte constantValue;
-		public long[] data;
-		public short[] counts;
-		
-		public LightSection(int initialValue)
-		{
-			this.constantValue = (byte) (initialValue);
-			this.counts = new short[16];
-			this.counts[initialValue] = 16 * 16 * 16;
-		}
-		
-		public int get(int x, int y, int z)
-		{
-			if (this.constantValue >= 0)
-			{
-				return this.constantValue;
-			}
-			
-			x &= 15;
-			y &= 15;
-			z &= 15;
-			long bits = this.data[(z << 4) | x];
-			return ((int) (bits >>> (y << 2))) & 15;
-		}
-		
-		public void set(int x, int y, int z, int lightLevel)
-		{
-			int oldLightLevel = -1;
-			if (this.constantValue >= 0)
-			{
-				oldLightLevel = this.constantValue;
-				
-				//if the light level didn't change, then there's nothing to do.
-				if (oldLightLevel == lightLevel) return;
-				
-				//if we are a constant value and need to change something,
-				//then that means we need to convert to a non-constant value.
-				this.data = DataRecycler.get();
-				
-				//repeat oldLightLevel 16 times as a bit pattern.
-				long payload = oldLightLevel;
-				payload |= payload << 4;
-				payload |= payload << 8;
-				payload |= payload << 16;
-				payload |= payload << 32;
-				
-				//fill our data with our constant value.
-				Arrays.fill(this.data, payload);
-				
-				//we are no longer a constant value.
-				this.constantValue = -1;
-			}
-			
-			x &= 15;
-			y &= 15;
-			z &= 15;
-			int index = (z << 4) | x;
-			long bits = this.data[index];
-			//if we weren't a constant value before, now's the time to initialize oldLightLevel.
-			if (oldLightLevel < 0)
-			{
-				oldLightLevel = ((int) (bits >>> (y << 2))) & 15;
-			}
-			//clear the 4 bits that correspond to the light level at x, y, z...
-			bits &= ~(15L << (y << 2));
-			//...and then re-populate those bits with the new light level.
-			bits |= ((long) (lightLevel)) << (y << 2);
-			//store the updated bits in our data.
-			this.data[index] = bits;
-			
-			//we have one less of the old light level...
-			this.counts[oldLightLevel]--;
-			//...and one more of the new level.
-			//if the number associated with the new level is now 4096 (AKA 16 ^ 3),
-			//then this implies every position in this section has the same light level,
-			//and therefore we can convert back to a constant value.
-			if (++this.counts[lightLevel] == 4096)
-			{
-				this.constantValue = (byte) (lightLevel);
-				DataRecycler.reclaim(this.data);
-				this.data = null;
-			}
-		}
-		
-	}
-	
-	static class DataRecycler
-	{
-		private static final ArrayList<long[]> recycled = new ArrayList<>(256);
-		
-		static synchronized long[] get()
-		{
-			if (recycled.isEmpty())
-			{
-				return new long[256];
-			}
-			else
-			{
-				return recycled.remove(recycled.size() - 1);
-			}
-		}
-		
-		static synchronized void reclaim(long[] data) { if (recycled.size() < 256) recycled.add(data); }
-	}
-	
-}

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

@@ -25,20 +25,18 @@ import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.Dh
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.DhBlockPos;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
-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 com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import com.seibel.distanthorizons.coreapi.ModInfo;
 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.ChunkStatus;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.levelgen.Heightmap;
 
@@ -73,15 +71,19 @@ import net.minecraft.world.level.lighting.LevelLightEngine;
 import net.minecraft.core.SectionPos;
 #endif
 
+#if MC_VER <= MC_1_20_4
+import net.minecraft.world.level.chunk.ChunkStatus;
+#else
+import net.minecraft.world.level.chunk.status.ChunkStatus;
+#endif
+
+
 public class ChunkWrapper implements IChunkWrapper
 {
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
-	/** useful for debugging, but can slow down chunk operations quite a bit due to being called every time. */
-	private static final boolean RUN_RELATIVE_POS_INDEX_VALIDATION = ModInfo.IS_DEV_BUILD;
-	
 	/** can be used for interactions with the underlying chunk where creating new BlockPos objects could cause issues for the garbage collector. */
-	private static final ThreadLocal<BlockPos.MutableBlockPos> MUTABLE_BLOCK_POS_REF = ThreadLocal.withInitial(() -> new BlockPos.MutableBlockPos());
+	private static final ThreadLocal<BlockPos.MutableBlockPos> MUTABLE_BLOCK_POS_REF = ThreadLocal.withInitial(BlockPos.MutableBlockPos::new);
 	
 	
 	private final ChunkAccess chunk;
@@ -103,6 +105,8 @@ public class ChunkWrapper implements IChunkWrapper
 	private int minNonEmptyHeight = Integer.MIN_VALUE;
 	private int maxNonEmptyHeight = Integer.MAX_VALUE;
 	
+	private int blockBiomeHashCode = 0;
+	
 	/**
 	 * Due to vanilla `isClientLightReady()` not being designed for use by a non-render thread, it may return 'true'
 	 * before the light engine has ticked, (right after all light changes is marked by the engine to be processed).
@@ -142,30 +146,34 @@ public class ChunkWrapper implements IChunkWrapper
 	
 	
 	//=========//
-	// methods //
+	// getters //
 	//=========//
 	
 	@Override
-	public int getHeight()
+	public int getHeight() { return getHeight(this.chunk); }
+	public static int getHeight(ChunkAccess chunk)
 	{
 		#if MC_VER < MC_1_17_1
 		return 255;
 		#else
-		return this.chunk.getHeight();
+		return chunk.getHeight();
 		#endif
 	}
 	
 	@Override
-	public int getMinBuildHeight()
+	public int getMinBuildHeight() { return getMinBuildHeight(this.chunk); }
+	public static int getMinBuildHeight(ChunkAccess chunk)
 	{
 		#if MC_VER < MC_1_17_1
 		return 0;
 		#else
-		return this.chunk.getMinBuildHeight();
+		return chunk.getMinBuildHeight();
 		#endif
 	}
+	
 	@Override
-	public int getMaxBuildHeight() { return this.chunk.getMaxBuildHeight(); }
+	public int getMaxBuildHeight() { return getMaxBuildHeight(this.chunk); }
+	public static int getMaxBuildHeight(ChunkAccess chunk) { return chunk.getMaxBuildHeight(); }
 	
 	@Override
 	public int getMinNonEmptyHeight()
@@ -215,6 +223,9 @@ public class ChunkWrapper implements IChunkWrapper
 		LevelChunkSection[] sections = this.chunk.getSections();
 		for (int index = sections.length-1; index >= 0; index--)
 		{
+			// update at each position to fix using the max height if the chunk is empty
+			this.maxNonEmptyHeight = this.getChunkSectionMinHeight(index) + 16;
+			
 			if (sections[index] == null)
 			{
 				continue;
@@ -222,7 +233,7 @@ public class ChunkWrapper implements IChunkWrapper
 			
 			if (!isChunkSectionEmpty(sections[index]))
 			{
-				this.maxNonEmptyHeight = this.getChunkSectionMinHeight(index) + 16;
+				// non-empty section found
 				break;
 			}
 		}
@@ -239,15 +250,7 @@ public class ChunkWrapper implements IChunkWrapper
 		return section.hasOnlyAir();
 		#endif
 	}
-	private int getChunkSectionMinHeight(int index)
+	private int getChunkSectionMinHeight(int index) { return (index * 16) + this.getMinBuildHeight(); }
-	{
-		// convert from an index to a block coordinate
-		#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
-		return this.chunk.getSections()[index].bottomBlockY();
-		#else
-		return this.chunk.getSectionYFromSectionIndex(index) * 16;
-		#endif
-	}
 	
 	
 	@Override
@@ -257,7 +260,6 @@ public class ChunkWrapper implements IChunkWrapper
 	public int getLightBlockingHeightMapValue(int xRel, int zRel) { return this.chunk.getOrCreateHeightmapUnprimed(Heightmap.Types.MOTION_BLOCKING).getFirstAvailable(xRel, zRel); }
 	
 	
-	
 	@Override
 	public IBiomeWrapper getBiome(int relX, int relY, int relZ)
 	{
@@ -281,11 +283,35 @@ public class ChunkWrapper implements IChunkWrapper
 		#endif
 	}
 	
+	@Override
+	public IBlockStateWrapper getBlockState(int relX, int relY, int relZ)
+	{
+		this.throwIndexOutOfBoundsIfRelativePosOutsideChunkBounds(relX, relY, relZ);
+		
+		BlockPos.MutableBlockPos blockPos = MUTABLE_BLOCK_POS_REF.get();
+		
+		blockPos.setX(relX);
+		blockPos.setY(relY);
+		blockPos.setZ(relZ);
+		
+		return BlockStateWrapper.fromBlockState(this.chunk.getBlockState(blockPos), this.wrappedLevel);
+	}
+	
 	@Override
 	public DhChunkPos getChunkPos() { return this.chunkPos; }
 	
 	public ChunkAccess getChunk() { return this.chunk; }
 	
+	public ChunkStatus getStatus() { return getStatus(this.getChunk()); }
+	public static ChunkStatus getStatus(ChunkAccess chunk)
+	{
+		#if MC_VER < MC_1_21 
+		return chunk.getStatus();
+		#else
+		return chunk.getPersistedStatus(); 
+		#endif
+	}
+	
 	@Override
 	public int getMaxBlockX() { return this.chunk.getPos().getMaxBlockX(); }
 	@Override
@@ -295,8 +321,11 @@ public class ChunkWrapper implements IChunkWrapper
 	@Override
 	public int getMinBlockZ() { return this.chunk.getPos().getMinBlockZ(); }
 	
-	@Override
+	
-	public long getLongChunkPos() { return this.chunk.getPos().toLong(); }
+	
+	//==========//
+	// lighting //
+	//==========//
 	
 	@Override
 	public void setIsDhLightCorrect(boolean isDhLightCorrect) { this.isDhLightCorrect = isDhLightCorrect; }
@@ -304,8 +333,6 @@ public class ChunkWrapper implements IChunkWrapper
 	@Override
 	public void setUseDhLighting(boolean useDhLighting) { this.useDhLighting = useDhLighting; }
 	
-	
-	
 	@Override
 	public boolean isLightCorrect()
 	{
@@ -318,9 +345,8 @@ public class ChunkWrapper implements IChunkWrapper
 		#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
 		return false; // MC's lighting engine doesn't work consistently enough to trust for 1.16 or 1.17
 		#else
-		if (this.chunk instanceof LevelChunk)
+		if (this.chunk instanceof LevelChunk levelChunk)
 		{
-			LevelChunk levelChunk = (LevelChunk) this.chunk;
 			if (levelChunk.getLevel() instanceof ClientLevel)
 			{
 				// connected to a server
@@ -358,10 +384,11 @@ public class ChunkWrapper implements IChunkWrapper
 	{
 		if (this.blockLightStorage == null)
 		{
-			this.blockLightStorage = new ChunkLightStorage(this.getMinBuildHeight(), this.getMaxBuildHeight());
+			this.blockLightStorage = ChunkLightStorage.createBlockLightStorage(this);
 		}
 		return this.blockLightStorage;
 	}
+	public void setBlockLightStorage(ChunkLightStorage lightStorage) { this.blockLightStorage = lightStorage; }
 	
 	
 	@Override
@@ -381,10 +408,11 @@ public class ChunkWrapper implements IChunkWrapper
 	{
 		if (this.skyLightStorage == null)
 		{
-			this.skyLightStorage = new ChunkLightStorage(this.getMinBuildHeight(), this.getMaxBuildHeight());
+			this.skyLightStorage = ChunkLightStorage.createSkyLightStorage(this);
 		}
 		return this.skyLightStorage;
 	}
+	public void setSkyLightStorage(ChunkLightStorage lightStorage) { this.skyLightStorage = lightStorage; }
 	
 	
 	@Override
@@ -445,64 +473,13 @@ public class ChunkWrapper implements IChunkWrapper
 			});
 			#else
 			this.chunk.findBlockLightSources((blockPos, blockState) ->
-			{
+					this.blockLightPosList.add(new DhBlockPos(blockPos.getX(), blockPos.getY(), blockPos.getZ())));
-				this.blockLightPosList.add(new DhBlockPos(blockPos.getX(), blockPos.getY(), blockPos.getZ()));
-			});
 			#endif
 		}
 		
 		return this.blockLightPosList;
 	}
 	
-	@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;
-	}
-	
-	public LevelReader getColorResolver() { return this.lightSource; }
-	
-	@Override
-	public String toString() { return this.chunk.getClass().getSimpleName() + this.chunk.getPos(); }
-	
-	@Override
-	public IBlockStateWrapper getBlockState(int relX, int relY, int relZ)
-	{
-		this.throwIndexOutOfBoundsIfRelativePosOutsideChunkBounds(relX, relY, relZ);
-		
-		BlockPos.MutableBlockPos blockPos = MUTABLE_BLOCK_POS_REF.get();
-		
-		blockPos.setX(relX);
-		blockPos.setY(relY);
-		blockPos.setZ(relZ);
-		
-		return BlockStateWrapper.fromBlockState(this.chunk.getBlockState(blockPos), this.wrappedLevel);
-	}
-	
-	@Override
-	public boolean isStillValid() { return this.wrappedLevel.tryGetChunk(this.chunkPos) == this; }
-	
-	
 	public static void syncedUpdateClientLightStatus()
 	{
 		#if MC_VER < MC_1_18_2
@@ -527,9 +504,8 @@ public class ChunkWrapper implements IChunkWrapper
 	/** Should be called after client light updates are triggered. */
 	private void updateIsClientLightingCorrect()
 	{
-		if (this.chunk instanceof LevelChunk && ((LevelChunk) this.chunk).getLevel() instanceof ClientLevel)
+		if (this.chunk instanceof LevelChunk levelChunk && ((LevelChunk) this.chunk).getLevel() instanceof ClientLevel)
 		{
-			LevelChunk levelChunk = (LevelChunk) this.chunk;
 			ClientChunkCache clientChunkCache = ((ClientLevel) levelChunk.getLevel()).getChunkSource();
 			this.isMcClientLightingCorrect = clientChunkCache.getChunkForLighting(this.chunk.getPos().x, this.chunk.getPos().z) != null &&
 					#if MC_VER <= MC_1_17_1
@@ -562,64 +538,57 @@ 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; }
+	
+	
+	
 	//================//
-	// helper methods //
+	// base overrides //
 	//================//
 	
-	/** used to prevent accidentally attempting to get/set values outside this chunk's boundaries */
+	@Override
-	private void throwIndexOutOfBoundsIfRelativePosOutsideChunkBounds(int x, int y, int z) throws IndexOutOfBoundsException
+	public String toString() { return this.chunk.getClass().getSimpleName() + this.chunk.getPos(); }
-	{
-		if (!RUN_RELATIVE_POS_INDEX_VALIDATION)
-		{
-			return;
-		}
-		
-		
-		// FIXME +1 is to handle the fact that LodDataBuilder adds +1 to all block lighting calculations, also done in the constructor
-		int minHeight = this.getMinBuildHeight();
-		int maxHeight = this.getMaxBuildHeight() + 1;
-		
-		if (x < 0 || x >= LodUtil.CHUNK_WIDTH
-				|| z < 0 || z >= LodUtil.CHUNK_WIDTH
-				|| y < minHeight || y > maxHeight)
-		{
-			String errorMessage = "Relative position [" + x + "," + y + "," + z + "] out of bounds. \n" +
-					"X/Z must be between 0 and 15 (inclusive) \n" +
-					"Y must be between [" + minHeight + "] and [" + maxHeight + "] (inclusive).";
-			throw new IndexOutOfBoundsException(errorMessage);
-		}
-	}
-	
-	
-	/**
-	 * Converts a 3D position into a 1D array index. <br><br>
-	 *
-	 * Source: <br>
-	 * <a href="https://stackoverflow.com/questions/7367770/how-to-flatten-or-index-3d-array-in-1d-array">stackoverflow</a>
-	 */
-	public int relativeBlockPosToIndex(int xRel, int y, int zRel)
-	{
-		int yRel = y - this.getMinBuildHeight();
-		return (zRel * LodUtil.CHUNK_WIDTH * this.getHeight()) + (yRel * LodUtil.CHUNK_WIDTH) + xRel;
-	}
-	
-	/**
-	 * Converts a 3D position into a 1D array index. <br><br>
-	 *
-	 * Source: <br>
-	 * <a href="https://stackoverflow.com/questions/7367770/how-to-flatten-or-index-3d-array-in-1d-array">stackoverflow</a>
-	 */
-	public DhBlockPos indexToRelativeBlockPos(int index)
-	{
-		final int zRel = index / (LodUtil.CHUNK_WIDTH * this.getHeight());
-		index -= (zRel * LodUtil.CHUNK_WIDTH * this.getHeight());
-		
-		final int y = index / LodUtil.CHUNK_WIDTH;
-		final int yRel = y + this.getMinBuildHeight();
-		
-		final int xRel = index % LodUtil.CHUNK_WIDTH;
-		return new DhBlockPos(xRel, yRel, zRel);
-	}
 	
+	//@Override 
+	//public int hashCode()
+	//{
+	//	if (this.blockBiomeHashCode == 0)
+	//	{
+	//		this.blockBiomeHashCode = this.getBlockBiomeHashCode();
+	//	}
+	//	
+	//	return this.blockBiomeHashCode;
+	//}
 	
 }

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

@@ -16,7 +16,7 @@ import java.util.regex.Pattern;
 // Logger (for debug stuff)
 
 import com.seibel.distanthorizons.api.enums.config.DisallowSelectingViaConfigGui;
-import com.seibel.distanthorizons.api.enums.config.EUpdateBranch;
+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.*;
@@ -98,6 +98,7 @@ public class ClassicConfigGUI
 		public static final int SpaceFromRightScreen = 10;
 		public static final int ButtonWidthSpacing = 5;
 		public static final int ResetButtonWidth = 40;
+		public static final int ResetButtonHeight = 20;
 		
 	}
 	
@@ -144,9 +145,9 @@ public class ClassicConfigGUI
 					case 0:
 						((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;
 				}
@@ -157,19 +158,22 @@ public class ClassicConfigGUI
 //            button.active = entries.stream().allMatch(e -> e.inLimits);
 			
 			
-			if (((ConfigEntry) info).isValid(value) == 0 && info.getType() != List.class)
+			if (info.getType() == String.class
+				|| info.getType() == List.class)
+			{
+				((ConfigEntry) info).uiSetWithoutSaving(stringValue);
+			}
+			else if (((ConfigEntry) info).isValid(value) == 0)
 			{
 				if (!cast)
+				{
 					((ConfigEntry) info).uiSetWithoutSaving(value);
+				}
 				else
+				{
 					((ConfigEntry) info).uiSetWithoutSaving(value.intValue());
 				}
-//            else if (((ConfigEntry) info).isValidMemoryAddress() == 0)
+			}
-//            {
-//                if (((List<String>) info.get()).size() == ((EntryInfo) info.guiValue).index)
-//                    info.uiSet(((List<String>) info.get()).add(""));
-//                info.uiSet(((List<String>) info.get()).set(((EntryInfo) info.guiValue).index, Arrays.stream(((EntryInfo) info.guiValue).tempValue.replace("[", "").replace("]", "").split(", ")).collect(Collectors.toList()).get(0)));
-//            }
 			
 			return true;
 		};
@@ -231,7 +235,7 @@ public class ClassicConfigGUI
 			ConfigBase.INSTANCE.configFileINSTANCE.saveToFile();
 			Objects.requireNonNull(this.minecraft).setScreen(this.parent);
 			
-			CONFIG_CORE_INTERFACE.onScreenChangeListenerList.forEach((listener) -> listener.run());
+			CONFIG_CORE_INTERFACE.onScreenChangeListenerList.forEach(Runnable::run);
 		}
 		
 		@Override
@@ -244,17 +248,23 @@ public class ClassicConfigGUI
 			}
 			
 			// Changelog button
-			if (Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get() && Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE)
+			if (Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get() && !ModInfo.IS_DEV_BUILD) // we only have changelogs for stable builds
 			{
 				this.addBtn(new TexturedButtonWidget(
 						// Where the button is on the screen
 						this.width - 28, this.height - 28,
 						// Width and height of the button
 						20, 20,
-						// Offset
+						// texture UV Offset
 						0, 0,
 						// Some textuary stuff
-						0, new ResourceLocation(ModInfo.ID, "textures/gui/changelog.png"), 20, 20,
+						0, 
+						#if MC_VER < MC_1_21 
+						new ResourceLocation(ModInfo.ID, "textures/gui/changelog.png"),
+						#else
+						ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "textures/gui/changelog.png"),
+						#endif
+						20, 20,
 						// Create the button and tell it where to go
 						(buttonWidget) -> {
 							ChangelogScreen changelogScreen = new ChangelogScreen(this);
@@ -269,7 +279,11 @@ public class ClassicConfigGUI
 			}
 			
 			
-			addBtn(MakeBtn(Translatable("distanthorizons.general.cancel"), this.width / 2 - 154, this.height - 28, 150, 20, button -> {
+			addBtn(MakeBtn(Translatable("distanthorizons.general.cancel"), 
+					this.width / 2 - 154, this.height - 28, 
+					150, 20, 
+					button -> 
+					{
 						ConfigBase.INSTANCE.configFileINSTANCE.loadFromFile();
 						Objects.requireNonNull(minecraft).setScreen(parent);
 					}));
@@ -279,8 +293,11 @@ public class ClassicConfigGUI
 			}));
 			
 			this.list = new ConfigListWidget(this.minecraft, this.width * 2, this.height, 32, 32, 25);
+			
+			#if MC_VER < MC_1_20_6 // no background is rendered in MC 1.20.6+
 			if (this.minecraft != null && this.minecraft.level != null)
 				this.list.setRenderBackground(false);
+			#endif
 			
 			this.addWidget(this.list);
 			
@@ -302,7 +319,7 @@ public class ClassicConfigGUI
 			
 			
 			
-			CONFIG_CORE_INTERFACE.onScreenChangeListenerList.forEach((listener) -> listener.run());
+			CONFIG_CORE_INTERFACE.onScreenChangeListenerList.forEach(Runnable::run);
 			
 		}
 		
@@ -311,20 +328,21 @@ public class ClassicConfigGUI
 			initEntry(info, this.translationPrefix);
 			Component name = Translatable(translationPrefix + info.getNameWCategory());
 			
+			
 			if (ConfigEntry.class.isAssignableFrom(info.getClass()))
 			{
 				Button.OnPress btnAction = button -> {
-					((ConfigEntry) info).uiSetWithoutSaving(((ConfigEntry) info).getDefaultValue());
+					((ConfigEntry) info).uiSetWithoutSaving(((ConfigEntry<?>) info).getDefaultValue());
 					((EntryInfo) info.guiValue).index = 0;
 					this.reload = true;
 					Objects.requireNonNull(minecraft).setScreen(this);
 				};
-				int a = this.width - ConfigScreenConfigs.SpaceFromRightScreen - 150 - ConfigScreenConfigs.ButtonWidthSpacing - ConfigScreenConfigs.ResetButtonWidth;
+				int posX = this.width - ConfigScreenConfigs.SpaceFromRightScreen - 150 - ConfigScreenConfigs.ButtonWidthSpacing - ConfigScreenConfigs.ResetButtonWidth;
-				int b = 0;
+				int posZ = 0;
-				int c = ConfigScreenConfigs.ResetButtonWidth;
-				int d = 20;
 				
-				Button resetButton = MakeBtn(Translatable("distanthorizons.general.reset").withStyle(ChatFormatting.RED), a, b, c, d, btnAction);
+				Button resetButton = MakeBtn(Translatable("distanthorizons.general.reset").withStyle(ChatFormatting.RED), 
+						posX, posZ, ConfigScreenConfigs.ResetButtonWidth, ConfigScreenConfigs.ResetButtonHeight, 
+						btnAction);
 				
 				if (((EntryInfo) info.guiValue).widget instanceof Map.Entry)
 				{
@@ -358,9 +376,7 @@ public class ClassicConfigGUI
 			}
 			if (ConfigUIButton.class.isAssignableFrom(info.getClass()))
 			{
-				Button widget = MakeBtn(name, this.width / 2 - 100, this.height - 28, 100 * 2, 20, (button -> {
+				Button widget = MakeBtn(name, this.width / 2 - 100, this.height - 28, 100 * 2, 20, (button -> ((ConfigUIButton) info).runAction()));
-					((ConfigUIButton) info).runAction();
-				}));
 				this.list.addButton(widget, null, null, null);
 				return;
 			}
@@ -428,7 +444,9 @@ public class ClassicConfigGUI
 						String key = translationPrefix + (newInfo.category.isEmpty() ? "" : newInfo.category + ".") + newInfo.getName() + ".@tooltip";
 						
 						if (((EntryInfo) newInfo.guiValue).error != null && text.equals(name))
+						{
 							DhRenderTooltip(matrices, font, ((EntryInfo) newInfo.guiValue).error.getValue(), mouseX, mouseY);
+						}
 						else if (I18n.exists(key) && (text != null && text.equals(name)))
 						{
 							List<Component> list = new ArrayList<>();

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

@@ -25,19 +25,18 @@ public class GetConfigScreen
 		// This shouldn't be here, but I need a way to test it after Minecraft inits its assets
 		//System.out.println(ConfigBase.INSTANCE.generateLang(false, true));
 		
-		switch (useScreen)
+		return switch (useScreen)
+		{
+			case Classic -> ClassicConfigGUI.getScreen(ConfigBase.INSTANCE, parent, "client");
+			case OpenGL ->
 			{
-			case Classic:
-				return ClassicConfigGUI.getScreen(ConfigBase.INSTANCE, parent, "client");
-			case OpenGL:
 				MinecraftScreen.getScreen(parent, new OpenGLConfigScreen(), ModInfo.ID + ".title");
-				return null;
+				yield null;
-//            case JavaFX -> MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new JavaScreenHandlerScreen.ExampleScreen()), ModInfo.ID + ".title");
-			case JavaFX:
-				return MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new ConfigScreen()), ModInfo.ID + ".title");
-			default:
-				return null;
 			}
+//            case JavaFX -> MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new JavaScreenHandlerScreen.ExampleScreen()), ModInfo.ID + ".title");
+			case JavaFX -> MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new ConfigScreen()), ModInfo.ID + ".title");
+			default -> throw new IllegalArgumentException("No config screen implementation defined for [" + useScreen + "].");
+		};
 	}
 	
 }

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

@@ -15,12 +15,12 @@ public class GuiHelper
 	/**
 	 * Helper static methods for versional compat
 	 */
-	public static Button MakeBtn(Component base, int a, int b, int c, int d, Button.OnPress action)
+	public static Button MakeBtn(Component base, int posX, int posZ, int width, int height, Button.OnPress action)
 	{
         #if MC_VER < MC_1_19_4
-		return new Button(a, b, c, d, base, action);
+		return new Button(posX, posZ, width, height, base, action);
         #else
-		return Button.builder(base, action).bounds(a, b, c, d).build();
+		return Button.builder(base, action).bounds(posX, posZ, width, height).build();
         #endif
 	}
 	

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

@@ -60,8 +60,12 @@ public class MinecraftScreen
 			screen.init(); // Init our own config screen
 			
 			this.list = new ConfigListWidget(this.minecraft, this.width, this.height, 0, 0, 25); // Select the area to tint
+			
+			#if MC_VER < MC_1_20_6 // no background is rendered in MC 1.20.6+
 			if (this.minecraft != null && this.minecraft.level != null) // Check if in game
 				this.list.setRenderBackground(false); // Disable from rendering
+			#endif
+			
 			this.addWidget(this.list); // Add the tint to the things to be rendered
 		}
 		

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

@@ -101,11 +101,17 @@ public class ChangelogScreen extends DhScreen
 		this.changelog.add("");
 		this.changelog.add("");
 		
+		String changelog = ModrinthGetter.changeLogs.get(versionID);
+		if (changelog == null)
+		{
+			// in case something goes wrong this will prevent null pointers
+			changelog = "";
+		}
+		
 		// Get the release changelog and split it by the new lines
 		String[] unwrappedChangelog = // Arrays.asList could be used if a list object is desired here vs List.of which is only available for Java 9+
-				new MarkdownFormatter.MinecraftFormat().convertTo( // This formats markdown to minecraft's "§" characters
+				// This formats markdown to minecraft's "§" charactersnew MarkdownFormatter.MinecraftFormat().convertTo(
-						ModrinthGetter.changeLogs.get(versionID)
+				new MarkdownFormatter.MinecraftFormat().convertTo(changelog).split("\\n");
-				).split("\\n");
 		// Makes the words wrap around to not go off the screen
 		for (String str : unwrappedChangelog)
 		{
@@ -128,9 +134,7 @@ public class ChangelogScreen extends DhScreen
 		
 		
 		this.addBtn( // Close
-				MakeBtn(Translatable(ModInfo.ID + ".general.back"), 5, this.height - 25, 100, 20, (btn) -> {
+				MakeBtn(Translatable(ModInfo.ID + ".general.back"), 5, this.height - 25, 100, 20, (btn) -> this.onClose())
-					this.onClose();
-				})
 		);
 		
 		
@@ -168,10 +172,9 @@ public class ChangelogScreen extends DhScreen
 		#endif
 		
 		
-		this.changelogArea.render(matrices, mouseX, mouseY, delta); // Render the changelog
+		// 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
 	}
 	

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

@@ -1,23 +1,19 @@
 package com.seibel.distanthorizons.common.wrappers.gui.updater;
 
-import com.mojang.blaze3d.platform.NativeImage;
+import com.seibel.distanthorizons.api.enums.config.EDhApiUpdateBranch;
-import com.seibel.distanthorizons.api.enums.config.EUpdateBranch;
 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.coreapi.ModInfo;
 import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.jar.JarUtils;
 import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter;
 import com.seibel.distanthorizons.core.jar.updater.SelfUpdater;
-import net.minecraft.client.Minecraft;
 #if MC_VER >= MC_1_20_1
 import net.minecraft.client.gui.GuiGraphics;
 #else
 import com.mojang.blaze3d.vertex.PoseStack;
 #endif
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.renderer.texture.DynamicTexture;
 import net.minecraft.resources.ResourceLocation;
 
 import static com.seibel.distanthorizons.common.wrappers.gui.GuiHelper.*;
@@ -46,15 +42,17 @@ public class UpdateModScreen extends DhScreen
 		this.parent = parent;
 		this.newVersionID = newVersionID;
 		
-        switch (Config.Client.Advanced.AutoUpdater.updateBranch.get()) {
+		
-	        case STABLE:
+		EDhApiUpdateBranch updateBranch = EDhApiUpdateBranch.convertAutoToStableOrNightly(Config.Client.Advanced.AutoUpdater.updateBranch.get());
-                currentVer = ModInfo.VERSION;
+		if (updateBranch == EDhApiUpdateBranch.STABLE)
-                nextVer = ModrinthGetter.releaseNames.get(this.newVersionID);
+        {
-				break;
+	        this.currentVer = ModInfo.VERSION;
-	        case NIGHTLY:
+	        this.nextVer = ModrinthGetter.releaseNames.get(this.newVersionID);
-                currentVer = ModJarInfo.Git_Commit.substring(0,7);
+        }
-                nextVer = this.newVersionID.substring(0,7);
+	    else
-				break;
+        {
+	        this.currentVer = ModJarInfo.Git_Commit.substring(0,7);
+	        this.nextVer = this.newVersionID.substring(0,7);
         }
 	}
 	
@@ -77,7 +75,13 @@ public class UpdateModScreen extends DhScreen
 					// Offset
 					0, 0,
 					// Some textuary stuff
-					0, new ResourceLocation(ModInfo.ID, "logo.png"), 130, 65,
+					0, 
+					#if MC_VER < MC_1_21 
+					new ResourceLocation(ModInfo.ID, "logo.png"),
+					#else
+					ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "logo.png"),
+					#endif
+					130, 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)
@@ -92,7 +96,7 @@ public class UpdateModScreen extends DhScreen
 			e.printStackTrace();
 		}
 		
-		if (Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE)
+		if (!ModInfo.IS_DEV_BUILD)
 		{
 			this.addBtn(new TexturedButtonWidget(
 					// Where the button is on the screen
@@ -102,7 +106,13 @@ public class UpdateModScreen extends DhScreen
 					// Offset
 					0, 0,
 					// Some textuary stuff
-					0, new ResourceLocation(ModInfo.ID, "textures/gui/changelog.png"), 20, 20,
+					0, 
+					#if MC_VER < MC_1_21 
+					new ResourceLocation(ModInfo.ID, "textures/gui/changelog.png"),
+					#else
+					ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "textures/gui/changelog.png"),
+					#endif
+					20, 20,
 					// Create the button and tell it where to go
 					(buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(new ChangelogScreen(this, this.newVersionID)), // TODO: Add a proper easter egg to pressing the logo (maybe with confetti)
 					// Add a title to the button
@@ -125,9 +135,7 @@ public class UpdateModScreen extends DhScreen
 				})
 		);
 		this.addBtn( // Later (not now)
-				MakeBtn(Translatable(ModInfo.ID + ".updater.later"), this.width / 2 + 2, this.height / 2 + 70, 100, 20, (btn) -> {
+				MakeBtn(Translatable(ModInfo.ID + ".updater.later"), this.width / 2 + 2, this.height / 2 + 70, 100, 20, (btn) -> this.onClose())
-					this.onClose();
-				})
 		);
 		this.addBtn( // Never
 				MakeBtn(Translatable(ModInfo.ID + ".updater.never"), this.width / 2 - 102, this.height / 2 + 70, 100, 20, (btn) -> {
@@ -151,17 +159,15 @@ public class UpdateModScreen extends DhScreen
 		this.renderBackground(matrices, mouseX, mouseY, delta); // Render background
 		#endif
 		
+		// TODO: add the tooltips for the buttons
+		super.render(matrices, mouseX, mouseY, delta); // Render the buttons
+		// TODO: Add tooltips
 		
 		// Render the text's
 		DhDrawCenteredString(matrices, this.font, Translatable(ModInfo.ID + ".updater.text1"), this.width / 2, this.height / 2 - 35, 0xFFFFFF);
 		DhDrawCenteredString(matrices, this.font, 
 				Translatable(ModInfo.ID + ".updater.text2", currentVer, nextVer), 
 				this.width / 2, this.height / 2 - 20, 0x52FD52);
-		
-		// TODO: add the tooltips for the buttons
-		super.render(matrices, mouseX, mouseY, delta); // Render the buttons
-		
-		// TODO: Add tooltips
 	}
 	
 	@Override

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

@@ -25,12 +25,13 @@ import java.util.ArrayList;
 import java.util.UUID;
 
 import com.mojang.blaze3d.platform.NativeImage;
-import com.seibel.distanthorizons.api.enums.config.ELodShading;
+import com.seibel.distanthorizons.api.enums.config.EDhApiLodShading;
 import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.enums.EDhDirection;
+import com.seibel.distanthorizons.core.file.structure.ClientOnlySaveStructure;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
@@ -43,6 +44,7 @@ import com.seibel.distanthorizons.core.pos.DhChunkPos;
 
 import net.minecraft.CrashReport;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.client.resources.model.ModelManager;
 import net.minecraft.core.BlockPos;
@@ -59,16 +61,15 @@ import org.jetbrains.annotations.Nullable;
  * A singleton that wraps the Minecraft object.
  *
  * @author James Seibel
- * @version 3-5-2022
  */
-//@Environment(EnvType.CLIENT)
 public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecraftSharedWrapper
 {
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
+	private static final Minecraft MINECRAFT = Minecraft.getInstance();
 	
 	public static final MinecraftClientWrapper INSTANCE = new MinecraftClientWrapper();
 	
-	public final Minecraft mc = Minecraft.getInstance();
+	
 	
 	/**
 	 * The lightmap for the current:
@@ -99,10 +100,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	 * This doesn't affect OpenGL objects in any way.
 	 */
 	@Override
-	public void clearFrameObjectCache()
+	public void clearFrameObjectCache() { this.lightMap = null; }
-	{
-		lightMap = null;
-	}
 	
 	
 	
@@ -113,84 +111,92 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	@Override
 	public float getShade(EDhDirection lodDirection)
 	{
-		ELodShading lodShading = Config.Client.Advanced.Graphics.AdvancedGraphics.lodShading.get();
+		EDhApiLodShading lodShading = Config.Client.Advanced.Graphics.AdvancedGraphics.lodShading.get();
 		switch (lodShading)
 		{
 			default:
-			case MINECRAFT:
+			case AUTO:
-				if (this.mc.level != null)
+				if (MINECRAFT.level != null)
 				{
 					Direction mcDir = McObjectConverter.Convert(lodDirection);
-					return this.mc.level.getShade(mcDir, true);
+					return MINECRAFT.level.getShade(mcDir, true);
 				}
 				else
 				{
 					return 0.0f;
 				}
 			
-			case OLD_LIGHTING:
+			case ENABLED:
-				switch (lodDirection)
+                return switch (lodDirection) {
+                    case DOWN -> 0.5F;
+                    default -> 1.0F;
+                    case NORTH, SOUTH -> 0.8F;
+                    case WEST, EAST -> 0.6F;
+                };
+			
+			case DISABLED:
+				return 1.0F;
+		}
+	}
+	
+	@Override
+	public boolean hasSinglePlayerServer() { return MINECRAFT.hasSingleplayerServer(); }
+	@Override
+	public boolean clientConnectedToDedicatedServer() { return MINECRAFT.getCurrentServer() != null && !this.hasSinglePlayerServer(); }
+	@Override
+	public boolean connectedToReplay() { return !MINECRAFT.hasSingleplayerServer() && MINECRAFT.getCurrentServer() == null; }
+	
+	@Override
+	public String getCurrentServerName() 
 	{
-					case DOWN:
+		if (this.connectedToReplay())
-						return 0.5F;
+		{
-					default:
+			return ClientOnlySaveStructure.REPLAY_SERVER_FOLDER_NAME;
-					case UP:
-						return 1.0F;
-					case NORTH:
-					case SOUTH:
-						return 0.8F;
-					case WEST:
-					case EAST:
-						return 0.6F;
 		}
-			
+		else
-			case NONE:
+		{
-				return 1.0F;
+			ServerData server = MINECRAFT.getCurrentServer();
+			return (server != null) ? server.name : "NULL";
 		}
 	}
 	
 	@Override
-	public boolean hasSinglePlayerServer() { return mc.hasSingleplayerServer(); }
+	public String getCurrentServerIp() 
-	@Override
+	{
-	public boolean clientConnectedToDedicatedServer() { return mc.getCurrentServer() != null && !this.hasSinglePlayerServer(); }
+		if (this.connectedToReplay())
-	
+		{
-	@Override
+			return "";
-	public String getCurrentServerName() { return mc.getCurrentServer().name; }
+		}
-	
+		else
-	@Override
+		{
-	public String getCurrentServerIp() { return mc.getCurrentServer().ip; }
+			ServerData server = MINECRAFT.getCurrentServer();
+			return (server != null) ? server.ip : "NA";
+		}
+	}
 	
 	@Override
 	public String getCurrentServerVersion()
 	{
-		return mc.getCurrentServer().version.getString();
+		ServerData server = MINECRAFT.getCurrentServer();
+		return (server != null) ? server.version.getString() : "UNKOWN";
 	}
 	
 	//=============//
 	// Simple gets //
 	//=============//
 	
-	public LocalPlayer getPlayer()
+	public LocalPlayer getPlayer() { return MINECRAFT.player; }
-	{
-		return mc.player;
-	}
 	
 	@Override
-	public boolean playerExists()
+	public boolean playerExists() { return MINECRAFT.player != null; }
-	{
-		return mc.player != null;
-	}
 	
 	@Override
-	public UUID getPlayerUUID()
+	public UUID getPlayerUUID() { return this.getPlayer().getUUID(); }
-	{
-		return getPlayer().getUUID();
-	}
 	
 	@Override
 	public DhBlockPos getPlayerBlockPos()
 	{
-		BlockPos playerPos = getPlayer().blockPosition();
+		BlockPos playerPos = this.getPlayer().blockPosition();
 		return new DhBlockPos(playerPos.getX(), playerPos.getY(), playerPos.getZ());
 	}
 	
@@ -198,55 +204,47 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	public DhChunkPos getPlayerChunkPos()
 	{
         #if MC_VER < MC_1_17_1
-        ChunkPos playerPos = new ChunkPos(getPlayer().blockPosition());
+        ChunkPos playerPos = new ChunkPos(this.getPlayer().blockPosition());
         #else
-		ChunkPos playerPos = getPlayer().chunkPosition();
+		ChunkPos playerPos = this.getPlayer().chunkPosition();
         #endif
 		return new DhChunkPos(playerPos.x, playerPos.z);
 	}
 	
-	public ModelManager getModelManager()
-	{
-		return mc.getModelManager();
-	}
-	
 	@Nullable
 	@Override
 	public IClientLevelWrapper getWrappedClientLevel()
 	{
-		if (this.mc.level == null)
+		if (MINECRAFT.level == null)
 		{
 			return null;
 		}
 		
-		return ClientLevelWrapper.getWrapperIgnoringOverride(this.mc.level);
+		return ClientLevelWrapper.getWrapperIgnoringOverride(MINECRAFT.level);
-	}
-	
-	/** Please move over to getInstallationDirectory() */
-	@Deprecated
-	@Override
-	public File getGameDirectory()
-	{
-		return getInstallationDirectory();
 	}
 	
 	@Override
 	public IProfilerWrapper getProfiler()
 	{
-		if (profilerWrapper == null)
+		if (this.profilerWrapper == null)
-			profilerWrapper = new ProfilerWrapper(mc.getProfiler());
+		{
-		else if (mc.getProfiler() != profilerWrapper.profiler)
+			this.profilerWrapper = new ProfilerWrapper(MINECRAFT.getProfiler());
-			profilerWrapper.profiler = mc.getProfiler();
+		}
-		return profilerWrapper;
+		else if (MINECRAFT.getProfiler() != this.profilerWrapper.profiler)
+		{
+			this.profilerWrapper.profiler = MINECRAFT.getProfiler();
+		}
+		
+		return this.profilerWrapper;
 	}
 	
 	/** Returns all worlds available to the server */
 	@Override
 	public ArrayList<ILevelWrapper> getAllServerWorlds()
 	{
-		ArrayList<ILevelWrapper> worlds = new ArrayList<ILevelWrapper>();
+		ArrayList<ILevelWrapper> worlds = new ArrayList<>();
 		
-		Iterable<ServerLevel> serverWorlds = mc.getSingleplayerServer().getAllLevels();
+		Iterable<ServerLevel> serverWorlds = MINECRAFT.getSingleplayerServer().getAllLevels();
 		for (ServerLevel world : serverWorlds)
 		{
 			worlds.add(ServerLevelWrapper.getWrapper(world));
@@ -260,12 +258,12 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	@Override
 	public void sendChatMessage(String string)
 	{
-		LocalPlayer p = getPlayer();
+		LocalPlayer player = this.getPlayer();
-		if (p == null) return;
+		if (player == null) return;
         #if MC_VER < MC_1_19_2
-		p.sendMessage(new TextComponent(string), getPlayer().getUUID());
+		player.sendMessage(new TextComponent(string), getPlayer().getUUID());
         #else
-		p.sendSystemMessage(net.minecraft.network.chat.Component.translatable(string));
+		player.sendSystemMessage(net.minecraft.network.chat.Component.translatable(string));
         #endif
 	}
 	
@@ -290,24 +288,15 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	}
 	
 	@Override
-	public Object getOptionsObject()
+	public Object getOptionsObject() { return MINECRAFT.options; }
-	{
-		return mc.options;
-	}
 	
 	@Override
-	public boolean isDedicatedServer()
+	public boolean isDedicatedServer() { return false; }
-	{
-		return false;
-	}
 	
 	@Override
-	public File getInstallationDirectory()
+	public File getInstallationDirectory() { return MINECRAFT.gameDirectory; }
-	{
-		return mc.gameDirectory;
-	}
 	
 	@Override
-	public void executeOnRenderThread(Runnable runnable) { this.mc.execute(runnable); }
+	public void executeOnRenderThread(Runnable runnable) { MINECRAFT.execute(runnable); }
 	
 }

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

@@ -12,16 +12,20 @@ public class MinecraftDedicatedServerWrapper implements IMinecraftSharedWrapper
 	private MinecraftDedicatedServerWrapper() { }
 	public DedicatedServer dedicatedServer = null;
 	@Override
-	public boolean isDedicatedServer()
+	public boolean isDedicatedServer() { return true; }
-	{
-		return true;
-	}
 	@Override
 	public File getInstallationDirectory()
 	{
-		if (dedicatedServer == null)
+		if (this.dedicatedServer == null)
+		{
 			throw new IllegalStateException("Trying to get Installation Direction before Dedicated server complete initialization!");
-		return dedicatedServer.getServerDirectory();
+		}
+		
+		#if MC_VER < MC_1_21
+		return this.dedicatedServer.getServerDirectory();
+		#else
+		return this.dedicatedServer.getServerDirectory().toFile();
+		#endif
 	}
 	
 }

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

@@ -21,10 +21,9 @@ package com.seibel.distanthorizons.common.wrappers.minecraft;
 
 import java.awt.Color;
 import java.lang.invoke.MethodHandles;
-import java.nio.FloatBuffer;
 import java.util.Collection;
-import java.util.HashMap;
 import java.util.HashSet;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 import com.mojang.blaze3d.pipeline.RenderTarget;
@@ -37,10 +36,10 @@ import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.render.DhApiRenderProxy;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper;
 
 #if MC_VER < MC_1_19_4
+import org.joml.Matrix4f;
 import org.joml.Vector3f;
 #else
 import org.joml.Matrix4f;
@@ -54,9 +53,9 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.AbstractOpt
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IDimensionTypeWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import com.seibel.distanthorizons.coreapi.util.math.Mat4f;
+import com.seibel.distanthorizons.core.util.math.Mat4f;
-import com.seibel.distanthorizons.coreapi.util.math.Vec3d;
+import com.seibel.distanthorizons.core.util.math.Vec3d;
-import com.seibel.distanthorizons.coreapi.util.math.Vec3f;
+import com.seibel.distanthorizons.core.util.math.Vec3f;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
@@ -80,7 +79,6 @@ import net.minecraft.world.level.material.FogType;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import org.apache.logging.log4j.Logger;
-import org.joml.Matrix4f;
 
 
 /**
@@ -105,7 +103,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 	 * In the case of immersive portals multiple levels may be active at once, causing conflicting lightmaps. <br> 
 	 * Requiring the use of multiple {@link LightMapWrapper}.
 	 */
-	public HashMap<IDimensionTypeWrapper, LightMapWrapper> lightmapByDimensionType = new HashMap<>();
+	public ConcurrentHashMap<IDimensionTypeWrapper, LightMapWrapper> lightmapByDimensionType = new ConcurrentHashMap<>();
 	
 	/** 
 	 * Holds the render buffer that should be used when displaying levels to the screen.
@@ -211,16 +209,25 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 	{
 		if (MC.level.dimensionType().hasSkyLight())
 		{
-			#if MC_VER < MC_1_17_1
+			float frameTime;
-			Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getBlockPosition(), MC.getFrameTime());
+			#if MC_VER < MC_1_21
+			frameTime = MC.getFrameTime();
 			#else
-			Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getPosition(), MC.getFrameTime());
+			frameTime = MC.getTimer().getRealtimeDeltaTicks();
+			#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);
 		}
 		else
+		{
 			return new Color(0, 0, 0);
 		}
+	}
 	
 	@Override
 	public double getFov(float partialTicks)
@@ -405,11 +412,8 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 		// so this will have to do for now
 		IDimensionTypeWrapper dimensionType = level.getDimensionType();
 		
-		if (!this.lightmapByDimensionType.containsKey(dimensionType))
+		LightMapWrapper wrapper = this.lightmapByDimensionType.computeIfAbsent(dimensionType, (dimType) -> new LightMapWrapper());
-		{
+		wrapper.uploadLightmap(lightPixels);
-			this.lightmapByDimensionType.put(dimensionType, new LightMapWrapper());
-		}
-		this.lightmapByDimensionType.get(dimensionType).uploadLightmap(lightPixels);
 	}
 	
 }

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

@@ -36,14 +36,6 @@ public class LightMapWrapper implements ILightMapWrapper
 	
 	public LightMapWrapper() { }
 	
-	private void createLightmap(NativeImage image)
-	{
-		this.textureId = GL32.glGenTextures();
-		GL32.glBindTexture(GL32.GL_TEXTURE_2D, 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);
-	}
-	
 	
 	
 	//=========//
@@ -53,14 +45,25 @@ public class LightMapWrapper implements ILightMapWrapper
 	public void uploadLightmap(NativeImage image)
 	{
 		int currentBind = GL32.glGetInteger(GL32.GL_TEXTURE_BINDING_2D);
-		GL32.glBindTexture(GL32.GL_TEXTURE_2D, this.textureId);
 		if (this.textureId == 0)
 		{
 			this.createLightmap(image);
 		}
+		else
+		{
+			GL32.glBindTexture(GL32.GL_TEXTURE_2D, this.textureId);
+		}
 		image.upload(0, 0, 0, false);
 		GL32.glBindTexture(GL32.GL_TEXTURE_2D, currentBind);
 	}
+	private void createLightmap(NativeImage image)
+	{
+		this.textureId = GL32.glGenTextures();
+		GL32.glBindTexture(GL32.GL_TEXTURE_2D, 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);
+	}
+	
 	
 	@Override
 	public void bind()

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

@@ -1,7 +1,7 @@
 package com.seibel.distanthorizons.common.wrappers.world;
 
 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiLevelType;
-import com.seibel.distanthorizons.api.interfaces.world.IDhApiDimensionTypeWrapper;
+import com.seibel.distanthorizons.api.interfaces.render.IDhApiCustomRenderRegister;
 import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
 import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper;
@@ -9,7 +9,7 @@ import com.seibel.distanthorizons.common.wrappers.block.cache.ClientBlockDetailM
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapper;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.level.IKeyedClientLevelManager;
+import com.seibel.distanthorizons.core.level.*;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.DhBlockPos;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
@@ -19,28 +19,40 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IDimensionTypeWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.LightLayer;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkSource;
-import net.minecraft.world.level.chunk.ChunkStatus;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
 
+#if MC_VER <= MC_1_20_4
+import net.minecraft.world.level.chunk.ChunkStatus;
+#else
+import net.minecraft.world.level.chunk.status.ChunkStatus;
+#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<>();
+	private static final ConcurrentHashMap<ClientLevel, ClientLevelWrapper> LEVEL_WRAPPER_BY_CLIENT_LEVEL = new ConcurrentHashMap<>(); // TODO can leak
 	private static final IKeyedClientLevelManager KEYED_CLIENT_LEVEL_MANAGER = SingletonInjector.INSTANCE.get(IKeyedClientLevelManager.class);
 	
+	private static final Minecraft MINECRAFT = Minecraft.getInstance();
+	
 	private final ClientLevel level;
 	private final ClientBlockDetailMap blockMap = new ClientBlockDetailMap(this);
 	
+	private BlockStateWrapper dirtBlockWrapper;
+	private BiomeWrapper plainsBiomeWrapper;
+	@Deprecated // TODO circular references are bad
+	private IDhLevel parentDhLevel;
+	
 	
 	
 	//=============//
@@ -79,7 +91,7 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	{
 		try
 		{
-			Iterable<ServerLevel> serverLevels = MinecraftClientWrapper.INSTANCE.mc.getSingleplayerServer().getAllLevels();
+			Iterable<ServerLevel> serverLevels = MINECRAFT.getSingleplayerServer().getAllLevels();
 			
 			// attempt to find the server level with the same dimension type
 			// TODO this assumes only one level per dimension type, the SubDimensionLevelMatcher will need to be added for supporting multiple levels per dimension
@@ -116,6 +128,46 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 		return this.blockMap.getColor(((BlockStateWrapper) blockState).blockState, (BiomeWrapper) biome, pos);
 	}
 	
+	@Override
+	public int getDirtBlockColor()
+	{
+		if (this.dirtBlockWrapper == null)
+		{
+			try
+			{
+				this.dirtBlockWrapper = (BlockStateWrapper) BlockStateWrapper.deserialize(BlockStateWrapper.DIRT_RESOURCE_LOCATION_STRING, this);
+			}
+			catch (IOException e)
+			{
+				// shouldn't happen, but just in case
+				LOGGER.warn("Unable to get dirt color with resource location ["+BlockStateWrapper.DIRT_RESOURCE_LOCATION_STRING+"] with level ["+this+"].", e);
+				return -1;
+			}
+		}
+		
+		return this.blockMap.getColor(this.dirtBlockWrapper.blockState, BiomeWrapper.EMPTY_WRAPPER, DhBlockPos.ZERO);
+	}
+	
+	@Override
+	public IBiomeWrapper getPlainsBiomeWrapper()
+	{
+		if (this.plainsBiomeWrapper == null)
+		{
+			try
+			{
+				this.plainsBiomeWrapper = (BiomeWrapper) BiomeWrapper.deserialize(BiomeWrapper.PLAINS_RESOURCE_LOCATION_STRING, this);
+			}
+			catch (IOException e)
+			{
+				// shouldn't happen, but just in case
+				LOGGER.warn("Unable to get planes biome with resource location ["+BiomeWrapper.PLAINS_RESOURCE_LOCATION_STRING+"] with level ["+this+"].", e);
+				return null;
+			}
+		}
+		
+		return this.plainsBiomeWrapper;
+	}
+	
 	@Override
 	public IDimensionTypeWrapper getDimensionType() { return DimensionTypeWrapper.getDimensionTypeWrapper(this.level.dimensionType()); }
 	
@@ -131,7 +183,7 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	public boolean hasSkyLight() { return this.level.dimensionType().hasSkyLight(); }
 	
 	@Override
-	public int getHeight() { return this.level.getHeight(); }
+	public int getMaxHeight() { return this.level.getHeight(); }
 	
 	@Override
 	public int getMinHeight()
@@ -180,7 +232,37 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	public ClientLevel getWrappedMcObject() { return this.level; }
 	
 	@Override
-	public void onUnload() { LEVEL_WRAPPER_BY_CLIENT_LEVEL.remove(this.level); }
+	public void onUnload() 
+	{ 
+		LEVEL_WRAPPER_BY_CLIENT_LEVEL.remove(this.level);
+		this.parentDhLevel = null;
+	}
+	
+	
+	
+	//===================//
+	// generic rendering //
+	//===================//
+	
+	@Override
+	public void setParentLevel(IDhLevel parentLevel) { this.parentDhLevel = parentLevel; }
+	
+	@Override 
+	public IDhApiCustomRenderRegister getRenderRegister()
+	{
+		if (this.parentDhLevel == null)
+		{
+			return null;
+		}
+		
+		return this.parentDhLevel.getGenericRenderer();
+	}
+	
+	
+	
+	//================//
+	// base overrides //
+	//================//
 	
 	@Override
 	public String toString()

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

@@ -23,12 +23,14 @@ import java.io.File;
 import java.util.concurrent.ConcurrentHashMap;
 
 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiLevelType;
+import com.seibel.distanthorizons.api.interfaces.render.IDhApiCustomRenderRegister;
 import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
 import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper;
 import com.seibel.distanthorizons.common.wrappers.block.cache.ServerBlockDetailMap;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapper;
+import com.seibel.distanthorizons.core.level.IDhLevel;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.DhBlockPos;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
@@ -41,7 +43,12 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapp
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkSource;
+
+#if MC_VER <= MC_1_20_4
 import net.minecraft.world.level.chunk.ChunkStatus;
+#else
+import net.minecraft.world.level.chunk.status.ChunkStatus;
+#endif
 
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
@@ -54,8 +61,9 @@ 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<>();
 	
-	final ServerLevel level;
+	private final ServerLevel level;
-	ServerBlockDetailMap blockMap = new ServerBlockDetailMap(this);
+	@Deprecated // TODO circular references are bad
+	private IDhLevel parentDhLevel;
 	
 	
 	
@@ -76,19 +84,6 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	// methods //
 	//=========//
 	
-	@Nullable
-	@Override
-	public IClientLevelWrapper tryGetClientLevelWrapper()
-	{
-		MinecraftClientWrapper client = MinecraftClientWrapper.INSTANCE;
-		if (client.mc.level == null)
-		{
-			return null;
-		}
-		
-		return ClientLevelWrapper.getWrapper(client.mc.level);
-	}
-	
 	@Override
 	public File getSaveFolder()
 	{
@@ -122,7 +117,7 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	}
 	
 	@Override
-	public int getHeight()
+	public int getMaxHeight()
 	{
 		return level.getHeight();
 	}
@@ -136,6 +131,7 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 		return level.getMinBuildHeight();
         #endif
 	}
+	
 	@Override
 	public IChunkWrapper tryGetChunk(DhChunkPos pos)
 	{
@@ -166,18 +162,33 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	}
 	
 	@Override
-	public ServerLevel getWrappedMcObject()
+	public ServerLevel getWrappedMcObject() { return this.level; }
-	{
-		return level;
-	}
 	
 	@Override
 	public void onUnload() { LEVEL_WRAPPER_BY_SERVER_LEVEL.remove(this.level); }
 	
+	
 	@Override
-	public String toString()
+	public void setParentLevel(IDhLevel parentLevel) { this.parentDhLevel = parentLevel; }
+	
+	@Override
+	public IDhApiCustomRenderRegister getRenderRegister()
 	{
-		return "Wrapped{" + level.toString() + "@" + getDimensionType().getDimensionName() + "}";
+		if (this.parentDhLevel == null)
+		{
+			return null;
 		}
 		
+		return this.parentDhLevel.getGenericRenderer();
+	}
+	
+	
+	
+	//================//
+	// base overrides //
+	//================//
+	
+	@Override
+	public String toString() { return "Wrapped{" + this.level.toString() + "@" + this.getDimensionType().getDimensionName() + "}"; }
+	
 }

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

@@ -35,6 +35,7 @@ import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.util.objects.EventTimer;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
+import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.ChunkLightStorage;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvironmentWrapper;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
@@ -66,7 +67,6 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.ProtoChunk;
 import net.minecraft.world.level.chunk.UpgradeData;
@@ -79,6 +79,12 @@ import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
 import net.minecraft.nbt.CompoundTag;
 import org.apache.logging.log4j.LogManager;
 
+#if MC_VER <= MC_1_20_4
+import net.minecraft.world.level.chunk.ChunkStatus;
+#else
+import net.minecraft.world.level.chunk.status.ChunkStatus;
+#endif
+
 /*
 Total:                   3.135214124s
 =====================================
@@ -104,8 +110,6 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			new ConfigBasedLogger(LogManager.getLogger("LodWorldGen"),
 					() -> Config.Client.Advanced.Logging.logWorldGenLoadEvent.get());
 	
-	//TODO: Make actual proper support for StarLight
-	
 	public static class PerfCalculator
 	{
 		private static final String[] TIME_NAMES = {
@@ -143,7 +147,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				if (index == -1) continue;
 				times.get(index).add(e.timeNs);
 			}
-			times.get(0).add(event.getTotalTimeNs());
+			times.getFirst().add(event.getTotalTimeNs());
 		}
 		
 		public String toString()
@@ -289,6 +293,9 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	
 	
 	
+	//=================//
+	// synchronization //
+	//=================//
 	
 	public <T> T joinSync(CompletableFuture<T> future)
 	{
@@ -339,8 +346,11 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			}
 			else if (event.hasTimeout(Config.Client.Advanced.WorldGenerator.worldGenerationTimeoutLengthInSeconds.get(), TimeUnit.SECONDS))
 			{
-				EVENT_LOGGER.error("Batching World Generator: " + event + " timed out and terminated!");
+				EVENT_LOGGER.warn(
-				EVENT_LOGGER.info("Dump PrefEvent: " + event.timer);
+						"Batching World Generator: [" + event + "] timed out and terminated after ["+Config.Client.Advanced.WorldGenerator.worldGenerationTimeoutLengthInSeconds.get()+"] seconds. " +
+								"\nYour computer might be overloaded or your world gen mods might be causing world gen to take longer than expected. " +
+								"\nEither increase DH's world gen timeout or reduce your computer's CPU load.");
+				EVENT_LOGGER.debug("Dump PrefEvent: " + event.timer);
 				try
 				{
 					if (!event.terminate())
@@ -363,31 +373,196 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		}
 	}
 	
-	private static ProtoChunk EmptyChunk(ServerLevel level, ChunkPos chunkPos)
-	{
-		return new ProtoChunk(chunkPos, UpgradeData.EMPTY
-					#if MC_VER >= MC_1_17_1 , level #endif
-					#if MC_VER >= MC_1_18_2 , level.registryAccess().registryOrThrow(
-						#if MC_VER < MC_1_19_4
-				Registry.BIOME_REGISTRY
-						#else
-				Registries.BIOME
-						#endif
-		), null #endif
-		);
 	
+	
+	//==================//
+	// world generation //
+	//==================//
+	
+	public void generateLodFromList(GenerationEvent genEvent) throws InterruptedException
+	{
+		EVENT_LOGGER.debug("Lod Generate Event: " + genEvent.minPos);
+		
+		ArrayGridList<ChunkWrapper> chunkWrapperList;
+		DhLitWorldGenRegion region;
+		DummyLightEngine dummyLightEngine;
+		LightGetterAdaptor adaptor;
+		
+		int borderSize = MaxBorderNeeded;
+		int refSize = genEvent.size + borderSize * 2;
+		int refPosX = genEvent.minPos.x - borderSize;
+		int refPosZ = genEvent.minPos.z - borderSize;
+		
+		try
+		{
+			ArrayGridList<ChunkAccess> totalChunks;
+			
+			adaptor = new LightGetterAdaptor(this.params.level);
+			dummyLightEngine = new DummyLightEngine(adaptor);
+			
+			
+			
+			//=============================//
+			// try getting existing chunks //
+			//=============================//
+			
+			HashMap<DhChunkPos, ChunkLightStorage> chunkSkyLightingByDhPos = new HashMap<>();
+			HashMap<DhChunkPos, ChunkLightStorage> chunkBlockLightingByDhPos = new HashMap<>();
+			IEmptyChunkGeneratorFunc emptyChunkGeneratorFunc = (int x, int z) ->
+			{
+				ChunkPos chunkPos = new ChunkPos(x, z);
+				DhChunkPos dhChunkPos = new DhChunkPos(x, z);
+				ChunkAccess newChunk = null;
+				try
+				{
+					// get the chunk
+					CompoundTag chunkData = this.getChunkNbtData(chunkPos);
+					newChunk = this.loadOrMakeChunk(chunkPos, chunkData);
+					
+					if (Config.Client.Advanced.LodBuilding.pullLightingForPregeneratedChunks.get())
+					{
+						// attempt to get chunk lighting
+						ChunkLoader.CombinedChunkLightStorage combinedLights = ChunkLoader.readLight(newChunk, chunkData);
+						if (combinedLights != null)
+						{
+							chunkSkyLightingByDhPos.put(dhChunkPos, combinedLights.skyLightStorage);
+							chunkBlockLightingByDhPos.put(dhChunkPos, combinedLights.blockLightStorage);
+						}
+					}
+				}
+				catch (RuntimeException loadChunkError)
+				{
+					// Continue...
 				}
 				
-	public ChunkAccess loadOrMakeChunk(ChunkPos chunkPos)
+				if (newChunk == null)
+				{
+					newChunk = new ProtoChunk(chunkPos, UpgradeData.EMPTY
+							#if MC_VER >= MC_1_17_1 , this.params.level #endif
+							#if MC_VER >= MC_1_18_2 , this.params.biomes, null #endif
+					);
+				}
+				return newChunk;
+			};
+			totalChunks = new ArrayGridList<>(refSize, (x, z) -> emptyChunkGeneratorFunc.generate(x + refPosX, z + refPosZ));
+			
+			int radius = refSize / 2;
+			int centerX = refPosX + radius;
+			int centerZ = refPosZ + radius;
+			
+			ChunkAccess centerChunk = totalChunks.stream().filter(chunk -> chunk.getPos().x == centerX && chunk.getPos().z == centerZ).findFirst().get();
+			
+			genEvent.refreshTimeout();
+			region = new DhLitWorldGenRegion(
+					centerX, centerZ,
+					centerChunk,
+					this.params.level, dummyLightEngine, totalChunks,
+					ChunkStatus.STRUCTURE_STARTS, radius, emptyChunkGeneratorFunc);
+			adaptor.setRegion(region);
+			genEvent.threadedParam.makeStructFeat(region, this.params);
+			
+			
+			
+			//=======================//
+			// create chunk wrappers //
+			//=======================//
+			
+			chunkWrapperList = new ArrayGridList<>(totalChunks.gridSize);
+			totalChunks.forEachPos((x, z) ->
+			{
+				ChunkAccess chunk = totalChunks.get(x, z);
+				if (chunk != null)
+				{
+					// wrap the chunk
+					ChunkWrapper chunkWrapper = new ChunkWrapper(chunk, region, this.serverlevel.getLevelWrapper());
+					chunkWrapperList.set(x, z, chunkWrapper);
+					
+					// try setting the wrapper's lighting
+					if (chunkBlockLightingByDhPos.containsKey(chunkWrapper.getChunkPos()))
+					{
+						chunkWrapper.setBlockLightStorage(chunkBlockLightingByDhPos.get(chunkWrapper.getChunkPos()));
+						chunkWrapper.setSkyLightStorage(chunkSkyLightingByDhPos.get(chunkWrapper.getChunkPos()));
+						chunkWrapper.setUseDhLighting(true);
+						chunkWrapper.setIsDhLightCorrect(true);
+					}
+				}
+			});
+			
+			
+			
+			//=================//
+			// generate chunks //
+			//=================//
+			
+			this.generateDirect(genEvent, chunkWrapperList, borderSize, genEvent.targetGenerationStep, region);
+			genEvent.timer.nextEvent("cleanup");
+		}
+		catch (StepStructureStart.StructStartCorruptedException f)
+		{
+			genEvent.threadedParam.markAsInvalid();
+			throw (RuntimeException) f.getCause();
+		}
+		
+		ArrayGridList<ChunkWrapper> finalGenChunks = GetCutoutFrom(chunkWrapperList, borderSize);
+		for (int offsetY = 0; offsetY < finalGenChunks.gridSize; offsetY++)
+		{
+			for (int offsetX = 0; offsetX < finalGenChunks.gridSize; offsetX++)
+			{
+				ChunkWrapper wrappedChunk = finalGenChunks.get(offsetX, offsetY);
+				ChunkAccess target = wrappedChunk.getChunk();
+				if (target instanceof LevelChunk)
+				{
+					#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
+					((LevelChunk) target).setLoaded(true);
+					#else
+					((LevelChunk) target).loaded = true;
+					#endif
+				}
+				
+				if (!wrappedChunk.isLightCorrect())
+				{
+					throw new RuntimeException("The generated chunk somehow has isLightCorrect() returning false");
+				}
+				
+				boolean isFull = ChunkWrapper.getStatus(target) == ChunkStatus.FULL || target instanceof LevelChunk;
+				#if MC_VER >= MC_1_18_2
+				boolean isPartial = target.isOldNoiseGeneration();
+				#endif
+				if (isFull)
+				{
+					LOAD_LOGGER.info("Detected full existing chunk at {}", target.getPos());
+					genEvent.resultConsumer.accept(wrappedChunk);
+				}
+				#if MC_VER >= MC_1_18_2
+				else if (isPartial)
+				{
+					LOAD_LOGGER.info("Detected old existing chunk at {}", target.getPos());
+					genEvent.resultConsumer.accept(wrappedChunk);
+				}
+				#endif
+				else if (ChunkWrapper.getStatus(target) == ChunkStatus.EMPTY)
+				{
+					genEvent.resultConsumer.accept(wrappedChunk);
+				}
+				else
+				{
+					genEvent.resultConsumer.accept(wrappedChunk);
+				}
+			}
+		}
+		
+		genEvent.timer.complete();
+		genEvent.refreshTimeout();
+		if (PREF_LOGGER.canMaybeLog())
+		{
+			genEvent.threadedParam.perf.recordEvent(genEvent.timer);
+			PREF_LOGGER.infoInc("{}", genEvent.timer);
+		}
+	}
+	private CompoundTag getChunkNbtData(ChunkPos chunkPos)
 	{
 		ServerLevel level = this.params.level;
 		
-		
-		
-		//====================//
-		// get the chunk data //
-		//====================//
-		
 		CompoundTag chunkData = null;
 		try
 		{
@@ -420,15 +595,15 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			LOAD_LOGGER.error("DistantHorizons: Couldn't load or make chunk " + chunkPos + ". Error: " + e.getMessage(), e);
 		}
 		
-		
+		return chunkData;
-		
+	}
-		//========================//
+	private ChunkAccess loadOrMakeChunk(ChunkPos chunkPos, CompoundTag chunkData)
-		// convert the chunk data //
+	{
-		//========================//
+		ServerLevel level = this.params.level;
 		
 		if (chunkData == null)
 		{
-			return EmptyChunk(level, chunkPos);
+			return CreateEmptyChunk(level, chunkPos);
 		}
 		else
 		{
@@ -446,148 +621,22 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 								"Error: ["+e.getMessage()+"]."
 						, e);
 				
-				return EmptyChunk(level, chunkPos);
+				return CreateEmptyChunk(level, chunkPos);
 			}
 		}
 	}
-	
+	private static ProtoChunk CreateEmptyChunk(ServerLevel level, ChunkPos chunkPos)
-	private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, int border)
 	{
-		return new ArrayGridList<>(total, border, total.gridSize - border);
+		return new ProtoChunk(chunkPos, UpgradeData.EMPTY
-	}
+					#if MC_VER >= MC_1_17_1 , level #endif
-	
+					#if MC_VER >= MC_1_18_2 , level.registryAccess().registryOrThrow(
-	private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, EDhApiWorldGenerationStep step)
+						#if MC_VER < MC_1_19_4
-	{
+				Registry.BIOME_REGISTRY
-		return GetCutoutFrom(total, MaxBorderNeeded - BorderNeeded.get(step));
-	}
-	
-	public void generateLodFromList(GenerationEvent genEvent) throws InterruptedException
-	{
-		EVENT_LOGGER.debug("Lod Generate Event: " + genEvent.minPos);
-		
-		ArrayGridList<ChunkWrapper> chunkWrapperList;
-		DhLitWorldGenRegion region;
-		DummyLightEngine lightEngine;
-		LightGetterAdaptor adaptor;
-		
-		int borderSize = MaxBorderNeeded;
-		int refSize = genEvent.size + borderSize * 2;
-		int refPosX = genEvent.minPos.x - borderSize;
-		int refPosZ = genEvent.minPos.z - borderSize;
-		
-		try
-		{
-			ArrayGridList<ChunkAccess> totalChunks;
-			
-			adaptor = new LightGetterAdaptor(this.params.level);
-			lightEngine = new DummyLightEngine(adaptor);
-			
-			EmptyChunkGenerator generator = (int x, int z) ->
-			{
-				ChunkPos chunkPos = new ChunkPos(x, z);
-				ChunkAccess target = null;
-				try
-				{
-					target = this.loadOrMakeChunk(chunkPos);
-				}
-				catch (RuntimeException e2)
-				{
-					// Continue...
-				}
-				
-				if (target == null)
-				{
-					target = new ProtoChunk(chunkPos, UpgradeData.EMPTY
-							#if MC_VER >= MC_1_17_1 , params.level #endif
-							#if MC_VER >= MC_1_18_2 , params.biomes, null #endif
-					);
-				}
-				return target;
-			};
-			
-			totalChunks = new ArrayGridList<>(refSize, (x, z) -> generator.generate(x + refPosX, z + refPosZ));
-			
-			genEvent.refreshTimeout();
-			region = new DhLitWorldGenRegion(params.level, lightEngine, totalChunks,
-					ChunkStatus.STRUCTURE_STARTS, refSize / 2, generator);
-			adaptor.setRegion(region);
-			genEvent.threadedParam.makeStructFeat(region, params);
-			
-			
-			chunkWrapperList = new ArrayGridList<>(totalChunks.gridSize);
-			totalChunks.forEachPos((x, z) ->
-			{
-				ChunkAccess chunk = totalChunks.get(x, z);
-				if (chunk != null)
-				{
-					chunkWrapperList.set(x, z, new ChunkWrapper(chunk, region, serverlevel.getLevelWrapper()));
-				}
-			});
-			
-			this.generateDirect(genEvent, chunkWrapperList, borderSize, genEvent.targetGenerationStep, region);
-			genEvent.timer.nextEvent("cleanup");
-		}
-		catch (StepStructureStart.StructStartCorruptedException f)
-		{
-			genEvent.threadedParam.markAsInvalid();
-			throw (RuntimeException) f.getCause();
-		}
-		
-		ArrayGridList<ChunkWrapper> finalGenChunks = GetCutoutFrom(chunkWrapperList, borderSize);
-		for (int offsetY = 0; offsetY < finalGenChunks.gridSize; offsetY++)
-		{
-			for (int offsetX = 0; offsetX < finalGenChunks.gridSize; offsetX++)
-			{
-				ChunkWrapper wrappedChunk = finalGenChunks.get(offsetX, offsetY);
-				ChunkAccess target = wrappedChunk.getChunk();
-				if (target instanceof LevelChunk)
-				{
-					#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
-					((LevelChunk) target).setLoaded(true);
 						#else
-					((LevelChunk) target).loaded = true;
+				Registries.BIOME
 						#endif
-				}
+		), null #endif
-				
+		);
-				if (!wrappedChunk.isLightCorrect())
-				{
-					throw new RuntimeException("The generated chunk somehow has isLightCorrect() returning false");
-				}
-				
-				boolean isFull = target.getStatus() == ChunkStatus.FULL || target instanceof LevelChunk;
-				#if MC_VER >= MC_1_18_2
-				boolean isPartial = target.isOldNoiseGeneration();
-				#endif
-				if (isFull)
-				{
-					LOAD_LOGGER.info("Detected full existing chunk at {}", target.getPos());
-					genEvent.resultConsumer.accept(wrappedChunk);
-				}
-				#if MC_VER >= MC_1_18_2
-				else if (isPartial)
-				{
-					LOAD_LOGGER.info("Detected old existing chunk at {}", target.getPos());
-					genEvent.resultConsumer.accept(wrappedChunk);
-				}
-				#endif
-				else if (target.getStatus() == ChunkStatus.EMPTY)
-				{
-					genEvent.resultConsumer.accept(wrappedChunk);
-				}
-				else
-				{
-					genEvent.resultConsumer.accept(wrappedChunk);
-				}
-			}
-		}
-		
-		genEvent.timer.complete();
-		genEvent.refreshTimeout();
-		if (PREF_LOGGER.canMaybeLog())
-		{
-			genEvent.threadedParam.perf.recordEvent(genEvent.timer);
-			PREF_LOGGER.infoInc("{}", genEvent.timer);
-		}
 	}
 	
 	public void generateDirect(
@@ -604,9 +653,8 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			chunksToGenerate.forEach((chunkWrapper) ->
 			{
 				ChunkAccess chunk = chunkWrapper.getChunk();
-				if (chunk instanceof ProtoChunk)
+				if (chunk instanceof ProtoChunk protoChunk)
 				{
-					ProtoChunk protoChunk = ((ProtoChunk) chunk);
 					
 					protoChunk.setLightEngine(region.getLightEngine());
 				}
@@ -689,7 +737,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			for (int i = 0; i < chunksToGenerate.size(); i++) // regular for loop since enhanced for loops increase GC pressure slightly
 			{
 				ChunkWrapper chunkWrapper = chunksToGenerate.get(i);
-				if (chunkWrapper.getChunk().getStatus() != ChunkStatus.EMPTY)
+				if (chunkWrapper.getStatus() != ChunkStatus.EMPTY)
 				{
 					iChunkWrapperList.add(chunkWrapper);
 				}
@@ -710,19 +758,19 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				// if this isn't done everything else afterward may fail
 				Heightmap.primeHeightmaps(((ChunkWrapper)centerChunk).getChunk(), ChunkStatus.FEATURES.heightmapsAfter());
 				
-				// populate the lighting
+				// pre-generated chunks should have lighting but new ones won't
+				if (!centerChunk.isLightCorrect())
+				{
 					DhLightingEngine.INSTANCE.lightChunk(centerChunk, iChunkWrapperList, maxSkyLight);
 				}
+			}
 			
 			genEvent.refreshTimeout();
 		}
 	}
+	private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, int border) { return new ArrayGridList<>(total, border, total.gridSize - border); }
+	private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, EDhApiWorldGenerationStep step) { return GetCutoutFrom(total, MaxBorderNeeded - BorderNeeded.get(step)); }
 	
-	public interface EmptyChunkGenerator
-	{
-		ChunkAccess generate(int x, int z);
-		
-	}
 	
 	@Override
 	public int getEventCount() { return this.generationEventList.size(); }
@@ -771,6 +819,12 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		return genEvent.future;
 	}
 	
+	
+	
+	//================//
+	// helper methods //
+	//================//
+	
 	/**
 	 * Called before code that may run for an extended period of time. <br>
 	 * This is necessary to allow canceling world gen since waiting
@@ -784,4 +838,16 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		}
 	}
 	
+	
+	
+	//================//
+	// helper classes //
+	//================//
+	
+	@FunctionalInterface
+	public interface IEmptyChunkGeneratorFunc
+	{
+		ChunkAccess generate(int x, int z);
+	}
+	
 }

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

@@ -26,13 +26,11 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep;
-import com.seibel.distanthorizons.core.generation.WorldGenerationQueue;
-import com.seibel.distanthorizons.core.util.ThreadUtil;
 import com.seibel.distanthorizons.core.util.objects.UncheckedInterruptedException;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.util.objects.EventTimer;
-import com.seibel.distanthorizons.core.util.threading.ThreadPools;
+import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 
 import org.apache.logging.log4j.Logger;
@@ -123,7 +121,7 @@ public final class GenerationEvent
 	public boolean terminate()
 	{
 		LOGGER.info("======================DUMPING ALL THREADS FOR WORLD GEN=======================");
-		ThreadPools.WORLD_GEN_THREAD_FACTORY.dumpAllThreadStacks();
+		ThreadPoolUtil.WORLD_GEN_THREAD_FACTORY.dumpAllThreadStacks();
 		this.future.cancel(true);
 		return this.future.isCancelled();
 	}

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

@@ -22,9 +22,14 @@ 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;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 
 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;
 
@@ -44,6 +49,7 @@ import net.minecraft.core.registries.Registries;
 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.*;
@@ -76,6 +82,14 @@ import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.material.Fluids;
 #endif
 
+#if MC_VER == MC_1_20_6
+import net.minecraft.world.level.chunk.status.ChunkStatus;
+import net.minecraft.world.level.chunk.status.ChunkType;
+#elif MC_VER == MC_1_21
+import net.minecraft.world.level.chunk.status.ChunkStatus;
+import net.minecraft.world.level.chunk.status.ChunkType;
+#endif
+
 import net.minecraft.world.level.material.Fluid;
 
 
@@ -95,133 +109,13 @@ public class ChunkLoader
 	private static final String FLUID_TICKS_TAG_PRE18 = "LiquidTicks";
 	private static final ConfigBasedLogger LOGGER = BatchGenerationEnvironment.LOAD_LOGGER;
 	
-	#if MC_VER >= MC_1_18_2
+	private static boolean lightingSectionErrorLogged = false;
-	private static BlendingData readBlendingData(CompoundTag chunkData)
-	{
-		BlendingData blendingData = null;
-		if (chunkData.contains("blending_data", 10))
-		{
-			@SuppressWarnings({"unchecked", "rawtypes"})
-			Dynamic<CompoundTag> blendingDataTag = new Dynamic(NbtOps.INSTANCE, chunkData.getCompound("blending_data"));
-			blendingData = BlendingData.CODEC.parse(blendingDataTag).resultOrPartial(LOGGER::error).orElse(null);
-		}
-		return blendingData;
-	}
-	#endif
 	
-	private static LevelChunkSection[] readSections(LevelAccessor level, ChunkPos chunkPos, CompoundTag chunkData)
-	{
-		#if MC_VER >= MC_1_18_2
-		#if MC_VER < MC_1_19_4
-		Registry<Biome> biomes = level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY);
-		#else
-		Registry<Biome> biomes = level.registryAccess().registryOrThrow(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(
-				biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getHolderOrThrow(Biomes.PLAINS));
-			#else
-		Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codecRW(
-				biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getHolderOrThrow(Biomes.PLAINS));
-			#endif
-		#endif
-		int i = #if MC_VER < MC_1_17_1 16; #else level.getSectionsCount(); #endif
-		LevelChunkSection[] chunkSections = new LevelChunkSection[i];
 	
-		boolean isLightOn = chunkData.getBoolean("isLightOn");
-		boolean hasSkyLight = level.dimensionType().hasSkyLight();
-		ListTag tagSections = chunkData.getList("Sections", 10);
-		if (tagSections.isEmpty()) tagSections = chunkData.getList("sections", 10);
 	
-		for (int j = 0; j < tagSections.size(); ++j)
+	//============//
-		{
+	// read chunk //
-			CompoundTag tagSection = tagSections.getCompound(j);
+	//============//
-			int sectionYPos = tagSection.getByte("Y");
-
-			#if MC_VER < MC_1_18_2
-			if (tagSection.contains("Palette", 9) && tagSection.contains("BlockStates", 12))
-			{
-				LevelChunkSection levelChunkSection = new LevelChunkSection(sectionYPos << 4);
-				levelChunkSection.getStates().read(tagSection.getList("Palette", 10),
-						tagSection.getLongArray("BlockStates"));
-				levelChunkSection.recalcBlockCounts();
-				if (!levelChunkSection.isEmpty())
-					chunkSections[#if MC_VER < MC_1_17_1 sectionYPos #else level.getSectionIndexFromSectionY(sectionYPos) #endif ]
-							= levelChunkSection;
-			}
-			#else
-			int sectionId = level.getSectionIndexFromSectionY(sectionYPos);
-			if (sectionId >= 0 && sectionId < chunkSections.length)
-			{
-				PalettedContainer<BlockState> blockStateContainer;
-				#if MC_VER < MC_1_18_2
-				PalettedContainer<Biome> biomeContainer;
-				#else
-				PalettedContainer<Holder<Biome>> biomeContainer;
-				#endif
-				
-				blockStateContainer = tagSection.contains("block_states", 10)
-						? BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagSection.getCompound("block_states")).promotePartial(string -> logErrors(chunkPos, sectionYPos, string)).getOrThrow(false, LOGGER::error)
-						: new PalettedContainer<BlockState>(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState(), PalettedContainer.Strategy.SECTION_STATES);
-
-				#if 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)
-						: new PalettedContainer<Biome>(biomes, biomes.getOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
-				#else
-				biomeContainer = tagSection.contains("biomes", 10)
-						? biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes")).promotePartial(string -> logErrors(chunkPos, i, (String) string)).getOrThrow(false, LOGGER::error)
-						: new PalettedContainer<Holder<Biome>>(biomes.asHolderIdMap(), biomes.getHolderOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
-				#endif
-				#if MC_VER < MC_1_20_1
-				chunkSections[sectionId] = new LevelChunkSection(sectionYPos, blockStateContainer, biomeContainer);
-				#else
-				chunkSections[sectionId] = new LevelChunkSection(blockStateContainer, biomeContainer);
-				#endif
-			}
-			#endif
-			
-		}
-		return chunkSections;
-	}
-	
-	private static void readHeightmaps(LevelChunk chunk, CompoundTag chunkData)
-	{
-		CompoundTag tagHeightmaps = chunkData.getCompound("Heightmaps");
-		for (Heightmap.Types type : ChunkStatus.FULL.heightmapsAfter())
-		{
-			String heightmap = type.getSerializationKey();
-			if (tagHeightmaps.contains(heightmap, 12))
-				chunk.setHeightmap(type, tagHeightmaps.getLongArray(heightmap));
-		}
-		Heightmap.primeHeightmaps(chunk, ChunkStatus.FULL.heightmapsAfter());
-	}
-	
-	private static void readPostPocessings(LevelChunk chunk, CompoundTag chunkData)
-	{
-		ListTag tagPostProcessings = chunkData.getList("PostProcessing", 9);
-		for (int n = 0; n < tagPostProcessings.size(); ++n)
-		{
-			ListTag listTag3 = tagPostProcessings.getList(n);
-			for (int o = 0; o < listTag3.size(); ++o)
-			{
-				chunk.addPackedPostProcess(listTag3.getShort(o), n);
-			}
-		}
-	}
-	
-	public static ChunkStatus.ChunkType readChunkType(CompoundTag tagLevel)
-	{
-		ChunkStatus chunkStatus = ChunkStatus.byName(tagLevel.getString("Status"));
-		if (chunkStatus != null)
-		{
-			return chunkStatus.getChunkType();
-		}
-		return ChunkStatus.ChunkType.PROTOCHUNK;
-	}
 	
 	public static LevelChunk read(WorldGenLevel level, ChunkPos chunkPos, CompoundTag chunkData)
 	{
@@ -262,19 +156,27 @@ public class ChunkLoader
 			}
 		}
 		
-		ChunkStatus.ChunkType chunkType = readChunkType(tagLevel);
+		#if MC_VER < MC_1_20_6
+		ChunkStatus.ChunkType chunkType;
+		#else
+		ChunkType chunkType;
+		#endif
+		chunkType = readChunkType(tagLevel);
+		
 		#if MC_VER < MC_1_18_2
 			if (chunkType != ChunkStatus.ChunkType.LEVELCHUNK)
 				return null;
 		#else
+			
 			BlendingData blendingData = readBlendingData(tagLevel);
 			#if MC_VER < MC_1_19_2
 			if (chunkType == ChunkStatus.ChunkType.PROTOCHUNK && (blendingData == null || !blendingData.oldNoise()))
 				return null;
 			#else
-		if (chunkType == ChunkStatus.ChunkType.PROTOCHUNK && blendingData == null)
+			if (chunkType == #if MC_VER < MC_1_20_6 ChunkStatus.ChunkType.PROTOCHUNK #else ChunkType.PROTOCHUNK #endif && blendingData == null)
 				return null;
 			#endif
+		
 		#endif
 		
 		long inhabitedTime = tagLevel.getLong("InhabitedTime");
@@ -331,10 +233,292 @@ public class ChunkLoader
 		readPostPocessings(chunk, chunkData);
 		return chunk;
 	}
-	
+	private static LevelChunkSection[] readSections(LevelAccessor level, ChunkPos chunkPos, CompoundTag chunkData)
-	private static void logErrors(ChunkPos chunkPos, int i, String string)
 	{
-		LOGGER.error("Distant Horizons: Recoverable errors when loading section [" + chunkPos.x + ", " + i + ", " + chunkPos.z + "]: " + string);
+		#if MC_VER >= MC_1_18_2
+		#if MC_VER < MC_1_19_4
+		Registry<Biome> biomes = level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY);
+		#else
+		Registry<Biome> biomes = level.registryAccess().registryOrThrow(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(
+				biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getHolderOrThrow(Biomes.PLAINS));
+			#else
+		Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codecRW(
+				biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getHolderOrThrow(Biomes.PLAINS));
+			#endif
+		#endif
+		int sectionYIndex = #if MC_VER < MC_1_17_1 16; #else level.getSectionsCount(); #endif
+		LevelChunkSection[] chunkSections = new LevelChunkSection[sectionYIndex];
+		
+		boolean isLightOn = chunkData.getBoolean("isLightOn");
+		boolean hasSkyLight = level.dimensionType().hasSkyLight();
+		ListTag tagSections = chunkData.getList("Sections", 10);
+		if (tagSections.isEmpty()) tagSections = chunkData.getList("sections", 10);
+		
+		for (int j = 0; j < tagSections.size(); ++j)
+		{
+			CompoundTag tagSection = tagSections.getCompound(j);
+			int sectionYPos = tagSection.getByte("Y");
+
+			#if MC_VER < MC_1_18_2
+			if (tagSection.contains("Palette", 9) && tagSection.contains("BlockStates", 12))
+			{
+				LevelChunkSection levelChunkSection = new LevelChunkSection(sectionYPos << 4);
+				levelChunkSection.getStates().read(tagSection.getList("Palette", 10),
+						tagSection.getLongArray("BlockStates"));
+				levelChunkSection.recalcBlockCounts();
+				if (!levelChunkSection.isEmpty())
+					chunkSections[#if MC_VER < MC_1_17_1 sectionYPos #else level.getSectionIndexFromSectionY(sectionYPos) #endif ]
+							= levelChunkSection;
+			}
+			#else
+			int sectionId = level.getSectionIndexFromSectionY(sectionYPos);
+			if (sectionId >= 0 && sectionId < chunkSections.length)
+			{
+				PalettedContainer<BlockState> blockStateContainer;
+				#if MC_VER < MC_1_18_2
+				PalettedContainer<Biome> biomeContainer;
+				#else
+				PalettedContainer<Holder<Biome>> biomeContainer;
+				#endif
+				
+				blockStateContainer = tagSection.contains("block_states", 10)
+						? BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagSection.getCompound("block_states")).promotePartial(string -> 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<>(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)
+						: new PalettedContainer<Biome>(biomes, biomes.getOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
+				#else
+				
+				biomeContainer = tagSection.contains("biomes", 10)
+						? biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes")).promotePartial(string -> 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<>(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);
+				#endif
+			}
+			#endif
+			
+		}
+		return chunkSections;
+	}
+	private static 
+		#if MC_VER < MC_1_20_6 ChunkStatus.ChunkType
+		#elif MC_VER < MC_1_21 ChunkType
+		#else ChunkType #endif 
+	readChunkType(CompoundTag tagLevel)
+	{
+		ChunkStatus chunkStatus = ChunkStatus.byName(tagLevel.getString("Status"));
+		if (chunkStatus != null)
+		{
+			return chunkStatus.getChunkType();
+		}
+		
+		return 
+				#if MC_VER <= MC_1_20_4 ChunkStatus.ChunkType.PROTOCHUNK;
+				#else ChunkType.PROTOCHUNK; #endif
+	}
+	private static void readHeightmaps(LevelChunk chunk, CompoundTag chunkData)
+	{
+		CompoundTag tagHeightmaps = chunkData.getCompound("Heightmaps");
+		for (Heightmap.Types type : ChunkStatus.FULL.heightmapsAfter())
+		{
+			String heightmap = type.getSerializationKey();
+			if (tagHeightmaps.contains(heightmap, 12))
+				chunk.setHeightmap(type, tagHeightmaps.getLongArray(heightmap));
+		}
+		Heightmap.primeHeightmaps(chunk, ChunkStatus.FULL.heightmapsAfter());
+	}
+	private static void readPostPocessings(LevelChunk chunk, CompoundTag chunkData)
+	{
+		ListTag tagPostProcessings = chunkData.getList("PostProcessing", 9);
+		for (int n = 0; n < tagPostProcessings.size(); ++n)
+		{
+			ListTag listTag3 = tagPostProcessings.getList(n);
+			for (int o = 0; o < listTag3.size(); ++o)
+			{
+				chunk.addPackedPostProcess(listTag3.getShort(o), n);
+			}
+		}
+	}
+	#if MC_VER >= MC_1_18_2
+	private static BlendingData readBlendingData(CompoundTag chunkData)
+	{
+		BlendingData blendingData = null;
+		if (chunkData.contains("blending_data", 10))
+		{
+			@SuppressWarnings({"unchecked", "rawtypes"})
+			Dynamic<CompoundTag> blendingDataTag = new Dynamic(NbtOps.INSTANCE, chunkData.getCompound("blending_data"));
+			blendingData = BlendingData.CODEC.parse(blendingDataTag).resultOrPartial(LOGGER::error).orElse(null);
+		}
+		return blendingData;
+	}
+	#endif
+	
+	
+	
+	//=====================//
+	// read chunk lighting //
+	//=====================//
+	
+	/**
+	 * https://minecraft.wiki/w/Chunk_format
+	 */
+	public static CombinedChunkLightStorage readLight(ChunkAccess chunk, CompoundTag chunkData)
+	{
+		#if MC_VER <= MC_1_17_1
+		// MC 1.16 and 1.17 doesn't have the necessary NBT info
+		return null;
+		#else
+		
+		CombinedChunkLightStorage combinedStorage = new CombinedChunkLightStorage(ChunkWrapper.getMinBuildHeight(chunk), ChunkWrapper.getMaxBuildHeight(chunk));
+		ChunkLightStorage blockLightStorage = combinedStorage.blockLightStorage;
+		ChunkLightStorage skyLightStorage = combinedStorage.skyLightStorage;
+		
+		boolean foundSkyLight = false;
+		
+		
+		
+		//===================//
+		// get NBT tags info //
+		//===================//
+		
+		Tag chunkSectionTags = chunkData.get("sections");
+		if (chunkSectionTags == null)
+		{
+			if (!lightingSectionErrorLogged)
+			{
+				lightingSectionErrorLogged = true;
+				LOGGER.error("No sections found for chunk at pos ["+chunk.getPos()+"] chunk data may be out of date.");
+			}
+			return null;
+		}
+		else if (!(chunkSectionTags instanceof ListTag))
+		{
+			if (!lightingSectionErrorLogged)
+			{
+				lightingSectionErrorLogged = true;
+				LOGGER.error("Chunk section tag list have unexpected type ["+chunkSectionTags.getClass().getName()+"], expected ["+ListTag.class.getName()+"].");
+			}
+			return null;
+		}
+		ListTag chunkSectionListTag = (ListTag) chunkSectionTags;
+		
+		
+		
+		//===================//
+		// get lighting info //
+		//===================//
+		
+		for (int sectionIndex = 0; sectionIndex < chunkSectionListTag.size(); sectionIndex++)
+		{
+			Tag chunkSectionTag = chunkSectionListTag.get(sectionIndex);
+			if (!(chunkSectionTag instanceof CompoundTag chunkSectionCompoundTag))
+			{
+				if (!lightingSectionErrorLogged)
+				{
+					lightingSectionErrorLogged = true;
+					LOGGER.error("Chunk section tag has an unexpected type ["+chunkSectionTag.getClass().getName()+"], expected ["+CompoundTag.class.getName()+"].");
+				}
+				return null;
+			}
+
+
+            // if null all lights = 0
+			byte[] blockLightNibbleArray = chunkSectionCompoundTag.getByteArray("BlockLight");
+			byte[] skyLightNibbleArray = chunkSectionCompoundTag.getByteArray("SkyLight");
+			
+			// if any sky light was found then all lights above will be max brightness
+			if (skyLightNibbleArray.length != 0)
+			{
+				foundSkyLight = true;
+			}
+			
+			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
+					for (int relY = 0; relY < LodUtil.CHUNK_WIDTH; relY++)
+					{
+						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.getMinBuildHeight(chunk);
+						blockLightStorage.set(relX, y, relZ, blockLight);
+						skyLightStorage.set(relX, y, relZ, skyLight);
+					}
+				}
+			}
+		}
+		
+		return combinedStorage;
+		#endif
+	}
+	/** source: https://minecraft.wiki/w/Chunk_format#Block_Format */
+	private static byte getNibbleAtIndex(byte[] arr, int index)
+	{
+		if (index % 2 == 0)
+		{
+			return (byte)(arr[index/2] & 0x0F);
+		}
+		else
+		{
+			return (byte)((arr[index/2]>>4) & 0x0F);
+		}
+	}
+	
+	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.");
+	}
+	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.");
+	}
+	
+	
+	
+	//================//
+	// helper classes //
+	//================//
+	
+	public static class CombinedChunkLightStorage
+	{
+		public ChunkLightStorage blockLightStorage;
+		public ChunkLightStorage skyLightStorage;
+		
+		public CombinedChunkLightStorage(int minY, int maxY)
+		{
+			this.blockLightStorage = ChunkLightStorage.createBlockLightStorage(minY, maxY);
+			this.skyLightStorage = ChunkLightStorage.createSkyLightStorage(minY, maxY);
+		}
 	}
 	
 }

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

@@ -0,0 +1,23 @@
+package com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject;
+
+#if MC_VER >= MC_1_21
+
+import net.minecraft.server.level.GenerationChunkHolder;
+import net.minecraft.world.level.ChunkPos;
+
+public class DhGenerationChunkHolder extends GenerationChunkHolder
+{
+	
+	public DhGenerationChunkHolder(ChunkPos pos)
+	{
+		super(pos);
+	}
+	
+	@Override 
+	public int getTicketLevel() { return 0; }
+	@Override 
+	public int getQueueLevel() { return 0; }
+	
+}
+
+#endif

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

@@ -20,14 +20,17 @@
 package com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject;
 
 import java.lang.invoke.MethodHandles;
+import java.util.EnumSet;
 import java.util.List;
 import java.util.concurrent.locks.ReentrantLock;
-
+import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.util.LodUtil;
 import net.minecraft.world.level.block.EntityBlock;
 import net.minecraft.world.level.block.SpawnerBlock;
 import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
@@ -50,28 +53,44 @@ import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.ImposterProtoChunk;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.lighting.LevelLightEngine;
 
+#if MC_VER <= MC_1_20_4
+import net.minecraft.world.level.chunk.ChunkStatus;
+#else
+import net.minecraft.world.level.chunk.status.*;
+#endif
+
+#if MC_VER == MC_1_21
+import net.minecraft.util.StaticCache2D;
+import com.google.common.collect.ImmutableList;
+import net.minecraft.server.level.GenerationChunkHolder;
+#endif
+
+
 public class DhLitWorldGenRegion extends WorldGenRegion
 {
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
 	
+	private static ChunkStatus debugTriggeredForStatus = null;
+	
+	
 	public final DummyLightEngine lightEngine;
-	public final BatchGenerationEnvironment.EmptyChunkGenerator generator;
+	public final BatchGenerationEnvironment.IEmptyChunkGeneratorFunc generator;
 	public final int writeRadius;
 	public final int size;
+	
 	private final ChunkPos firstPos;
 	private final List<ChunkAccess> cache;
-	Long2ObjectOpenHashMap<ChunkAccess> chunkMap = new Long2ObjectOpenHashMap<ChunkAccess>();
+	private final Long2ObjectOpenHashMap<ChunkAccess> chunkMap = new Long2ObjectOpenHashMap<>();
 	
 	/** 
 	 * Present to reduce the chance that we accidentally break underlying MC code that isn't thread safe, 
 	 * specifically: "it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap.getAndMoveToFirst()"
 	 */
-	ReentrantLock getChunkLock = new ReentrantLock();
+	private final ReentrantLock getChunkLock = new ReentrantLock();
 	
 	#if MC_VER < MC_1_18_2
 	private ChunkPos overrideCenterPos = null;
@@ -100,12 +119,30 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 	
 	
 	public DhLitWorldGenRegion(
+			int centerChunkX, int centerChunkZ,
+			ChunkAccess centerChunk,
 			ServerLevel serverLevel, DummyLightEngine lightEngine,
 			List<ChunkAccess> chunkList, ChunkStatus chunkStatus, int writeRadius,
-			BatchGenerationEnvironment.EmptyChunkGenerator generator)
+			BatchGenerationEnvironment.IEmptyChunkGeneratorFunc generator)
 	{
-		super(serverLevel, chunkList #if MC_VER >= MC_1_17_1 , chunkStatus, writeRadius #endif );
+		#if MC_VER == MC_1_16_5
-		this.firstPos = chunkList.get(0).getPos();
+		super(serverLevel, chunkList);
+		#elif MC_VER < MC_1_21
+		super(serverLevel, chunkList, chunkStatus, writeRadius);
+		#else
+		super(serverLevel, 
+				StaticCache2D.create(
+					centerChunkX, centerChunkZ,
+					writeRadius * 2, (x,z) -> new DhGenerationChunkHolder(new ChunkPos(x, z))), 
+				new ChunkStep(chunkStatus,
+						// reverse is needed because MC uses the index of the chunkStatus to determine how many items are in the list instead of the actual list count
+						new ChunkDependencies(ImmutableList.copyOf(ChunkStatus.getStatusList()).reverse()),
+						new ChunkDependencies(ImmutableList.copyOf(ChunkStatus.getStatusList()).reverse()),
+						writeRadius, (WorldGenContext var1, ChunkStep var2, StaticCache2D<GenerationChunkHolder> var3, ChunkAccess var4) -> null),
+				centerChunk);
+		
+		#endif
+		this.firstPos = chunkList.getFirst().getPos();
 		this.generator = generator;
 		this.lightEngine = lightEngine;
 		this.writeRadius = writeRadius;
@@ -198,12 +235,9 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 		#endif
 	}
 	
-	// Skip BlockEntity stuff. It aren't really needed
+	/** Skip BlockEntity stuff. They aren't needed for our use case. */
 	@Override
-	public boolean addFreshEntity(Entity entity)
+	public boolean addFreshEntity(@NotNull Entity entity) { return true; }
-	{
-		return true;
-	}
 	
 	// Allays have empty chunks even if it's outside the worldGenRegion
 	// @Override
@@ -214,13 +248,13 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 	// Override to ensure no other mod mixins cause skipping the overrided
 	// getChunk(...)
 	@Override
-	public ChunkAccess getChunk(int i, int j)
+	public @NotNull ChunkAccess getChunk(int chunkX, int chunkZ)
 	{
 		try
 		{
 			// lock is to prevent issues with underlying MC code that doesn't support multithreading
 			this.getChunkLock.lock();
-			return this.getChunk(i, j, ChunkStatus.EMPTY);
+			return this.getChunk(chunkX, chunkZ, ChunkStatus.EMPTY);
 		}
 		finally
 		{
@@ -231,13 +265,19 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 	// Override to ensure no other mod mixins cause skipping the overrided
 	// getChunk(...)
 	@Override
-	public ChunkAccess getChunk(int i, int j, ChunkStatus chunkStatus)
+	public @NotNull ChunkAccess getChunk(int chunkX, int chunkZ, @NotNull ChunkStatus chunkStatus)
 	{
 		try
 		{
 			// lock is to prevent issues with underlying MC code that doesn't support multithreading
 			this.getChunkLock.lock();
-			return this.getChunk(i, j, chunkStatus, true);
+			
+			ChunkAccess chunk = this.getChunk(chunkX, chunkZ, chunkStatus, true);
+			if (chunk == null)
+			{
+				LodUtil.assertNotReach("getChunk shouldn't return null values");
+			}
+			return chunk;
 		}
 		finally
 		{
@@ -245,28 +285,12 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 		}
 	}
 	
-	// Use this instead of super.getChunk() to bypass C2ME concurrency checks
+	/** Allows creating empty chunks even if they're outside the worldGenRegion */
-	private ChunkAccess superGetChunk(int x, int z, ChunkStatus cs)
-	{
-		int k = x - firstPos.x;
-		int l = z - firstPos.z;
-		return cache.get(k + l * size);
-	}
-	
-	// Use this instead of super.hasChunk() to bypass C2ME concurrency checks
-	public boolean superHasChunk(int x, int z)
-	{
-		int k = x - firstPos.x;
-		int l = z - firstPos.z;
-		return l >= 0 && l < size && k >= 0 && k < size;
-	}
-	
-	// Allow creating empty chunks even if it's outside the worldGenRegion
 	@Override
 	@Nullable
-	public ChunkAccess getChunk(int i, int j, ChunkStatus chunkStatus, boolean bl)
+	public ChunkAccess getChunk(int chunkX, int chunkZ, @NotNull ChunkStatus chunkStatus, boolean returnNonNull)
 	{
-		ChunkAccess chunk = getChunkAccess(i, j, chunkStatus, bl);
+		ChunkAccess chunk = this.getChunkAccess(chunkX, chunkZ, chunkStatus, returnNonNull);
 		if (chunk instanceof LevelChunk)
 		{
 			chunk = new ImposterProtoChunk((LevelChunk) chunk #if MC_VER >= MC_1_18_2 , true #endif );
@@ -274,67 +298,98 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 		return chunk;
 	}
 	
-	private static ChunkStatus debugTriggeredForStatus = null;
+	/**
-	
+	 * @param returnNonNull if true this method will always return a non-null chunk,
-	private ChunkAccess getChunkAccess(int i, int j, ChunkStatus chunkStatus, boolean bl)
+	 *                      if false it will return null if no chunk exists at the given position with the given status 
+	 */
+	private ChunkAccess getChunkAccess(int chunkX, int chunkZ, ChunkStatus chunkStatus, boolean returnNonNull)
 	{
-		ChunkAccess chunk = superHasChunk(i, j) ? superGetChunk(i, j, ChunkStatus.EMPTY) : null;
+		ChunkAccess chunk = this.superHasChunk(chunkX, chunkZ) ? this.superGetChunk(chunkX, chunkZ) : null;
-		if (chunk != null && chunk.getStatus().isOrAfter(chunkStatus))
+		if (chunk != null && ChunkWrapper.getStatus(chunk).isOrAfter(chunkStatus))
 		{
 			return chunk;
 		}
-		if (!bl)
+		else if (!returnNonNull)
+		{
+			// no chunk found with the necessary status and null return values are allowed
 			return null;
+		}
+		
+		
+		// we need a non-null chunk
 		if (chunk == null)
 		{
-			chunk = chunkMap.get(ChunkPos.asLong(i, j));
+			// check memory
+			chunk = this.chunkMap.get(ChunkPos.asLong(chunkX, chunkZ));
 			if (chunk == null)
 			{
-				chunk = generator.generate(i, j);
+				// chunk isn't in memory, generate a new one
+				chunk = this.generator.generate(chunkX, chunkZ);
 				if (chunk == null)
+				{
 					throw new NullPointerException("The provided generator should not return null!");
-				chunkMap.put(ChunkPos.asLong(i, j), chunk);
+				}
+				this.chunkMap.put(ChunkPos.asLong(chunkX, chunkZ), chunk);
 			}
 		}
+		
 		if (chunkStatus != ChunkStatus.EMPTY && chunkStatus != debugTriggeredForStatus)
 		{
 			LOGGER.info("WorldGen requiring " + chunkStatus
 					+ " outside expected range detected. Force passing EMPTY chunk and seeing if it works.");
 			debugTriggeredForStatus = chunkStatus;
 		}
+		
 		return chunk;
 	}
 	
-	/** Overriding allows us to use our own lighting engine */
+	/** Use this instead of super.hasChunk() to bypass C2ME concurrency checks */
-	@Override
+	public boolean superHasChunk(int x, int z)
-	public LevelLightEngine getLightEngine() { return this.lightEngine; }
-	
-	/** Overriding allows us to use our own lighting engine */
-	@Override
-	public int getBrightness(LightLayer lightLayer, BlockPos blockPos) { return 0; }
-	
-	/** Overriding allows us to use our own lighting engine */
-	@Override
-	public int getRawBrightness(BlockPos blockPos, int i) { return 0; }
-	
-	/** Overriding allows us to use our own lighting engine */
-	@Override
-	public boolean canSeeSky(BlockPos blockPos)
 	{
-		return (getBrightness(LightLayer.SKY, blockPos) >= getMaxLightLevel());
+		int k = x - this.firstPos.x;
+		int l = z - this.firstPos.z;
+		return l >= 0 && l < this.size && k >= 0 && k < this.size;
 	}
 	
-	public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver)
+	/** Use this instead of super.getChunk() to bypass C2ME concurrency checks */
+	private ChunkAccess superGetChunk(int x, int z)
 	{
-		return calculateBlockTint(blockPos, colorResolver);
+		int k = x - this.firstPos.x;
+		int l = z - this.firstPos.z;
+		return this.cache.get(k + l * this.size);
+	}
+	
+	
+	/** Overriding allows us to use our own lighting engine */
+	@Override
+	public @NotNull LevelLightEngine getLightEngine() { return this.lightEngine; }
+	
+	/** Overriding allows us to use our own lighting engine */
+	@Override
+	public int getBrightness(@NotNull LightLayer lightLayer, @NotNull BlockPos blockPos) { return 0; }
+	
+	/** Overriding allows us to use our own lighting engine */
+	@Override
+	public int getRawBrightness(@NotNull BlockPos blockPos, int i) { return 0; }
+	
+	/** Overriding allows us to use our own lighting engine */
+	@Override
+	public boolean canSeeSky(@NotNull BlockPos blockPos)
+	{
+		return (this.getBrightness(LightLayer.SKY, blockPos) >= this.getMaxLightLevel());
+	}
+	
+	public int getBlockTint(@NotNull BlockPos blockPos, @NotNull ColorResolver colorResolver)
+	{
+		return this.calculateBlockTint(blockPos, colorResolver);
 	}
 	
 	private Biome _getBiome(BlockPos pos)
 	{
 		#if MC_VER >= MC_1_18_2
-		return getBiome(pos).value();
+		return this.getBiome(pos).value();
 		#else
-		return getBiome(pos);
+		return this.getBiome(pos);
 		#endif
 	}
 	

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

@@ -23,15 +23,24 @@ import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IStarlightAccessor;
 
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.chunk.LightChunkGetter;
+
 #if MC_VER >= MC_1_17_1
 import net.minecraft.world.level.LevelHeightAccessor;
 #endif
-import net.minecraft.world.level.chunk.ChunkStatus;
+
-import net.minecraft.world.level.chunk.LightChunkGetter;
 #if MC_VER >= MC_1_20_1
 import net.minecraft.world.level.chunk.LightChunk;
 #endif
 
+#if MC_VER <= MC_1_20_4
+import net.minecraft.world.level.chunk.ChunkStatus;
+#else
+import net.minecraft.world.level.chunk.status.ChunkStatus;
+#endif
+
+
+
 public class LightGetterAdaptor implements LightChunkGetter
 {
 	private final BlockGetter heightGetter;

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

@@ -17,6 +17,10 @@ import java.nio.file.Path;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.locks.ReentrantLock;
 
+#if MC_VER >= MC_1_20_6
+import net.minecraft.world.level.chunk.storage.RegionStorageInfo;
+#endif
+
 /** 
  * @deprecated should be replaced with net.minecraft.world.level.chunk.storage.IOWorker to
  *              prevent potential file corruption and issues with the C2ME mod.
@@ -180,8 +184,10 @@ public class RegionFileStorageExternalCache implements AutoCloseable
 		Path regionFilePath = storageFolderPath.resolve("r." + pos.getRegionX() + "." + pos.getRegionZ() + ".mca");
 		#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
 		rFile = new RegionFile(regionFilePath.toFile(), storageFolderPath.toFile(), false);
-		#else
+		#elif MC_VER <= MC_1_20_4
 		rFile = new RegionFile(regionFilePath, storageFolderPath, false);
+		#else
+		rFile = new RegionFile(new RegionStorageInfo("level", null, "level type"), regionFilePath, storageFolderPath, false);
 		#endif
 		
 		this.regionFileCache.add(new RegionFileCache(ChunkPos.asLong(pos.getRegionX(), pos.getRegionZ()), rFile));

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

@@ -35,7 +35,6 @@ import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.levelgen.WorldGenSettings;
 #if MC_VER < MC_1_19_2
 import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
@@ -57,6 +56,12 @@ import net.minecraft.world.level.levelgen.structure.StructureStart;
 import net.minecraft.world.level.levelgen.feature.StructureFeature;
 #endif
 
+#if MC_VER <= MC_1_20_4
+import net.minecraft.world.level.chunk.ChunkStatus;
+#else
+import net.minecraft.world.level.chunk.status.ChunkStatus;
+#endif
+
 
 
 public class WorldGenStructFeatManager extends #if MC_VER < MC_1_19_2 StructureFeatureManager #else StructureManager #endif
@@ -226,11 +231,9 @@ public class WorldGenStructFeatManager extends #if MC_VER < MC_1_19_2 StructureF
 		Map<Structure, LongSet> map = chunk.getAllReferences();
 		
 		ImmutableList.Builder<StructureStart> builder = ImmutableList.builder();
-		Iterator<Map.Entry<Structure, LongSet>> var5 = map.entrySet().iterator();
 		
-		while (var5.hasNext())
+		for (Map.Entry<Structure, LongSet> entry : map.entrySet())
 		{
-			Map.Entry<Structure, LongSet> entry = var5.next();
 			Structure configuredStructureFeature = entry.getKey();
 			if (predicate.test(configuredStructureFeature))
 			{

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

@@ -27,15 +27,19 @@ import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGeneratio
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
 
 import net.minecraft.server.level.WorldGenRegion;
-#if MC_VER < MC_1_19_2
-#endif
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.ProtoChunk;
+
 #if MC_VER >= MC_1_18_2
 import net.minecraft.world.level.levelgen.blending.Blender;
 #endif
 
+#if MC_VER <= MC_1_20_4
+import net.minecraft.world.level.chunk.ChunkStatus;
+#else
+import net.minecraft.world.level.chunk.status.ChunkStatus;
+#endif
+
 public final class StepBiomes
 {
 	public static final ChunkStatus STATUS = ChunkStatus.BIOMES;
@@ -52,29 +56,44 @@ public final class StepBiomes
 			List<ChunkWrapper> chunkWrappers)
 	{
 		
-		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
+		ArrayList<ChunkAccess> chunksToDo = new ArrayList<>();
 		
 		for (ChunkWrapper chunkWrapper : chunkWrappers)
 		{
 			ChunkAccess chunk = chunkWrapper.getChunk();
-			if (chunk.getStatus().isOrAfter(STATUS)) continue;
+			if (chunkWrapper.getStatus().isOrAfter(STATUS))
+			{
+				// this chunk has already generated this step
+				continue;
+			}
+			else if (chunk instanceof ProtoChunk)
+			{
+				#if MC_VER < MC_1_21
 				((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
-			environment.params.generator.createBiomes(environment.params.biomes, chunk);
+			this.environment.params.generator.createBiomes(this.environment.params.biomes, chunk);
 			#elif MC_VER < MC_1_19_2
-			chunk = environment.joinSync(environment.params.generator.createBiomes(environment.params.biomes, Runnable::run, Blender.of(worldGenRegion),
+			chunk = this.environment.joinSync(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 = environment.joinSync(environment.params.generator.createBiomes(environment.params.biomes, Runnable::run, environment.params.randomState, Blender.of(worldGenRegion),
+			chunk = this.environment.joinSync(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
+			chunk = this.environment.joinSync(this.environment.params.generator.createBiomes(Runnable::run, this.environment.params.randomState, Blender.of(worldGenRegion),
 					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
 			#else
-			chunk = environment.joinSync(environment.params.generator.createBiomes(Runnable::run, environment.params.randomState, Blender.of(worldGenRegion),
+			chunk = this.environment.joinSync(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

@@ -27,11 +27,16 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
 
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.ProtoChunk;
 import net.minecraft.world.level.levelgen.Heightmap;
 import org.apache.logging.log4j.Logger;
 
+#if MC_VER <= MC_1_20_4
+import net.minecraft.world.level.chunk.ChunkStatus;
+#else
+import net.minecraft.world.level.chunk.status.ChunkStatus;
+#endif
+
 
 public final class StepFeatures
 {
@@ -54,14 +59,18 @@ public final class StepFeatures
 		for (ChunkWrapper chunkWrapper : chunkWrappers)
 		{
 			ChunkAccess chunk = chunkWrapper.getChunk();
-			if (chunk.getStatus().isOrAfter(STATUS))
+			if (chunkWrapper.getStatus().isOrAfter(STATUS))
 			{
+				// this chunk has already generated this step
 				continue;
 			}
-			
+			else if (chunk instanceof ProtoChunk)
-			if (chunk instanceof ProtoChunk)
 			{
+				#if MC_VER < MC_1_21
 				((ProtoChunk) chunk).setStatus(STATUS);
+				#else
+				((ProtoChunk) chunk).setPersistedStatus(STATUS);
+				#endif
 			}
 			
 			

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

@@ -28,17 +28,19 @@ import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParame
 
 import com.seibel.distanthorizons.core.util.objects.UncheckedInterruptedException;
 import net.minecraft.server.level.WorldGenRegion;
-#if MC_VER >= MC_1_17_1
-#endif
-#if MC_VER < MC_1_19_2
-#endif
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.ProtoChunk;
+
 #if MC_VER >= MC_1_18_2
 import net.minecraft.world.level.levelgen.blending.Blender;
 #endif
 
+#if MC_VER <= MC_1_20_4
+import net.minecraft.world.level.chunk.ChunkStatus;
+#else
+import net.minecraft.world.level.chunk.status.ChunkStatus;
+#endif
+
 public final class StepNoise
 {
 	private static final ChunkStatus STATUS = ChunkStatus.NOISE;
@@ -56,13 +58,21 @@ public final class StepNoise
 			List<ChunkWrapper> chunkWrappers)
 	{
 		
-		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
+		ArrayList<ChunkAccess> chunksToDo = new ArrayList<>();
 		
 		for (ChunkWrapper chunkWrapper : chunkWrappers)
 		{
 			ChunkAccess chunk = chunkWrapper.getChunk();
-			if (chunk.getStatus().isOrAfter(STATUS)) continue;
+			if (chunkWrapper.getStatus().isOrAfter(STATUS))
+			{
+				continue;
+			}
+			
+			#if MC_VER < MC_1_21
 			((ProtoChunk) chunk).setStatus(STATUS);
+			#else
+			((ProtoChunk) chunk).setPersistedStatus(STATUS);
+			#endif
 			chunksToDo.add(chunk);
 		}
 		
@@ -70,15 +80,18 @@ public final class StepNoise
 		{
 			// System.out.println("StepNoise: "+chunk.getPos());
 			#if MC_VER < MC_1_17_1
-			environment.params.generator.fillFromNoise(worldGenRegion, tParams.structFeat, chunk);
+			this.environment.params.generator.fillFromNoise(worldGenRegion, tParams.structFeat, chunk);
 			#elif MC_VER < MC_1_18_2
-			chunk = environment.joinSync(environment.params.generator.fillFromNoise(Runnable::run,
+			chunk = this.environment.joinSync(this.environment.params.generator.fillFromNoise(Runnable::run,
 					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
 			#elif MC_VER < MC_1_19_2
-			chunk = environment.joinSync(environment.params.generator.fillFromNoise(Runnable::run, Blender.of(worldGenRegion),
+			chunk = this.environment.joinSync(this.environment.params.generator.fillFromNoise(Runnable::run, Blender.of(worldGenRegion),
+					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
+			#elif MC_VER < MC_1_21
+			chunk = this.environment.joinSync(this.environment.params.generator.fillFromNoise(Runnable::run, Blender.of(worldGenRegion), this.environment.params.randomState,
 					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
 			#else
-			chunk = environment.joinSync(environment.params.generator.fillFromNoise(Runnable::run, Blender.of(worldGenRegion), environment.params.randomState,
+			chunk = this.environment.joinSync(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

@@ -27,12 +27,16 @@ import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGeneratio
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
 
 import net.minecraft.server.level.WorldGenRegion;
-#if MC_VER < MC_1_19_2
-#endif
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.ProtoChunk;
 
+#if MC_VER <= MC_1_20_4
+import net.minecraft.world.level.chunk.ChunkStatus;
+#else
+import net.minecraft.world.level.chunk.status.ChunkStatus;
+#endif
+
+
 public final class StepStructureReference
 {
 	private static final ChunkStatus STATUS = ChunkStatus.STRUCTURE_REFERENCES;
@@ -50,15 +54,26 @@ public final class StepStructureReference
 			List<ChunkWrapper> chunkWrappers)
 	{
 		
-		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
+		ArrayList<ChunkAccess> chunksToDo = new ArrayList<>();
 		
 		for (ChunkWrapper chunkWrapper : chunkWrappers)
 		{
 			ChunkAccess chunk = chunkWrapper.getChunk();
-			if (chunk.getStatus().isOrAfter(STATUS)) continue;
+			if (chunkWrapper.getStatus().isOrAfter(STATUS))
+			{
+				// this chunk has already generated this step
+				continue;
+			}
+			else if (chunk instanceof ProtoChunk)
+			{
+				#if MC_VER < MC_1_21
 				((ProtoChunk) chunk).setStatus(STATUS);
+				#else
+				((ProtoChunk) chunk).setPersistedStatus(STATUS);
+				#endif
 				chunksToDo.add(chunk);
 			}
+		}
 		
 		for (ChunkAccess chunk : chunksToDo)
 		{

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

@@ -30,10 +30,16 @@ import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParame
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.ProtoChunk;
 import org.apache.logging.log4j.Logger;
 
+#if MC_VER <= MC_1_20_4
+import net.minecraft.world.level.chunk.ChunkStatus;
+#else
+import net.minecraft.world.level.chunk.status.ChunkStatus;
+#endif
+
+
 public final class StepStructureStart
 {
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
@@ -70,20 +76,29 @@ public final class StepStructureStart
 		for (ChunkWrapper chunkWrapper : chunkWrappers)
 		{
 			ChunkAccess chunk = chunkWrapper.getChunk();
-			if (!chunk.getStatus().isOrAfter(STATUS))
+			if (chunkWrapper.getStatus().isOrAfter(STATUS))
 			{
+				// this chunk has already generated this step
+				continue;
+			}
+			else if (chunk instanceof ProtoChunk)
+			{
+				#if MC_VER < MC_1_21
 				((ProtoChunk) chunk).setStatus(STATUS);
+				#else
+				((ProtoChunk) chunk).setPersistedStatus(STATUS);
+				#endif
 				chunksToDo.add(chunk);
 			}
 		}
 		
 		#if MC_VER < MC_1_19_2
-		if (environment.params.worldGenSettings.generateFeatures())
+		if (this.environment.params.worldGenSettings.generateFeatures())
 		{
 		#elif MC_VER < MC_1_19_4
-		if (environment.params.worldGenSettings.generateStructures()) {
+		if (this.environment.params.worldGenSettings.generateStructures()) {
 		#else
-		if (environment.params.worldOptions.generateStructures())
+		if (this.environment.params.worldOptions.generateStructures())
 		{
 		#endif
 			for (ChunkAccess chunk : chunksToDo)

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

@@ -28,9 +28,14 @@ import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParame
 
 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.ProtoChunk;
-import net.minecraft.world.level.levelgen.Heightmap;
+
+#if MC_VER <= MC_1_20_4
+import net.minecraft.world.level.chunk.ChunkStatus;
+#else
+import net.minecraft.world.level.chunk.status.ChunkStatus;
+#endif
+
 
 public final class StepSurface
 {
@@ -53,10 +58,22 @@ public final class StepSurface
 		for (ChunkWrapper chunkWrapper : chunkWrappers)
 		{
 			ChunkAccess chunk = chunkWrapper.getChunk();
-			if (chunk.getStatus().isOrAfter(STATUS)) continue;
+			if (chunkWrapper.getStatus().isOrAfter(STATUS))
+			{
+				// this chunk has already generated this step
+				continue;
+			}
+			else if (chunk instanceof ProtoChunk)
+			{
+				#if MC_VER < MC_1_21
 				((ProtoChunk) chunk).setStatus(STATUS);
+				#else
+				((ProtoChunk) chunk).setPersistedStatus(STATUS);
+				#endif
+				
 				chunksToDo.add(chunk);
 			}
+		}
 		
 		for (ChunkAccess chunk : chunksToDo)
 		{

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

@@ -0,0 +1,46 @@
+accessWidener v1 named
+
+# used when determining where to save files to
+accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File;
+
+# used when rendering
+accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)D
+
+# used for grabbing vanilla rendered chunks
+accessible field net/minecraft/client/renderer/LevelRenderer visibleSections Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
+
+#accessible method net/minecraft/client/renderer/LevelRenderer renderSectionLayer (Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLorg/joml/Matrix4f;)V
+
+# 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
+
+# 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
+
+

fabric/build.gradle

@@ -1,55 +1,83 @@
-unimined.minecraft {
+plugins {
-    fabric {
+    id "fabric-loom" version "1.6-SNAPSHOT"
-        loader rootProject.fabric_loader_version
+}
-        accessWidener(project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener"))
 
-        skipInsertAw = true
+loom {
+    accessWidenerPath = project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener")
+    
+    // "runs" isn't required, but when we do need it then it can be useful
+    runs {
+        client {
+            client()
+            setConfigName("Fabric Client")
+            ideConfigGenerated(true)
+            runDir("../run")
+        }
+        server {
+            server()
+            setConfigName("Fabric Server")
+            ideConfigGenerated(true)
+            runDir("../run")
+        }
     }
 }
 
+remapJar {
+    inputFile = shadeDowngradedApi.archiveFile
+    dependsOn shadeDowngradedApi
+}
+
+
 configurations {
     // The addModJar basically embeds the mod to the built jar
     addModJar
     include.extendsFrom addModJar
     modImplementation.extendsFrom addModJar
-    dummy
 }
     
+    
+
 def addMod(path, enabled) {
     if (enabled == "2")
         dependencies { modImplementation(path) }
     else if (enabled == "1")
-        dependencies { compileOnly(path) }
+        dependencies { modCompileOnly(path) }
-}
-
-// TODO: There currently seems to be a bug which causes the regular addModJar to not work, swap back to the regular addModJar when fixed
-def addModJar_(path) {
-    dependencies {
-        modImplementation(path)
-        include(path)
-    }
 }
 
 dependencies {
-    annotationProcessor "javax.annotation:javax.annotation-api:1.3.2"
+    minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-    implementation("javax.annotation:javax.annotation-api:1.3.2")
+    mappings loom.layered() {
-    runtimeOnly "javax.annotation:javax.annotation-api:1.3.2"
+        // Mojmap mappings
-    compileOnly "javax.annotation:javax.annotation-api:1.3.2"
+        officialMojangMappings()
-    modImplementation "javax.annotation:javax.annotation-api:1.3.2"
+        // Parchment mappings (it adds parameter mappings & javadoc)
+        parchment("org.parchmentmc.data:parchment-${rootProject.parchment_version}@zip")
+    }
+    // Fabric loader
+    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+
+
+//    annotationProcessor "javax.annotation:javax.annotation-api:1.3.2"
+//    implementation("javax.annotation:javax.annotation-api:1.3.2")
+//    runtimeOnly "javax.annotation:javax.annotation-api:1.3.2"
+//    compileOnly "javax.annotation:javax.annotation-api:1.3.2"
+//    modImplementation "javax.annotation:javax.annotation-api:1.3.2"
     
     // Fabric API
-    addModJar_(fabricApi.fabricModule("fabric-api-base", rootProject.fabric_api_version))
+    addModJar(fabricApi.module("fabric-api-base", rootProject.fabric_api_version))
-    addModJar_(fabricApi.fabricModule("fabric-lifecycle-events-v1", rootProject.fabric_api_version))
+    addModJar(fabricApi.module("fabric-lifecycle-events-v1", rootProject.fabric_api_version))
-    addModJar_(fabricApi.fabricModule("fabric-resource-loader-v0", rootProject.fabric_api_version))
+    addModJar(fabricApi.module("fabric-resource-loader-v0", rootProject.fabric_api_version))
-    addModJar_(fabricApi.fabricModule("fabric-events-interaction-v0", rootProject.fabric_api_version))
+    addModJar(fabricApi.module("fabric-events-interaction-v0", rootProject.fabric_api_version))
-    addModJar_(fabricApi.fabricModule("fabric-rendering-v1", rootProject.fabric_api_version)) // TODO: Remove this as it is only needed in 1 line (FabricClientProxy)
+    addModJar(fabricApi.module("fabric-rendering-v1", rootProject.fabric_api_version)) // TODO: Remove this as it is only needed in 1 line (FabricClientProxy)
-    addModJar_(fabricApi.fabricModule("fabric-networking-api-v1", rootProject.fabric_api_version))
+    addModJar(fabricApi.module("fabric-networking-api-v1", rootProject.fabric_api_version))
+    
+    // used by mod menu in MC 1.20.6+
+    addModJar(fabricApi.module("fabric-screen-api-v1", rootProject.fabric_api_version))
+    addModJar(fabricApi.module("fabric-key-binding-api-v1", rootProject.fabric_api_version))
+
 
     // Mod Menu
     modImplementation("com.terraformersmc:modmenu:${rootProject.modmenu_version}")
 
-
-
     // Starlight
     addMod("curse.maven:starlight-521783:${rootProject.starlight_version_fabric}", rootProject.enable_starlight)
 
@@ -77,8 +105,9 @@ dependencies {
     addMod("io.vram:canvas-fabric-${project.canvas_version}", rootProject.enable_canvas)
     
     // Immersive Portals
-    if (rootProject.enable_immersive_portals == "1")
+    if (rootProject.enable_immersive_portals == "1") {
-        modCompileOnly ("com.github.iPortalTeam.ImmersivePortalsMod:imm_ptl_core:${project.immersive_portals_version}")
+        modCompileOnly("com.github.iPortalTeam.ImmersivePortalsMod:imm_ptl_core:${project.immersive_portals_version}")
+    }
     else if (rootProject.enable_immersive_portals == "2") {
         modImplementation ("com.github.iPortalTeam.ImmersivePortalsMod:imm_ptl_core:${project.immersive_portals_version}") {
             exclude(group: "net.fabricmc.fabric-api")
@@ -98,12 +127,6 @@ dependencies {
     }
 }
 
-remapJar {
-    inputFile = shadowJar.archiveFile
-    dependsOn shadowJar
-//    classifier null
-}
-
 
 task deleteResources(type: Delete) {
     delete file("build/resources/main")
@@ -114,31 +137,16 @@ processResources {
     dependsOn(copyCommonLoaderResources)
 }
 
-afterEvaluate {
+runClient {
-    runClient {
     dependsOn(copyCoreResources)
     dependsOn(copyCommonLoaderResources)
 //    jvmArgs([ "-XX:-OmitStackTraceInFastThrow", minecraftMemoryJavaArg ])
     finalizedBy(deleteResources)
-    }
 }
 
-//jar {
-//    classifier "dev"
-//}
 
 sourcesJar {
     def commonSources = project(":common").sourcesJar
     dependsOn commonSources
     from commonSources.archiveFile.map { zipTree(it) }
-
-//    def fabricLikeSources = project(":fabricLike").sourcesJar
-//    dependsOn fabricLikeSources
-//    from fabricLikeSources.archiveFile.map { zipTree(it) }
 }
-
-//components.java {
-//    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-//        skip()
-//    }
-//}

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

@@ -19,8 +19,9 @@
 
 package com.seibel.distanthorizons.fabric;
 
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import com.seibel.distanthorizons.common.AbstractModInitializer;
-import com.seibel.distanthorizons.common.rendering.SeamlessOverdraw;
 import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
@@ -28,15 +29,14 @@ import com.mojang.blaze3d.platform.InputConstants;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
-import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
+import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
-import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
+import com.seibel.distanthorizons.core.util.math.Mat4f;
 import com.seibel.distanthorizons.fabric.wrappers.modAccessor.SodiumAccessor;
 //import io.netty.buffer.ByteBuf;
 import net.fabricmc.api.EnvType;
@@ -53,12 +53,14 @@ import net.minecraft.client.gui.screens.TitleScreen;
 import java.nio.FloatBuffer;
 #endif
 import java.util.HashSet;
+import java.util.concurrent.ThreadPoolExecutor;
 
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.phys.HitResult;
 import org.apache.logging.log4j.Logger;
+import org.joml.Matrix4f;
 import org.lwjgl.glfw.GLFW;
 
 /**
@@ -104,7 +106,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		// tick events //
 		//=============//
 		
-		ClientTickEvents.START_CLIENT_TICK.register((client) -> { ClientApi.INSTANCE.clientTickEvent(); });
+		ClientTickEvents.START_CLIENT_TICK.register((client) -> ClientApi.INSTANCE.clientTickEvent());
 		
 		
 		
@@ -120,6 +122,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		});
 		
 		// (kinda) block break event
+		// Since fabric doesn't have a client-side break-block API event, this is the next best thing
 		AttackBlockCallback.EVENT.register((player, level, interactionHand, blockPos, direction) ->
 		{
 			// if we have access to the server, use the chunk save event instead 
@@ -127,11 +130,18 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 			{
 				if (SharedApi.isChunkAtBlockPosAlreadyUpdating(blockPos.getX(), blockPos.getZ()))
 				{
-					// Since fabric doesn't have a client-side break-block API event, this is the next best thing
+					// 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();
+					if (executor != null)
+					{
+						executor.execute(() ->
+						{
 							ChunkAccess chunk = level.getChunk(blockPos);
 							if (chunk != null)
 							{
-						LOGGER.trace("attack block at blockPos: " + blockPos);
+								//LOGGER.trace("attack block at blockPos: " + blockPos);
 								
 								IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper((ClientLevel) level);
 								SharedApi.INSTANCE.chunkBlockChangedEvent(
@@ -139,6 +149,8 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 										wrappedLevel
 								);
 							}
+						});
+					}
 				}
 			}
 			
@@ -147,21 +159,29 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		});
 		
 		// (kinda) block place event
+		// Since fabric doesn't have a client-side place-block API event, this is the next best thing
 		UseBlockCallback.EVENT.register((player, level, hand, hitResult) -> 
 		{
 			// if we have access to the server, use the chunk save event instead 
 			if (MC.clientConnectedToDedicatedServer())
 			{
-				if (SharedApi.isChunkAtBlockPosAlreadyUpdating(hitResult.getBlockPos().getX(), hitResult.getBlockPos().getZ()))
-				{
-					// Since fabric doesn't have a client-side place-block API event, this is the next best thing
 				if (hitResult.getType() == HitResult.Type.BLOCK
 						&& !hitResult.isInside())
+				{
+					if (SharedApi.isChunkAtBlockPosAlreadyUpdating(hitResult.getBlockPos().getX(), hitResult.getBlockPos().getZ()))
+					{
+						// 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();
+						if (executor != null)
+						{
+							executor.execute(() ->
 							{
 								ChunkAccess chunk = level.getChunk(hitResult.getBlockPos());
 								if (chunk != null)
 								{
-							LOGGER.trace("use block at blockPos: " + hitResult.getBlockPos());
+									//LOGGER.trace("use block at blockPos: " + hitResult.getBlockPos());
 									
 									IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper((ClientLevel) level);
 									SharedApi.INSTANCE.chunkBlockChangedEvent(
@@ -169,6 +189,8 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 											wrappedLevel
 									);
 								}
+							});
+						}
 					}
 				}
 			}
@@ -193,25 +215,24 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 
 		WorldRenderEvents.AFTER_SETUP.register((renderContext) ->
 		{
-			this.clientApi.renderLods(ClientLevelWrapper.getWrapper(renderContext.world()),
+			Mat4f projectionMatrix = McObjectConverter.Convert(renderContext.projectionMatrix());
-					McObjectConverter.Convert(renderContext.matrixStack().last().pose()),
-					McObjectConverter.Convert(renderContext.projectionMatrix()),
-					renderContext.tickDelta());
 			
-			
+			Mat4f modelViewMatrix;
-			// experimental proof-of-concept option
+			#if MC_VER < MC_1_20_6
-			if (Config.Client.Advanced.Graphics.AdvancedGraphics.seamlessOverdraw.get())
+			modelViewMatrix = McObjectConverter.Convert(renderContext.matrixStack().last().pose());
-			{
-				float[] matrixFloatArray = SeamlessOverdraw.overwriteMinecraftNearFarClipPlanes(renderContext.projectionMatrix(), renderContext.tickDelta());
-				
-				#if MC_VER == MC_1_16_5
-				SeamlessOverdraw.applyLegacyProjectionMatrix(matrixFloatArray);
-				#elif MC_VER < MC_1_19_4
-				renderContext.projectionMatrix().load(FloatBuffer.wrap(matrixFloatArray));
 			#else
-				renderContext.projectionMatrix().set(matrixFloatArray);
+			modelViewMatrix = McObjectConverter.Convert(renderContext.positionMatrix());
 			#endif
-			}
+			
+			this.clientApi.renderLods(ClientLevelWrapper.getWrapper(renderContext.world()),
+					modelViewMatrix,
+					projectionMatrix,
+					#if MC_VER < MC_1_21
+					renderContext.tickDelta()
+					#else
+					renderContext.tickCounter().getGameTimeDeltaTicks()
+					#endif
+					);
 		});
 
 		// Debug keyboard event

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

@@ -25,6 +25,7 @@ import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.config.ConfigBase;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.*;
 import com.seibel.distanthorizons.coreapi.ModInfo;
@@ -37,8 +38,10 @@ import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
+import org.apache.logging.log4j.Logger;
 
 import javax.swing.*;
+import java.awt.*;
 import java.util.function.Consumer;
 
 /**
@@ -50,6 +53,8 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti
 {
 	private static final ResourceLocation INITIAL_PHASE = ResourceLocation.tryParse("distanthorizons:dedicated_server_initial");
 	
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	
 	
 	
 	@Override
@@ -72,10 +77,13 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti
 			// If sodium is installed Indium is also necessary in order to use the Fabric rendering API
 			if (!modChecker.isModLoaded("indium"))
 			{
-				// People don't read the crash logs!!!
+				String indiumMissingMessage = ModInfo.READABLE_NAME + " needs Indium to work with Sodium.\nPlease download Indium from https://modrinth.com/mod/indium";
-				// So, just put a notification, so they hopefully realise what's the problem (and dont just open issues)
+				LOGGER.fatal(indiumMissingMessage);
-				System.setProperty("java.awt.headless", "false"); // Required to make it work
+				
-				JOptionPane.showMessageDialog(null, ModInfo.READABLE_NAME + " now relies on Indium to work with Sodium.\nPlease download Indium from https://modrinth.com/mod/indium", ModInfo.READABLE_NAME, JOptionPane.INFORMATION_MESSAGE);
+				if (!GraphicsEnvironment.isHeadless())
+				{
+					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.";

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

@@ -7,6 +7,7 @@ import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+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;
@@ -23,13 +24,29 @@ public class MixinClientPacketListener
 	@Shadow
 	private ClientLevel level;
 	
+	@Unique
+	private ClientLevel previousLevel;
+	
+	
 	@Inject(method = "handleLogin", at = @At("RETURN"))
 	void onHandleLoginEnd(CallbackInfo ci) { ClientApi.INSTANCE.onClientOnlyConnected(); }
 	
 	@Inject(method = "handleRespawn", at = @At("HEAD"))
-	void onHandleRespawnStart(CallbackInfo ci) { ClientApi.INSTANCE.clientLevelUnloadEvent(ClientLevelWrapper.getWrapper(this.level)); }
+	void onHandleRespawnStart(CallbackInfo ci) { this.previousLevel = this.level; }
 	@Inject(method = "handleRespawn", at = @At("RETURN"))
-	void onHandleRespawnEnd(CallbackInfo ci) { ClientApi.INSTANCE.clientLevelLoadEvent(ClientLevelWrapper.getWrapper(this.level)); }
+	void onHandleRespawnEnd(CallbackInfo ci) 
+	{
+		// If the player changes dimensions the "this.level" will be changed halfway through the respawn method.
+		// By checking if the object references are the same, we can see if the previous level should be unloaded
+		// or if the player just respawned in the same level. 
+		if (this.previousLevel != this.level)
+		{
+			ClientApi.INSTANCE.clientLevelUnloadEvent(ClientLevelWrapper.getWrapper(this.previousLevel));
+			ClientApi.INSTANCE.clientLevelLoadEvent(ClientLevelWrapper.getWrapper(this.level));
+		}
+		
+		this.previousLevel = null;
+	}
 	
 	#if MC_VER < MC_1_19_4
 	@Inject(method = "cleanup", at = @At("HEAD"))

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

@@ -1,69 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 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.fabric.mixins.client;
-
-
-import com.mojang.blaze3d.platform.NativeImage;
-import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
-import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import com.seibel.distanthorizons.common.util.ILightTextureMarker;
-import net.minecraft.client.renderer.texture.DynamicTexture;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-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;
-
-@Mixin(DynamicTexture.class)
-public class MixinDynamicTexture implements ILightTextureMarker
-{
-	/** Used to prevent accidentally using other dynamic textures as a lightmap */
-	@Unique
-	private boolean isLightTexture = false;
-	
-	@Shadow
-	@Final
-	private NativeImage pixels;
-	
-	@Inject(method = "upload()V", at = @At("HEAD"))
-	public void updateLightTexture(CallbackInfo ci)
-	{
-		// since the light map is always updated on the client render thread we should be able to access the client level at the same time
-		IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
-		if (!this.isLightTexture
-			|| mc == null
-			|| mc.getWrappedClientLevel() == null
-			)
-		{
-			return;
-		}
-		
-		//ApiShared.LOGGER.info("Lightmap update");
-		IClientLevelWrapper clientLevel = mc.getWrappedClientLevel();
-		MinecraftRenderWrapper.INSTANCE.updateLightmap(this.pixels, clientLevel);
-	}
-	
-	public void markLightTexture() { this.isLightTexture = true; }
-	
-}

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

@@ -22,6 +22,7 @@ package com.seibel.distanthorizons.fabric.mixins.client;
 import com.mojang.blaze3d.vertex.PoseStack;
 #if MC_VER < MC_1_19_4
 import com.mojang.math.Matrix4f;
+import org.lwjgl.opengl.GL32;
 #else
 import org.joml.Matrix4f;
 #endif
@@ -29,23 +30,17 @@ import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
-import com.seibel.distanthorizons.coreapi.util.math.Mat4f;
+import com.seibel.distanthorizons.core.util.math.Mat4f;
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LightTexture;
 import com.seibel.distanthorizons.core.config.Config;
-import net.minecraft.client.Camera;
 import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LevelRenderer;
-import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.world.level.lighting.LevelLightEngine;
-import org.lwjgl.opengl.GL15;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
-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;
@@ -84,33 +79,49 @@ public class MixinLevelRenderer
             method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLorg/joml/Matrix4f;)V",
             cancellable = true)
     private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double cameraXBlockPos, double cameraYBlockPos, double cameraZBlockPos, Matrix4f projectionMatrix, CallbackInfo callback)
-    #else
+    #elif MC_VER < MC_1_20_6
 	@Inject(at = @At("HEAD"),
 			method = "Lnet/minecraft/client/renderer/LevelRenderer;renderSectionLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLorg/joml/Matrix4f;)V",
 			cancellable = true)
 	private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double camX, double camY, double camZ, Matrix4f projectionMatrix, CallbackInfo callback)
+	#else
+	@Inject(at = @At("HEAD"),
+			method = "Lnet/minecraft/client/renderer/LevelRenderer;renderSectionLayer(Lnet/minecraft/client/renderer/RenderType;DDDLorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V",
+			cancellable = true)
+	private void renderChunkLayer(RenderType renderType, double x, double y, double z, Matrix4f projectionMatrix, Matrix4f frustumMatrix, CallbackInfo callback)
     #endif
     {
 		#if MC_VER == MC_1_16_5
 	    // get the matrices from the OpenGL fixed pipeline
 	    float[] mcProjMatrixRaw = new float[16];
-	    GL15.glGetFloatv(GL15.GL_PROJECTION_MATRIX, mcProjMatrixRaw);
+	    GL32.glGetFloatv(GL32.GL_PROJECTION_MATRIX, mcProjMatrixRaw);
 	    Mat4f mcProjectionMatrix = new Mat4f(mcProjMatrixRaw);
 	    mcProjectionMatrix.transpose();
 	    
 	    Mat4f mcModelViewMatrix = McObjectConverter.Convert(matrixStackIn.last().pose());
 		
-		#else
+		#elif MC_VER <= MC_1_20_4
 		// get the matrices directly from MC
 		Mat4f mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose());
 		Mat4f mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
+		#else
+	    // MC combined the model view and projection matricies
+	    Mat4f mcModelViewMatrix = McObjectConverter.Convert(projectionMatrix);
+	    Mat4f mcProjectionMatrix = new Mat4f();
+	    mcProjectionMatrix.setIdentity();
 		#endif
 	    
-	    if (renderType.equals(RenderType.translucent())) {
+	    if (renderType.equals(RenderType.translucent())) 
+		{
 		    ClientApi.INSTANCE.renderDeferredLods(ClientLevelWrapper.getWrapper(this.level),
 				    mcModelViewMatrix,
 				    mcProjectionMatrix,
-				    Minecraft.getInstance().getFrameTime());
+					#if MC_VER < MC_1_21
+					Minecraft.getInstance().getFrameTime()
+					#else
+				    Minecraft.getInstance().getTimer().getRealtimeDeltaTicks()
+					#endif
+				    );
 	    }
 		
 		// FIXME completely disables rendering when sodium is installed
@@ -126,9 +137,12 @@ public class MixinLevelRenderer
 	#elif MC_VER < MC_1_20_1
 	@Inject(at = @At(value = "TAIL", target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runUpdates(IZZ)I"), method = "renderLevel")
 	public void callAfterRunUpdates(PoseStack poseStack, float partialTick, long finishNanoTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f projectionMatrix, CallbackInfo ci)
-	#else
+	#elif MC_VER < MC_1_20_6
 	@Inject(at = @At(value = "TAIL", target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runLightUpdates()I"), method = "renderLevel")
 	private void callAfterRunUpdates(PoseStack poseStack, float partialTick, long finishNanoTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f projectionMatrix, CallbackInfo ci)
+	#else
+	@Inject(at = @At(value = "TAIL", target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runLightUpdates()I"), method = "renderLevel")
+	private void callAfterRunUpdates(CallbackInfo ci) 
 	#endif
 	{
 		ChunkWrapper.syncedUpdateClientLightStatus();

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

@@ -20,9 +20,14 @@
 package com.seibel.distanthorizons.fabric.mixins.client;
 
 
-import com.seibel.distanthorizons.common.util.ILightTextureMarker;
+import com.mojang.blaze3d.platform.NativeImage;
+
+import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import net.minecraft.client.renderer.LightTexture;
-import net.minecraft.client.renderer.texture.DynamicTexture;
+
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -35,13 +40,20 @@ public class MixinLightTexture
 {
 	@Shadow
 	@Final
-	private DynamicTexture lightTexture;
+	private NativeImage lightPixels;
 	
-	@Inject(method = "<init>", at = @At("RETURN"))
+	
-	public void markLightTexture(CallbackInfo ci)
+	@Inject(method = "updateLightTexture(F)V", at = @At("RETURN"))
+	public void updateLightTexture(float partialTicks, CallbackInfo ci)
 	{
-		// 
+		IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
-		((ILightTextureMarker) this.lightTexture).markLightTexture();
+		if (mc == null || mc.getWrappedClientLevel() == null)
+		{
+			return;
+		}
+		
+		IClientLevelWrapper clientLevel = mc.getWrappedClientLevel();
+		MinecraftRenderWrapper.INSTANCE.updateLightmap(this.lightPixels, clientLevel);
 	}
 	
 }

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

@@ -1,6 +1,6 @@
 package com.seibel.distanthorizons.fabric.mixins.client;
 
-import com.seibel.distanthorizons.api.enums.config.EUpdateBranch;
+import com.seibel.distanthorizons.api.enums.config.EDhApiUpdateBranch;
 import com.seibel.distanthorizons.common.wrappers.gui.updater.UpdateModScreen;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
@@ -8,10 +8,12 @@ import com.seibel.distanthorizons.core.jar.installer.GitlabGetter;
 import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter;
 import com.seibel.distanthorizons.core.jar.updater.SelfUpdater;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants;
-import net.minecraft.client.Minecraft;
+import com.seibel.distanthorizons.coreapi.ModInfo;
 import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.TitleScreen;
 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.Redirect;
@@ -25,6 +27,15 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(Minecraft.class)
 public class MixinMinecraft
 {
+	/** 
+	 * Can be enabled for testing the auto updater UI. <br/>
+	 * will always show the auto updater if set to true. 
+	 */
+	@Unique
+	private static final boolean DEBUG_ALWAYS_SHOW_UPDATER = false;
+
+	
+	
 	#if MC_VER < MC_1_20_2
 	#if MC_VER == MC_1_20_1
 	@Redirect(
@@ -41,17 +52,17 @@ public class MixinMinecraft
 	public void onOpenScreen(Minecraft instance, Screen guiScreen)
 	{
 	#endif
-		if (!Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get()) // Don't do anything if the user doesn't want it
+		if (!Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get() && !DEBUG_ALWAYS_SHOW_UPDATER) // Don't do anything if the user doesn't want it
 		{
 			instance.setScreen(guiScreen); // Sets the screen back to the vanilla screen as if nothing ever happened
 			return;
 		}
 		
-		if (SelfUpdater.onStart())
+		if (SelfUpdater.onStart() || DEBUG_ALWAYS_SHOW_UPDATER)
 		{
 			instance.setScreen(new UpdateModScreen(
 					new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons
-					(Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()): GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha"))
+					(Config.Client.Advanced.AutoUpdater.updateBranch.get() == EDhApiUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()): GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha"))
 			));
 		}
 		else
@@ -69,15 +80,31 @@ public class MixinMinecraft
 	private void buildInitialScreens(Runnable runnable)
 	{
 		if (
-				Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get() // Don't do anything if the user doesn't want it
+				DEBUG_ALWAYS_SHOW_UPDATER ||
+				(
+					// Don't do anything if the user doesn't want it
+					Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get()
 					&& SelfUpdater.onStart()
 				)
+			)
 		{
-			runnable = () -> {
+			runnable = () -> 
+			{
+				String versionId;
+				EDhApiUpdateBranch updateBranch = EDhApiUpdateBranch.convertAutoToStableOrNightly(Config.Client.Advanced.AutoUpdater.updateBranch.get());
+				if (updateBranch == EDhApiUpdateBranch.STABLE)
+				{
+					versionId = ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion());
+				}
+				else
+				{
+					versionId = GitlabGetter.INSTANCE.projectPipelines.getFirst().get("sha");
+				}
+				
 				Minecraft.getInstance().setScreen(new UpdateModScreen(
 						// TODO: Change to runnable, instead of tittle screen
 						new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons
-						(Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()) : GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha"))
+						versionId
 				));
 			};
 		}

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

@@ -23,7 +23,6 @@ import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen;
 import com.seibel.distanthorizons.common.wrappers.gui.TexturedButtonWidget;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.core.config.Config;
-import net.minecraft.client.gui.screens.OptionsScreen;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 #if MC_VER < MC_1_19_2
@@ -31,51 +30,127 @@ import net.minecraft.network.chat.TranslatableComponent;
 #endif
 import net.minecraft.resources.ResourceLocation;
 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;
 
 import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
+
+#if MC_VER >= MC_1_20_6
+import net.minecraft.client.gui.layouts.LinearLayout;
+import net.minecraft.client.gui.layouts.HeaderAndFooterLayout;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Shadow;
+#endif
+
+#if MC_VER < MC_1_21
+import net.minecraft.client.gui.screens.OptionsScreen;
+#else
+import net.minecraft.client.gui.screens.options.OptionsScreen;
+#endif
+
 
 /**
  * Adds a button to the menu to goto the config
  *
  * @author coolGi
- * @version 12-02-2021
+ * @version 2024-5-20
  */
 @Mixin(OptionsScreen.class)
 public class MixinOptionsScreen extends Screen
 {
-	// Get the texture for the button
+	/** Texture used for the config opening button */
-	private static final ResourceLocation ICON_TEXTURE = new ResourceLocation(ModInfo.ID, "textures/gui/button.png");
+	@Unique
-	protected MixinOptionsScreen(Component title)
+	private static final ResourceLocation ICON_TEXTURE =
-	{
+		#if MC_VER < MC_1_21
-		super(title);
+		new ResourceLocation(ModInfo.ID, "textures/gui/button.png");
-	}
+		#else
+		ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "textures/gui/button.png");
+		#endif 
 	
-	@Inject(at = @At("HEAD"), method = "init")
+	
+	@Unique
+	private TexturedButtonWidget optionsButton = null;
+	
+	#if MC_VER >= MC_1_20_6
+	@Shadow
+	@Final
+	protected HeaderAndFooterLayout layout;
+	#endif
+	
+	
+	
+	//==============//
+	// constructors //
+	//==============//
+	
+	protected MixinOptionsScreen(Component title) { super(title); }
+	
+	@Inject(at = @At("RETURN"), method = "init")
 	private void lodconfig$init(CallbackInfo ci)
 	{
 		if (Config.Client.optionsButton.get())
-			this. #if MC_VER < MC_1_17_1 addButton #else addRenderableWidget #endif
+		{
-					(new TexturedButtonWidget(
+			#if MC_VER < MC_1_17_1
+			this.addButton(this.getOptionsButton());
+			#elif MC_VER < MC_1_20_6
+			this.addRenderableWidget(this.getOptionsButton());
+			#else
+			
+			// add the button so it's rendered 
+			this.addRenderableWidget(this.getOptionsButton());
+			
+			// add the button to the correct location in the UI
+			// TODO is there a better way to do this instead of using access transformers to inject into the exact UI elements?
+			LinearLayout layout = (LinearLayout) this.layout.headerFrame.children.getFirst().child;
+			
+			// determine how wide the other option buttons are so we can put our botton to the left of them all
+			AtomicInteger width = new AtomicInteger(0);
+			layout.visitChildren(x -> width.addAndGet(x.getWidth()));
+			width.addAndGet(-10); // padding between the DH button and the FOV slider
+			
+			layout.wrapped.addChild(this.getOptionsButton(), 1, 2, (settings) -> settings.paddingLeft(width.get() * -1));
+			layout.arrangeElements();
+			
+		    #endif
+		}
+	}
+	
+	
+	
+	//================//
+	// helper methods //
+	//================//
+	
+	@Unique
+	public TexturedButtonWidget getOptionsButton()
+	{
+		if (this.optionsButton == null)
+		{
+			this.optionsButton
+					= new TexturedButtonWidget(
 					// Where the button is on the screen
 					this.width / 2 - 180, this.height / 6 - 12,
 					// Width and height of the button
 					20, 20,
-							// Offset
+					// texture UV Offset
 					0, 0,
 					// Some textuary stuff
 					20, ICON_TEXTURE, 20, 40,
 					// Create the button and tell it where to go
 					// For now it goes to the client option by default
-							(buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(GetConfigScreen.getScreen(this)),
+					(buttonWidget) -> Objects.requireNonNull(this.minecraft).setScreen(GetConfigScreen.getScreen(this)),
-							// Add a title to the utton
+					// Add a title to the button
 	                #if MC_VER < MC_1_19_2
-							new TranslatableComponent(ModInfo.ID + ".title")));
+					new TranslatableComponent(ModInfo.ID + ".title"));
 	                #else
-							Component.translatable(ModInfo.ID + ".title")));
+					Component.translatable(ModInfo.ID + ".title"));
 					#endif
 		}
 		
+		return this.optionsButton;
+	}
+	
 }

fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/unsafe/MixinThreadingDetector.java

@@ -1,60 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 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.fabric.mixins.server.unsafe;
-
-import org.spongepowered.asm.mixin.Mixin;
-
-//FIXME: Is this still needed?
-#if MC_VER >= MC_1_18_2
-
-import net.minecraft.util.ThreadingDetector;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.concurrent.Semaphore;
-
-/**
- * Why does this exist? But okay! (Will be probably removed when the experimental generator is done)
- * FIXME: Recheck this
- */
-@Mixin(ThreadingDetector.class)
-public class MixinThreadingDetector
-{
-	@Mutable
-	@Shadow
-	private Semaphore lock;
-	
-	@Inject(method = "<init>", at = @At("RETURN"))
-	private void setSemaphore(CallbackInfo ci)
-	{
-		this.lock = new Semaphore(2);
-	}
-	
-}
-#else
-
-import net.minecraft.server.level.ServerLevel;
-
-@Mixin(ServerLevel.class)
-public class MixinThreadingDetector { } //FIXME: Is there some way to make this file just not be added?
-#endif

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

@@ -32,7 +32,7 @@ public class ModMenuIntegration implements ModMenuApi
 	@Override
 	public ConfigScreenFactory<?> getModConfigScreenFactory()
 	{
-		return parent -> GetConfigScreen.getScreen(parent);
+		return GetConfigScreen::getScreen;
 	}
 	
 }

fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/BCLibAccessor.java

@@ -1,11 +1,11 @@
 package com.seibel.distanthorizons.fabric.wrappers.modAccessor;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IBCLibAccessor;
-#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1 || MC_VER == MC_1_20_4 // These versions either don't have BCLib, or the implementation is different
+#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1 || MC_VER == MC_1_20_4 || MC_VER == MC_1_20_6  // These versions either don't have BCLib, or the implementation is different
 #elif MC_VER == MC_1_18_2
 import ru.bclib.config.ClientConfig;
 import ru.bclib.config.Configs;
-#else
+#elif MC_VER < MC_1_21
 import org.betterx.bclib.config.ClientConfig;
 import org.betterx.bclib.config.Configs;
 #endif
@@ -17,7 +17,8 @@ public class BCLibAccessor implements IBCLibAccessor
 	
 	public void setRenderCustomFog(boolean newValue)
 	{
-		#if !(MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1 || MC_VER == MC_1_20_4) // These versions either don't have BCLib, or the implementation is different
+		// only some MC versions have BCLib and require this fix
+		#if (MC_VER > MC_1_17_1 && MC_VER < MC_1_20_4)
 		
 		// Change the value of CUSTOM_FOG_RENDERING in the bclib client config
 		// This disabled fog from rendering within bclib

fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/IrisAccessor.java

@@ -22,7 +22,11 @@ package com.seibel.distanthorizons.fabric.wrappers.modAccessor;
 #if MC_VER >= MC_1_19_4
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IIrisAccessor;
+#if MC_VER <= MC_1_20_4
 import net.coderbot.iris.Iris;
+#else
+import net.irisshaders.iris.Iris;
+#endif
 import net.irisshaders.iris.api.v0.IrisApi;
 
 public class IrisAccessor implements IIrisAccessor

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

@@ -37,7 +37,7 @@ public class ModChecker implements IModChecker
 	@Override
 	public File modLocation(String modid)
 	{
-		return new File(FabricLoader.getInstance().getModContainer(modid).get().getOrigin().getPaths().get(0).toUri());
+		return new File(FabricLoader.getInstance().getModContainer(modid).get().getOrigin().getPaths().getFirst().toUri());
 	}
 	
 }

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

@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.coreapi.util.math.Mat4f;
+import com.seibel.distanthorizons.core.util.math.Mat4f;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
@@ -69,11 +69,9 @@ public class SodiumAccessor implements ISodiumAccessor
 
 		#if MC_VER >= MC_1_20_1
 		// TODO: This is just a tmp solution, use a proper solution later
-		return MC_RENDER.getMaximumRenderedChunks().stream().filter((DhChunkPos chunk) -> {
+		return MC_RENDER.getMaximumRenderedChunks().stream().filter((DhChunkPos chunk) -> (renderer.isBoxVisible(
-			return (renderer.isBoxVisible(
 				chunk.getMinBlockX() + 1, height.getMinBuildHeight() + 1, chunk.getMinBlockZ() + 1,
-					chunk.getMinBlockX() + 15, height.getMaxBuildHeight() - 1, chunk.getMinBlockZ() + 15));
+				chunk.getMinBlockX() + 15, height.getMaxBuildHeight() - 1, chunk.getMinBlockZ() + 15))).collect(Collectors.toCollection(HashSet::new));
-		}).collect(Collectors.toCollection(HashSet::new));
 		#elif MC_VER >= MC_1_18_2
 		// 0b11 = Lighted chunk & loaded chunk
 		return renderer.getChunkTracker().getChunks(0b00).filter(

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

@@ -3,7 +3,6 @@
     "minVersion": "0.8",
     "package": "com.seibel.distanthorizons.fabric.mixins",
     "mixins": [
-        "server.unsafe.MixinThreadingDetector",
         "server.MixinChunkGenerator",
         "server.MixinChunkMap",
         "server.MixinUtilBackgroundThread"
@@ -15,7 +14,6 @@
         "client.MixinFogRenderer",
         "client.MixinGameRenderer",
         "client.MixinLevelRenderer",
-        "client.MixinDynamicTexture",
         "client.MixinLightTexture",
         "client.MixinOptionsScreen",
         "client.MixinMinecraft",

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

@@ -56,7 +56,6 @@
     },
     
     "suggests": {
-        "blendium": "*"
     },
     
     "breaks": $fabric_incompatibility_list,

forge/build.gradle

@@ -1,44 +1,99 @@
-unimined.minecraft {
+plugins {
-    minecraftForge {
+    // Note: This is only needed for multi-loader projects
-        loader forge_version
+    // The main architectury loom version is set at the start of the root build.gradle
-        mixinConfig("DistantHorizons.forge.mixins.json")
+    id "architectury-plugin" version "3.4-SNAPSHOT"
+}
 
-        file("build/sourcesSets/main/META-INF/").mkdirs()
+sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21
-        accessTransformer(aw2at(
+
-                project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener"),
+architectury {
-                file("build/sourcesSets/main/META-INF/accesstransformer.cfg") // We'd wanna output the access transformer to somewhere where it'll only appear in the final jar
+    platformSetupLoomIde()
-        ))
+    forge()
+}
+
+//loom {
+//    forge {
+//        convertAccessWideners.set(true)
+//        extraAccessWideners.add("lod.accesswidener")
+//        mixinConfigs("DistantHorizons.mixins.json")
+//    }
+//}
+
+loom {
+    silentMojangMappingsLicense() // Shut the licencing warning
+    accessWidenerPath = project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener")
+
+    forge {
+        convertAccessWideners = true
+        extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
+
+        mixinConfigs = [
+                "DistantHorizons.forge.mixins.json"
+        ]
+    }
+
+    // "runs" isn't required, but when we do need it then it can be useful
+    runs {
+        client {
+            client()
+            setConfigName("Forge Client")
+            ideConfigGenerated(true)
+            runDir("../run")
+//            vmArgs("-XX:-OmitStackTraceInFastThrow", minecraftMemoryJavaArg)
+        }
+        server {
+            server()
+            setConfigName("Forge Server")
+            ideConfigGenerated(true)
+            runDir("../run")
+        }
     }
 }
 
+remapJar {
+    inputFile = shadeDowngradedApi.archiveFile
+    dependsOn shadeDowngradedApi
+}
 
 def addMod(path, enabled) {
     if (enabled == "2")
-        dependencies { modImplementation(path) }
+        dependencies { implementation(path) }
     else if (enabled == "1")
-        dependencies { compileOnly(path) }
+        dependencies { modCompileOnly(path) }
 }
-dependencies {
-    // Architectury API
-//    if (minecraft_version == "1.16.5") {
-//        implementation("me.shedaniel:architectury-forge:${rootProject.architectury_version}")
-//    } else {
-//        implementation("dev.architectury:architectury-forge:${rootProject.architectury_version}")
-//    }
 
-    // Starlight
+dependencies {
-    addMod("curse.maven:starlight-forge-526854:${rootProject.starlight_version_forge}", rootProject.enable_starlight_forge)
+    minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-//    annotationProcessor "org.spongepowered:mixin:0.8.4:processor"
+    mappings loom.layered() {
+        // Mojmap mappings
+        officialMojangMappings()
+        // Parchment mappings (it adds parameter mappings & javadoc)
+        parchment("org.parchmentmc.data:parchment-${rootProject.parchment_version}@zip")
+    }
+
+    // Forge
+    forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"
 
     addMod("curse.maven:TerraForged-363820:${rootProject.terraforged_version}", rootProject.enable_terraforged)
 
     addMod("curse.maven:TerraFirmaCraft-302973:4616004", rootProject.enable_terrafirmacraft)
 
-//    annotationProcessor "org.spongepowered:mixin:0.8.5:processor"
     
-//    if (System.getProperty("idea.sync.active") != "true") {
+    if ( // Only run on MC 1.20.6 or later
-//        annotationProcessor "org.spongepowered:mixin:0.8.4:processor"
+        // FIXME: Add an environment variable for the Major, Minor, and Patch version number of Minecraft
-//    }
+        minecraft_version.split("\\.")[1].toInteger() >= 20 &&
+        (
+            minecraft_version.split("\\.").length > 1 && // Incase there isn't a minor version
+            minecraft_version.split("\\.")[2].toInteger() >= 6
+        )
+    ) {
+        // (potential) hack fix, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transitive dependencies request 6.0+ 
+        implementation('net.sf.jopt-simple:jopt-simple:5.0.4') //{ version { strictly '5.0.4' } }
+    }
+}
+
+task deleteResources(type: Delete) {
+    delete file("build/resources/main")
 }
 
 tasks.register('copyAllResources') {
@@ -46,70 +101,12 @@ tasks.register('copyAllResources') {
     dependsOn(copyCommonLoaderResources)
 }
 
-
-
 processResources {
     dependsOn(tasks.named('copyAllResources'))
 }
 
-afterEvaluate {
+tasks.named('runClient') {
-    runClient {
     dependsOn(tasks.named('copyAllResources'))
-    }
+    finalizedBy(deleteResources)
-    
-    // TODO this isn't a great place for these, but `tasks.build.doLast` doesn't always work and I'm not sure of a better place right now
-    tasks.runClient.doFirst {
-        // TODO can we just ignore these folders instead?
-        //  deleting them may cause issues if the OS locks the files
-        //  and it feels hacky
-        delete file("../common/build/libs")
-        delete file("../coreSubProjects/core/build/libs")
-        delete file("../coreSubProjects/api/build/libs")
-    }
-}
-
-remapJar {
-    inputFile = shadowJar.archiveFile
-    dependsOn shadowJar
-//    classifier null
-}
-
-
-sourcesJar {
-    def commonSources = project(":common").sourcesJar
-    dependsOn commonSources
-    from commonSources.archiveFile.map { zipTree(it) }
-}
-
-//components.java {
-//    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-//        skip()
-//    }
-//}
-
-
-
-// TODO this was specifically added for MC 1.20.4 and should not be used on MC versions prior to it 
-// source: https://github.com/MinecraftForge/MinecraftForge/blob/5d0047753dfac0caaf5d97cc3f5c9a8b0990cb44/mdk/build.gradle#L209-L217
-//
-// Merge the resources and classes into the same directory. 
-// This is done because java expects modules to be in a single directory.
-// And if we have it in multiple we have to do performance intensive hacks like having the UnionFileSystem
-// This will eventually be migrated to ForgeGradle so modders don't need to manually do it. But that is later.
-sourceSets.each {
-    if ( // Only run on MC 1.20.4 or later
-        // FIXME: Add an environment variable for the Major, Minor, and Patch version number of Minecraft
-            minecraft_version.split("\\.")[1].toInteger() >= 20 &&
-            (
-                    minecraft_version.split("\\.").length > 1 && // Incase there isn't a minor version
-                    minecraft_version.split("\\.")[2].toInteger() >= 4
-            )
-    ) {
-        // all of our code and resources should be in the sourceSets/main/ folder for Forge 1.20.4+
-        def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
-        println "source name: [" + it.name + "]"// as of 2024-2-4 "it.name" only returned "main" and "test"
-        it.output.resourcesDir = dir
-        it.java.destinationDirectory = dir
-    }
 }
 

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

@@ -27,6 +27,7 @@ import com.seibel.distanthorizons.core.api.internal.ClientApi;
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
 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.chunk.IChunkWrapper;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
@@ -65,6 +66,8 @@ import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import org.lwjgl.opengl.GL32;
 
+import java.util.concurrent.ThreadPoolExecutor;
+
 /**
  * This handles all events sent to the client,
  * and is the starting point for most of the mod.
@@ -144,7 +147,7 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 	#if MC_VER < MC_1_19_2
 	public void clientLevelUnloadEvent(WorldEvent.Unload event)
 	#else
-	public void clientLevelUnloadEvent(LevelEvent.Load event)
+	public void clientLevelUnloadEvent(LevelEvent.Unload event)
 	#endif
 	{
 		LOGGER.info("level unload");
@@ -178,7 +181,7 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 			return;
 		}
 		
-		LOGGER.trace("interact or block place event at blockPos: " + event.getPos());
+		//LOGGER.trace("interact or block place event at blockPos: " + event.getPos());
 		
 		#if MC_VER < MC_1_19_2
 		LevelAccessor level = event.getWorld();
@@ -186,8 +189,15 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 		LevelAccessor level = event.getLevel();
 		#endif
 		
+		ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor();
+		if (executor != null)
+		{
+			executor.execute(() ->
+			{
 				ChunkAccess chunk = level.getChunk(event.getPos());
 				this.onBlockChangeEvent(level, chunk);
+			});
+		}
 	}
 	@SubscribeEvent
 	public void leftClickBlockEvent(PlayerInteractEvent.LeftClickBlock event)
@@ -197,7 +207,7 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 			return;
 		}
 		
-		LOGGER.trace("break or block attack at blockPos: " + event.getPos());
+		//LOGGER.trace("break or block attack at blockPos: " + event.getPos());
 		
 		#if MC_VER < MC_1_19_2
 		LevelAccessor level = event.getWorld();
@@ -205,8 +215,15 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 		LevelAccessor level = event.getLevel();
 		#endif
 		
+		ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor();
+		if (executor != null)
+		{
+			executor.execute(() ->
+			{
 				ChunkAccess chunk = level.getChunk(event.getPos());
 				this.onBlockChangeEvent(level, chunk);
+			});
+		}
 	}
 	private void onBlockChangeEvent(LevelAccessor level, ChunkAccess chunk)
 	{
@@ -328,9 +345,7 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 		#elif MC_VER >= MC_1_18_2
 		if (event.getStage() == RenderLevelStageEvent.Stage.AFTER_SOLID_BLOCKS)
 		#else
-		// FIXME: Is this the correct location for 1.16 & 1.17???
+		if (event.type.equals(TickEvent.RenderTickEvent.Type.RENDER))
-		// I couldnt find anything for rendering after the level, so is rendering after overlays ok?
-		if (event.type.equals(TickEvent.RenderTickEvent.Type.WORLD))
 		#endif
 		{
 			try

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

@@ -70,7 +70,7 @@ import java.util.function.Consumer;
  * If you are looking for the real start of the mod
  * check out the ClientProxy.
  */
-@Mod("distanthorizons") // TODO: Change it back to ModInfo.ID when forge works
+@Mod(ModInfo.ID)
 public class ForgeMain extends AbstractModInitializer
 {
 	public ForgeMain()

forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinDynamicTexture.java

@@ -1,74 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 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.forge.mixins.client;
-
-
-import com.mojang.blaze3d.platform.NativeImage;
-
-import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
-import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import com.seibel.distanthorizons.common.util.ILightTextureMarker;
-
-import net.minecraft.client.renderer.texture.DynamicTexture;
-
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-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;
-
-import org.jetbrains.annotations.Nullable;
-
-@Mixin(DynamicTexture.class)
-public abstract class MixinDynamicTexture implements ILightTextureMarker
-{
-	/** Used to prevent accidentally using other dynamic textures as a lightmap */
-	@Unique
-	private boolean isLightTexture = false;
-	
-	@Shadow
-	@Final
-	private NativeImage pixels;
-	
-	@Inject(method = "upload()V", at = @At("HEAD"))
-	public void updateLightTexture(CallbackInfo ci)
-	{
-		// since the light map is always updated on the client render thread we should be able to access the client level at the same time
-		IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
-		if (!this.isLightTexture
-			|| mc == null
-			|| mc.getWrappedClientLevel() == null
-			)
-		{
-			return;
-		}
-		
-		//ApiShared.LOGGER.info("Lightmap update");
-		IClientLevelWrapper clientLevel = mc.getWrappedClientLevel();
-		MinecraftRenderWrapper.INSTANCE.updateLightmap(this.pixels, clientLevel);
-	}
-	
-	public void markLightTexture() { this.isLightTexture = true; }
-	
-}

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

@@ -22,6 +22,10 @@ package com.seibel.distanthorizons.forge.mixins.client;
 import com.mojang.blaze3d.vertex.PoseStack;
 #if MC_VER < MC_1_19_4
 import com.mojang.math.Matrix4f;
+import net.minecraft.client.Camera;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GameRenderer;
+import net.minecraft.client.renderer.LightTexture;
 #else
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
@@ -29,19 +33,14 @@ import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LightTexture;
 import org.joml.Matrix4f;
 #endif
-import com.seibel.distanthorizons.common.rendering.SeamlessOverdraw;
 import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
-import com.seibel.distanthorizons.coreapi.util.math.Mat4f;
+import com.seibel.distanthorizons.core.util.math.Mat4f;
-import net.minecraft.client.Camera;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LevelRenderer;
-import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.RenderType;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -50,7 +49,7 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.nio.FloatBuffer;
+import javax.annotation.Nullable;
 
 #if MC_VER < MC_1_17_1
 import org.lwjgl.opengl.GL15;
@@ -69,7 +68,8 @@ import org.lwjgl.opengl.GL15;
 @Mixin(LevelRenderer.class)
 public class MixinLevelRenderer
 {
-	@Shadow
+	@Nullable
+	@Shadow //# if MC_VER >= MC_1_20_4 (remap = false) # endif
 	private ClientLevel level;
 	@Unique
 	private static float previousPartialTicks = 0;
@@ -112,11 +112,16 @@ public class MixinLevelRenderer
 			method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLorg/joml/Matrix4f;)V",
 			cancellable = true)
 	private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double cameraXBlockPos, double cameraYBlockPos, double cameraZBlockPos, Matrix4f projectionMatrix, CallbackInfo callback)
-    #else
+    #elif MC_VER < MC_1_20_4
     @Inject(at = @At("HEAD"),
             method = "Lnet/minecraft/client/renderer/LevelRenderer;renderSectionLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLorg/joml/Matrix4f;)V",
             cancellable = true)
     private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double camX, double camY, double camZ, Matrix4f projectionMatrix, CallbackInfo callback)
+    #else
+	@Inject(at = @At("HEAD"),
+			method = "renderSectionLayer",
+			cancellable = true)
+	private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double camX, double camY, double camZ, Matrix4f projectionMatrix, CallbackInfo callback)
     #endif
 	{
 		// get MC's model view and projection matrices
@@ -141,20 +146,6 @@ public class MixinLevelRenderer
 		if (renderType.equals(RenderType.solid()))
 		{
 			ClientApi.INSTANCE.renderLods(ClientLevelWrapper.getWrapper(this.level), mcModelViewMatrix, mcProjectionMatrix, Minecraft.getInstance().getFrameTime());
-			
-			// experimental proof-of-concept option
-			if (Config.Client.Advanced.Graphics.AdvancedGraphics.seamlessOverdraw.get())
-			{
-				float[] matrixFloatArray = SeamlessOverdraw.overwriteMinecraftNearFarClipPlanes(mcProjectionMatrix, previousPartialTicks);
-				
-				#if MC_VER == MC_1_16_5
-				SeamlessOverdraw.applyLegacyProjectionMatrix(matrixFloatArray);
-				#elif MC_VER < MC_1_19_4
-				projectionMatrix.load(FloatBuffer.wrap(matrixFloatArray));
-				#else
-				projectionMatrix.set(matrixFloatArray);
-				#endif
-			}
 		} 
 		else if (renderType.equals(RenderType.translucent())) 
 		{

forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLightTexture.java

@@ -20,10 +20,13 @@
 package com.seibel.distanthorizons.forge.mixins.client;
 
 
-import com.seibel.distanthorizons.common.util.ILightTextureMarker;
+import com.mojang.blaze3d.platform.NativeImage;
 
+import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import net.minecraft.client.renderer.LightTexture;
-import net.minecraft.client.renderer.texture.DynamicTexture;
 
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -35,11 +38,22 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(LightTexture.class)
 public class MixinLightTexture
 {
-	@Shadow
+	@Shadow //# if MC_VER >= MC_1_20_4 (remap = false) # endif
 	@Final 
-	private DynamicTexture lightTexture;
+	private NativeImage lightPixels;
 	
-	@Inject(method = "<init>", at = @At("RETURN"))
+	
-	public void markLightTexture(CallbackInfo ci) { ((ILightTextureMarker) this.lightTexture).markLightTexture(); }
+	@Inject(method = "updateLightTexture(F)V", at = @At("RETURN"))
+	public void updateLightTexture(float partialTicks, CallbackInfo ci)
+	{
+		IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
+		if (mc == null || mc.getWrappedClientLevel() == null)
+		{
+			return;
+		}
+		
+		IClientLevelWrapper clientLevel = mc.getWrappedClientLevel();
+		MinecraftRenderWrapper.INSTANCE.updateLightmap(this.lightPixels, clientLevel);
+	}
 	
 }

forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinMinecraft.java

@@ -1,6 +1,6 @@
 package com.seibel.distanthorizons.forge.mixins.client;
 
-import com.seibel.distanthorizons.api.enums.config.EUpdateBranch;
+import com.seibel.distanthorizons.api.enums.config.EDhApiUpdateBranch;
 import com.seibel.distanthorizons.common.wrappers.gui.updater.UpdateModScreen;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
@@ -51,7 +51,7 @@ public class MixinMinecraft
 		{
 			instance.setScreen(new UpdateModScreen(
 					new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons
-					(Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()): GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha"))
+					(Config.Client.Advanced.AutoUpdater.updateBranch.get() == EDhApiUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()): GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha"))
 			));
 		}
 		else
@@ -73,11 +73,23 @@ public class MixinMinecraft
 				&& SelfUpdater.onStart()
 		)
 		{
-			runnable = () -> {
+			runnable = () -> 
+			{
+				String versionId;
+				EDhApiUpdateBranch updateBranch = EDhApiUpdateBranch.convertAutoToStableOrNightly(Config.Client.Advanced.AutoUpdater.updateBranch.get());
+				if (updateBranch == EDhApiUpdateBranch.STABLE)
+				{
+					versionId = ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion());
+				}
+				else
+				{
+					versionId = GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha");
+				}
+				
 				Minecraft.getInstance().setScreen(new UpdateModScreen(
 						// TODO: Change to runnable, instead of tittle screen
 						new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons
-						(Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()) : GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha"))
+						versionId
 				));
 			};
 		}

forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinWorldUpgrader.java

@@ -1,156 +0,0 @@
-package com.seibel.distanthorizons.forge.mixins.client;
-
-import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiLevelType;
-import com.seibel.distanthorizons.api.interfaces.world.IDhApiDimensionTypeWrapper;
-import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper;
-import com.seibel.distanthorizons.common.wrappers.world.DimensionTypeWrapper;
-import com.seibel.distanthorizons.core.file.structure.LocalSaveStructure;
-import com.seibel.distanthorizons.core.level.DhServerLevel;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
-import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.util.worldupdate.WorldUpgrader;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.dimension.DimensionType;
-import net.minecraft.world.level.dimension.LevelStem;
-import net.minecraft.world.level.levelgen.WorldGenSettings;
-import net.minecraft.world.level.storage.DimensionDataStorage;
-import net.minecraft.world.level.storage.LevelStorageSource;
-import org.jetbrains.annotations.Nullable;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-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;
-import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
-
-import java.io.File;
-import java.nio.file.Path;
-
-#if FALSE
-@Mixin(WorldUpgrader.class)
-public class MixinWorldUpgrader {
-    static class FakeLevelWrapper implements IServerLevelWrapper {
-        private Path saveFolder;
-        private LevelStem stem;
-        private DimensionType dimension;
-        private DimensionTypeWrapper dimensionTypeWrapper;
-
-        public FakeLevelWrapper(LevelStorageSource.LevelStorageAccess storage, WorldGenSettings gen, ResourceKey<Level> dim) {
-            saveFolder = storage.getDimensionPath(dim);
-            stem = gen.dimensions().getOrThrow(WorldGenSettings.levelToLevelStem(dim));
-            dimension = stem.typeHolder().value();
-            dimensionTypeWrapper = DimensionTypeWrapper.getDimensionTypeWrapper(dimension);
-        }
-
-        @Override
-        public EDhApiLevelType getLevelType() {
-            return EDhApiLevelType.SERVER_LEVEL;
-        }
-
-        @Override
-        public IDhApiDimensionTypeWrapper getDimensionType() {
-            return dimensionTypeWrapper;
-        }
-
-        @Override
-        public int getBlockLight(int x, int y, int z) {
-            return 0;
-        }
-
-        @Override
-        public int getSkyLight(int x, int y, int z) {
-            return 0;
-        }
-
-        @Override
-        public boolean hasCeiling() {
-            return dimension.hasCeiling();
-        }
-
-        @Override
-        public boolean hasSkyLight() {
-            return dimension.hasSkyLight();
-        }
-
-        @Override
-        public int getHeight() {
-            return dimension.height();
-        }
-
-        @Override
-        public int getMinHeight() {
-            return dimension.minY();
-        }
-
-        @Override
-        public boolean hasChunkLoaded(int chunkX, int chunkZ) {
-            return false;
-        }
-
-        @Override
-        public IBlockStateWrapper getBlockState(DhBlockPos pos) {
-            return BlockStateWrapper.AIR;
-        }
-
-        @Override
-        public IBiomeWrapper getBiome(DhBlockPos pos) {
-            throw new UnsupportedOperationException("Not implemented yet");
-        }
-
-        @Override
-        public Object getWrappedMcObject() {
-            return null;
-        }
-
-        @Nullable
-        @Override
-        public IClientLevelWrapper tryGetClientLevelWrapper() {
-            return null;
-        }
-
-        @Override
-        public File getSaveFolder() {
-            return saveFolder.toFile();
-        }
-    }
-
-    @Unique
-    private DhServerLevel dhServerLevel;
-    @Unique
-    private FakeLevelWrapper fakeLevelWrapper;
-    @Unique
-    public LocalSaveStructure saveStructure;
-
-    @Shadow @Final
-    private DimensionDataStorage overworldDataStorage;
-    @Shadow @Final
-    private LevelStorageSource.LevelStorageAccess levelStorage;
-    @Shadow @Final
-    private WorldGenSettings worldGenSettings;
-
-    @Inject(method = "Lnet/minecraft/util/worldupdate/WorldUpgrader;work()V",
-            at = @At(value = "INVOKE")
-    )
-    private void initWorldUpgrade() {
-        saveStructure = new LocalSaveStructure();
-    }
-
-    @Inject(method = "Lnet/minecraft/util/worldupdate/WorldUpgrader;work()V",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/util/worldupdate/WorldUpgrader;getAllChunkPos(Lnet/minecraft/resources/ResourceKey;)Ljava/util/List;", shift = At.Shift.AFTER),
-            locals = LocalCapture.CAPTURE_FAILSOFT
-    )
-    private void startWorldUpgrade(CallbackInfo info, ResourceKey resourceKey) {
-        ResourceKey<Level> key = resourceKey;
-        fakeLevelWrapper = new FakeLevelWrapper(levelStorage, worldGenSettings, key);
-        dhServerLevel = new DhServerLevel(saveStructure, fakeLevelWrapper);
-    }
-
-
-}
-#endif

forge/src/main/java/com/seibel/distanthorizons/forge/mixins/server/unsafe/MixinThreadingDetector.java

@@ -1,59 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 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.forge.mixins.server.unsafe;
-
-import org.spongepowered.asm.mixin.Mixin;
-#if MC_VER >= MC_1_18_2
-
-import net.minecraft.util.ThreadingDetector;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.concurrent.Semaphore;
-
-/**
- * Why does this exist? But okay! (Will be probably removed when the experimental generator is done)
- * FIXME: Recheck this // STILL check this
- */
-@Mixin(ThreadingDetector.class)
-public class MixinThreadingDetector
-{
-	@Mutable
-	@Shadow
-	private Semaphore lock;
-	
-	@Inject(method = "<init>", at = @At("RETURN"))
-	private void setSemaphore(CallbackInfo ci)
-	{
-		this.lock = new Semaphore(2);
-	}
-	
-}
-
-#else
-
-import net.minecraft.world.level.chunk.ChunkGenerator;
-
-@Mixin(ChunkGenerator.class)
-public class MixinThreadingDetector { }
-#endif

forge/src/main/resources/DistantHorizons.forge.mixins.json

@@ -3,7 +3,6 @@
     "minVersion": "0.8",
     "package": "com.seibel.distanthorizons.forge.mixins",
     "mixins": [
-        "server.unsafe.MixinThreadingDetector",
         "server.MixinUtilBackgroundThread",
         "server.MixinChunkGenerator",
         "server.MixinTFChunkGenerator"
@@ -14,7 +13,6 @@
         "client.MixinFogRenderer",
         "client.MixinGameRenderer",
         "client.MixinLevelRenderer",
-        "client.MixinDynamicTexture",
         "client.MixinLightTexture",
         "client.MixinOptionsScreen",
         "client.MixinTextureUtil"

gradle.properties

@@ -2,17 +2,15 @@
 org.gradle.jvmargs=-Xmx4096M
 org.gradle.parallel=true
 org.gradle.caching=true
-fabric.loom.multiProjectOptimisation=true
 
 # Mod Info
 mod_name=DistantHorizons
-mod_id=distanthorizons
+mod_version=2.1.3-a-dev
-mod_version=2.0.2-a-dev
+api_version=3.0.0
-api_version=1.1.0
 maven_group=com.seibel.distanthorizons
 mod_readable_name=Distant Horizons
 mod_description=This mod generates and renders simplified terrain beyond the normal view distance at a low performance cost. Allowing you to see much farther without turning your game into a slideshow.
-# Note: In forge's mods.toml this is hard coded because Architectury throws an error with setting it as a varuable
+# Note: In forge's mods.toml this is hard coded because Architectury throws an error with setting it as a variable
 mod_authors=["James Seibel", "Leonardo Amato", "Cola", "coolGi", "Ran", "Leetom"]
 mod_homepage=https://modrinth.com/mod/distanthorizons
 mod_source=https://gitlab.com/jeseibel/distant-horizons
@@ -20,14 +18,19 @@ mod_issues=https://gitlab.com/jeseibel/distant-horizons/-/issues
 mod_discord=https://discord.gg/xAB8G4cENx
 
 # Global Plugin Versions
-manifold_version=2024.1.0
+manifold_version=2023.1.17
+# 2023.1.17 can be used if there are mystery Java compiler issues
 nightconfig_version=3.6.6
 lz4_version=1.8.0
+xz_version=1.9
 sqlite_jdbc_version=3.43.0.0
+# 8.2.1 is the newest version we can use since that's the version MC 1.16.5 uses 
+# (at least until we can fix the gradle script so core and main can use/shade different fastutil versions)
+fastutil_version=8.2.1
 #svgSalamander_version=1.1.3
 
-# Minecraft related libaries (included in MC's jar)
+# Minecraft related libraries (included in MC's jar)
-log4j_version=2.20.0
+log4j_version=2.23.1
 netty_version=4.1.94.Final
 lwjgl_version=3.3.1
 joml_version=1.10.2
@@ -46,7 +49,7 @@ versionStr=
 
 # This defines what MC version Intellij will use for the preprocessor
 # and what version is used automatically by build and run commands
-mcVer=1.20.4
+mcVer=1.21
 
-# Defines the maximum amount of memory Minecraft is allowed when run in a developement environment
+# Defines the maximum amount of memory Minecraft is allowed when run in a development environment
 #minecraftMemoryJavaArg="-Xmx4G"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

neoforge/build.gradle

@@ -1,44 +1,74 @@
-unimined.minecraft {
+plugins {
-    neoForged {
+    // Note: This is only needed for multi-loader projects
-        loader neoforge_version
+    // The main architectury loom version is set at the start of the root build.gradle
-        mixinConfig("DistantHorizons.neoforge.mixins.json")
+    id "architectury-plugin" version "3.4-SNAPSHOT"
+}
 
-        file("build/sourcesSets/main/META-INF/").mkdirs()
+sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
-        accessTransformer(aw2at(
+
-                project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener"),
+architectury {
-                file("build/sourcesSets/main/META-INF/accesstransformer.cfg") // We'd wanna output the access transformer to somewhere where it'll only appear in the final jar
+    platformSetupLoomIde()
-        ))
+    neoForge()
+}
+
+loom {
+    silentMojangMappingsLicense() // Shut the licencing warning
+    accessWidenerPath = project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener")
+
+    neoForge {
+        // Access wideners are defined in the `remapJar.atAccessWideners`
+
+        // Mixins are defined in the `mods.toml`
+    }
+    mixin {
+        // Mixins are defined in the `mods.toml`
+    }
+
+    // "runs" isn't required, but when we do need it then it can be useful
+    runs {
+        client {
+            client()
+            setConfigName("NeoForge Client")
+            ideConfigGenerated(true)
+            runDir("../run")
+//            vmArgs("-XX:-OmitStackTraceInFastThrow", minecraftMemoryJavaArg)
+        }
+        server {
+            server()
+            setConfigName("NeoForge Server")
+            ideConfigGenerated(true)
+            runDir("../run")
+        }
     }
 }
 
+remapJar {
+    inputFile = apiDowngrade.archiveFile
+    dependsOn apiDowngrade
+//    classifier null
+
+    atAccessWideners.add("distanthorizons.accesswidener")
+}
 
 def addMod(path, enabled) {
     if (enabled == "2")
-        dependencies { modImplementation(path) }
+        dependencies { implementation(path) }
     else if (enabled == "1")
-        dependencies { compileOnly(path) }
+        dependencies { modCompileOnly(path) }
 }
+
 dependencies {
-    // Architectury API
+    minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-//    if (minecraft_version == "1.16.5") {
+    mappings loom.layered() {
-//        implementation("me.shedaniel:architectury-forge:${rootProject.architectury_version}")
+        // Mojmap mappings
-//    } else {
+        officialMojangMappings()
-//        implementation("dev.architectury:architectury-forge:${rootProject.architectury_version}")
+        // Parchment mappings (it adds parameter mappings & javadoc)
-//    }
+        parchment("org.parchmentmc.data:parchment-${rootProject.parchment_version}@zip")
-
+    }
-    // Starlight
-    addMod("curse.maven:starlight-forge-526854:${rootProject.starlight_version_forge}", rootProject.enable_starlight_forge)
-//    annotationProcessor "org.spongepowered:mixin:0.8.4:processor"
-
-    addMod("curse.maven:TerraForged-363820:${rootProject.terraforged_version}", rootProject.enable_terraforged)
 
+    // Neoforge
+    neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}"
     addMod("curse.maven:TerraFirmaCraft-302973:4616004", rootProject.enable_terrafirmacraft)
-
-//    annotationProcessor "org.spongepowered:mixin:0.8.5:processor"
-
-//    if (System.getProperty("idea.sync.active") != "true") {
-//        annotationProcessor "org.spongepowered:mixin:0.8.4:processor"
-//    }
 }
 
 task deleteResources(type: Delete) {
@@ -54,28 +84,13 @@ processResources {
     dependsOn(tasks.named('copyAllResources'))
 }
 
-afterEvaluate {
+tasks.named('runClient') {
-    runClient {
     dependsOn(tasks.named('copyAllResources'))
     finalizedBy(deleteResources)
-    }
 }
 
-remapJar {
-    inputFile = shadowJar.archiveFile
-    dependsOn shadowJar
-//    classifier null
-}
-
-
 sourcesJar {
     def commonSources = project(":common").sourcesJar
     dependsOn commonSources
     from commonSources.archiveFile.map { zipTree(it) }
 }
-
-//components.java {
-//    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
-//        skip()
-//    }
-//}

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java

@@ -21,19 +21,21 @@ package com.seibel.distanthorizons.neoforge;
 
 import com.seibel.distanthorizons.common.AbstractModInitializer;
 import com.seibel.distanthorizons.common.util.ProxyUtil;
+import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.util.math.Mat4f;
+import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import com.seibel.distanthorizons.coreapi.ModInfo;
-//import io.netty.buffer.ByteBuf;
 import net.minecraft.world.level.LevelAccessor;
 
 import net.minecraft.client.multiplayer.ClientLevel;
@@ -54,10 +56,16 @@ import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 
 import net.minecraft.client.Minecraft;
 import net.neoforged.neoforge.client.event.InputEvent;
-import net.neoforged.neoforge.event.TickEvent;
 import net.neoforged.bus.api.SubscribeEvent;
 import org.lwjgl.opengl.GL32;
 
+#if MC_VER < MC_1_20_6
+import net.neoforged.neoforge.event.TickEvent;
+#else
+import net.neoforged.neoforge.client.event.ClientTickEvent;
+#endif
+
+
 /**
  * This handles all events sent to the client,
  * and is the starting point for most of the mod.
@@ -72,8 +80,10 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 
 //	private static SimpleChannel multiversePluginChannel;
 	
+	// Not the cleanest way of passing this to the LOD renderer, but it'll have to do for now
+	public static Mat4f currentModelViewMatrix = new Mat4f();
+	public static Mat4f currentProjectionMatrix = new Mat4f();
 	
-	private static LevelAccessor GetEventLevel(LevelEvent e) { return e.getLevel(); }
 	
 	
 	
@@ -90,6 +100,7 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 	// tick events //
 	//=============//
 	
+	#if MC_VER < MC_1_20_6
 	@SubscribeEvent
 	public void clientTickEvent(TickEvent.ClientTickEvent event)
 	{
@@ -98,6 +109,13 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 			ClientApi.INSTANCE.clientTickEvent();
 		}
 	}
+	#else
+	@SubscribeEvent
+	public void clientTickEvent(ClientTickEvent.Pre event)
+	{
+		ClientApi.INSTANCE.clientTickEvent();
+	}
+	#endif
 	
 	
 	
@@ -111,28 +129,26 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 		LOGGER.info("level load");
 		
 		LevelAccessor level = event.getLevel();
-		if (!(level instanceof ClientLevel))
+		if (!(level instanceof ClientLevel clientLevel))
 		{
 			return;
 		}
 		
-		ClientLevel clientLevel = (ClientLevel) level;
 		IClientLevelWrapper clientLevelWrapper = ClientLevelWrapper.getWrapper(clientLevel);
 		// TODO this causes a crash due to level being set to null somewhere
 		ClientApi.INSTANCE.clientLevelLoadEvent(clientLevelWrapper);
 	}
 	@SubscribeEvent
-	public void clientLevelUnloadEvent(LevelEvent.Load event)
+	public void clientLevelUnloadEvent(LevelEvent.Unload event)
 	{
 		LOGGER.info("level unload");
 		
 		LevelAccessor level = event.getLevel();
-		if (!(level instanceof ClientLevel))
+		if (!(level instanceof ClientLevel clientLevel))
 		{
 			return;
 		}
 		
-		ClientLevel clientLevel = (ClientLevel) level;
 		IClientLevelWrapper clientLevelWrapper = ClientLevelWrapper.getWrapper(clientLevel);
 		ClientApi.INSTANCE.clientLevelUnloadEvent(clientLevelWrapper);
 	}
@@ -151,12 +167,21 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 			return;
 		}
 		
-		LOGGER.trace("interact or block place event at blockPos: " + event.getPos());
+		// executor to prevent locking up the render/event thread
+		// if the getChunk() takes longer than expected 
+		// (which can be caused by certain mods) 
+		var executor = ThreadPoolUtil.getFileHandlerExecutor();
+		if (executor != null)
+		{
+			executor.execute(() ->
+			{
+				//LOGGER.trace("interact or block place event at blockPos: " + event.getPos());
 				
 				LevelAccessor level = event.getLevel();
-		
 				ChunkAccess chunk = level.getChunk(event.getPos());
 				this.onBlockChangeEvent(level, chunk);
+			});
+		}
 	}
 	@SubscribeEvent
 	public void leftClickBlockEvent(PlayerInteractEvent.LeftClickBlock event)
@@ -166,12 +191,21 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 			return;
 		}
 		
-		LOGGER.trace("break or block attack at blockPos: " + event.getPos());
+		// executor to prevent locking up the render/event thread
+		// if the getChunk() takes longer than expected 
+		// (which can be caused by certain mods) 
+		var executor = ThreadPoolUtil.getFileHandlerExecutor();
+		if (executor != null)
+		{
+			executor.execute(() ->
+			{
+				//LOGGER.trace("break or block attack at blockPos: " + event.getPos());
 				
 				LevelAccessor level = event.getLevel();
-		
 				ChunkAccess chunk = level.getChunk(event.getPos());
 				this.onBlockChangeEvent(level, chunk);
+			});
+		}
 	}
 	private void onBlockChangeEvent(LevelAccessor level, ChunkAccess chunk)
 	{
@@ -281,6 +315,16 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 	// rendering //
 	//===========//
 	
+	@SubscribeEvent
+	public void beforeLevelRenderEvent(RenderLevelStageEvent event)
+	{
+		if (event.getStage() == RenderLevelStageEvent.Stage.AFTER_SKY)
+		{
+			currentModelViewMatrix = McObjectConverter.Convert(event.getModelViewMatrix());
+			currentProjectionMatrix = McObjectConverter.Convert(event.getProjectionMatrix());
+		}
+	}
+	
 	@SubscribeEvent
 	public void afterLevelRenderEvent(RenderLevelStageEvent event)
 	{
@@ -301,4 +345,12 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 	}
 	
 	
+	
+	//================//
+	// helper methods //
+	//================//
+	
+	private static LevelAccessor GetEventLevel(LevelEvent e) { return e.getLevel(); }
+	
+	
 }

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java

@@ -35,13 +35,18 @@ import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
 import net.neoforged.fml.event.lifecycle.FMLDedicatedServerSetupEvent;
-import net.neoforged.neoforge.client.ConfigScreenHandler;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.RegisterCommandsEvent;
 import net.neoforged.neoforge.event.server.ServerStartingEvent;
 
 import java.util.function.Consumer;
 
+#if MC_VER < MC_1_20_6
+import net.neoforged.neoforge.client.ConfigScreenHandler;
+#else
+import net.neoforged.neoforge.client.gui.IConfigScreenFactory;	
+#endif
+
 /**
  * Initialize and setup the Mod. <br>
  * If you are looking for the real start of the mod
@@ -70,14 +75,20 @@ public class NeoforgeMain extends AbstractModInitializer
 	{
 		this.tryCreateModCompatAccessor("optifine", IOptifineAccessor.class, OptifineAccessor::new);
 		
+		#if MC_VER < MC_1_20_6
 		ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class,
 				() -> new ConfigScreenHandler.ConfigScreenFactory((client, parent) -> GetConfigScreen.getScreen(parent)));
+		#else
+		ModLoadingContext.get().registerExtensionPoint(IConfigScreenFactory.class,
+				// TODO fix potential null pointer
+				() -> (client, parent) -> GetConfigScreen.getScreen(parent));
+		#endif
 	}
 	
 	@Override
 	protected void subscribeRegisterCommandsEvent(Consumer<CommandDispatcher<CommandSourceStack>> eventHandler)
 	{
-		NeoForge.EVENT_BUS.addListener((RegisterCommandsEvent e) ->  { eventHandler.accept(e.getDispatcher()); });
+		NeoForge.EVENT_BUS.addListener((RegisterCommandsEvent e) -> eventHandler.accept(e.getDispatcher()));
 	}
 	
 	@Override
@@ -89,7 +100,7 @@ public class NeoforgeMain extends AbstractModInitializer
 	@Override
 	protected void subscribeServerStartingEvent(Consumer<MinecraftServer> eventHandler)
 	{
-		NeoForge.EVENT_BUS.addListener((ServerStartingEvent e) -> { eventHandler.accept(e.getServer()); });
+		NeoForge.EVENT_BUS.addListener((ServerStartingEvent e) -> eventHandler.accept(e.getServer()));
 	}
 	
 	@Override

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeServerProxy.java

@@ -12,7 +12,6 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.LevelAccessor;
 import net.neoforged.neoforge.common.NeoForge;
-import net.neoforged.neoforge.event.TickEvent;
 import net.neoforged.neoforge.event.level.ChunkEvent;
 import net.neoforged.neoforge.event.level.LevelEvent;
 import net.neoforged.bus.api.SubscribeEvent;
@@ -20,11 +19,17 @@ import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.event.server.ServerAboutToStartEvent;
 import net.neoforged.neoforge.event.server.ServerStoppingEvent;
 
-
 import org.apache.logging.log4j.Logger;
 
 import java.util.function.Supplier;
 
+#if MC_VER < MC_1_20_6
+import net.neoforged.neoforge.event.TickEvent;
+#else
+import net.neoforged.neoforge.event.tick.ServerTickEvent;
+#endif
+
+
 public class NeoforgeServerProxy implements AbstractModInitializer.IEventProxy
 {
 	private static LevelAccessor GetEventLevel(LevelEvent e) { return e.getLevel(); }
@@ -58,7 +63,7 @@ public class NeoforgeServerProxy implements AbstractModInitializer.IEventProxy
 	// events //
 	//========//
 	
-	// ServerTickEvent (at end)
+	#if MC_VER < MC_1_20_6
 	@SubscribeEvent
 	public void serverTickEvent(TickEvent.ServerTickEvent event)
 	{
@@ -67,6 +72,13 @@ public class NeoforgeServerProxy implements AbstractModInitializer.IEventProxy
 			this.serverApi.serverTickEvent();
 		}
 	}
+	#else
+	@SubscribeEvent
+	public void serverTickEvent(ServerTickEvent.Post event)
+	{
+		this.serverApi.serverTickEvent();
+	}
+	#endif
 	
 	// ServerWorldLoadEvent
 	@SubscribeEvent

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinDynamicTexture.java

@@ -1,75 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 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.neoforge.mixins.client;
-
-
-import com.mojang.blaze3d.platform.NativeImage;
-
-import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
-import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import com.seibel.distanthorizons.common.util.ILightTextureMarker;
-
-import net.minecraft.client.renderer.texture.DynamicTexture;
-
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-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;
-
-@Mixin(DynamicTexture.class)
-public abstract class MixinDynamicTexture implements ILightTextureMarker
-{
-	/** Used to prevent accidentally using other dynamic textures as a lightmap */
-	@Unique
-	private boolean isLightTexture = false;
-	
-	@Shadow
-	#if MC_VER >= MC_1_20_4
-			(remap = false)
-	#endif
-	@Final
-	private NativeImage pixels;
-	
-	@Inject(method = "upload()V", at = @At("HEAD"))
-	public void updateLightTexture(CallbackInfo ci)
-	{
-		// since the light map is always updated on the client render thread we should be able to access the client level at the same time
-		IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
-		if (!this.isLightTexture
-			|| mc == null
-			|| mc.getWrappedClientLevel() == null
-			)
-		{
-			return;
-		}
-		
-		//ApiShared.LOGGER.info("Lightmap update");
-		IClientLevelWrapper clientLevel = mc.getWrappedClientLevel();
-		MinecraftRenderWrapper.INSTANCE.updateLightmap(this.pixels, clientLevel);
-	}
-	
-	public void markLightTexture() { this.isLightTexture = true; }
-	
-}

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

@@ -19,23 +19,24 @@
 
 package com.seibel.distanthorizons.neoforge.mixins.client;
 
+import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 #if MC_VER < MC_1_19_4
 import com.mojang.math.Matrix4f;
 #else
+import com.seibel.distanthorizons.core.util.math.Mat4f;
+import com.seibel.distanthorizons.neoforge.NeoforgeClientProxy;
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LightTexture;
 import org.joml.Matrix4f;
 #endif
-import com.seibel.distanthorizons.common.rendering.SeamlessOverdraw;
 import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
-import com.seibel.distanthorizons.coreapi.util.math.Mat4f;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.client.renderer.RenderType;
@@ -68,30 +69,6 @@ public class MixinLevelRenderer
 			(remap = false)
 	#endif
 	private ClientLevel level;
-	@Unique
-	private static float previousPartialTicks = 0;
-	
-	// TODO: Is there any reason why this is here? Can it be deleted?
-	public MixinLevelRenderer()
-	{
-		throw new NullPointerException("Null cannot be cast to non-null type.");
-	}
-	
-	#if MC_VER < MC_1_17_1
-	@Inject(at = @At("RETURN"), method = "renderSky(Lcom/mojang/blaze3d/vertex/PoseStack;F)V")
-	private void renderSky(PoseStack matrixStackIn, float partialTicks, CallbackInfo callback)
-	#else
-	@Inject(method = "renderClouds", at = @At("HEAD"), cancellable = true)
-	public void renderClouds(PoseStack poseStack, Matrix4f projectionMatrix, float partialTicks, double cameraX, double cameraY, double cameraZ, CallbackInfo ci) 
-	#endif
-	{
-		// FIXME this is only called when clouds are enabled and vanilla render distance is far enough
-		//  not having the partial ticks doesn't appear to be critical currently, but might cause weird issues down the line
-		
-		// get the partial ticks since renderBlockLayer doesn't
-		// have access to them
-		previousPartialTicks = partialTicks;
-	}
 	
 	
 	#if MC_VER < MC_1_17_1
@@ -109,14 +86,18 @@ public class MixinLevelRenderer
 			method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLorg/joml/Matrix4f;)V",
 			cancellable = true)
 	private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double cameraXBlockPos, double cameraYBlockPos, double cameraZBlockPos, Matrix4f projectionMatrix, CallbackInfo callback)
-    #else
+    #elif MC_VER < MC_1_20_6
     @Inject(at = @At("HEAD"),
             method = "Lnet/minecraft/client/renderer/LevelRenderer;renderSectionLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLorg/joml/Matrix4f;)V",
             cancellable = true)
     private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double camX, double camY, double camZ, Matrix4f projectionMatrix, CallbackInfo callback)
+	#else
+	@Inject(at = @At("HEAD"),
+			method = "Lnet/minecraft/client/renderer/LevelRenderer;renderSectionLayer(Lnet/minecraft/client/renderer/RenderType;DDDLorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V",
+			cancellable = true)
+	private void renderChunkLayer(RenderType renderType, double x, double y, double z, Matrix4f projectionMatrix, Matrix4f frustumMatrix, CallbackInfo callback)
 	#endif
 	{
-		// get MC's model view and projection matrices
 		#if MC_VER == MC_1_16_5
 		// get the matrices from the OpenGL fixed pipeline
 		float[] mcProjMatrixRaw = new float[16];
@@ -126,36 +107,33 @@ public class MixinLevelRenderer
 		
 		Mat4f mcModelViewMatrix = McObjectConverter.Convert(matrixStackIn.last().pose());
 		
-		#else
+		#elif MC_VER <= MC_1_20_4
 		// get the matrices directly from MC
 		Mat4f mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose());
 		Mat4f mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
+		#else
+		// get the matrices from neoForge's render event.
+		// We can't call the renderer there because we don't have access to the level that's being rendered
+		Mat4f mcModelViewMatrix = NeoforgeClientProxy.currentModelViewMatrix;
+		Mat4f mcProjectionMatrix = NeoforgeClientProxy.currentProjectionMatrix;
 		#endif
 		
 		
+		float frameTime;
+		#if MC_VER < MC_1_21
+		frameTime = Minecraft.getInstance().getFrameTime();
+		#else
+		frameTime = Minecraft.getInstance().getTimer().getRealtimeDeltaTicks();
+		#endif
 		
 		// only render before solid blocks
 		if (renderType.equals(RenderType.solid()))
 		{
-			ClientApi.INSTANCE.renderLods(ClientLevelWrapper.getWrapper(level), mcModelViewMatrix, mcProjectionMatrix, Minecraft.getInstance().getFrameTime());
+			ClientApi.INSTANCE.renderLods(ClientLevelWrapper.getWrapper(this.level), mcModelViewMatrix, mcProjectionMatrix, frameTime);
-			
-			// experimental proof-of-concept option
-			if (Config.Client.Advanced.Graphics.AdvancedGraphics.seamlessOverdraw.get())
-			{
-				float[] matrixFloatArray = SeamlessOverdraw.overwriteMinecraftNearFarClipPlanes(mcProjectionMatrix, previousPartialTicks);
-				
-				#if MC_VER == MC_1_16_5
-				SeamlessOverdraw.applyLegacyProjectionMatrix(matrixFloatArray);
-				#elif MC_VER < MC_1_19_4
-				projectionMatrix.load(FloatBuffer.wrap(matrixFloatArray));
-				#else
-				projectionMatrix.set(matrixFloatArray);
-				#endif
-			}
 		} 
 		else if (renderType.equals(RenderType.translucent())) 
 		{
-			ClientApi.INSTANCE.renderDeferredLods(ClientLevelWrapper.getWrapper(level), mcModelViewMatrix, mcProjectionMatrix, Minecraft.getInstance().getFrameTime());
+			ClientApi.INSTANCE.renderDeferredLods(ClientLevelWrapper.getWrapper(this.level), mcModelViewMatrix, mcProjectionMatrix, frameTime);
 		}
 		
 		if (Config.Client.Advanced.Debugging.lodOnlyMode.get())
@@ -170,12 +148,16 @@ public class MixinLevelRenderer
 	#elif MC_VER < MC_1_20_1
 	@Inject(at = @At(value = "TAIL", target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runUpdates(IZZ)I"), method = "renderLevel")
 	public void callAfterRunUpdates(PoseStack poseStack, float partialTick, long finishNanoTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f projectionMatrix, CallbackInfo ci)
-	#else
+	#elif MC_VER < MC_1_20_6
 	@Inject(at = @At(value = "TAIL", target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runLightUpdates()I"), method = "renderLevel")
 	private void callAfterRunUpdates(PoseStack poseStack, float partialTick, long finishNanoTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightTexture lightTexture, Matrix4f projectionMatrix, CallbackInfo ci)
+	#else
+	@Inject(at = @At(value = "TAIL", target = "Lnet/minecraft/world/level/lighting/LevelLightEngine;runLightUpdates()I"), method = "renderLevel")
+	private void callAfterRunUpdates(CallbackInfo ci) 
 	#endif
 	{
 		ChunkWrapper.syncedUpdateClientLightStatus();
 	}
 	
+	
 }

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLightTexture.java

@@ -20,10 +20,13 @@
 package com.seibel.distanthorizons.neoforge.mixins.client;
 
 
-import com.seibel.distanthorizons.common.util.ILightTextureMarker;
+import com.mojang.blaze3d.platform.NativeImage;
 
+import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import net.minecraft.client.renderer.LightTexture;
-import net.minecraft.client.renderer.texture.DynamicTexture;
 
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -36,13 +39,21 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public class MixinLightTexture
 {
 	@Shadow
-	#if MC_VER >= MC_1_20_4
-			(remap = false)
-	#endif
 	@Final
-	private DynamicTexture lightTexture;
+	private NativeImage lightPixels;
 	
-	@Inject(method = "<init>", at = @At("RETURN"))
+	
-	public void markLightTexture(CallbackInfo ci) { ((ILightTextureMarker) this.lightTexture).markLightTexture(); }
+	@Inject(method = "updateLightTexture(F)V", at = @At("RETURN"))
+	public void updateLightTexture(float partialTicks, CallbackInfo ci)
+	{
+		IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
+		if (mc == null || mc.getWrappedClientLevel() == null)
+		{
+			return;
+		}
+		
+		IClientLevelWrapper clientLevel = mc.getWrappedClientLevel();
+		MinecraftRenderWrapper.INSTANCE.updateLightmap(this.lightPixels, clientLevel);
+	}
 	
 }

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinMinecraft.java

@@ -1,6 +1,6 @@
 package com.seibel.distanthorizons.neoforge.mixins.client;
 
-import com.seibel.distanthorizons.api.enums.config.EUpdateBranch;
+import com.seibel.distanthorizons.api.enums.config.EDhApiUpdateBranch;
 import com.seibel.distanthorizons.common.wrappers.gui.updater.UpdateModScreen;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
@@ -8,6 +8,7 @@ import com.seibel.distanthorizons.core.jar.installer.GitlabGetter;
 import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter;
 import com.seibel.distanthorizons.core.jar.updater.SelfUpdater;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants;
+import com.seibel.distanthorizons.coreapi.ModInfo;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.TitleScreen;
 import org.spongepowered.asm.mixin.Mixin;
@@ -24,41 +25,44 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(Minecraft.class)
 public class MixinMinecraft
 {
-	#if MC_VER < MC_1_20_2
+	// commented out due to a bug with Manifold and having nested preprocessors
-	#if MC_VER == MC_1_20_1
+	// and since neoforge doesn't work for anything before MC 1.20.6 anyway it doesn't need to be included
-	@Redirect(
-			method = "Lnet/minecraft/client/Minecraft;setInitialScreen(Lcom/mojang/realmsclient/client/RealmsClient;Lnet/minecraft/server/packs/resources/ReloadInstance;Lnet/minecraft/client/main/GameConfig$QuickPlayData;)V",
-			at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;setScreen(Lnet/minecraft/client/gui/screens/Screen;)V")
-	)
-	public void onOpenScreen(Minecraft instance, Screen guiScreen)
-	{
-	#else
-	@Redirect(
-			method = "<init>(Lnet/minecraft/client/main/GameConfig;)V",
-			at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;setScreen(Lnet/minecraft/client/gui/screens/Screen;)V")
-	)
-	public void onOpenScreen(Minecraft instance, Screen guiScreen)
-	{
-	#endif
-		if (!Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get()) // Don't do anything if the user doesn't want it
-		{
-			instance.setScreen(guiScreen); // Sets the screen back to the vanilla screen as if nothing ever happened
-			return;
-		}
 	
-		if (SelfUpdater.onStart())
+	//#if MC_VER < MC_1_20_2
-		{
+	//#if MC_VER == MC_1_20_1
-			instance.setScreen(new UpdateModScreen(
+	//@Redirect(
-					new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons
+	//		method = "Lnet/minecraft/client/Minecraft;setInitialScreen(Lcom/mojang/realmsclient/client/RealmsClient;Lnet/minecraft/server/packs/resources/ReloadInstance;Lnet/minecraft/client/main/GameConfig$QuickPlayData;)V",
-					(Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()): GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha"))
+	//		at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;setScreen(Lnet/minecraft/client/gui/screens/Screen;)V")
-			));
+	//)
-		}
+	//public void onOpenScreen(Minecraft instance, Screen guiScreen)
-		else
+	//{
-		{
+	//#else
-			instance.setScreen(guiScreen); // Sets the screen back to the vanilla screen as if nothing ever happened
+	//@Redirect(
-		}
+	//		method = "<init>(Lnet/minecraft/client/main/GameConfig;)V",
-	}
+	//		at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;setScreen(Lnet/minecraft/client/gui/screens/Screen;)V")
-	#endif
+	//)
+	//public void onOpenScreen(Minecraft instance, Screen guiScreen)
+	//{
+	//#endif
+	//	if (!Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get()) // Don't do anything if the user doesn't want it
+	//	{
+	//		instance.setScreen(guiScreen); // Sets the screen back to the vanilla screen as if nothing ever happened
+	//		return;
+	//	}
+	//	
+	//	if (SelfUpdater.onStart())
+	//	{
+	//		instance.setScreen(new UpdateModScreen(
+	//				new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons
+	//				(Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()): GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha"))
+	//		));
+	//	}
+	//	else
+	//	{
+	//		instance.setScreen(guiScreen); // Sets the screen back to the vanilla screen as if nothing ever happened
+	//	}
+	//}
+	//#endif
 	
 	#if MC_VER >= MC_1_20_2
 	@Redirect(
@@ -72,11 +76,23 @@ public class MixinMinecraft
 				&& SelfUpdater.onStart()
 		)
 		{
-			runnable = () -> {
+			runnable = () -> 
+			{
+				String versionId;
+				EDhApiUpdateBranch updateBranch = EDhApiUpdateBranch.convertAutoToStableOrNightly(Config.Client.Advanced.AutoUpdater.updateBranch.get());
+				if (updateBranch == EDhApiUpdateBranch.STABLE)
+				{
+					versionId = ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion());
+				}
+				else
+				{
+					versionId = GitlabGetter.INSTANCE.projectPipelines.getFirst().get("sha");
+				}
+				
 				Minecraft.getInstance().setScreen(new UpdateModScreen(
 						// TODO: Change to runnable, instead of tittle screen
 						new TitleScreen(false), // We don't want to use the vanilla title screen as it would fade the buttons
-						(Config.Client.Advanced.AutoUpdater.updateBranch.get() == EUpdateBranch.STABLE ? ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()) : GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha"))
+						versionId
 				));
 			};
 		}

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinOptionsScreen.java

@@ -23,7 +23,6 @@ import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen;
 import com.seibel.distanthorizons.common.wrappers.gui.TexturedButtonWidget;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.core.config.Config;
-import net.minecraft.client.gui.screens.OptionsScreen;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 #if MC_VER < MC_1_19_2
@@ -31,51 +30,127 @@ import net.minecraft.network.chat.TranslatableComponent;
 #endif
 import net.minecraft.resources.ResourceLocation;
 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;
 
 import java.util.Objects;
+import java.util.concurrent.atomic.AtomicInteger;
+
+#if MC_VER >= MC_1_20_6
+import net.minecraft.client.gui.layouts.LinearLayout;
+import net.minecraft.client.gui.layouts.HeaderAndFooterLayout;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Shadow;
+#endif
+
+#if MC_VER < MC_1_21
+import net.minecraft.client.gui.screens.OptionsScreen;
+#else
+import net.minecraft.client.gui.screens.options.OptionsScreen;
+#endif
+
 
 /**
  * Adds a button to the menu to goto the config
  *
  * @author coolGi
- * @version 12-02-2021
+ * @version 2024-5-20
  */
 @Mixin(OptionsScreen.class)
 public class MixinOptionsScreen extends Screen
 {
-	// Get the texture for the button
+	/** Texture used for the config opening button */
-	private static final ResourceLocation ICON_TEXTURE = new ResourceLocation(ModInfo.ID, "textures/gui/button.png");
+	@Unique
-	protected MixinOptionsScreen(Component title)
+	private static final ResourceLocation ICON_TEXTURE =
-	{
+		#if MC_VER < MC_1_21
-		super(title);
+		new ResourceLocation(ModInfo.ID, "textures/gui/button.png");
-	}
+		#else
+			ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "textures/gui/button.png");
+		#endif
 	
-	@Inject(at = @At("HEAD"), method = "init")
+	
+	@Unique
+	private TexturedButtonWidget optionsButton = null;
+	
+	#if MC_VER >= MC_1_20_6
+	@Shadow
+	@Final
+	protected HeaderAndFooterLayout layout;
+	#endif
+	
+	
+	
+	//==============//
+	// constructors //
+	//==============//
+	
+	protected MixinOptionsScreen(Component title) { super(title); }
+	
+	@Inject(at = @At("RETURN"), method = "init")
 	private void lodconfig$init(CallbackInfo ci)
 	{
 		if (Config.Client.optionsButton.get())
-			this. #if MC_VER < MC_1_17_1 addButton #else addRenderableWidget #endif
+		{
-					(new TexturedButtonWidget(
+			#if MC_VER < MC_1_17_1
+			this.addButton(this.getOptionsButton());
+			#elif MC_VER < MC_1_20_6
+			this.addRenderableWidget(this.getOptionsButton());
+			#else
+			
+			// add the button so it's rendered 
+			this.addRenderableWidget(this.getOptionsButton());
+			
+			// add the button to the correct location in the UI
+			// TODO is there a better way to do this instead of using access transformers to inject into the exact UI elements?
+			LinearLayout layout = (LinearLayout) this.layout.headerFrame.children.getFirst().child;
+			
+			// determine how wide the other option buttons are so we can put our botton to the left of them all
+			AtomicInteger width = new AtomicInteger(0);
+			layout.visitChildren(x -> width.addAndGet(x.getWidth()));
+			width.addAndGet(-10); // padding between the DH button and the FOV slider
+			
+			layout.wrapped.addChild(this.getOptionsButton(), 1, 2, (settings) -> settings.paddingLeft(width.get() * -1));
+			layout.arrangeElements();
+			
+		    #endif
+		}
+	}
+	
+	
+	
+	//================//
+	// helper methods //
+	//================//
+	
+	@Unique
+	public TexturedButtonWidget getOptionsButton()
+	{
+		if (this.optionsButton == null)
+		{
+			this.optionsButton
+					= new TexturedButtonWidget(
 					// Where the button is on the screen
 					this.width / 2 - 180, this.height / 6 - 12,
 					// Width and height of the button
 					20, 20,
-							// Offset
+					// texture UV Offset
 					0, 0,
 					// Some textuary stuff
 					20, ICON_TEXTURE, 20, 40,
 					// Create the button and tell it where to go
 					// For now it goes to the client option by default
-							(buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(GetConfigScreen.getScreen(this)),
+					(buttonWidget) -> Objects.requireNonNull(this.minecraft).setScreen(GetConfigScreen.getScreen(this)),
 					// Add a title to the button
                     #if MC_VER < MC_1_19_2
-							new TranslatableComponent(ModInfo.ID + ".title")));
+					new TranslatableComponent(ModInfo.ID + ".title"));
                     #else
-							Component.translatable(ModInfo.ID + ".title")));
+					Component.translatable(ModInfo.ID + ".title"));
                     #endif
 		}
 		
+		return this.optionsButton;
+	}
+	
 }

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinWorldUpgrader.java

@@ -1,126 +0,0 @@
-package com.seibel.distanthorizons.neoforge.mixins.client;
-
-import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper;
-
-#if FALSE
-@Mixin(WorldUpgrader.class)
-public class MixinWorldUpgrader {
-    static class FakeLevelWrapper implements IServerLevelWrapper {
-        private Path saveFolder;
-        private LevelStem stem;
-        private DimensionType dimension;
-        private DimensionTypeWrapper dimensionTypeWrapper;
-
-        public FakeLevelWrapper(LevelStorageSource.LevelStorageAccess storage, WorldGenSettings gen, ResourceKey<Level> dim) {
-            saveFolder = storage.getDimensionPath(dim);
-            stem = gen.dimensions().getOrThrow(WorldGenSettings.levelToLevelStem(dim));
-            dimension = stem.typeHolder().value();
-            dimensionTypeWrapper = DimensionTypeWrapper.getDimensionTypeWrapper(dimension);
-        }
-
-        @Override
-        public EDhApiLevelType getLevelType() {
-            return EDhApiLevelType.SERVER_LEVEL;
-        }
-
-        @Override
-        public IDhApiDimensionTypeWrapper getDimensionType() {
-            return dimensionTypeWrapper;
-        }
-
-        @Override
-        public int getBlockLight(int x, int y, int z) {
-            return 0;
-        }
-
-        @Override
-        public int getSkyLight(int x, int y, int z) {
-            return 0;
-        }
-
-        @Override
-        public boolean hasCeiling() {
-            return dimension.hasCeiling();
-        }
-
-        @Override
-        public boolean hasSkyLight() {
-            return dimension.hasSkyLight();
-        }
-
-        @Override
-        public int getHeight() {
-            return dimension.height();
-        }
-
-        @Override
-        public int getMinHeight() {
-            return dimension.minY();
-        }
-
-        @Override
-        public boolean hasChunkLoaded(int chunkX, int chunkZ) {
-            return false;
-        }
-
-        @Override
-        public IBlockStateWrapper getBlockState(DhBlockPos pos) {
-            return BlockStateWrapper.AIR;
-        }
-
-        @Override
-        public IBiomeWrapper getBiome(DhBlockPos pos) {
-            throw new UnsupportedOperationException("Not implemented yet");
-        }
-
-        @Override
-        public Object getWrappedMcObject() {
-            return null;
-        }
-
-        @Nullable
-        @Override
-        public IClientLevelWrapper tryGetClientLevelWrapper() {
-            return null;
-        }
-
-        @Override
-        public File getSaveFolder() {
-            return saveFolder.toFile();
-        }
-    }
-
-    @Unique
-    private DhServerLevel dhServerLevel;
-    @Unique
-    private FakeLevelWrapper fakeLevelWrapper;
-    @Unique
-    public LocalSaveStructure saveStructure;
-
-    @Shadow @Final
-    private DimensionDataStorage overworldDataStorage;
-    @Shadow @Final
-    private LevelStorageSource.LevelStorageAccess levelStorage;
-    @Shadow @Final
-    private WorldGenSettings worldGenSettings;
-
-    @Inject(method = "Lnet/minecraft/util/worldupdate/WorldUpgrader;work()V",
-            at = @At(value = "INVOKE")
-    )
-    private void initWorldUpgrade() {
-        saveStructure = new LocalSaveStructure();
-    }
-
-    @Inject(method = "Lnet/minecraft/util/worldupdate/WorldUpgrader;work()V",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/util/worldupdate/WorldUpgrader;getAllChunkPos(Lnet/minecraft/resources/ResourceKey;)Ljava/util/List;", shift = At.Shift.AFTER),
-            locals = LocalCapture.CAPTURE_FAILSOFT
-    )
-    private void startWorldUpgrade(CallbackInfo info, ResourceKey resourceKey) {
-        ResourceKey<Level> key = resourceKey;
-        fakeLevelWrapper = new FakeLevelWrapper(levelStorage, worldGenSettings, key);
-        dhServerLevel = new DhServerLevel(saveStructure, fakeLevelWrapper);
-    }
-
-
-}
-#endif

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/server/unsafe/MixinThreadingDetector.java

@@ -1,59 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 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.neoforge.mixins.server.unsafe;
-
-import org.spongepowered.asm.mixin.Mixin;
-#if MC_VER >= MC_1_18_2
-
-import net.minecraft.util.ThreadingDetector;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import java.util.concurrent.Semaphore;
-
-/**
- * Why does this exist? But okay! (Will be probably removed when the experimental generator is done)
- * FIXME: Recheck this // STILL check this
- */
-@Mixin(ThreadingDetector.class)
-public class MixinThreadingDetector
-{
-	@Mutable
-	@Shadow
-	private Semaphore lock;
-	
-	@Inject(method = "<init>", at = @At("RETURN"))
-	private void setSemaphore(CallbackInfo ci)
-	{
-		this.lock = new Semaphore(2);
-	}
-	
-}
-
-#else
-
-import net.minecraft.world.level.chunk.ChunkGenerator;
-
-@Mixin(ChunkGenerator.class)
-public class MixinThreadingDetector { }
-#endif

neoforge/src/main/resources/DistantHorizons.neoforge.mixins.json

@@ -3,7 +3,6 @@
     "minVersion": "0.8",
     "package": "com.seibel.distanthorizons.neoforge.mixins",
     "mixins": [
-        "server.unsafe.MixinThreadingDetector",
         "server.MixinUtilBackgroundThread",
         "server.MixinChunkGenerator",
         "server.MixinTFChunkGenerator"
@@ -14,7 +13,6 @@
         "client.MixinFogRenderer",
         "client.MixinGameRenderer",
         "client.MixinLevelRenderer",
-        "client.MixinDynamicTexture",
         "client.MixinLightTexture",
         "client.MixinOptionsScreen",
         "client.MixinTextureUtil"

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -24,13 +24,12 @@ issueTrackerURL = "${issues}"
     acceptableRemoteVersions = "*"
 
 # We may need this to make forge (lexforge) & neoforge work together
-#[[mixins]]
+[[mixins]]
-#    config = "DistantHorizons.neoforge.mixins.json"
+    config = "DistantHorizons.neoforge.mixins.json"
 
 [[dependencies.distanthorizons]]
     modId = "minecraft"
-    mandatory = true  # Forge syntax
+    type = "required"
-    type = "required" # Neoforge syntax
     versionRange = "${compatible_forgemc_versions}" # Where we set what version of mc it is avalible for
     ordering = "NONE"
     side = "BOTH"

settings.gradle

@@ -10,9 +10,13 @@ pluginManagement {
             url "https://maven.minecraftforge.net/"
         }
         maven {
-            name "NeoForge"
+            name "NeoForge Releases"
             url "https://maven.neoforged.net/releases/"
         }
+        maven {
+            name "NeoForge Snapshot"
+            url "https://maven.neoforged.net/snapshots/"
+        }
         maven {
             name "Architectury (Better Forge because regular Forge is annoying)" // TODO: Once we switch to NeoForge, would it's gradle work better? or will it have Forge's problems in it
             url "https://maven.architectury.dev/"
@@ -29,11 +33,11 @@ pluginManagement {
             name "ParchmentMC"
             url "https://maven.parchmentmc.org"
         }
-        maven {
+        maven { // Used for downgrading Java versions
-            url = "https://maven.wagyourtail.xyz/releases"
+            url "https://maven.wagyourtail.xyz/releases"
         }
         maven {
-            url = "https://maven.wagyourtail.xyz/snapshots"
+            url "https://maven.wagyourtail.xyz/snapshots"
         }
         mavenCentral()
         gradlePluginPortal()
@@ -43,11 +47,6 @@ pluginManagement {
     }
 }
 
-plugins {
-    // handles JVM and toolchain downloading
-    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.7.0'
-}
-
 
 
 // Throw an error and a little help message if the user forgot to clone the core sub-project

versionProperties/1.16.5.properties

@@ -21,8 +21,8 @@ fabric_api_version=0.42.0+1.16
     immersive_portals_version=
     canvas_version=
 
-    fabric_incompatibility_list={ }
+    fabric_incompatibility_list={ "iris": "*" }
-    fabric_recommend_list={ "indium": "*" }
+    fabric_recommend_list={}
 
     # Fabric mod run
     # 0 = Don't enable and don't run

versionProperties/1.17.1.properties

@@ -21,8 +21,8 @@ fabric_api_version=0.46.1+1.17
     immersive_portals_version=
     canvas_version=
 
-    fabric_incompatibility_list={ }
+    fabric_incompatibility_list={ "iris": "*" }
-    fabric_recommend_list={ "indium": "*" }
+    fabric_recommend_list={}
 
     # Fabric mod run
     # 0 = Don't enable and don't run

versionProperties/1.18.2.properties

@@ -22,8 +22,8 @@ fabric_api_version=0.76.0+1.18.2
     immersive_portals_version=v1.4.11-1.18
     canvas_version=mc118:1.0.2616
 
-    fabric_incompatibility_list={ }
+    fabric_incompatibility_list={ "iris": "*" }
-    fabric_recommend_list={ "indium": "*" }
+    fabric_recommend_list={}
 
     # Fabric mod run
     # 0 = Don't enable and don't run

versionProperties/1.19.2.properties

@@ -21,8 +21,8 @@ fabric_api_version=0.76.1+1.19.2
     immersive_portals_version=
     canvas_version=mc119-1.0.2480
 
-    fabric_incompatibility_list={ }
+    fabric_incompatibility_list={ "iris": "*" }
-    fabric_recommend_list={ "indium": "*" }
+    fabric_recommend_list={}
 
     # Fabric mod run
     # 0 = Don't enable and don't run

versionProperties/1.19.4.properties

@@ -20,8 +20,8 @@ fabric_api_version=0.87.1+1.19.4
     immersive_portals_version=
     canvas_version=
     
-    fabric_incompatibility_list={ }
+    fabric_incompatibility_list={ "iris": "*" }
-    fabric_recommend_list={ "indium": "*" }
+    fabric_recommend_list={}
 
     # Fabric mod run
     # 0 = Don't enable and don't run

versionProperties/1.20.1.properties

@@ -7,7 +7,7 @@ accessWidenerVersion=1_20
 builds_for=fabric,forge
 
 # Fabric loader
-fabric_loader_version=0.14.24
+fabric_loader_version=0.15.6
 fabric_api_version=0.90.4+1.20.1
     # Fabric mod versions
     modmenu_version=7.2.2
@@ -20,8 +20,8 @@ fabric_api_version=0.90.4+1.20.1
     immersive_portals_version=
     canvas_version=
     
-    fabric_incompatibility_list={ }
+    fabric_incompatibility_list={ "iris": "<=1.6.20" }
-    fabric_recommend_list={ "indium": "*" }
+    fabric_recommend_list={}
     
     # Fabric mod run
     # 0 = Don't enable and don't run

versionProperties/1.20.2.properties

@@ -7,7 +7,7 @@ accessWidenerVersion=1_20_2
 builds_for=fabric,forge
 
 # Fabric loader
-fabric_loader_version=0.14.24
+fabric_loader_version=0.15.6
 fabric_api_version=0.90.4+1.20.2
     # Fabric mod versions
     modmenu_version=8.0.0
@@ -20,8 +20,8 @@ fabric_api_version=0.90.4+1.20.2
     immersive_portals_version=
     canvas_version=
     
-    fabric_incompatibility_list={ }
+    fabric_incompatibility_list={ "iris": "<=1.6.20" }
-    fabric_recommend_list={ "indium": "*" }
+    fabric_recommend_list={}
     
     # Fabric mod run
     # 0 = Don't enable and don't run

versionProperties/1.20.4.properties

@@ -4,10 +4,11 @@ minecraft_version=1.20.4
 parchment_version=1.20.2:2023.12.10
 compatible_minecraft_versions=["1.20.3", "1.20.4"]
 accessWidenerVersion=1_20_2
-builds_for=fabric,neoforge,forge
+builds_for=fabric,forge
+# neoforge can be added once the issue with mixins has been resolved
 
 # Fabric loader
-fabric_loader_version=0.15.1
+fabric_loader_version=0.15.6
 fabric_api_version=0.91.2+1.20.4
     # Fabric mod versions
     modmenu_version=9.0.0-pre.1
@@ -20,8 +21,8 @@ fabric_api_version=0.91.2+1.20.4
     immersive_portals_version=
     canvas_version=
     
-    fabric_incompatibility_list={ }
+    fabric_incompatibility_list={ "iris": "<=1.6.20" }
-    fabric_recommend_list={ "indium": "*" }
+    fabric_recommend_list={}
     
     # Fabric mod run
     # 0 = Don't enable and don't run
@@ -38,7 +39,7 @@ fabric_api_version=0.91.2+1.20.4
 
 # (Neo)Forge loader
 forge_version=49.0.30
-neoforge_version=118-beta
+neoforge_version=20.4.233
     # (Neo)Forge mod versions
     starlight_version_forge=
     terraforged_version=

versionProperties/1.20.6.properties

@@ -0,0 +1,53 @@
+# 1.20.6 version
+java_version=21
+minecraft_version=1.20.6
+parchment_version=1.20.6:2024.05.01
+compatible_minecraft_versions=["1.20.6"]
+accessWidenerVersion=1_20_6
+builds_for=fabric,neoforge
+# forge is broken due to gradle/build script issues
+
+# Fabric loader
+fabric_loader_version=0.15.10
+fabric_api_version=0.97.8+1.20.6
+    # Fabric mod versions
+    modmenu_version=10.0.0-beta.1
+    starlight_version_fabric=
+    phosphor_version_fabric=
+    lithium_version=
+    sodium_version=mc1.20.6-0.5.8
+    iris_version=1.7.0+1.20.6
+    bclib_version=
+    immersive_portals_version=
+    canvas_version=
+    
+    fabric_incompatibility_list={ "iris": "<=1.6.20" }
+    fabric_recommend_list={}
+    
+    # Fabric mod run
+    # 0 = Don't enable and don't run
+    # 1 = Can be referenced in code but doesn't run
+    # 2 = Can be referenced in code and runs in client
+    enable_starlight=0
+    enable_phosphor=0
+    enable_sodium=1
+    enable_lithium=0
+    enable_iris=1
+    enable_bclib=0
+    enable_immersive_portals=0
+    enable_canvas=0
+
+# (Neo)Forge loader
+forge_version=50.0.19
+neoforge_version=20.6.70-beta
+    # (Neo)Forge mod versions
+    starlight_version_forge=
+    terraforged_version=
+
+    # (Neo)Forge mod run
+    # 0 = Don't enable and don't run
+    # 1 = Can be referenced in code but doesn't run
+    # 2 = Can be referenced in code and runs in client
+    enable_starlight_forge=0
+    enable_terraforged=0
+    enable_terrafirmacraft=0

versionProperties/1.21.properties

@@ -0,0 +1,53 @@
+# 1.21 version
+java_version=21
+minecraft_version=1.21
+parchment_version=1.20.6:2024.05.01
+compatible_minecraft_versions=["1.21.0"]
+accessWidenerVersion=1_20_6
+builds_for=fabric,neoforge
+# forge is broken due to gradle/build script issues
+
+# Fabric loader
+fabric_loader_version=0.15.11
+fabric_api_version=0.100.1+1.21
+    # Fabric mod versions
+    modmenu_version=11.0.0-beta.1
+    starlight_version_fabric=
+    phosphor_version_fabric=
+    lithium_version=
+    sodium_version=mc1.21-0.5.9
+    iris_version=1.7.1+1.21
+    bclib_version=
+    immersive_portals_version=
+    canvas_version=
+    
+    fabric_incompatibility_list={ "iris": "<=1.6.20" }
+    fabric_recommend_list={}
+    
+    # Fabric mod run
+    # 0 = Don't enable and don't run
+    # 1 = Can be referenced in code but doesn't run
+    # 2 = Can be referenced in code and runs in client
+    enable_starlight=0
+    enable_phosphor=0
+    enable_sodium=1
+    enable_lithium=0
+    enable_iris=1
+    enable_bclib=0
+    enable_immersive_portals=0
+    enable_canvas=0
+
+# (Neo)Forge loader
+forge_version=50.0.19
+neoforge_version=21.0.4-beta
+    # (Neo)Forge mod versions
+    starlight_version_forge=
+    terraforged_version=
+
+    # (Neo)Forge mod run
+    # 0 = Don't enable and don't run
+    # 1 = Can be referenced in code but doesn't run
+    # 2 = Can be referenced in code and runs in client
+    enable_starlight_forge=0
+    enable_terraforged=0
+    enable_terrafirmacraft=0