Reduce getWorldBlockLightPosList() work for 1.12.2 by skipping empty chunk sections

Fixes !1262

.dockerignore

@@ -1,19 +0,0 @@
-**/.git
-**/.gitlab
-**/.cache
-
-buildAllJars
-
-**/_Misc Files
-*.bat
-*.md
-*.sh
-*.txt
-
-coreSubProjects/*.md
-coreSubProjects/*.txt
-
-**/.gitignore
-**/.gitattributes
-**/.gitlab-cy.yml
-**/.gitmodules

.gitignore

@@ -25,6 +25,8 @@ hs_err_pid*
 Merged/
 # Folder created by the buildAll scripts
 buildAllJars/
+_buildAllJars/
+_buildWorkers/
 
 relocate_natives/.venv/
 relocate_natives/__pycache__/

.gitlab-ci.yml

@@ -1,9 +1,10 @@
 # use Eclipse's JDK
 # The ci should always use a unix(-like) OS to work
-image: eclipse-temurin:21
+image: eclipse-temurin:25
 
 # all stages need to be defined here
 stages:
+  - translations
   - build
   - api
   - pages
@@ -32,22 +33,31 @@ variables:
 
 build:
   stage: build
+  needs:
+    - job: translations
+      artifacts: true
   parallel:
     matrix:
       - MC_VER: [
+      "26.1.2",
       "1.21.11", "1.21.10", "1.21.9", "1.21.8", "1.21.6", "1.21.5", "1.21.4", "1.21.3", "1.21.1", 
       "1.20.6", "1.20.4", "1.20.2", "1.20.1", 
       "1.19.4", "1.19.2",
       "1.18.2", 
       "1.17.1", 
-      "1.16.5"
+      "1.16.5",
+      "1.12.2"
       ]
+  before_script:
+    # MC 1.12.2 needs both JDK 25 (for unimined) and JDK 8 (for MC 1.12)
+    # hopefully downloading the JDK 8 like this will solve that problem?
+    - apt-get update -q 
+    - apt-get install -y openjdk-8-jdk
   script:
     # this both runs the unit tests and assembles the code
     - ./gradlew clean -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
     - ./gradlew build -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
-    - ./gradlew mergeJars -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
+    - cp ./fabric/build/libs/* ./forge/build/libs/* ./neoforge/build/libs/* ./build/forgix/* . || true
-    - cp ./fabric/build/libs/* ./forge/build/libs/* ./neoforge/build/libs/* ./build/merged/* . || true
   artifacts:
     name: "NightlyBuild_${MC_VER}-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
     paths:
@@ -101,3 +111,17 @@ pages:
       - public
   allow_failure: false
   extends: .build_java
+
+translations:
+  stage: translations
+  needs: []
+  image: crowdin/cli:latest
+  script:
+    - if [ "$CI_COMMIT_BEFORE_SHA" = "0000000000000000000000000000000000000000" ] || git diff --name-only "$CI_COMMIT_BEFORE_SHA" "$CI_COMMIT_SHA" -- coreSubProjects/core/src/main/resources/assets/distanthorizons/lang | grep -q .; then crowdin upload sources; fi
+    - crowdin download --export-only-approved --skip-untranslated-files
+    - for f in coreSubProjects/core/src/main/resources/assets/distanthorizons/lang/*.json; do [ -e "$f" ] || continue; sed -i 's/\\\\n/\\n/g' "$f"; n="$(basename "$f" | tr '[:upper:]' '[:lower:]')"; [ "$(basename "$f")" = "$n" ] || mv "$f" "$(dirname "$f")/$n"; done
+  artifacts:
+    paths:
+      - coreSubProjects/core/src/main/resources/assets/distanthorizons/lang/**
+    expire_in: 1 day
+    when: always

.mailmap

@@ -0,0 +1,16 @@
+# See mailmap docs: https://git-scm.com/docs/gitmailmap
+# Test with git shortlog --summary --email
+# Keep sorted for easier editing and smaller diffs
+
+Ada Aster <an.ada.poirier@gmail.com>
+CodeF53 <fseusb@gmail.com> <37855219+CodeF53@users.noreply.github.com>
+coolGi <me@coolgi.dev> <sasanaps@hotmail.com>
+James Seibel <jeseibel@gondtc.com> <jseibel@vertsys.com>
+Morippi <leoleo97@libero.it> <leoloe97@libero.it>
+Morippi <leoleo97@libero.it> <Morippi>
+Ran <43445785+Ran-Mewo@users.noreply.github.com> <10044908-_Ran@users.noreply.gitlab.com>
+Ran <43445785+Ran-Mewo@users.noreply.github.com> <43445785+Ran-Mewo@users.noreply.github.com>
+Ran <43445785+Ran-Mewo@users.noreply.github.com> <43445785+RanCraftPlayz@users.noreply.github.com>
+TomTheFurry <tomlee92502@yahoo.com>
+TomTheFurry <tomlee92502@yahoo.com> <46843632+TomTheFurry@users.noreply.github.com>
+Yeshi <yeshi@newengine.org>

.run/Fabric Client & Server.run.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Fabric Client &amp; Server" type="CompoundRunConfigurationType">
-    <toRun name="Fabric Client (:fabric)" type="Application" />
+    <toRun name="distant-horizons [fabric:runClient]" type="GradleRunConfiguration" />
-    <toRun name="Fabric Server (:fabric)" type="Application" />
+    <toRun name="distant-horizons [fabric:runServer]" type="GradleRunConfiguration" />
     <method v="2" />
   </configuration>
 </component>

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

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

Dockerfile

@@ -1,12 +0,0 @@
-FROM eclipse-temurin:17-jdk
-
-WORKDIR /home/build/
-COPY ./gradlew .
-RUN chmod +x ./gradlew
-CMD echo "\r========== [CLEAN: $MC_VER] ==========" && \
-    ./gradlew clean -PmcVer="$MC_VER" --gradle-user-home .gradle-cache/ && \
-    echo "\r========== [BUILD: $MC_VER] ==========" && \
-    ./gradlew build -PmcVer="$MC_VER" --gradle-user-home .gradle-cache/ && \
-    echo "\r========== [MERGE: $MC_VER] ==========" && \
-    ./gradlew mergeJars -PmcVer="$MC_VER" --gradle-user-home .gradle-cache/ && \
-    echo "\r========== [DONE:  $MC_VER] =========="

Readme.md

@@ -12,91 +12,18 @@ Below is a video demonstrating the system:
 
 <a href="https://youtu.be/SxQdbtjGEsc" target="_blank">![Distant Horizons - Alpha 2.0](https://i.ytimg.com/vi/SxQdbtjGEsc/hqdefault.jpg)</a>
 
-<br>
+## Translations
-
-## Minecraft and Library Versions
-
-### This branch supports the following versions of Minecraft:
-
-#### 1.20.4, 1.20.3 (Default)
-Fabric: 0.15.1\
-Fabric API: 0.91.2+1.20.4\
-Forge: 49.0.30\
-NeoForge: 118-beta\
-Parchment: 1.20.2:2023.12.10\
-Modmenu: 9.0.0-pre.1
-
-#### 1.20.2
-Fabric: 0.14.24\
-Fabric API: 0.90.4+1.20.2\
-Forge: 48.0.13\
-Parchment: 1.20.1:2023.09.03\
-Modmenu: 8.0.0
-
-#### 1.20.1, 1.20
-Fabric: 0.14.24\
-Fabric API: 0.90.4+1.20.1\
-Forge: 47.2.1\
-Parchment: 1.20.1:2023.09.03\
-Modmenu: 7.2.2
-
-#### 1.19.4
-Fabric: 0.14.24\
-Fabric API: 0.87.1+1.19.4\
-Forge: 45.2.4\
-Parchment: 1.19.4:2023.06.26\
-Modmenu: 6.3.1
-
-#### 1.19.2
-Fabric: 0.14.24\
-Fabric API: 0.76.1+1.19.2\
-Forge: 43.3.2\
-Parchment: 1.19.2:2022.11.27\
-Modmenu: 4.2.0-beta.2
-
-#### 1.18.2
-Fabric: 0.14.24\
-Fabric API: 0.76.0+1.18.2\
-Forge: 40.2.10\
-Parchment: 1.18.2:2022.11.06\
-Modmenu: 3.2.5
-
-#### 1.17.1, 1.17
-Fabric: 0.14.24\
-Fabric API: 0.46.1+1.17\
-Forge: 37.1.1\
-Parchment: 1.17.1:2021.12.12\
-Modmenu: 2.0.14
-
-#### 1.16.5, 1.16.4
-Fabric: 0.14.24\
-Fabric API: 0.42.0+1.16\
-Forge: 36.2.39\
-Parchment: 1.16.5:2022.03.06\
-Modmenu: 1.16.22
-
-### Versions no longer supported
-- 1.18.1, 1.18
-- 1.19.1, 1.19
-- 1.19.3
-
-<br>
-
-### Plugin and Library versions
-
-Gradle: 8.5\
-Fabric loom: 1.4-SNAPSHOT\
-Architectury loom (Forge gradle replacement): 1.4-SNAPSHOT\
-Sponge vanilla gradle: 0.2.1-SNAPSHOT\
-Java Preprocessor plugin: Manifold Preprocessor
 
+[![Crowdin](https://badges.crowdin.net/distant-horizons/localized.svg)](https://crowdin.com/project/distant-horizons)\
+Crowdin Project: [Distant Horizons](https://crowdin.com/project/distant-horizons)\
+Guidelines: [translations.md](translations.md)
 <br>
 
 ## Source Code Installation
 
 ### Prerequisites
 
-* A Java Development Kit (JDK) for Java 17 (recommended) or newer. <br>
+* A Java Development Kit (JDK) for Java 25 (recommended) or newer. <br>
   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.
@@ -104,15 +31,10 @@ Java Preprocessor plugin: Manifold Preprocessor
 
 **If using IntelliJ:**
 1. Install the Manifold plugin
+   - https://plugins.jetbrains.com/plugin/10057-manifold-ij
 2. Open IDEA and import the build.gradle
 3. Refresh the Gradle project in IDEA if required
 
-**If using Eclipse: (Note that Eclipse doesn't support Manifold's preprocessor!)**
-1. Run the command: `./gradlew geneclipseruns`
-2. Run the command: `./gradlew eclipse`
-3. Make sure eclipse has the JDK 17 installed. (This is needed so that eclipse can run minecraft)
-4. Import the project into eclipse
-
 <br>
 
 ## Switching Versions
@@ -127,72 +49,42 @@ In IntelliJ, you will also need to do a gradle sync if it didn't happen automati
 ## Compiling
 
 Prerequisites:
-- JDK 17 or newer
+- JDK 25 or newer
-
-From the File Explorer:
-1. Download and extract the project zip
-2. Download the core from https://gitlab.com/distant-horizons-team/distant-horizons-core and extract into a folder called `coreSubProjects`
-3. Open a terminal emulator in the project folder (On Windows you can type `cmd` in the title bar)
-4. Run the commands: `./gradlew assemble` (You may need to use a `.\` on Windows)
-5. Merge the jars with `./gradlew mergeJars`
-6. The compiled jar file will be in the folder `Merged`
 
 From the command line:
 1. `git clone --recurse-submodules https://gitlab.com/distant-horizons-team/distant-horizons.git`
 2. `cd distant-horizons`
 3. `./gradlew assemble`
-4. `./gradlew mergeJars`
+5. The compiled jar file will be in the folder `\build\libs`
-5. The compiled jar file will be in the folder `Merged`
 
-Run tests with: `./gradlew test`
+From the File Explorer:
+1. Download and extract the project zip
+2. Download the core from https://gitlab.com/distant-horizons-team/distant-horizons-core and extract into a folder called `coreSubProjects`
+3. Open command prompt/terminal in the project folder
+4. Run the commands: `./gradlew assemble`
+6. The compiled jar file will be in the folder `\build\libs`
 
 >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.\
 > For example: `./gradlew assemble -PmcVer=1.18.2`
 
 <br>
 
-## Compiling with Docker
-
-`./compile <version>`
-
-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
 
-`./gradlew --refresh-dependencies` to refresh local dependencies.
-
-`./gradlew clean` to delete any compiled code.
-
-<br>
-
-## Note to self
-
-The Minecraft source code is NOT added to your workspace in an editable way. Minecraft is treated like a normal Library. Sources are there for documentation and research purposes only.
-
-Source code uses Mojang mappings & [Parchment](https://parchmentmc.org/) mappings.
-
-To generate the source code run `./gradlew genSources` <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)
-
-<br>
-
-## Other Useful commands
-
 Run the standalone jar: `./gradlew run` <br>
 Build the standalone jar: `./gradlew core:build` <br>
 Only build Fabric: `./gradlew fabric:assemble` or `./gradlew fabric:build` <br>
 Only build Forge: `./gradlew forge:assemble` or `./gradlew forge:build` <br>
 Run the Fabric client (for debugging): `./gradlew fabric:runClient` <br>
 Run the Forge client (for debugging): `./gradlew forge:runClient` <br>
+Delete all compiled code: `./gradlew clean` <br>
+Refresh local dependencies: `./gradlew --refresh-dependencies`
 
-To build all versions: `./buildAll` (all builds will end up in the `Merged` folder)
+To build all versions: `./buildAll`
 
 <br>
 
-## Open Source Acknowledgements
+## Open Source Libraries
 
 Forgix (To merge multiple mod versions into one jar) [_Formerly_ [_DHJarMerger_](https://github.com/Ran-helo/DHJarMerger)]\
 https://github.com/PacifistMC/Forgix
@@ -208,3 +100,18 @@ https://github.com/blackears/svgSalamander
 
 sqlite-jdbc\
 https://github.com/xerial/sqlite-jdbc
+
+
+## Acknowledgements
+
+Distant Horizons has been graciously provided an open source license for <a href="https://www.yourkit.com/java/profiler/">YourKit Java Profiler</a>.  
+
+> <img src="https://www.yourkit.com/images/yklogo.png">
+>
+> YourKit supports open source projects with innovative and intelligent tools
+for monitoring and profiling Java and .NET applications.
+YourKit is the creator of <a href="https://www.yourkit.com/java/profiler/">YourKit Java Profiler</a>,
+<a href="https://www.yourkit.com/dotnet-profiler/">YourKit .NET Profiler</a>,
+and <a href="https://www.yourkit.com/youmonitor/">YourKit YouMonitor</a>.
+
+

build.gradle

@@ -1,684 +1,34 @@
-import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
-import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
-import org.apache.tools.zip.ZipEntry
-
-import javax.annotation.Nonnull
-import org.apache.tools.zip.ZipOutputStream
-
-import java.util.function.Function
-import java.util.function.Predicate
-
-
 plugins {
-    id "java"
+    id 'root'
-
+    id 'io.github.pacifistmc.forgix' version '2.+'
-    // Plugin to put dependencies inside our final jar
-    id "com.github.johnrengelman.shadow" version '8.1.1' apply false
-
-    // Plugin to create merged jars
-    id "io.github.pacifistmc.forgix" version "1.3.4"
-
-    // Manifold preprocessor
-    id "systems.manifold.manifold-gradle-plugin" version "0.0.2-alpha"
-
-    // Architectury is used here only as a replacement for forge's own loom
-    id "dev.architectury.loom" version "1.13-SNAPSHOT" apply false
 }
 
+forgix {
     
-/**
+    // add the mod loaders to the end of the jar
- * Creates the list of preprocessors to use.
+    // put together in the format: "a", "a-b", "a-b-c"
- *
+    int loaderCount = 0;
- * @param mcVers array of all MC versions
+    String modLoaders = "";
- * @param mcIndex array index of the currently active MC version
+    ((String) gradle.builds_for)
- */
+        .split(",")
-def writeBuildGradlePredefine(List<String> mcVers, int mcIndex)
+        .each 
-{
+        { loader ->
-    // Build the list of preprocessors to use
+            def loaderName = loader.trim()
-    StringBuilder sb = new StringBuilder();
+            if (modLoaders != "")
+            {
+                modLoaders += "-";
+            }
             
-    sb.append("# DON'T TOUCH THIS FILE, This is handled by the build script\n");
+            modLoaders += loaderName;
 
-    
+            loaderCount++;
-    for (int i = 0; i < mcVers.size(); i++)
-    {
-        String verStr = mcVers[i].replace(".", "_");
-        sb.append("MC_" + verStr + "=" + i.toString() + "\n");
-        
-        if (mcIndex == i) 
-        {
-            sb.append("MC_VER=" + i.toString() + "\n");
         }
-    }
 
+    // run if there are multiple launchers that need merging
+    autoRun = (loaderCount > 1);
     
-    // Check if this is a development build
+    // merged jars are named in the format: 
-    if (mod_version.toLowerCase().contains("dev"))
+    // "DistantHorizons-3.0.1-b-dev-26.1-fabric-neoforge.jar"
-    {
+    archiveClassifier = modLoaders
-        // WARNING: only use this for logging, we don't want to have confusion
-        // when a method doesn't work correctly in the release build.
-        sb.append("DEV_BUILD=\n");
-    }
-
-    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)
-
-// 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")
-
-class NativeTransformer implements Transformer {
-    private Predicate<String> fileMatcher
-    private Function<String, String> filePathMapper
-
-    private final HashMap<String, String> replacements = new HashMap()
-    private final HashMap<String, byte[]> rewrittenFiles = new HashMap()
-    private var nativeRelocator
-
-    public File rootDir
-
-    void matchFiles(Predicate<String> matcher) {
-        fileMatcher = matcher
-    }
-
-    void mapPaths(Function<String, String> mapper) {
-        filePathMapper = mapper
-    }
-
-    void relocateNative(String target, String replacement) {
-        if (replacement.length() > target.length()) {
-            throw new GradleException("Length of value \"${replacement}\" exceeds the length of \"${target}\": ${replacement.length()} > ${target.length()}")
-        }
-
-        replacements.put(target, replacement)
-    }
-
-    @Override
-    boolean canTransformResource(@Nonnull FileTreeElement element) {
-        return fileMatcher.test(element.name)
-    }
-
-    @Override
-    void transform(@Nonnull TransformerContext context) {
-        byte[] content = context.is.readAllBytes()
-
-        if (nativeRelocator == null) {
-            nativeRelocator = new NativeRelocator(rootDir.toPath().resolve("relocate_natives"))
-        }
-
-        try {
-            String path = filePathMapper != null
-                ? filePathMapper.apply(context.path)
-                : context.path
-            content = nativeRelocator.processBinary(path, content, replacements)
-
-            rewrittenFiles.put(path, content)
-        }
-        catch (Throwable e) {
-            throw new GradleException("Failed to relocate", e)
-        }
-    }
-
-    @Override
-    boolean hasTransformedResource() { return !rewrittenFiles.isEmpty() }
-
-    @Override
-    void modifyOutputStream(@Nonnull ZipOutputStream os, boolean preserveFileTimestamps) {
-        for (Map.Entry<String, byte[]> rewrittenFile : rewrittenFiles.entrySet()) {
-            os.putNextEntry(new ZipEntry(rewrittenFile.key))
-            os.write(rewrittenFile.value)
-        }
-    }
-}
-
-subprojects { p ->
-    // 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")
-
-
-    // Apply plugins
-    apply plugin: "java"
-    apply plugin: "com.github.johnrengelman.shadow"
-    if (isMinecraftSubProject)
-        apply plugin: "systems.manifold.manifold-gradle-plugin"
-    
-    // Apply forge's loom
-    if ((findProject(":forge") && p == project(":forge")) ||
-        (findProject(":neoforge") && p == project(":neoforge"))
-        )
-    {
-        apply plugin: "dev.architectury.loom"
-    }
-
-
-    // Set the manifold version (may not be required tough)
-    manifold {
-        manifoldVersion = rootProject.manifold_version
-    }
-    
-
-    // set up custom configurations (configurations are a way to handle dependencies) 
-    configurations {
-        // extends the shadowJar configuration
-        shadowMe
-        // have implemented dependencies automatically embedded in the final jar
-        implementation.extendsFrom(shadowMe)
-
-        // Configuration fpr core & api
-        coreProjects
-        shadowMe.extendsFrom(coreProjects)
-
-
-        // FIXME this additional configuration is necessary because forge 
-        //  needs forgeRuntimeLibrary, although adding it to shadowMe
-        //  causes runtime issues where the libraries aren't properly added
-        forgeShadowMe
-        // 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
-        }
-    }
-
-
-    dependencies {
-        //=====================//
-        // shared dependencies //
-        //=====================//
-        
-        // Manifold
-        if (isMinecraftSubProject) {
-            annotationProcessor("systems.manifold:manifold-preprocessor:${rootProject.manifold_version}")
-        }
-
-        // Log4j
-        if (p == project(":core"))
-        {
-            // the standalone core jar needs logging shaded otherwise it won't run
-            forgeShadowMe("org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}")
-            forgeShadowMe("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
-        }
-        else
-        {
-            // When running in MC, MC already includes logging
-            implementation("org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}")
-            implementation("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
-        }
-        
-
-        // JOML
-        if (project.hasProperty("embed_joml") && embed_joml == "true")
-            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")
-
-        // FastUtil
-        // Note: MC 1.16 uses 8.2.1, and versions after use 8.5.12
-        // We cannot relocate this library since we call some MC classes that reference it
-        implementation("it.unimi.dsi:fastutil:${rootProject.fastutil_version}")
-
-        forgeShadowMe("com.github.luben:zstd-jni:${rootProject.zstd_version}")
-        
-        // Compression
-        forgeShadowMe("org.lz4:lz4-java:${rootProject.lz4_version}") // LZ4
-        forgeShadowMe("org.tukaani:xz:${rootProject.xz_version}") // LZMA
-
-        // Sqlite Database
-        forgeShadowMe("org.xerial:sqlite-jdbc:${rootProject.sqlite_jdbc_version}")
-        
-        // NightConfig (includes Toml & Json)
-        forgeShadowMe("com.electronwill.night-config:toml:${rootProject.nightconfig_version}")
-        forgeShadowMe("com.electronwill.night-config:json:${rootProject.nightconfig_version}")
-
-        // SVG (not needed atm)
-//        forgeShadowMe("com.formdev:svgSalamander:${rootProject.svgSalamander_version}")
-        
-        // Netty
-        implementation("io.netty:netty-buffer:${rootProject.netty_version}")
-
-        
-        
-        //==========================//
-        // conditional dependencies //
-        //==========================//
-
-
-        // Add core
-        if (isMinecraftSubProject) {
-            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
-            }
-        }
-
-        // Add the api
-        if (p != 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
-            }
-        }
-
-        // Add common
-        if (isMinecraftSubProject && p != project(":common")) {
-            // Common
-            common(project(":common")) { transitive false }
-            shadowCommon(project(":common")) { transitive false }
-        }
-    }
-
-
-    shadowJar {
-        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
-        }
-        def librariesLocation = "DistantHorizons.libraries"
-        
-        // Compression (LZ4)
-        relocate "net.jpountz", "${librariesLocation}.jpountz"
-        
-        // Logging
-        relocate "org.slf4j", "${librariesLocation}.slf4j"
-
-        // Sqlite Database
-        // librariesLocation isn't used because it's too long for replacing paths in native libraries
-        // Allowing strings larger than the original string would require shifting the entire binary's contents
-        relocate "org.sqlite", "dh_sqlite", {
-            exclude "org/sqlite/native/**"
-        }
-        relocate "jdbc:sqlite", "jdbc:dh_sqlite"
-
-        transform(NativeTransformer) {
-            rootDir = project.rootDir
-
-            matchFiles { it.startsWith("org/sqlite") }
-            mapPaths { it.replace("org/sqlite", "dh_sqlite") }
-
-            relocateNative "org/sqlite", "dh_sqlite"
-            relocateNative "org_sqlite", "dh_1sqlite"
-        }
-
-        // ZStd
-        // librariesLocation isn't used because it's too long for replacing paths in native libraries
-        // Allowing strings larger than the original string would require shifting the entire binary's contents
-        relocate "com.github.luben", "dhcomgithubluben"
-        relocate "libzstd-jni", "libzstd-jni_dh"
-        relocate "zstd-jni", "zstd-jni_dh"
-
-        transform(NativeTransformer) {
-            rootDir = project.rootDir
-
-            matchFiles { it.contains("libzstd-jni") && !it.contains("aix/ppc64") }
-            mapPaths { it.replace("libzstd-jni", "libzstd-jni_dh") }
-
-            relocateNative "com/github/luben", "dhcomgithubluben"
-            relocateNative "com_github_luben", "dhcomgithubluben"
-        }
-        
-        
-        // JOML
-        if (project.hasProperty("embed_joml") && embed_joml == "true")
-            relocate "org.joml", "${librariesLocation}.joml"
-
-        // NightConfig (includes Toml & Json)
-        relocate "com.electronwill.nightconfig", "${librariesLocation}.electronwill.nightconfig"
-
-        // Netty
-        // Don't relocate, it causes problems with using MC's FriendlyByteBufs
-//        relocate "io.netty", "${librariesLocation}.netty"
-
-        mergeServiceFiles()
-    }
-    // Using jar.finalizedBy(shadowJar) causes issues so we do this scuffed bypass
-    jar.dependsOn(shadowJar)
-
-
-    // Put stuff from gradle.properties into the mod info
-    // Note: these resources are only included in the mod jars, the core and API jars don't include these files
-    processResources {
-        def resourceTargets = [ // Location of where to inject the properties
-                                // Holds info like git commit
-                                "build_info.json",
-
-                                // Properties for each of the loaders
-                                "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 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"]
-        def compatible_forgemc_versions = "${compatible_minecraft_versions}".replaceAll("\"", "").replaceAll("]", ",)")
-//        println compatible_forgemc_versions
-
-        // Quilt's custom contributors system
-        // This has to be like
-        // "Person": "Developer", "Another person": "Developer"
-        def quilt_contributors = []
-        def mod_author_list = mod_authors.replaceAll("\"", "").replace("[", "").replace("]", "").split(",")
-        for (dev in mod_author_list) {
-            quilt_contributors.push("\"${dev.strip()}\": \"Developer\"")
-        }
-        quilt_contributors.reverse()
-        //println quilt_contributors.join(", ")
-
-        
-        // These "hasProperty"'s are so that they can be passed through the cli (ie in the CI)
-        try {
-            if (infoGitCommit == "null")
-                infoGitCommit = 'git rev-parse --verify HEAD'.execute().text.trim()
-            if (infoGitBranch == "null")
-                infoGitBranch = 'git symbolic-ref --short HEAD'.execute().text.trim()
-        } catch (Exception e) {
-            infoGitCommit = infoGitBranch = "Git not found"
-            println "Git or Git project not found"
-        }
-
-        // The left side is what gets replaced in the mod info and the right side is where to get it from in the gradle.properties
-        def replaceProperties = [
-                version                      : mod_version,
-                mod_name                     : mod_readable_name,
-                group                        : maven_group,
-                authors                      : mod_authors,
-                description                  : mod_description,
-                homepage                     : mod_homepage,
-                source                       : mod_source,
-                issues                       : mod_issues,
-                discord                      : mod_discord,
-                minecraft_version            : minecraft_version,
-                compatible_minecraft_versions: compatible_minecraft_versions,
-                compatible_forgemc_versions  : compatible_forgemc_versions,
-                java_version                 : java_version,
-                quilt_contributors           : "{"+quilt_contributors.join(", ")+"}",
-
-                info_git_commit              : infoGitBranch,
-                info_git_branch              : infoGitCommit,
-                info_build_source            : infoBuildSource,
-
-                fabric_incompatibility_list  : fabric_incompatibility_list,
-                fabric_recommend_list        : fabric_recommend_list,
-
-                neoforge_version_range       : neoforge_version_range,
-        ]
-        
-        // replace any properties in the sub-projects with the values defined here
-        inputs.properties replaceProperties
-        replaceProperties.put "project", project
-        filesMatching(resourceTargets) {
-            expand replaceProperties
-        }
-        
-        intoTargets.each { target ->
-            if (file(target).exists()) {
-                copy {
-                    from(sourceSets.main.resources) {
-                        include resourceTargets
-                        expand replaceProperties
-                    }
-                    into target
-                }
-            }
-        }
-
-
-
-        // ==================== Delete un-needed files ====================
-        // Jank solution to remove all unused accesswideners
-        // (neo)forge (well, mainly architectury) requires the original accesswidener file, meaning we require this jank solution to keep it
-        exclude { file ->
-            if (file.name.contains(".distanthorizons.accesswidener") && file.name != "${accessWidenerVersion}.distanthorizons.accesswidener") {
-                return true
-            }
-            return false
-        }
-    }
-
-
-    // Adds the standalone jar's entrypoint
-    jar {
-        from "LICENSE.txt"
-        manifest {
-            attributes( 
-                'Implementation-Title': rootProject.mod_name,
-                'Implementation-Version': rootProject.mod_version,
-                'Multi-Release': true, // needed for logging in the standalone core jar
-                'Main-Class': 'com.seibel.distanthorizons.core.jar.JarMain', // When changing the main of the jar change this line
-            )
-        }
-    }
-
-    // this can be un-commented if we ever wanted to make DH modular (AKA use a module-info.java file) again
-    /*
-    // Tells gradle where to look for other modules
-    // Why isn't the classpath added to the modules path by default?
-    if (p == project(":core")) {
-        compileJava {
-            inputs.property('moduleName', 'dhApi')
-            doFirst {
-                options.compilerArgs = [
-                        '--module-path', classpath.asPath
-                ]
-                classpath = files()
-            }
-        }
-    }
-    */
-}
-
-allprojects { p ->
-    // 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")
-
-
-    apply plugin: "java"
-    apply plugin: "maven-publish"
-    
-    // Sets the name of the jar, the version will contain the name of the project if it isn't the root project
-    archivesBaseName = rootProject.mod_name
-    version = (project == rootProject ? "" : project.name + "-") + rootProject.versionStr
-    group = rootProject.maven_group
-    
-    // this is the text that appears at the top of the overview (home) page
-    // and is used when bookmarking a page
-    javadoc.title = rootProject.mod_name + "-" + project.name
-
-    // Some annotations arent "technically" part of the official java standard,
-    //  so we define it ourself here
-    javadoc {
-        configure( options ) {
-            tags(
-                    'todo:X"',
-                    'apiNote:a:API Note:',
-                    'implSpec:a:Implementation Requirements:',
-                    'implNote:a:Implementation Note:'
-            )
-        }
-    }
-
-
-    repositories {
-        // Mojang overrides (added to fix downloading the wrong LWJGL libs on M1 Mac's and potentially other arm64 based machines)
-        maven { url "https://libraries.minecraft.net/" }
-
-        // The central repo
-        mavenCentral()
-
-        // Used for Google's Collect library
-        maven { url "https://repo.enonic.com/public/" }
-
-        // For parchment mappings
-        // versions can be found here: https://ldtteam.jfrog.io/ui/native/parchmentmc-public/org/parchmentmc/data/
-        maven { url "https://maven.parchmentmc.org" }
-
-        // For Architectury API
-        maven { url "https://maven.architectury.dev" }
-
-        // For Git repositories
-        maven { url "https://jitpack.io" }
-
-        // For Manifold Preprocessor
-        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
-
-        // Required for importing Modrinth mods
-        maven {
-            name = "Modrinth"
-            url = "https://api.modrinth.com/maven"
-            content {
-                includeGroup "maven.modrinth"
-            }
-        }
-
-        // Required for importing CursedForge mods
-        maven {
-            url "https://www.cursemaven.com"
-            content {
-                includeGroup "curse.maven"
-            }
-        }
-
-        // VanillaGradle and Mixins in common
-        maven { url "https://repo.spongepowered.org/maven/" }
-
-        // 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 {
-            dirs "${rootDir}/mods/fabric"
-            content {
-                includeGroup "fabric-mod"
-            }
-        }
-        flatDir {
-            dirs "${rootDir}/mods/quilt"
-            content {
-                includeGroup "quilt-mod"
-            }
-        }
-        flatDir {
-            dirs "${rootDir}/mods/forge"
-            content {
-                includeGroup "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()
-
-        dependencies { 
-            // All of these dependencies are in Vanilla Minecraft, but we need to depend on them as we arent importing Minecraft in the core
-            
-            // Imports most of lwjgl's libraries
-            implementation platform("org.lwjgl:lwjgl-bom:${rootProject.lwjgl_version}")
-
-            // REMEMBER: Don't shadow stuff here, these are just the libs that are included in Minecraft so that the core can use them
-            implementation "org.lwjgl:lwjgl"
-            implementation "org.lwjgl:lwjgl-assimp"
-            implementation "org.lwjgl:lwjgl-glfw"
-            // OpenGL is removed since DH now handles rendering in the "Common" project
-            // so we can use OpenGL for old MC versions and Blaze3D (IE Vulkan) for newer ones
-//            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")
-        }
-    }
-
-
-    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"
-    }
-
-    task copyCoreResources(type: Copy) {
-        from fileTree(project(":core").file("src/main/resources"))
-        into p.file("build/resources/main")
-    }
-
-    tasks.withType(JavaCompile) {
-        if (isMinecraftSubProject) {
-            options.release = rootProject.java_version as Integer
-        } else {
-            options.release = 8; // Core & Api should use Java 8 no matter what
-        }
-        options.encoding = "UTF-8"
-    }
-
-    java {
-        withSourcesJar()
-    }
-}

buildAll

@@ -3,6 +3,7 @@
 echo "==================== Note: All build jars will be in the folder called 'buildAllJars' ===================="
 mkdir -p buildAllJars
 rm -rf buildAllJars/*
+rm -rf build/forgix/*
 
 # Loop trough everything in the version properties folder
 for d in versionProperties/*; do
@@ -19,10 +20,6 @@ for d in versionProperties/*; do
   sh gradlew build -PmcVer=$version
   if [ $? != 0 ]; then continue; fi
 
-  echo "==================== Merging $version ===================="
-  sh gradlew mergeJars -PmcVer=$version
-  if [ $? != 0 ]; then continue; fi
-  
   echo "==================== Moving jar ===================="
-  mv build/merged/*.jar buildAllJars/
+  mv build/forgix/*.jar buildAllJars/
 done

buildAll.bat

@@ -6,6 +6,7 @@
 echo ==================== Note: All build jars will be in the folder called 'buildAllJars' ====================
 mkdir buildAllJars
 del buildAllJars/*
+del build/forgix/*
 
 @rem Loop trough everything in the version properties folder
 for %%f in (versionProperties\*) do (
@@ -19,11 +20,8 @@ for %%f in (versionProperties\*) do (
 	echo ==================== Building !version! ====================
     call .\gradlew.bat build -PmcVer="!version!"
     
-	echo ==================== Merging !version! ====================
-    call .\gradlew.bat mergeJars -PmcVer="!version!"
-	
     echo ==================== Moving jar ====================
-    move build\merged\*.jar buildAllJars\
+    move build\forgix\*.jar buildAllJars\
 )
 
 endlocal

buildAllParallel.bat

@@ -0,0 +1,35 @@
+@echo off & setlocal enabledelayedexpansion
+
+
+echo ==================== Getting versions to build... ====================
+mkdir _buildAllJars 2>nul
+del _buildAllJars\* /Q 2>nul
+
+set "ROOT=%~dp0"
+set "WORK_DIR=%ROOT%_buildWorkers"
+mkdir "%WORK_DIR%" 2>nul
+
+
+REM get the number of versions to compile
+set count=0
+for %%f in (versionProperties\*) do set /a count+=1
+echo ==================== Found %count% versions to build in parallel ====================
+
+REM Launch a parallel job for each version
+for %%f in (%ROOT%versionProperties\*) do (
+    set version=%%~nf
+	
+	echo starting [!version!]...
+    start "Build !version!" cmd /c ""%ROOT%build_worker.bat" "!version!" "%ROOT%" "%WORK_DIR%" ""..\..\_buildAllJars"""
+	
+	REM Minor timeout between launches so we can stop the build early if we only want 
+	REM to test part of the script and to reduce startup load
+	timeout /t 3 /nobreak
+	
+REM 2>nul to supress a harmless warning that the for loop
+REM "cannot find the drive specified"
+) 2>nul
+
+
+echo ==================== All builds started... Completed Jars will be in _buildAllJars ====================
+endlocal

buildSrc/build.gradle

@@ -0,0 +1,24 @@
+plugins {
+    id 'groovy-gradle-plugin'
+}
+
+repositories {
+    gradlePluginPortal()
+    mavenCentral()
+    maven { url = 'https://maven.wagyourtail.xyz/releases' } // Jvmdowngrader & unimined libs
+    maven { url = 'https://maven.outlands.top/releases' } // Hosts the kappa fork of unimined
+    maven { url = 'https://maven.wagyourtail.xyz/snapshots' } // The manifold gradle plugin we use
+    maven { url = 'https://maven.architectury.dev/' } // Minecraft mod libs
+    maven { url = 'https://maven.fabricmc.net/' } // Fabric
+    maven { url = 'https://maven.neoforged.net/releases/' } // NeoForge
+    maven { url = 'https://maven.minecraftforge.net/' } // Forge
+    maven { url = 'https://repo.spongepowered.org/repository/maven-public/' } // Hosts minecraft libs
+    maven { url = 'https://oss.sonatype.org/content/repositories/snapshots/' } // Hosts a few dependencies we use
+}
+
+dependencies {
+    implementation 'com.gradleup.shadow:shadow-gradle-plugin:9.0.0'
+    implementation 'xyz.wagyourtail.unimined:xyz.wagyourtail.unimined.gradle.plugin:1.4.18-kappa'
+    implementation 'xyz.wagyourtail:manifold-gradle:1.0.0-SNAPSHOT'
+    implementation 'xyz.wagyourtail.jvmdowngrader:xyz.wagyourtail.jvmdowngrader.gradle.plugin:1.3.4'
+}

buildSrc/src/main/groovy/dh-loader.gradle

@@ -0,0 +1,594 @@
+import com.github.jengelman.gradle.plugins.shadow.transformers.ResourceTransformer
+import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
+import org.apache.tools.zip.ZipEntry
+import org.apache.tools.zip.ZipOutputStream
+
+import javax.annotation.Nonnull
+import java.util.function.Function
+import java.util.function.Predicate
+import groovy.json.JsonSlurper
+
+// Convention plugin for all MC-facing subprojects (common + loaders).
+// Common uses this directly; loaders use it via unimined-fabric/forge/neoforge.
+// IMPORTANT: unimined MUST be applied before shadow/jvmdowngrader
+// so its afterEvaluate runs first and can modify configs.
+
+plugins {
+    id 'java'
+    id 'maven-publish'
+    id 'xyz.wagyourtail.unimined'
+    id 'com.gradleup.shadow'
+    id 'xyz.wagyourtail.manifold'
+    id 'xyz.wagyourtail.jvmdowngrader'
+}
+
+def isNotCommonProject = project.name != "common"
+
+if (isNotCommonProject) {
+    evaluationDependsOn(":common")
+}
+
+// ==================== Version Properties ====================
+
+project.gradle.ext.getProperties().each { prop ->
+    rootProject.ext.set(prop.key, prop.value)
+}
+
+manifold {
+    version = rootProject.manifold_version
+}
+
+
+// ==================== Repositories ====================
+
+repositories {
+    maven { url "https://libraries.minecraft.net/" }
+    mavenCentral()
+    maven { url "https://repo.enonic.com/public/" }
+    maven { url "https://maven.parchmentmc.org" }
+    maven { url "https://maven.architectury.dev" }
+    maven { url "https://jitpack.io" }
+    maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
+    maven {
+        name = "Modrinth"
+        url = "https://api.modrinth.com/maven"
+        content { includeGroup "maven.modrinth" }
+    }
+    maven {
+        url "https://www.cursemaven.com"
+        content { includeGroup "curse.maven" }
+    }
+    maven {
+        url "https://repo.spongepowered.org/maven/"
+		// exclusion is needed since sponge has a deprecated version of fabric
+		// that gradle would prefer to get over the up-to-date version modrinth provides
+        content { excludeGroupByRegex "net\\.fabricmc(\\..*)?" }
+    }
+    maven { url "https://maven.terraformersmc.com/" }
+    maven { url "https://maven.neoforged.net/releases/" }
+    flatDir {
+        dirs "${rootDir}/mods/fabric"
+        content { includeGroup "fabric-mod" }
+    }
+    flatDir {
+        dirs "${rootDir}/mods/quilt"
+        content { includeGroup "quilt-mod" }
+    }
+    flatDir {
+        dirs "${rootDir}/mods/forge"
+        content { includeGroup "forge-mod" }
+    }
+}
+
+
+// ==================== Java Config ====================
+
+tasks.withType(JavaCompile).configureEach {
+    options.release = rootProject.java_version as Integer
+    options.encoding = "UTF-8"
+}
+
+java {
+    sourceCompatibility = JavaVersion.toVersion(gradle.ext.java_version as Integer)
+    targetCompatibility = JavaVersion.toVersion(gradle.ext.java_version as Integer)
+    withSourcesJar()
+}
+
+
+// ==================== Loader-Only Config ====================
+
+if (isNotCommonProject) {
+    base { archivesName = rootProject.mod_name }
+    rootProject.ext.versionStr = rootProject.mod_version + "-" + rootProject.minecraft_version
+    version = project.name + "-" + rootProject.versionStr
+    group = rootProject.maven_group
+
+    javadoc.title = rootProject.mod_name + "-" + project.name
+
+    tasks.withType(GenerateModuleMetadata).configureEach {
+        enabled = false
+    }
+    tasks.withType(Test).configureEach {
+        enabled = false
+    }
+    compileTestJava.enabled = false
+    tasks.withType(Sign).configureEach {
+        enabled = false
+    }
+
+    jar {
+        from "LICENSE.txt"
+        manifest {
+            attributes(
+                'Implementation-Title': rootProject.mod_name,
+                'Implementation-Version': rootProject.mod_version,
+                'Multi-Release': true,
+                'Main-Class': 'com.seibel.distanthorizons.core.jar.JarMain',
+            )
+            if (project.name == "cleanroom") {
+                attributes(
+                    'ModType': 'CRL',
+                    'MixinConfigs': "${mod_id}.default.mixin.json,${mod_id}.mod.mixin.json",
+                    'FMLCorePlugin': 'com.seibel.distanthorizons.cleanroom.DistantHorizonsLoadingPlugin',
+                    'FMLCorePluginContainsFMLMod': true,
+                    'FMLAT': "${gradle.ext.accessWidenerVersion}.distanthorizons_at.cfg"
+                )
+            }
+        }
+    }
+}
+
+
+// ==================== Unimined Minecraft Config ====================
+
+unimined.minecraft(sourceSets.main, true) {
+    version gradle.ext.minecraft_version
+
+    if (gradle.ext.minecraft_version.startsWith("1.")) { // 26.1+ doesn't use obfuscation
+        mappings {
+            if(gradle.ext.minecraft_version.startsWith("1.12.2")){
+                mcp("stable", "39-1.12")
+            }
+            else{
+                mojmap()
+                devNamespace "mojmap"
+            }
+
+        }
+    }
+}
+
+if (isNotCommonProject) {
+    // Mixin remapping and common project wiring
+    unimined.minecraft(sourceSets.main, true) {
+        mods.modImplementation {
+            mixinRemap {
+                reset()
+                enableBaseMixin()
+                enableMixinExtra()
+            }
+            // Some Fabric API modules ship AW in 'named' namespace instead of 'intermediary'
+            catchAWNamespaceAssertion()
+        }
+    }
+
+    dependencies {
+        implementation(project(":common"))
+    }
+
+    processResources {
+        from project(":common").sourceSets.main.resources
+    }
+
+    tasks.withType(JavaCompile).configureEach {
+        source(project(":common").sourceSets.main.allSource)
+    }
+} else {
+    unimined.minecraft {
+        if (gradle.ext.minecraft_version.equals("1.12.2")) {
+            cleanroom {
+                loader gradle.ext.cleanroom_loader_version
+                accessTransformer  project.file("src/main/resources/${gradle.ext.accessWidenerVersion}.distanthorizons_at.cfg")
+            }
+        } else {
+            fabric {
+                loader gradle.ext.fabric_loader_version
+                accessWidener project.file("src/main/resources/${gradle.ext.accessWidenerVersion}.distanthorizons.accesswidener")
+            }
+        }
+        defaultRemapJar = false
+        runs.off = true
+    }
+}
+
+// ==================== Configurations ====================
+
+evaluationDependsOn(":core")
+
+configurations {
+    shadowMe
+    coreProjects
+    shadowMe.extendsFrom(coreProjects)
+    implementation.extendsFrom(shadowMe)
+    
+    common
+    implementation.extendsFrom(common)
+}
+
+
+// ==================== Dependencies ====================
+
+// Copy core's compileOnly deps so MC-provided deps are visible without redeclaring them.
+project(":core").configurations.compileOnly.allDependencies.each { dep ->
+    if (!(dep instanceof ProjectDependency))
+        dependencies.add("compileOnly", dep)
+}
+
+dependencies {
+    // Manifold preprocessor & strings
+    annotationProcessor(manifold.module("preprocessor"))
+
+    // NightConfig: implementation in core (bundled) but Unimined strips it from compile classpath
+    compileOnly("com.electronwill.night-config:toml:${rootProject.nightconfig_version}")
+
+    // Core & API projects — bundled into shadow jar
+    coreProjects(project(":core"))
+    coreProjects(project(":api"))
+
+    // JOML: shadow for old MC versions that don't bundle it (core has it compileOnly already)
+    if (project.hasProperty("embed_joml") && embed_joml == "true")
+        shadowMe("org.joml:joml:${rootProject.joml_version}")
+
+    // Common project dependency
+    if (isNotCommonProject)
+        common(project(":common")) { transitive false }
+}
+
+
+// ==================== NativeTransformer ====================
+
+class NativeTransformer implements ResourceTransformer {
+    private Predicate<String> fileMatcher
+    private Function<String, String> filePathMapper
+
+    private final HashMap<String, String> replacements = new HashMap()
+    private final HashMap<String, byte[]> rewrittenFiles = new HashMap()
+    private nativeRelocator
+
+    public File rootDir
+
+    void matchFiles(Predicate<String> matcher) {
+        fileMatcher = matcher
+    }
+
+    void mapPaths(Function<String, String> mapper) {
+        filePathMapper = mapper
+    }
+
+    void relocateNative(String target, String replacement) {
+        if (replacement.length() > target.length()) {
+            throw new GradleException("Length of value \"${replacement}\" exceeds the length of \"${target}\": ${replacement.length()} > ${target.length()}")
+        }
+        replacements.put(target, replacement)
+    }
+
+    @Override
+    boolean canTransformResource(@Nonnull FileTreeElement element) {
+        return fileMatcher != null && fileMatcher.test(element.relativePath.pathString)
+    }
+
+    @Override
+    void transform(@Nonnull TransformerContext context) {
+        byte[] content = context.inputStream.readAllBytes()
+
+        if (nativeRelocator == null) {
+            nativeRelocator = new NativeRelocator(rootDir.toPath().resolve("relocate_natives"))
+        }
+
+        try {
+            String path = filePathMapper != null
+                ? filePathMapper.apply(context.path)
+                : context.path
+            content = nativeRelocator.processBinary(path, content, replacements)
+            rewrittenFiles.put(path, content)
+        }
+        catch (Throwable e) {
+            throw new GradleException("Failed to relocate", e)
+        }
+    }
+
+    @Override
+    boolean hasTransformedResource() { return !rewrittenFiles.isEmpty() }
+
+    @Override
+    void modifyOutputStream(@Nonnull ZipOutputStream os, boolean preserveFileTimestamps) {
+        for (Map.Entry<String, byte[]> rewrittenFile : rewrittenFiles.entrySet()) {
+            os.putNextEntry(new ZipEntry(rewrittenFile.key))
+            os.write(rewrittenFile.value)
+        }
+    }
+}
+
+
+// ==================== Shadow JAR (loaders only) ====================
+
+if (isNotCommonProject) {
+    shadowJar {
+        configurations = [project.configurations.shadowMe]
+        def librariesLocation = "DistantHorizons.libraries"
+
+        // LZ4
+        relocate "net.jpountz", "${librariesLocation}.jpountz"
+
+        // SLF4J
+        relocate "org.slf4j", "${librariesLocation}.slf4j"
+
+        // SQLite
+        relocate "org.sqlite", "dh_sqlite", { exclude "org/sqlite/native/**" }
+        relocate "jdbc:sqlite", "jdbc:dh_sqlite"
+
+        transform(NativeTransformer) {
+            rootDir = project.rootDir
+            matchFiles { it.startsWith("org/sqlite") }
+            mapPaths { it.replace("org/sqlite", "dh_sqlite") }
+            relocateNative "org/sqlite", "dh_sqlite"
+            relocateNative "org_sqlite", "dh_1sqlite"
+        }
+
+        // ZStd
+        relocate "com.github.luben", "dhcomgithubluben"
+        relocate "libzstd-jni", "libzstd-jni_dh"
+        relocate "zstd-jni", "zstd-jni_dh"
+
+        transform(NativeTransformer) {
+            rootDir = project.rootDir
+            matchFiles { it.contains("libzstd-jni") && !it.contains("aix/ppc64") }
+            mapPaths { it.replace("libzstd-jni", "libzstd-jni_dh") }
+            relocateNative "com/github/luben", "dhcomgithubluben"
+            relocateNative "com_github_luben", "dhcomgithubluben"
+        }
+
+        // JOML (conditional)
+        if (project.hasProperty("embed_joml") && embed_joml == "true")
+            relocate "org.joml", "${librariesLocation}.joml"
+
+        // NightConfig
+        relocate "com.electronwill.nightconfig", "${librariesLocation}.electronwill.nightconfig"
+
+        mergeServiceFiles()
+    }
+    afterEvaluate {
+        tasks.named("remapJar").configure {
+            dependsOn(shadowJar)
+            inputFile.set(shadowJar.archiveFile)
+        }
+
+        // Make run tasks use the shadow jar so relocated deps work in dev.
+        // Filter out jars bundled in the shadow jar, but keep jars that the loader also
+        // needs (e.g. NightConfig — DH relocates it, but NeoForge needs the original).
+        def shadowedPaths = configurations.shadowMe.resolve().collect { it.path }.toSet()
+        def loaderPaths = configurations.minecraftLibraries.resolve().collect { it.path }.toSet()
+        tasks.withType(JavaExec).configureEach { runTask ->
+            dependsOn(shadowJar)
+            if (project.name != "cleanroom") {
+                classpath = files(shadowJar.archiveFile) + classpath.filter { file ->
+                    file != shadowJar.archiveFile.get().asFile &&
+                        !file.path.contains(project.buildDir.path) &&
+                        !file.path.contains("core${File.separator}build") &&
+                        !file.path.contains("api${File.separator}build") &&
+                        !file.path.contains("common${File.separator}build") &&
+                        !(shadowedPaths.contains(file.path) && !loaderPaths.contains(file.path))
+                }
+            } else {
+                // For cleanroom, don't put shadow jar on app classpath.
+                // crl.dev.extrapath loads it via LaunchClassLoader instead.
+                classpath = classpath.filter { file ->
+                    !file.path.contains(project.buildDir.path) &&
+                        !file.path.contains("core${File.separator}build") &&
+                        !file.path.contains("api${File.separator}build") &&
+                        !file.path.contains("common${File.separator}build") &&
+                        !(shadowedPaths.contains(file.path) && !loaderPaths.contains(file.path))
+                }
+            }
+
+            // Shared run directory so all loaders use the same worlds
+            def isClient = runTask.name.toLowerCase().contains("client")
+            runTask.workingDir = rootProject.file("run/${isClient ? 'client' : 'server'}")
+
+            // Minecraft automatically has G1GC args present,
+            // remove them so we can use ZGC instead
+            def filteredArgs = runTask.jvmArgs.findAll { arg ->
+                !arg.startsWith("-XX:+UseG1GC") &&
+                !arg.startsWith("-XX:G1") &&
+                !arg.startsWith("-XX:MaxGCPauseMillis")
+            }
+            runTask.jvmArgs = filteredArgs
+
+            if(project.name == "forge" 
+                || project.name == "neoforge" 
+                || project.name == "cleanroom") 
+            {
+                // fix (Neo)forge, Cleanroom debug running
+                doFirst {
+                    def modsDir = rootProject.file("run/${isClient ? 'client' : 'server'}/mods")
+                    modsDir.mkdirs()
+                
+                    // Remove any stale DH jars before copying the fresh one
+                    modsDir.listFiles()?.each({ file ->
+                        if (file.name.startsWith(rootProject.mod_name))
+                        {
+                            file.delete()
+                        }
+                    });
+                
+                    // Copy shadow jar into mods folder so (Neo)Forge discovers it properly
+                    copy {
+                        from shadowJar.archiveFile
+                        into modsDir
+                    }
+                }
+            }
+            
+            // JVM args
+            runTask.jvmArgs(
+                "-Dio.netty.leakDetection.level=advanced",
+                // TODO only use for modern java versions
+                "-XX:+UseZGC",
+                // TODO don't use for even more modern-er java versions
+                //"-XX:+ZGenerational",
+                rootProject.minecraftMemoryJavaArg,
+            )
+            if (isClient) 
+            {
+                runTask.jvmArgs(
+                    "-Dminecraft.api.auth.host=https://nope.invalid",
+                    "-Dminecraft.api.account.host=https://nope.invalid",
+                    "-Dminecraft.api.session.host=https://nope.invalid",
+                    "-Dminecraft.api.services.host=https://nope.invalid",
+                )
+                runTask.args(
+                    // use a consistent username for easier debugging in a given world (vs randomly teleporting to a new user each time the game boots)
+                    "--username", "Dev",
+                    // "--renderDebugLabels" is a Mojang command to show render names in RenderDoc
+                    "--renderDebugLabels"
+                    )
+                
+                // enabling tracy causes constant memory growth so it isn't always desired
+                if (rootProject.minecraftEnableTracy == "true")
+                {
+                    // "--tracy" is a Mojang command to allow individual frames to be debugged using Tracy https://github.com/wolfpld/tracy/releases/tag/v0.13.1
+                    runTask.args("--tracy")
+                }
+                
+                
+            }
+        }
+        
+        tasks.downgradeJar.inputFile.set(tasks.named("remapJar").flatMap { it.archiveFile })
+        tasks.jar.finalizedBy(tasks.named("remapJar"))
+        tasks.named("remapJar").configure { finalizedBy(tasks.shadeDowngradedApi) }
+    }
+}
+
+
+// ==================== Process Resources (loaders only) ====================
+
+if (isNotCommonProject) {
+    processResources {
+        def resourceTargets = [
+            "build_info.json",
+            "fabric.mod.json",
+            "mcmod.info",
+            "quilt.mod.json",
+            "META-INF/mods.toml",
+            "META-INF/neoforge.mods.toml",
+        ]
+
+        // incoming format: `["26.2.0","26.2-alpha.9"]`
+        // outgoing format: `[26.2.0],[26.2-alpha.9]`
+        def compatible_forgemc_versions = "${rootProject.compatible_minecraft_versions}"
+            .replaceAll("\",\"", "],[")
+            .replaceAll("\"", "")
+
+        // Quilt contributors
+        def quilt_contributors = []
+        def mod_author_list = rootProject.mod_authors.replaceAll("\"", "").replace("[", "").replace("]", "").split(",")
+        def cleanroom_author_list = rootProject.mod_authors.replace('[', '').replace(']', '').split(',').collect({ it.trim().replace('"', '') }).join('", "')
+        for (dev in mod_author_list) {
+            quilt_contributors.push("\"${dev.strip()}\": \"Developer\"")
+        }
+        quilt_contributors.reverse()
+
+        try {
+            if (rootProject.infoGitCommit == "null")
+                rootProject.ext.infoGitCommit = 'git rev-parse --verify HEAD'.execute().text.trim()
+            if (rootProject.infoGitBranch == "null")
+                rootProject.ext.infoGitBranch = 'git symbolic-ref --short HEAD'.execute().text.trim()
+        } catch (Exception e) {
+            rootProject.ext.infoGitCommit = "Git not found"
+            rootProject.ext.infoGitBranch = "Git not found"
+        }
+
+        def replaceProperties = [
+            version                      : rootProject.mod_version,
+            mod_id                       : rootProject.mod_id,
+            mod_name                     : rootProject.mod_readable_name,
+            group                        : rootProject.maven_group,
+            authors                      : rootProject.mod_authors,
+            cleanroom_authors            : cleanroom_author_list,
+            description                  : rootProject.mod_description,
+            homepage                     : rootProject.mod_homepage,
+            source                       : rootProject.mod_source,
+            issues                       : rootProject.mod_issues,
+            discord                      : rootProject.mod_discord,
+            minecraft_version            : rootProject.minecraft_version,
+            accessWidenerVersion         : rootProject.accessWidenerVersion,
+            compatible_minecraft_versions: rootProject.compatible_minecraft_versions,
+            compatible_forgemc_versions  : compatible_forgemc_versions,
+            java_version                 : rootProject.java_version,
+            quilt_contributors           : "{" + quilt_contributors.join(", ") + "}",
+            info_git_commit              : rootProject.infoGitBranch,
+            info_git_branch              : rootProject.infoGitCommit,
+            info_build_source            : rootProject.infoBuildSource,
+            fabric_incompatibility_list  : rootProject.fabric_incompatibility_list,
+            fabric_recommend_list        : rootProject.fabric_recommend_list,
+            neoforge_version_range       : rootProject.neoforge_version_range,
+            logo_path                    : "assets/distanthorizons/icon.png"
+        ]
+
+        inputs.properties replaceProperties
+        replaceProperties.put "project", project
+        filesMatching(resourceTargets) {
+            expand replaceProperties
+        }
+
+        // Remove unused access wideners
+        exclude { file ->
+            if ((file.name.contains(".distanthorizons.accesswidener") && file.name != "${rootProject.accessWidenerVersion}.distanthorizons.accesswidener")) {
+                return true
+            }
+            return false
+        }
+    }
+
+
+    // ==================== Resource Copy Tasks ====================
+
+    // task copyCommonLoaderResources(type: Copy) {
+    //     from project(":common").file("src/main/resources/${rootProject.accessWidenerVersion}.distanthorizons.accesswidener")
+    //     into(file(project.file("build/resources/main")))
+    //     rename "${rootProject.accessWidenerVersion}.distanthorizons.accesswidener", "distanthorizons.accesswidener"
+    // }
+
+    task copyCoreResources(type: Copy) {
+        from fileTree(project(":core").file("src/main/resources"))
+        into project.file("build/resources/main")
+    }
+    
+    tasks.register("convertJsonToLang") {
+        dependsOn(copyCoreResources)
+        
+        File input = project.file("build/resources/main/assets/distanthorizons/lang/en_us.json")
+        File output = project.file("build/resources/main/assets/distanthorizons/lang/en_us.lang")
+        inputs.file(input)
+        outputs.file(output)
+        doLast {
+            output.withWriter("UTF-8") { writer ->
+                writer.writeLine("#PARSE_ESCAPES")
+                new JsonSlurper()
+                    .parse(input)
+                    .each { key, value ->
+                        def text = value.toString().replaceAll(/%(?!((\d+)\$)?s|%)/, "%%").replace("\n", "\\n")
+                        writer.writeLine("${key}=${text}")
+                    }
+            }
+        }
+    }
+
+
+    // ==================== JVMDowngrader ====================
+
+    jvmdg.downgradeTo = JavaVersion.toVersion(rootProject.java_version)
+    downgradeJar.archiveClassifier.set(null)
+    shadeDowngradedApi.archiveClassifier.set(null)
+}

buildSrc/src/main/groovy/root.gradle

@@ -0,0 +1,56 @@
+plugins {
+    id 'java'
+}
+
+// Transfer version properties from settings.gradle to project
+project.gradle.ext.getProperties().each { prop ->
+    rootProject.ext.set(prop.key, prop.value)
+}
+
+// Version string for archives
+rootProject.ext.versionStr = rootProject.mod_version + "-" + rootProject.minecraft_version
+rootProject.allprojects {
+    version = (it == rootProject ? "" : it.name + "-") + rootProject.versionStr
+    group = rootProject.maven_group
+
+    // Custom javadoc tags for all subprojects
+    plugins.withType(JavaPlugin) {
+        javadoc {
+            options.tags(
+                'todo:X"',
+                'apiNote:a:API Note:',
+                'implSpec:a:Implementation Requirements:',
+                'implNote:a:Implementation Note:'
+            )
+        }
+    }
+}
+
+// Create build.properties with preprocessor definitions
+def writePreprocessorDefinitions() {
+    StringBuilder sb = new StringBuilder()
+    sb.append("# DON'T TOUCH THIS FILE, This is handled by the build script\n")
+
+    gradle.ext.mcVers.eachWithIndex { ver, idx ->
+        sb.append("MC_${ver.replace('.', '_')}=${idx}\n")
+        if (gradle.ext.mcIndex == idx)
+            sb.append("MC_VER=${idx}\n")
+    }
+
+    if (rootProject.mod_version.toLowerCase().contains("dev")) {
+        sb.append("DEV_BUILD=\n")
+    }
+
+    new File(rootDir, "build.properties").text = sb.toString()
+}
+writePreprocessorDefinitions()
+
+// Wire JVMDowngrader to process remapped jars
+gradle.projectsEvaluated {
+    rootProject.subprojects.each {
+        if (it.tasks.findByName('remapJar') == null) return
+        it.tasks.downgradeJar.inputFile = it.tasks.remapJar.archiveFile
+        it.tasks.jar.finalizedBy(it.tasks.remapJar)
+        it.tasks.remapJar.finalizedBy(it.tasks.shadeDowngradedApi)
+    }
+}

buildSrc/src/main/groovy/unimined-cleanroom.gradle

@@ -0,0 +1,15 @@
+plugins {
+    id 'dh-loader'
+}
+
+unimined.minecraft {
+    cleanroom {
+        loader gradle.ext.cleanroom_loader_version
+        useToolchains = false
+        accessTransformer project(":common").file("src/main/resources/${gradle.ext.accessWidenerVersion}.distanthorizons_at.cfg")
+        runs.all {
+            systemProperty("crl.dev.mixin", "${mod_id}.default.mixin.json,${mod_id}.mod.mixin.json")
+            systemProperty("fml.coreMods.load", "com.seibel.distanthorizons.cleanroom.DistantHorizonsLoadingPlugin")
+        }
+    }
+}

buildSrc/src/main/groovy/unimined-fabric.gradle

@@ -0,0 +1,13 @@
+plugins {
+    id 'dh-loader'
+}
+
+unimined.minecraft {
+    fabric {
+        loader gradle.ext.fabric_loader_version
+        accessWidener project(":common").file("src/main/resources/${gradle.ext.accessWidenerVersion}.distanthorizons.accesswidener")
+    }
+}
+
+runClient.javaLauncher = null
+runServer.javaLauncher = null

buildSrc/src/main/groovy/unimined-forge.gradle

@@ -0,0 +1,17 @@
+plugins {
+    id 'dh-loader'
+}
+
+def awFile = project(":common").file("src/main/resources/${gradle.ext.accessWidenerVersion}.distanthorizons.accesswidener")
+
+unimined.minecraft {
+    forge {
+        loader gradle.ext.forge_version
+        useToolchains = false
+        mixinConfig("DistantHorizons.forge.mixins.json")
+        accessTransformer aw2at(awFile)
+    }
+}
+
+runClient.javaLauncher = null
+runServer.javaLauncher = null

buildSrc/src/main/groovy/unimined-neoforge.gradle

@@ -0,0 +1,16 @@
+plugins {
+    id 'dh-loader'
+}
+
+def awFile = project(":common").file("src/main/resources/${gradle.ext.accessWidenerVersion}.distanthorizons.accesswidener")
+
+unimined.minecraft {
+    neoForged {
+        loader gradle.ext.neoforge_version
+        useToolchains = false
+        accessTransformer aw2at(awFile)
+    }
+}
+
+runClient.javaLauncher = null
+runServer.javaLauncher = null

build_worker.bat

@@ -0,0 +1,41 @@
+@echo off & setlocal enabledelayedexpansion
+
+set "VERSION=%~1"
+set "ROOT=%~2"
+set "WORK_DIR=%~3"
+set "WORKER=%WORK_DIR%\%VERSION%"
+set "JAR_OUTPUT_DIR=%~4"
+
+REM remove the ending "\" from the root folder, otherwise the final quote
+REM in the robocopy command will be escaped and it won't run
+if "%ROOT:~-1%"=="\" set "ROOT=%ROOT:~0,-1%"
+set "WORKER=%~3\%~1"
+
+set "BUILT_JAR_DIR=%WORKER%\build\forgix"
+
+
+
+echo ==================== [%VERSION%] Copying workspace ====================
+mkdir "%WORKER%"
+robocopy "%ROOT%" "%WORKER%" /E /XD "%WORKER%" "_buildWorkers" "buildAllJars" ".gradle" "build" ".git" ".idea" ".gitlab" "run" "testScripts" /NFL /NDL
+
+echo ==================== [%VERSION%] Cleaning ====================
+cd /d "%WORKER%"
+call .\gradlew.bat clean 
+REM optional arg that can be added if we want to log the result to a file
+REM >"%WORK_DIR%\build_%VERSION%.log" 2>&1
+
+echo ==================== [%VERSION%] Assembling ====================
+call .\gradlew.bat assemble -PmcVer="%VERSION%" 
+REM optional arg that can be added if we want to log the result to a file
+REM >>"%WORK_DIR%\build_%VERSION%.log" 2>&1
+
+echo ==================== [%VERSION%] Exporting ====================
+mkdir "%JAR_OUTPUT_DIR%"
+robocopy "%BUILT_JAR_DIR%" "%JAR_OUTPUT_DIR%" /NFL /NDL
+
+echo ==================== [%VERSION%] Done ====================
+endlocal
+
+REM can be uncommented for debugging
+REM pause

cleanroom/build.gradle

@@ -0,0 +1,48 @@
+plugins {
+    id 'unimined-cleanroom'
+}
+
+
+// ==================== Mod Dependency Helper ====================
+
+def addMod(path, enabled) {
+    if (enabled == "2")
+        dependencies { modImplementation(path) }
+    else if (enabled == "1")
+        dependencies { compileOnly(path) }
+}
+
+
+// ==================== Dependencies ====================
+
+dependencies {
+  
+}
+
+
+// ==================== Tasks ====================
+
+task deleteResources(type: Delete) {
+    delete file("build/resources/main")
+}
+
+processResources {
+    rename '(.+_at.cfg)', 'META-INF/$1'
+    dependsOn(copyCoreResources)
+    dependsOn(convertJsonToLang)
+    // dependsOn(copyCommonLoaderResources)
+}
+
+tasks.named('runClient') {
+    dependsOn(copyCoreResources)
+    // dependsOn(copyCommonLoaderResources)
+    finalizedBy(deleteResources)
+}
+
+sourcesJar {
+    def commonSources = project(":common").sourcesJar
+    dependsOn commonSources
+    from commonSources.archiveFile.map { zipTree(it) }
+}
+
+

cleanroom/src/main/java/com/seibel/distanthorizons/cleanroom/CleanroomClientProxy.java

@@ -0,0 +1,214 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.cleanroom;
+
+import com.seibel.distanthorizons.common.AbstractModInitializer;
+import com.seibel.distanthorizons.common.util.ProxyUtil;
+import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
+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.ServerApi;
+import com.seibel.distanthorizons.core.api.internal.SharedApi;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.logging.f3.F3Screen;
+import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
+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.misc.IPluginPacketSender;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.Chunk;
+import net.minecraftforge.client.event.RenderGameOverlayEvent;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.player.PlayerInteractEvent;
+import net.minecraftforge.event.world.ChunkEvent;
+import net.minecraftforge.event.world.WorldEvent;
+import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.InputEvent;
+import net.minecraftforge.fml.common.gameevent.TickEvent;
+import org.jetbrains.annotations.NotNull;
+import org.lwjgl.glfw.GLFW;
+import org.lwjgl.opengl.GL32;
+
+import java.util.concurrent.AbstractExecutorService;
+
+public class CleanroomClientProxy implements AbstractModInitializer.IEventProxy
+{
+	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
+	private static final CleanroomPluginPacketSender PACKET_SENDER = (CleanroomPluginPacketSender) SingletonInjector.INSTANCE.get(IPluginPacketSender.class);
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	
+	private static World GetEventLevel(WorldEvent e) { return e.getWorld(); }
+	
+	
+	@Override
+	public void registerEvents()
+	{
+		MinecraftForge.EVENT_BUS.register(this);
+		MinecraftForge.EVENT_BUS.register(FMLCommonHandler.instance());
+		CleanroomPluginPacketSender.setPacketHandler(ClientApi.INSTANCE::pluginMessageReceived);
+	}
+	
+	
+	//==============//
+	// chunk events //
+	//==============//
+	//region
+	
+	@SubscribeEvent
+	public void rightClickBlockEvent(PlayerInteractEvent.RightClickBlock event)
+	{
+		if (MC.clientConnectedToDedicatedServer())
+		{
+			World level = event.getWorld();
+			
+			ILevelWrapper wrappedLevel = ProxyUtil.getLevelWrapper(level);
+			if (SharedApi.isChunkAtBlockPosAlreadyUpdating(wrappedLevel, event.getPos().getX(), event.getPos().getZ()))
+			{
+				return;
+			}
+			
+			AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
+			if (executor != null)
+			{
+				executor.execute(() ->
+				{
+					Chunk chunk = level.getChunk(event.getPos());
+					SharedApi.INSTANCE.applyChunkUpdate(new ChunkWrapper(chunk, wrappedLevel), wrappedLevel);
+				});
+			}
+		}
+	}
+	@SubscribeEvent
+	public void leftClickBlockEvent(PlayerInteractEvent.LeftClickBlock event)
+	{
+		if (MC.clientConnectedToDedicatedServer())
+		{
+			World level = event.getWorld();
+			
+			ILevelWrapper wrappedLevel = ProxyUtil.getLevelWrapper(level);
+			if (SharedApi.isChunkAtBlockPosAlreadyUpdating(wrappedLevel, event.getPos().getX(), event.getPos().getZ()))
+			{
+				return;
+			}
+			
+			AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
+			if (executor != null)
+			{
+				executor.execute(() ->
+				{
+					Chunk chunk = level.getChunk(event.getPos());
+					SharedApi.INSTANCE.applyChunkUpdate(new ChunkWrapper(chunk, wrappedLevel), wrappedLevel);
+				});
+			}
+		}
+	}
+
+	@SubscribeEvent
+	public void clientChunkLoadEvent(ChunkEvent.Load event)
+	{
+		if (MC.clientConnectedToDedicatedServer())
+		{
+			ILevelWrapper wrappedLevel = ProxyUtil.getLevelWrapper(GetEventLevel(event));
+			IChunkWrapper chunkWrapper = new ChunkWrapper(event.getChunk(), wrappedLevel);
+			SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, wrappedLevel);
+		}
+	}
+	
+	//endregion
+	
+	
+	
+	//==============//
+	// key bindings //
+	//==============//
+	//region
+	
+	@SubscribeEvent
+	public void registerKeyBindings(InputEvent.KeyInputEvent event)
+	{
+	/*	if (Minecraft.getMinecraft().player == null)
+		{
+			return;
+		}
+		if (event.getAction() != GLFW.GLFW_PRESS)
+		{
+			return;
+		}
+		
+		ClientApi.INSTANCE.keyPressedEvent(event.getKey());*/
+	}
+	
+	//endregion
+	
+	
+	
+	//===========//
+	// rendering //
+	//===========//
+	//region
+	
+	@SubscribeEvent
+	public void afterLevelRenderEvent(TickEvent.RenderTickEvent event)
+	{
+		if (event.type.equals(TickEvent.RenderTickEvent.Type.RENDER))
+		{
+			try
+			{
+				// should generally only need to be set once per game session
+				// allows DH to render directly to Optifine's level frame buffer,
+				// allowing better shader support
+				MinecraftRenderWrapper.INSTANCE.finalLevelFrameBufferId = GL32.glGetInteger(GL32.GL_FRAMEBUFFER_BINDING);
+			}
+			catch (Exception | Error e)
+			{
+				LOGGER.error("Unexpected error in afterLevelRenderEvent: "+e.getMessage(), e);
+			}
+		}
+	}
+	
+	@SubscribeEvent
+	public void onRenderOverlay(RenderGameOverlayEvent.Text event) 
+	{
+		Minecraft mc = Minecraft.getMinecraft();
+		if (event.isCanceled() 
+			|| !mc.gameSettings.showDebugInfo)
+		{
+			return;
+		}
+		
+		F3Screen.addStringToDisplay(event.getRight());
+	}
+	
+	//endregion
+	
+	
+	
+}

cleanroom/src/main/java/com/seibel/distanthorizons/cleanroom/CleanroomMain.java

@@ -0,0 +1,147 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.cleanroom;
+
+import com.seibel.distanthorizons.cleanroom.modAccessor.ModChecker;
+import com.seibel.distanthorizons.common.AbstractModInitializer;
+import com.seibel.distanthorizons.common.commands.CommandInitializer;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.InternalServerGenerator;
+import com.seibel.distanthorizons.core.api.internal.ServerApi;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
+import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker;
+import com.seibel.distanthorizons.coreapi.ModInfo;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.World;
+import net.minecraftforge.common.ForgeChunkManager;
+import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.event.*;
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.core.config.Configurator;
+
+
+import java.util.List;
+import java.util.function.Consumer;
+
+/**
+ * Initialize and setup the Mod. <br>
+ * If you are looking for the real start of the mod
+ * check out the ClientProxy.
+ */
+@Mod(modid = ModInfo.ID, name = ModInfo.NAME, version = ModInfo.VERSION)
+public class CleanroomMain extends AbstractModInitializer
+{
+	@Mod.Instance
+	public static CleanroomMain instance;
+	
+	@Mod.EventHandler
+	public void preinit(FMLPreInitializationEvent event)
+	{
+		Configurator.setLevel("org.sqlite", Level.INFO);
+		ForgeChunkManager.setForcedChunkLoadingCallback(CleanroomMain.instance, (tickets, world) -> { });	
+	}
+	
+	@Mod.EventHandler
+	public void init(FMLInitializationEvent event)
+	{
+		if (FMLCommonHandler.instance().getEffectiveSide().isClient())
+		{
+			this.onInitializeClient();
+		}
+		else
+		{
+			this.onInitializeServer();
+		}
+	}
+	
+	@Override
+	protected void createInitialSharedBindings()
+	{
+		SingletonInjector.INSTANCE.bind(IModChecker.class, ModChecker.INSTANCE);
+		SingletonInjector.INSTANCE.bind(IPluginPacketSender.class, new CleanroomPluginPacketSender());
+	}
+	@Override
+	protected void createInitialClientBindings() { /* no additional setup needed currently */ }
+	
+	@Override
+	protected IEventProxy createClientProxy() { return new CleanroomClientProxy(); }
+	
+	@Override
+	protected IEventProxy createServerProxy(boolean isDedicated) { return new CleanroomServerProxy(isDedicated); }
+	
+	@Override
+	protected void initializeModCompat()
+	{
+		
+	}
+	
+/*	@Override
+	protected void subscribeRegisterCommandsEvent(Consumer<CommandDispatcher<CommandSourceStack>> eventHandler)
+	{ MinecraftForge.EVENT_BUS.addListener((RegisterCommandsEvent e) -> { eventHandler.accept(e.getDispatcher()); }); }*/
+	
+	@Override
+	protected void subscribeClientStartedEvent(Runnable eventHandler)
+	{
+		// Just run the event handler, since there are no proper ClientLifecycleEvent for the client 
+		// to signify readiness other than FmlClientSetupEvent
+		eventHandler.run();
+	}
+	
+	@Mod.EventHandler
+	public void onServerStarting(FMLServerStartingEvent event)
+	{
+		event.registerServerCommand(CommandInitializer.initCommands());
+	}
+	
+	@Mod.EventHandler
+	public void onServerAboutToStart(FMLServerAboutToStartEvent event)
+	{
+		if (eventHandlerStartServer != null)
+		{
+			eventHandlerStartServer.accept(event.getServer());
+		}
+	}
+	
+	Consumer<MinecraftServer> eventHandlerStartServer;
+	
+	@Override
+	protected void subscribeServerStartingEvent(Consumer<MinecraftServer> eventHandler)
+	{
+		eventHandlerStartServer = eventHandler;
+	}
+	
+	@Override
+	protected void runDelayedSetup() { SingletonInjector.INSTANCE.runDelayedSetup(); }
+	
+	// ServerWorldLoadEvent
+	@Mod.EventHandler
+	public void dedicatedWorldLoadEvent(FMLServerAboutToStartEvent event)
+	{
+		ServerApi.INSTANCE.serverLoadEvent(event.getServer().isDedicatedServer());
+	}
+	
+	// ServerWorldUnloadEvent
+	@Mod.EventHandler
+	public void serverWorldUnloadEvent(FMLServerStoppingEvent event)
+	{
+		ServerApi.INSTANCE.serverUnloadEvent();
+	}
+}

cleanroom/src/main/java/com/seibel/distanthorizons/cleanroom/CleanroomPluginPacketSender.java

@@ -0,0 +1,136 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.cleanroom;
+
+import com.seibel.distanthorizons.common.AbstractPluginPacketSender;
+import com.seibel.distanthorizons.common.wrappers.misc.ServerPlayerWrapper;
+import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
+import com.seibel.distanthorizons.core.network.messages.MessageRegistry;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
+import io.netty.buffer.ByteBuf;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraftforge.fml.common.network.NetworkRegistry;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
+import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
+import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
+import net.minecraftforge.fml.relauncher.Side;
+
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+
+public class CleanroomPluginPacketSender extends AbstractPluginPacketSender
+{
+	public static final SimpleNetworkWrapper PLUGIN_CHANNEL =
+		NetworkRegistry.INSTANCE.newSimpleChannel(
+			AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE
+		);
+	
+	
+	
+	public static void setPacketHandler(Consumer<AbstractNetworkMessage> consumer)
+	{ setPacketHandler((player, message) -> consumer.accept(message)); }
+	static BiConsumer<IServerPlayerWrapper, AbstractNetworkMessage> consumerPacket;
+	public static void setPacketHandler(BiConsumer<IServerPlayerWrapper, AbstractNetworkMessage> consumer)
+	{
+		PLUGIN_CHANNEL.registerMessage(MessageWrapper.Handler.class, MessageWrapper.class, 0, Side.CLIENT);
+		PLUGIN_CHANNEL.registerMessage(MessageWrapper.Handler.class, MessageWrapper.class, 0, Side.SERVER);
+		consumerPacket = consumer;
+	}
+	
+	@Override
+	public void sendToServer(AbstractNetworkMessage message)
+	{ PLUGIN_CHANNEL.sendToServer(new MessageWrapper(message)); }
+	
+	@Override
+	public void sendToClient(EntityPlayerMP serverPlayer, AbstractNetworkMessage message)
+	{ PLUGIN_CHANNEL.sendTo(new MessageWrapper(message), serverPlayer); }
+	
+	
+	
+	//================//
+	// helper classes //
+	//================//
+	//region
+	
+	// Forge doesn't support using abstract classes
+	@SuppressWarnings({"ClassCanBeRecord", "RedundantSuppression"})
+	public static class MessageWrapper implements IMessage
+	{
+		public AbstractNetworkMessage message;
+		
+		
+		//=============//
+		// constructor //
+		//=============//
+		//region
+		
+		public MessageWrapper(AbstractNetworkMessage message) { this.message = message; }
+		
+		public MessageWrapper()
+		{
+			// For reflection
+		}
+		
+		//endregion
+		
+		
+		@Override
+		public void fromBytes(ByteBuf buf) 
+		{
+			int messageId = buf.readByte();
+			message = MessageRegistry.INSTANCE.createMessage(messageId);
+			message.decode(buf);
+		}
+		
+		@Override
+		public void toBytes(ByteBuf buf) 
+		{
+			buf.writeByte(MessageRegistry.INSTANCE.getMessageId(message));
+			message.encode(buf);
+		}
+		
+		public static class Handler implements IMessageHandler<MessageWrapper, IMessage>
+		{
+			@Override
+			public IMessage onMessage(MessageWrapper wrapper, MessageContext context) 
+			{
+				if (wrapper.message != null)
+				{
+					if (context.side == Side.SERVER)
+					{
+						consumerPacket.accept(ServerPlayerWrapper.getWrapper(context.getServerHandler().player), wrapper.message);
+					}
+					else 
+					{
+						consumerPacket.accept(null, wrapper.message);
+					}
+				}
+				
+				return null; // No response needed
+			}
+		}
+	}
+	
+	//endregion
+	
+	
+	
+}

cleanroom/src/main/java/com/seibel/distanthorizons/cleanroom/CleanroomServerProxy.java

@@ -0,0 +1,181 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.cleanroom;
+
+import com.seibel.distanthorizons.common.AbstractModInitializer;
+import com.seibel.distanthorizons.common.commands.CommandInitializer;
+import com.seibel.distanthorizons.common.commonMixins.MixinChunkMapCommon;
+import com.seibel.distanthorizons.common.util.ProxyUtil;
+import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
+import com.seibel.distanthorizons.common.wrappers.misc.ServerPlayerWrapper;
+import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.InternalServerGenerator;
+import com.seibel.distanthorizons.core.api.internal.ServerApi;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldServer;
+import net.minecraftforge.common.ForgeChunkManager;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.world.ChunkDataEvent;
+import net.minecraftforge.event.world.ChunkEvent;
+import net.minecraftforge.event.world.WorldEvent;
+import net.minecraftforge.fml.common.FMLCommonHandler;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent;
+import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
+import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.PlayerEvent;
+
+import java.lang.reflect.Field;
+
+import static com.seibel.distanthorizons.cleanroom.CleanroomMain.instance;
+
+public class CleanroomServerProxy implements AbstractModInitializer.IEventProxy
+{
+	private static final CleanroomPluginPacketSender PACKET_SENDER = (CleanroomPluginPacketSender) SingletonInjector.INSTANCE.get(IPluginPacketSender.class);
+	private static World GetEventLevel(WorldEvent e) { return e.getWorld(); }
+	
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private final ServerApi serverApi = ServerApi.INSTANCE;
+	private final boolean isDedicated;
+	
+	
+	
+	@Override
+	public void registerEvents()
+	{
+		MinecraftForge.EVENT_BUS.register(this);
+		FMLCommonHandler.instance().bus().register(this);
+		if (this.isDedicated)
+		{
+			PACKET_SENDER.setPacketHandler(ServerApi.INSTANCE::pluginMessageReceived);
+		}
+	}
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	//region
+	
+	public CleanroomServerProxy(boolean isDedicated) { this.isDedicated = isDedicated; }
+	
+	//endregion
+	
+	
+	
+	//========//
+	// events //
+	//========//
+	//region
+	
+	// ServerLevelLoadEvent
+	@SubscribeEvent
+	public void serverLevelLoadEvent(WorldEvent.Load event)
+	{
+		if (GetEventLevel(event) instanceof WorldServer)
+		{
+			this.serverApi.serverLevelLoadEvent(getServerLevelWrapper((WorldServer) GetEventLevel(event)));
+		}
+	}
+	
+	// ServerLevelUnloadEvent
+	@SubscribeEvent
+	public void serverLevelUnloadEvent(WorldEvent.Unload event)
+	{
+		if (GetEventLevel(event) instanceof WorldServer)
+		{
+			this.serverApi.serverLevelUnloadEvent(getServerLevelWrapper((WorldServer) GetEventLevel(event)));
+		}
+	}
+	
+	@SubscribeEvent
+	public void serverChunkLoadEvent(ChunkEvent.Load event)
+	{
+		ILevelWrapper levelWrapper = ProxyUtil.getLevelWrapper(GetEventLevel(event));
+		IChunkWrapper chunk = new ChunkWrapper(event.getChunk(), levelWrapper);
+		this.serverApi.serverChunkLoadEvent(chunk, levelWrapper);
+	}
+	
+	@SubscribeEvent
+	public void serverChunkSaveEvent(ChunkDataEvent.Save event)
+	{
+		if (event.getWorld() instanceof WorldServer worldServer && event.getChunk().dirty)
+		{
+			MixinChunkMapCommon.onChunkSave(worldServer, event.getChunk());
+		}
+	}
+	
+	@SubscribeEvent
+	public void playerLoggedInEvent(PlayerEvent.PlayerLoggedInEvent event)
+	{ this.serverApi.serverPlayerJoinEvent(getServerPlayerWrapper(event)); }
+	
+	@SubscribeEvent
+	public void playerLoggedOutEvent(PlayerEvent.PlayerLoggedOutEvent event)
+	{ this.serverApi.serverPlayerDisconnectEvent(getServerPlayerWrapper(event)); }
+	
+	@SubscribeEvent
+	public void playerChangedDimensionEvent(PlayerEvent.PlayerChangedDimensionEvent event)
+	{
+		this.serverApi.serverPlayerLevelChangeEvent(
+			getServerPlayerWrapper(event),
+			getServerLevelWrapper(event.fromDim, event),
+			getServerLevelWrapper(event.toDim, event)
+		);
+	}
+	
+	//endregion
+	
+	
+	
+	//================//
+	// helper methods //
+	//================//
+	//region
+	
+	private static ServerLevelWrapper getServerLevelWrapper(WorldServer level) { return ServerLevelWrapper.getWrapper(level); }
+	
+	private static ServerLevelWrapper getServerLevelWrapper(int dimensionId, PlayerEvent event)
+	{
+		MinecraftServer server = event.player.getServer();
+		if (server == null)
+		{
+			LOGGER.error("getServerLevelWrapper: server is null for player {}", event.player.getName());
+			return null;
+		}
+		return getServerLevelWrapper(server.getWorld(dimensionId));
+	}
+	
+	private static ServerPlayerWrapper getServerPlayerWrapper(PlayerEvent event)
+	{ return ServerPlayerWrapper.getWrapper((EntityPlayerMP) event.player); }
+	
+	//endregion
+	
+	
+}

cleanroom/src/main/java/com/seibel/distanthorizons/cleanroom/DistantHorizonsConfigPlugin.java

@@ -0,0 +1,56 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.cleanroom;
+
+import net.minecraftforge.fml.common.Loader;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.objectweb.asm.tree.ClassNode;
+import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
+import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
+
+import java.util.List;
+import java.util.Set;
+
+public class DistantHorizonsConfigPlugin implements IMixinConfigPlugin
+{
+	private static final Logger LOGGER = LogManager.getLogger();
+	
+	@Override
+	public void onLoad(String mixinPackage)
+	{ }
+	
+	@Override
+	public boolean shouldApplyMixin(String targetClassName, String mixinClassName)
+	{
+/*		return switch (mixinClassName.split("\\.")[5]) {
+			case "mist" -> Loader.isModLoaded("mist");
+			default -> true;	
+		};*/
+		return true;
+	}
+	
+	@Override public String getRefMapperConfig() { return null; }
+	@Override public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) { }
+	@Override public List<String> getMixins() { return null; }
+	@Override public void preApply(String targetClassName, ClassNode classNode, String mixinClassName, IMixinInfo mixinInfo) { }
+	@Override public void postApply(String targetClassName, ClassNode classNode, String mixinClassName, IMixinInfo mixinInfo) { }
+	
+}

cleanroom/src/main/java/com/seibel/distanthorizons/cleanroom/DistantHorizonsLoadingPlugin.java

@@ -0,0 +1,52 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.cleanroom;
+
+import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Map;
+
+public class DistantHorizonsLoadingPlugin implements IFMLLoadingPlugin
+{
+	@Override
+	public @Nullable String[] getASMTransformerClass()
+	{
+		return new String[0];
+	}
+	@Override
+	public @Nullable String getModContainerClass()
+	{
+		return null;
+	}
+	@Override
+	public @Nullable String getSetupClass()
+	{
+		return null;
+	}
+	@Override
+	public void injectData(Map<String, Object> data) { }
+	@Override
+	public @Nullable String getAccessTransformerClass()
+	{
+		return null;
+	}
+	
+}

cleanroom/src/main/java/com/seibel/distanthorizons/cleanroom/mixins/client/MixinEntityRenderer.java

@@ -0,0 +1,82 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.cleanroom.mixins.client;
+
+import com.seibel.distanthorizons.common.commonMixins.MixinVanillaFogCommon;
+import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
+import com.seibel.distanthorizons.core.api.internal.ClientApi;
+import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.EntityRenderer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.init.MobEffects;
+import org.apache.logging.log4j.Logger;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(EntityRenderer.class)
+public class MixinEntityRenderer
+{
+	@Shadow
+	@Final
+	private DynamicTexture lightmapTexture;
+	
+	@Shadow @Final private Minecraft mc;
+	@Shadow @Final private static Logger LOGGER;
+	private static final float A_REALLY_REALLY_BIG_VALUE = 420694206942069.F;
+	private static final float A_EVEN_LARGER_VALUE = 42069420694206942069.F;
+	
+	@Inject(at = @At("TAIL"), method = "updateLightmap")
+	public void onUpdateLightmap(float patrialTicks, CallbackInfo ci)
+	{
+		IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
+		if (mc == null || mc.getWrappedClientLevel() == null)
+		{
+			return;
+		}
+		
+		MinecraftRenderWrapper renderWrapper = (MinecraftRenderWrapper)SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
+		renderWrapper.setLightmapId(lightmapTexture.getGlTextureId());
+	}
+	
+	@Inject(at = @At("RETURN"), method = "setupFog")
+	private void disableSetupFog(int startCoords, float partialTicks, CallbackInfo ci)
+	{
+		boolean cancelFog = MixinVanillaFogCommon.cancelFog(startCoords, mc);
+		if (cancelFog)
+		{
+			GlStateManager.setFogStart(A_REALLY_REALLY_BIG_VALUE);
+			GlStateManager.setFogEnd(A_EVEN_LARGER_VALUE);
+			ClientApi.RENDER_STATE.vanillaFogEnabled = false;
+		}
+		else
+		{
+			ClientApi.RENDER_STATE.vanillaFogEnabled = true;
+		}
+	}
+}

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

@@ -0,0 +1,24 @@
+package com.seibel.distanthorizons.cleanroom.mixins.client;
+
+import com.seibel.distanthorizons.common.commonMixins.DhUpdateScreenBase;
+import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.coreapi.ModInfo;
+import net.minecraft.client.Minecraft;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(Minecraft.class)
+public class MixinMinecraft
+{
+	
+	@Inject(method = "init", at = @At("TAIL"))
+	private void onInit(CallbackInfo ci)
+	{
+		if(Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get() && !ModInfo.IS_DEV_BUILD) // weird lib class not found error can occur if we don't check if we are in dev
+		{
+			DhUpdateScreenBase.tryShowUpdateScreenAndRunAutoUpdateStartup(null);
+		}
+	}
+}

cleanroom/src/main/java/com/seibel/distanthorizons/cleanroom/mixins/client/MixinNetHandlerPlayClient.java

@@ -0,0 +1,46 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.cleanroom.mixins.client;
+
+import com.seibel.distanthorizons.core.api.internal.ClientApi;
+import net.minecraft.client.network.NetHandlerPlayClient;
+import net.minecraft.network.play.server.SPacketJoinGame;
+import net.minecraft.util.text.ITextComponent;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(NetHandlerPlayClient.class)
+public class MixinNetHandlerPlayClient
+{
+	@Inject(method = "handleJoinGame", at = @At("RETURN"))
+	private void onHandleJoinGameEnd(SPacketJoinGame packet, CallbackInfo ci)
+	{
+		ClientApi.INSTANCE.onClientOnlyConnected();
+	}
+	
+	@Inject(method = "onDisconnect", at = @At("RETURN"))
+	private void onDisconnect(ITextComponent reason, CallbackInfo ci)
+	{
+		ClientApi.INSTANCE.onClientOnlyDisconnected();
+	}
+	
+}

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

@@ -0,0 +1,83 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.cleanroom.mixins.client;
+
+import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen;
+import com.seibel.distanthorizons.common.wrappers.gui.TexturedButtonWidget;
+import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.coreapi.ModInfo;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiOptions;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.util.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;
+
+/**
+ * Adds a button to the menu to goto the config
+ *
+ * @author coolGi
+ * @version 12-02-2021
+ */
+@Mixin(GuiOptions.class)
+public class MixinOptionsScreen extends GuiScreen
+{
+	// Get the texture for the button
+	@Unique private static final ResourceLocation ICON_TEXTURE = new ResourceLocation(ModInfo.ID, "textures/gui/button.png");
+
+    @Unique private static final int button_id = 99;
+
+	@Inject(at = @At("HEAD"), method = "initGui")
+	private void lodconfig$init(CallbackInfo ci)
+	{
+		if (Config.Client.showDhOptionsButtonInMinecraftUi.get())
+			this.buttonList.add(
+					(new TexturedButtonWidget(
+							button_id,
+							// Where the button is on the screen
+							this.width / 2 - 180, this.height / 6 - 12,
+							// Width and height of the button
+							20, 20,
+							// Offset
+							0, 0,
+							// Some textuary stuff
+							20, ICON_TEXTURE, 20, 40,
+							// Create the button and tell it where to go
+							// For now it goes to the client option by default
+							// Add a title to the button
+							ModInfo.ID + ".title")));
+
+	}
+
+    @Inject(at = @At("HEAD"), method = "actionPerformed", cancellable = true)
+    private void lodconfig$actionPerformed(GuiButton button, CallbackInfo ci)
+    {
+        if (button.id == button_id)
+        {
+            Minecraft.getMinecraft().displayGuiScreen(GetConfigScreen.getScreen(this));
+            ci.cancel();
+        }
+    }
+
+}

cleanroom/src/main/java/com/seibel/distanthorizons/cleanroom/mixins/client/MixinRenderGlobal.java

@@ -0,0 +1,68 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.cleanroom.mixins.client;
+
+import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
+import com.seibel.distanthorizons.core.api.internal.ClientApi;
+import com.seibel.distanthorizons.core.util.math.DhMat4f;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.entity.Entity;
+import net.minecraft.util.BlockRenderLayer;
+import org.lwjgl.opengl.GL32;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(RenderGlobal.class)
+public class MixinRenderGlobal
+{
+	@Shadow private WorldClient world;
+
+	@Inject(method = "renderBlockLayer(Lnet/minecraft/util/BlockRenderLayer;DILnet/minecraft/entity/Entity;)I", at = @At("HEAD"))
+	private void renderChunkLayer(BlockRenderLayer blockLayerIn, double partialTicks, int pass, Entity entityIn, CallbackInfoReturnable<Integer> cir)
+	{
+		if (blockLayerIn == BlockRenderLayer.SOLID)
+		{
+			float[] mcProjMatrixRaw = new float[16];
+			GL32.glGetFloatv(GL32.GL_PROJECTION_MATRIX, mcProjMatrixRaw);
+			ClientApi.RENDER_STATE.mcProjectionMatrix = new DhMat4f(mcProjMatrixRaw);
+			ClientApi.RENDER_STATE.mcProjectionMatrix.transpose();
+			
+			float[] mcModelViewRaw = new float[16];
+			GL32.glGetFloatv(GL32.GL_MODELVIEW_MATRIX, mcModelViewRaw);
+			ClientApi.RENDER_STATE.mcModelViewMatrix = new DhMat4f(mcModelViewRaw);
+			ClientApi.RENDER_STATE.mcModelViewMatrix.transpose();
+			
+			ClientApi.RENDER_STATE.partialTickTime = (float) partialTicks;
+			ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, this.world);
+			
+			ClientApi.INSTANCE.renderLods();
+			
+			//Some 1.12.2 rendering mods breaks if we don't unbind buffers
+			GL32.glBindVertexArray(0);
+			GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, 0);
+			GL32.glBindBuffer(GL32.GL_ELEMENT_ARRAY_BUFFER, 0);
+			GL32.glUseProgram(0);
+		}
+	}
+}

cleanroom/src/main/java/com/seibel/distanthorizons/cleanroom/mixins/common/MixinThreadedFileIOBase.java

@@ -0,0 +1,17 @@
+package com.seibel.distanthorizons.cleanroom.mixins.common;
+
+import net.minecraft.world.storage.ThreadedFileIOBase;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(ThreadedFileIOBase.class)
+public class MixinThreadedFileIOBase
+{
+	@Redirect(method = "processQueue", at = @At(value = "INVOKE", target = "Ljava/lang/Thread;sleep(J)V"))
+	private void reduceSleep(long millis) throws InterruptedException
+	{
+		// 0ms between chunks, 5ms when idle
+		Thread.sleep(millis == 25L ? 5L : 0L);
+	}
+}

cleanroom/src/main/java/com/seibel/distanthorizons/cleanroom/mixins/server/MixinEntityPlayerMP.java

@@ -0,0 +1,66 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.cleanroom.mixins.server;
+
+import com.seibel.distanthorizons.common.wrappers.misc.IMixinServerPlayer;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.WorldServer;
+import net.minecraftforge.common.util.ITeleporter;
+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.CallbackInfoReturnable;
+
+@Mixin(EntityPlayerMP.class)
+public abstract class MixinEntityPlayerMP implements IMixinServerPlayer
+{
+	@Shadow 
+	@Final
+	public MinecraftServer server;
+	
+	@Unique
+	@Nullable
+	private volatile WorldServer distantHorizons$dimensionChangeDestination;
+	
+	
+	
+	@Override
+	@Nullable
+	public WorldServer distantHorizons$getDimensionChangeDestination()
+	{ return this.distantHorizons$dimensionChangeDestination; }
+	
+	@Inject(at = @At("HEAD"), method = "changeDimension(ILnet/minecraftforge/common/util/ITeleporter;)Lnet/minecraft/entity/Entity;")
+	public void setDimensionChangeDestination(int destinationDimensionID, ITeleporter teleporter, CallbackInfoReturnable<Entity> cir)
+	{ this.distantHorizons$dimensionChangeDestination = this.server.getWorld(destinationDimensionID); }
+	
+	@Inject(at = @At("RETURN"), method = "clearInvulnerableDimensionChange")
+	public void clearDimensionChangeDestination(CallbackInfo ci)
+	{ this.distantHorizons$dimensionChangeDestination = null; }
+	
+	
+	
+}

cleanroom/src/main/java/com/seibel/distanthorizons/cleanroom/modAccessor/ModChecker.java

@@ -0,0 +1,52 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.cleanroom.modAccessor;
+
+import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker;
+import net.minecraftforge.fml.common.Loader;
+import net.minecraftforge.fml.common.ModContainer;
+
+import java.io.File;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+public class ModChecker implements IModChecker
+{
+	public static final ModChecker INSTANCE = new ModChecker();
+	
+	@Override
+	public boolean isModLoaded(String modid)
+	{
+		return Loader.isModLoaded(modid);
+	}
+	
+	@Override
+	public File modLocation(String modid)
+	{
+		Stream<ModContainer> foundStream = Loader.instance().getModList().stream().filter(x -> x.getModId().equals(modid));
+		Optional<ModContainer> container = foundStream.findFirst();
+		if (!container.isPresent())
+		{
+			throw new RuntimeException("Mod not found: " + modid);
+		}
+		return container.get().getSource();
+	}
+	
+}

cleanroom/src/main/resources/distanthorizons.default.mixin.json

@@ -0,0 +1,20 @@
+{
+  "required": true,
+  "package": "com.seibel.distanthorizons.cleanroom.mixins",
+  "compatibilityLevel": "JAVA_8",
+  "target": "@env(DEFAULT)",
+  "mixins": [
+    "common.MixinThreadedFileIOBase"
+  ],
+  "minVersion": "0.8.7",
+  "server": [
+    "server.MixinEntityPlayerMP"
+  ],
+  "client": [
+    "client.MixinEntityRenderer",
+    "client.MixinMinecraft",
+    "client.MixinNetHandlerPlayClient",
+    "client.MixinOptionsScreen",
+    "client.MixinRenderGlobal"
+  ]
+}

cleanroom/src/main/resources/distanthorizons.mod.mixin.json

@@ -0,0 +1,11 @@
+{
+    "required": false,
+    "package": "com.seibel.distanthorizons.cleanroom.mixins.mod",
+    "compatibilityLevel": "JAVA_8",
+    "target": "@env(MOD)",
+    "mixins": [],
+    "minVersion": "0.8.7",
+    "plugin": "com.seibel.distanthorizons.cleanroom.DistantHorizonsConfigPlugin",
+    "client": [
+    ]
+}

cleanroom/src/main/resources/mcmod.info

@@ -0,0 +1,12 @@
+[{
+    "modid": "${mod_id}",
+    "name": "${mod_name}",
+    "version": "${version}",
+    "mcversion": "1.12.2",
+    "description": "${description}",
+    "authorList": ["${cleanroom_authors}"],
+    "credits": "",
+    "url": "",
+    "updateJSON": "",
+    "logoFile": "${logo_path}"
+}]

cleanroom/src/main/resources/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+	"pack": {
+		"description": "${mod_name} Resources",
+		"pack_format": 3
+	}
+}

common/build.gradle

@@ -1,41 +1,3 @@
-
-// temporary fix for broken spongepowered version
-buildscript {
-    configurations.configureEach {
-        resolutionStrategy {
-            force 'org.spongepowered:vanillagradle:0.2.1-20240507.024226-82'
-            // newer versions can be found by going to the link:
-            // https://repo.spongepowered.org/#browse/browse:maven-public:org%2Fspongepowered%2Fvanillagradle%2F0.2.1-SNAPSHOT
-        }
-    }
-}
-
 plugins {
-    id "org.spongepowered.gradle.vanilla" version "0.2.1-SNAPSHOT"
+    id 'dh-loader'
 }
-
-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

@@ -1,15 +1,17 @@
 package com.seibel.distanthorizons.common;
 
-import com.mojang.brigadier.CommandDispatcher;
+import com.seibel.distanthorizons.api.enums.config.EDhApiMcRenderingFadeMode;
-import com.seibel.distanthorizons.api.enums.config.EDhApiRenderApi;
+import com.seibel.distanthorizons.api.enums.config.EDhApiRenderingEngine;
+import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorMode;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiAfterDhInitEvent;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeDhInitEvent;
 import com.seibel.distanthorizons.common.commands.CommandInitializer;
 import com.seibel.distanthorizons.common.wrappers.DependencySetup;
 import com.seibel.distanthorizons.common.wrappers.gui.DhDebugScreenEntry;
+import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapper;
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftServerWrapper;
+import com.seibel.distanthorizons.core.Initializer;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
-import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.config.ConfigHandler;
 import com.seibel.distanthorizons.core.config.eventHandlers.presets.ThreadPresetConfigEventHandler;
@@ -19,7 +21,10 @@ import com.seibel.distanthorizons.core.enums.MinecraftTextFormat;
 import com.seibel.distanthorizons.core.jar.ModJarInfo;
 import com.seibel.distanthorizons.core.jar.updater.SelfUpdater;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.util.NativeDialogUtil;
+import com.seibel.distanthorizons.core.render.renderer.AbstractDebugWireframeRenderer;
+import com.seibel.distanthorizons.core.render.renderer.StubDebugWireframeRenderer;
+import com.seibel.distanthorizons.common.wrappers.gui.NativeDialogUtil;
+import com.seibel.distanthorizons.core.util.ThreadUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IIrisAccessor;
@@ -27,14 +32,19 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModAccesso
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
 import com.seibel.distanthorizons.coreapi.ModInfo;
-import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.dedicated.DedicatedServer;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
+#if MC_VER > MC_1_12_2
+import com.mojang.brigadier.CommandDispatcher;
+import net.minecraft.commands.CommandSourceStack;
+#endif
+
 /**
  * Base for all mod loader initializers 
  * and handles most setup. 
@@ -58,7 +68,9 @@ public abstract class AbstractModInitializer
 	protected abstract IEventProxy createServerProxy(boolean isDedicated);
 	protected abstract void initializeModCompat();
 	
+	#if MC_VER > MC_1_12_2
 	protected abstract void subscribeRegisterCommandsEvent(Consumer<CommandDispatcher<CommandSourceStack>> eventHandler);
+	#endif
 	
 	protected abstract void subscribeClientStartedEvent(Runnable eventHandler);
 	protected abstract void subscribeServerStartingEvent(Consumer<MinecraftServer> eventHandler);
@@ -91,7 +103,9 @@ public abstract class AbstractModInitializer
 		
 		// Client uses config for auto-updater, so it's initialized here instead of post-init stage
 		this.initConfig();
-		logModIncompatibilityWarnings(); // needs to be called after config loading
+		logIncompatibilityWarnings(); // needs to be called after config loading
+		setUnsupportedConfigsBasedOnMcVersion();
+		Initializer.postConfigInit();
 		
 		LOGGER.info(ModInfo.READABLE_NAME + " client Initialized.");
 		
@@ -125,20 +139,33 @@ public abstract class AbstractModInitializer
 		this.initializeModCompat();
 		
 		LOGGER.info(ModInfo.READABLE_NAME + " server Initialized, adding event subscribers...");
+		#if MC_VER > MC_1_12_2
 		this.commandInitializer = new CommandInitializer();
 		this.subscribeRegisterCommandsEvent(dispatcher -> { this.commandInitializer.initCommands(dispatcher); });
+		#endif
 		
 		this.subscribeServerStartingEvent(server -> 
 		{
 			MinecraftServerWrapper.INSTANCE.dedicatedServer = (DedicatedServer)server;
 			
 			this.initConfig();
+			Initializer.postConfigInit();
 			this.postInit();
+			this.postServerInit();
+			#if MC_VER > MC_1_12_2
 			this.commandInitializer.onServerReady();
+			#endif
 			
 			this.checkForUpdates();
 			
-			LOGGER.info(ModInfo.READABLE_NAME + " server Initialized at " + server.getServerDirectory());
+			String serverFolderPath;
+			#if MC_VER <= MC_1_12_2
+			serverFolderPath = server.getDataDirectory() + "";
+			#else
+			serverFolderPath = server.getServerDirectory() + "";
+			#endif
+			
+			LOGGER.info(ModInfo.READABLE_NAME + " server Initialized at " + serverFolderPath);
 		});
 	}
 	
@@ -154,7 +181,7 @@ public abstract class AbstractModInitializer
 	private void startup()
 	{
 		DependencySetup.createSharedBindings();
-		SharedApi.init();
+		Initializer.preConfigInit();
 		this.createInitialSharedBindings();
 	}
 	
@@ -222,15 +249,45 @@ public abstract class AbstractModInitializer
 		ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null);
 	}
 	
-	private void postClientInit() { DependencySetup.setRenderingApiBindings(); }
+	private void postClientInit() 
+	{
+		CompletableFuture<Void> future = new CompletableFuture<>();
+		
+		// This method may be called from either the render thread,
+		// or some other random setup thread depending on the mod loader.
+		// In order to avoid confusion/inconsistent problems, we're always going 
+		// to run setup on our own thread.
+		Thread dhSetupThread = new Thread(() -> 
+		{
+			try
+			{
+				DependencySetup.setRenderingApiBindings();
+			}
+			catch (Exception e)
+			{
+				NativeDialogUtil.showDialog(ModInfo.READABLE_NAME, e.getMessage(), "ok", "error");
+				MinecraftClientWrapper.INSTANCE.crashMinecraft(e.getMessage(), e);
+				future.completeExceptionally(e);
+			}
+			finally
+			{
+				future.complete(null);
+			}
+		});
+		dhSetupThread.setName(ThreadUtil.THREAD_NAME_PREFIX + "PostClientInit Thread");
+		dhSetupThread.start();
+		
+		future.join();
+	}
+	private void postServerInit() { SingletonInjector.INSTANCE.bind(AbstractDebugWireframeRenderer.class, new StubDebugWireframeRenderer()); }
 	
 	//endregion
 	
 	
 	
-	//==================================//
+	//======================//
-	// mod partial compatibility checks //
+	// compatibility checks //
-	//==================================//
+	//======================//
 	//region
 	
 	/** 
@@ -239,7 +296,7 @@ public abstract class AbstractModInitializer
 	 * This method will log (and display to chat if enabled)
 	 * these warnings and potential fixes.
 	 */
-	private static void logModIncompatibilityWarnings()
+	private static void logIncompatibilityWarnings()
 	{
 		boolean showChatWarnings = Config.Common.Logging.Warning.showModCompatibilityWarningsOnStartup.get();
 		IModChecker modChecker = SingletonInjector.INSTANCE.get(IModChecker.class);
@@ -333,17 +390,17 @@ public abstract class AbstractModInitializer
 		if (iris != null)
 		{
 			// get the currently selected rendering API
-			EDhApiRenderApi renderApi = Config.Client.Advanced.Graphics.Experimental.renderingApi.get();
+			EDhApiRenderingEngine renderApi = Config.Client.Advanced.Graphics.Experimental.renderingEngine.get();
-			if (renderApi == EDhApiRenderApi.AUTO)
+			if (renderApi == EDhApiRenderingEngine.AUTO)
 			{
 				IVersionConstants versionConstants = SingletonInjector.INSTANCE.get(IVersionConstants.class);
-				renderApi = versionConstants.getDefaultRenderingApi();
+				renderApi = versionConstants.getDefaultRenderingEngine();
 			}
 			
-			// Iris only supports nataive OpenGL
+			// Iris only supports native OpenGL
-			if (renderApi != EDhApiRenderApi.OPEN_GL)
+			if (renderApi != EDhApiRenderingEngine.OPEN_GL)
 			{
-				String irisUnsupportedMessage = "Iris doesn't support DH when using the ["+EDhApiRenderApi.BLAZE_3D+"] rendering API, please change it to ["+EDhApiRenderApi.OPEN_GL+"] in DH's config file.";
+				String irisUnsupportedMessage = "Iris doesn't support DH when using the ["+ EDhApiRenderingEngine.BLAZE_3D+"] rendering engine, this will need to be fixed on Iris end. As a temporary fix please change the rendering engine to ["+ EDhApiRenderingEngine.OPEN_GL+"] in the DH config file.";
 				LOGGER.fatal(irisUnsupportedMessage);
 				NativeDialogUtil.showDialog(ModInfo.READABLE_NAME, irisUnsupportedMessage, "ok", "error");
 				
@@ -358,6 +415,24 @@ public abstract class AbstractModInitializer
 		
 	}
 	
+	/**
+	 * Some Minecraft versions don't support all
+	 * DH options.
+	 * In that case we need to override what options are available.
+	 */
+	private static void setUnsupportedConfigsBasedOnMcVersion()
+	{
+		
+		#if MC_VER <= MC_1_12_2
+		Config.Client.Advanced.Graphics.Experimental.renderingEngine.setMcVersionOverrideValue(EDhApiRenderingEngine.OPEN_GL);
+		Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.setMcVersionOverrideValue(EDhApiMcRenderingFadeMode.NONE);
+		Config.Common.WorldGenerator.distantGeneratorMode.setMcVersionOverrideValue(EDhApiDistantGeneratorMode.INTERNAL_SERVER);
+		#elif MC_VER <= MC_1_21_10
+		Config.Client.Advanced.Graphics.Experimental.renderingEngine.setMcVersionOverrideValue(EDhApiRenderingEngine.OPEN_GL);
+		#else
+		#endif
+	}
+	
 	//endregion
 	
 	

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

@@ -12,10 +12,17 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSende
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import io.netty.buffer.ByteBufUtil;
+#if MC_VER <= MC_1_12_2
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.network.PacketBuffer;
+#else
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.server.level.ServerPlayer;
+#endif
 
-#if MC_VER <= MC_1_21_10
+#if MC_VER <= MC_1_12_2
+import net.minecraft.util.ResourceLocation;
+#elif MC_VER <= MC_1_21_10
 import net.minecraft.resources.ResourceLocation;
 #else
 import net.minecraft.resources.Identifier;
@@ -30,7 +37,9 @@ public abstract class AbstractPluginPacketSender implements IPluginPacketSender
 			.fileLevelConfig(Config.Common.Logging.logNetworkEventToFile)
 			.build();
 	
-	#if MC_VER <= MC_1_20_6
+	#if MC_VER <= MC_1_12_2
+	public static final String WRAPPER_PACKET_RESOURCE = ModInfo.RESOURCE_NAMESPACE + ModInfo.WRAPPER_PACKET_PATH;
+	#elif MC_VER <= MC_1_20_6
 	public static final ResourceLocation WRAPPER_PACKET_RESOURCE = new ResourceLocation(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH);
 	#elif  MC_VER <= MC_1_21_10
 	public static final ResourceLocation WRAPPER_PACKET_RESOURCE = ResourceLocation.fromNamespaceAndPath(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH);
@@ -52,14 +61,28 @@ public abstract class AbstractPluginPacketSender implements IPluginPacketSender
 	@Override
 	public final void sendToClient(IServerPlayerWrapper serverPlayer, AbstractNetworkMessage message)
 	{
+		#if MC_VER <= MC_1_12_2
+		this.sendToClient((EntityPlayerMP) serverPlayer.getWrappedMcObject(), message);
+		#else
 		this.sendToClient((ServerPlayer) serverPlayer.getWrappedMcObject(), message);
+		#endif
 	}
+	
+	#if MC_VER <= MC_1_12_2
+	public abstract void sendToClient(EntityPlayerMP serverPlayer, AbstractNetworkMessage message);
+	#else
 	public abstract void sendToClient(ServerPlayer serverPlayer, AbstractNetworkMessage message);
+	#endif
+	
 	
 	@Override
 	public abstract void sendToServer(AbstractNetworkMessage message);
 	
+	#if MC_VER <= MC_1_12_2
+	public AbstractNetworkMessage decodeMessage(PacketBuffer in)
+	#else
 	public AbstractNetworkMessage decodeMessage(FriendlyByteBuf in)
+	#endif
 	{
 		AbstractNetworkMessage message = null;
 		
@@ -100,7 +123,11 @@ public abstract class AbstractPluginPacketSender implements IPluginPacketSender
 		}
 	}
 	
+	#if MC_VER <= MC_1_12_2
+	public void encodeMessage(PacketBuffer out, AbstractNetworkMessage message) 
+	#else 
 	public void encodeMessage(FriendlyByteBuf out, AbstractNetworkMessage message)
+	#endif
 	{
 		// This is intentionally unhandled, because errors related to this are unlikely to appear in wild
 		Objects.requireNonNull(message);

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

@@ -1,5 +1,9 @@
 package com.seibel.distanthorizons.common.commands;
 
+#if MC_VER <= MC_1_12_2
+public abstract class AbstractCommand {}
+
+#else
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import com.seibel.distanthorizons.common.wrappers.misc.ServerPlayerWrapper;
@@ -100,3 +104,4 @@ public abstract class AbstractCommand
 	}
 	
 }
+#endif

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

@@ -1,12 +1,26 @@
 package com.seibel.distanthorizons.common.commands;
-
+#if MC_VER <= MC_1_12_2
+import com.seibel.distanthorizons.core.config.ConfigHandler;
+import com.seibel.distanthorizons.core.config.types.AbstractConfigBase;
+import com.seibel.distanthorizons.core.config.types.ConfigEntry;
+import com.seibel.distanthorizons.core.logging.f3.F3Screen;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.ICommand;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.text.TextComponentString;
+#else
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import net.minecraft.commands.CommandSourceStack;
+import static net.minecraft.commands.Commands.literal;
+#endif
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static com.seibel.distanthorizons.core.network.messages.MessageRegistry.DEBUG_CODEC_CRASH_MESSAGE;
-import static net.minecraft.commands.Commands.literal;
 
 #if MC_VER <= MC_1_21_10
 #else
@@ -25,6 +39,70 @@ public class CommandInitializer
 	#endif
 	
 	
+	
+	#if MC_VER <= MC_1_12_2
+	public static ICommand initCommands()
+	{
+		return new CommandBase()
+		{
+			@Override
+			public String getName() { return "dh"; }
+			
+			@Override
+			public String getUsage(ICommandSender sender) { return "/dh <debug|config|pregen>"; }
+			
+			@Override
+			public void execute(MinecraftServer server, ICommandSender sender, String[] args)
+			{
+				if (args.length == 0)
+				{
+					if (DEBUG_CODEC_CRASH_MESSAGE)
+					{
+						sender.sendMessage(new TextComponentString("Usage: /dh <debug|config|crash|pregen>"));
+					}
+					else
+					{
+						sender.sendMessage(new TextComponentString("Usage: /dh <debug|config|pregen"));
+					}
+					return;
+				}
+				
+				switch (args[0])
+				{
+					case "debug":
+						DebugCommand debugCommand = new DebugCommand();
+						debugCommand.execute(sender);
+						break;
+					case "config":
+						ConfigCommand configCommand = new ConfigCommand();
+						configCommand.execute(sender, args);
+						break;
+					case "crash":
+						if (DEBUG_CODEC_CRASH_MESSAGE)
+						{
+							CrashCommand crashCommand = new CrashCommand();
+							crashCommand.execute(sender, args);
+						}
+						break;
+					case "pregen":
+						if (!server.isDedicatedServer())
+						{
+							sender.sendMessage(new TextComponentString("Pregen command is only available on dedicated servers"));
+							break;
+						}
+						PregenCommand pregenCommand = new PregenCommand();
+						pregenCommand.execute(server, sender, args);
+						break;
+					default:
+						sender.sendMessage(new TextComponentString("Unknown subcommand: " + args[0]));
+				}
+			}
+		};
+		
+	}
+	
+	#else
+	
 	/**
 	 * A received command dispatcher, which is held until the server is ready to initialize the commands.
 	 */
@@ -80,5 +158,5 @@ public class CommandInitializer
 		
 		commandDispatcher.register(builder);
 	}
-	
+	#endif
 }

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

@@ -1,13 +1,25 @@
 package com.seibel.distanthorizons.common.commands;
 
-import com.mojang.brigadier.arguments.*;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.context.CommandContext;
 import com.seibel.distanthorizons.core.config.ConfigHandler;
 import com.seibel.distanthorizons.core.config.types.AbstractConfigBase;
 import com.seibel.distanthorizons.core.config.types.ConfigEntry;
+
+#if MC_VER <= MC_1_12_2
+import net.minecraft.command.ICommandSender;
+import net.minecraft.util.text.TextComponentString;
+#else
+import com.mojang.brigadier.arguments.*;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
 import net.minecraft.commands.CommandSourceStack;
 
+import static com.mojang.brigadier.arguments.DoubleArgumentType.doubleArg;
+import static com.mojang.brigadier.arguments.IntegerArgumentType.integer;
+import static net.minecraft.commands.Commands.argument;
+import static net.minecraft.commands.Commands.literal;
+#endif
+
+
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
@@ -16,16 +28,75 @@ import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.function.ToIntBiFunction;
 
-import static com.mojang.brigadier.arguments.DoubleArgumentType.doubleArg;
+
-import static com.mojang.brigadier.arguments.IntegerArgumentType.integer;
-import static net.minecraft.commands.Commands.argument;
-import static net.minecraft.commands.Commands.literal;
 
 /**
  * Command for managing config.
  */
 public class ConfigCommand extends AbstractCommand
 {
+	#if MC_VER <= MC_1_12_2
+	@SuppressWarnings({"unchecked", "rawtypes"})
+	private static void setConfigValue(ConfigEntry<?> configEntry, String value)
+	{
+		Class<?> type = configEntry.getType();
+		
+		if (type == Boolean.class)       ((ConfigEntry) configEntry).set(Boolean.parseBoolean(value));
+		else if (type == Integer.class)  ((ConfigEntry) configEntry).set(Integer.parseInt(value));
+		else if (type == Double.class)   ((ConfigEntry) configEntry).set(Double.parseDouble(value));
+		else if (type == Float.class)    ((ConfigEntry) configEntry).set(Float.parseFloat(value));
+		else if (type == Long.class)     ((ConfigEntry) configEntry).set(Long.parseLong(value));
+		else if (type == String.class)   ((ConfigEntry) configEntry).set(value);
+		else if (type.isEnum())          ((ConfigEntry) configEntry).set(Enum.valueOf((Class<Enum>) type, value));
+		else throw new RuntimeException("Unsupported config type: " + type.getSimpleName());
+	}
+	public void execute(ICommandSender sender, String[] args)
+	{
+		if (args.length < 2)
+		{
+			sender.sendMessage(new TextComponentString("Usage: /dh config <name> [value]"));
+			return;
+		}
+		
+		String configName = args[1];
+		AbstractConfigBase<?> found = null;
+		for (AbstractConfigBase<?> entry : ConfigHandler.INSTANCE.configBaseList)
+		{
+			if (entry instanceof ConfigEntry && configName.equals(((ConfigEntry<?>) entry).getChatCommandName()))
+			{
+				found = entry;
+				break;
+			}
+		}
+		
+		if (found == null)
+		{
+			sender.sendMessage(new TextComponentString("Unknown config: " + configName));
+			return;
+		}
+		
+		ConfigEntry<?> configEntry = (ConfigEntry<?>) found;
+		if (args.length == 2)
+		{
+			sender.sendMessage(new TextComponentString("Current value of " + configName + " is " + configEntry.get()));
+		}
+		else
+		{
+			String value = args[2];
+			try
+			{
+				setConfigValue(configEntry, value);
+				sender.sendMessage(new TextComponentString("Changed " + configName + " to " + value));
+			}
+			catch (Exception e)
+			{
+				sender.sendMessage(new TextComponentString("Invalid value: " + value));
+			}
+		}
+	}
+	
+	#else
+	
 	private static final List<CommandArgumentData<?>> commandArguments = Arrays.asList(
 			new CommandArgumentData<>(Integer.class, configEntry -> integer(configEntry.getMin(), configEntry.getMax()), IntegerArgumentType::getInteger),
 			new CommandArgumentData<>(Double.class, configEntry -> doubleArg(configEntry.getMin(), configEntry.getMax()), DoubleArgumentType::getDouble),
@@ -150,5 +221,6 @@ public class ConfigCommand extends AbstractCommand
 		}
 		
 	}
+	#endif
 	
 }

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

@@ -1,15 +1,60 @@
 package com.seibel.distanthorizons.common.commands;
 
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.multiplayer.server.ServerPlayerState;
 import com.seibel.distanthorizons.core.network.messages.base.CodecCrashMessage;
+
+#if MC_VER <= MC_1_12_2
+import com.seibel.distanthorizons.common.wrappers.misc.ServerPlayerWrapper;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.util.text.TextComponentString;
+#else
 import net.minecraft.commands.CommandSourceStack;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 
 import static net.minecraft.commands.Commands.literal;
+#endif
+
 
 public class CrashCommand extends AbstractCommand
 {
+	#if MC_VER <= MC_1_12_2
+	public void execute(ICommandSender sender, String[] args)
+	{
+		if (!(sender instanceof EntityPlayerMP))
+		{
+			sender.sendMessage(new TextComponentString("This command can only be run by a player"));
+			return;
+		}
+		
+		if (args.length < 2)
+		{
+			sender.sendMessage(new TextComponentString("Usage: /dh crash <encode|decode>"));
+			return;
+		}
+		
+		if (SharedApi.tryGetDhServerWorld() == null) return;
+		
+		ServerPlayerState serverPlayerState = SharedApi.tryGetDhServerWorld()
+			.getServerPlayerStateManager()
+			.getConnectedPlayer(ServerPlayerWrapper.getWrapper((EntityPlayerMP) sender));
+		
+		if (serverPlayerState == null) return;
+		
+		switch (args[1])
+		{
+			case "encode":
+				serverPlayerState.networkSession.sendMessage(new CodecCrashMessage(CodecCrashMessage.ECrashPhase.ENCODE));
+				break;
+			case "decode":
+				serverPlayerState.networkSession.sendMessage(new CodecCrashMessage(CodecCrashMessage.ECrashPhase.DECODE));
+				break;
+			default:
+				sender.sendMessage(new TextComponentString("Usage: /dh crash <encode|decode>"));
+		}
+	}
+	#else
 	@Override
 	public LiteralArgumentBuilder<CommandSourceStack> buildCommand()
 	{
@@ -40,5 +85,6 @@ public class CrashCommand extends AbstractCommand
 							return 1;
 						}));
 	}
+	#endif
 	
 }

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

@@ -1,25 +1,44 @@
 package com.seibel.distanthorizons.common.commands;
 
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.seibel.distanthorizons.core.logging.f3.F3Screen;
+
+#if MC_VER <= MC_1_12_2
+import net.minecraft.command.ICommandSender;
+import net.minecraft.util.text.TextComponentString;
+#else
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import net.minecraft.commands.CommandSourceStack;
 
+import static net.minecraft.commands.Commands.literal;
+#endif
+
 import java.util.ArrayList;
 import java.util.List;
 
-import static net.minecraft.commands.Commands.literal;
 
 public class DebugCommand extends AbstractCommand
 {
+	private static String getDebugString()
+	{
+		List<String> lines = new ArrayList<>();
+		F3Screen.addStringToDisplay(lines);
+		return String.join("\n", lines);
+	}
+	
+	#if MC_VER > MC_1_12_2
 	@Override
 	public LiteralArgumentBuilder<CommandSourceStack> buildCommand()
 	{
-		return literal("debug")
+      return literal("debug")
-				.executes(c -> {
+            .executes(c -> {
-					List<String> lines = new ArrayList<>();
+                return this.sendSuccessResponse(c, getDebugString(), false);
-					F3Screen.addStringToDisplay(lines);
+            });
-					return this.sendSuccessResponse(c, String.join("\n", lines), false);
-				});
 	}
+	#else
+	public void execute(ICommandSender sender)
+	{
+		sender.sendMessage(new TextComponentString(getDebugString()));
+	}
+	#endif
 	
 }

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

@@ -1,29 +1,140 @@
 package com.seibel.distanthorizons.common.commands;
 
+import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
+import com.seibel.distanthorizons.core.api.internal.SharedApi;
+import com.seibel.distanthorizons.core.generation.PregenManager;
+import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
+import com.seibel.distanthorizons.core.world.DhServerWorld;
+
+#if MC_VER <= MC_1_12_2
+import net.minecraft.command.ICommandSender;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.text.TextComponentString;
+import net.minecraft.world.WorldServer;
+#else
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
-import com.seibel.distanthorizons.core.generation.PregenManager;
-import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.arguments.DimensionArgument;
 import net.minecraft.commands.arguments.coordinates.ColumnPosArgument;
 import net.minecraft.server.level.ColumnPos;
 import net.minecraft.server.level.ServerLevel;
 
-import java.util.concurrent.CancellationException;
-import java.util.concurrent.CompletableFuture;
-
 import static com.mojang.brigadier.arguments.IntegerArgumentType.getInteger;
 import static com.mojang.brigadier.arguments.IntegerArgumentType.integer;
 import static net.minecraft.commands.Commands.argument;
 import static net.minecraft.commands.Commands.literal;
+#endif
+
+import java.util.Objects;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+
 
 public class PregenCommand extends AbstractCommand
 {
-	private final PregenManager pregenManager = new PregenManager();
+	private PregenManager getPregenManager()
+	{
+		DhServerWorld world = (DhServerWorld) Objects.requireNonNull(SharedApi.getAbstractDhWorld());
+		return world.getPregenManager();
+	}
 	
+	#if MC_VER <= MC_1_12_2
+	public void execute(MinecraftServer server, ICommandSender sender, String[] args)
+	{
+		if (args.length < 2)
+		{
+			sender.sendMessage(new TextComponentString("Usage: /dh pregen <status|start|stop>"));
+			return;
+		}
+		
+		switch (args[1])
+		{
+			case "status":
+			{
+				String statusString = this.getPregenManager().getStatusString();
+				sender.sendMessage(new TextComponentString(
+					statusString != null ? statusString : "Pregen is not running"));
+				break;
+			}
+			case "start":
+			{
+				if (args.length < 5)
+				{
+					sender.sendMessage(new TextComponentString("Usage: /dh pregen start <dimension> <x> <z> <chunkRadius>"));
+					return;
+				}
+				
+				try
+				{
+					String dimensionName = args[2];
+					int x = Integer.parseInt(args[3]);
+					int z = Integer.parseInt(args[4]);
+					int chunkRadius = args.length >= 6 ? Integer.parseInt(args[5]) : 32;
+					
+					// find the world by dimension name
+					WorldServer world = null;
+					for (WorldServer w : server.worlds)
+					{
+						if (w.provider.getDimensionType().getName().equals(dimensionName))
+						{
+							world = w;
+							break;
+						}
+					}
+					
+					if (world == null)
+					{
+						sender.sendMessage(new TextComponentString("Unknown dimension: " + dimensionName));
+						return;
+					}
+					
+					sender.sendMessage(new TextComponentString("Starting pregen. Progress will be in the server console."));
+					
+					final ICommandSender finalSender = sender;
+					CompletableFuture<Void> future = this.getPregenManager().startPregen(
+						ServerLevelWrapper.getWrapper(world),
+						new DhBlockPos2D(x, z),
+						chunkRadius
+					);
+					
+					future.whenComplete((result, throwable) -> {
+						if (throwable instanceof CancellationException)
+						{
+							finalSender.sendMessage(new TextComponentString("Pregen is cancelled"));
+							return;
+						}
+						else if (throwable != null)
+						{
+							finalSender.sendMessage(new TextComponentString("Pregen failed: " + throwable.getMessage()));
+							return;
+						}
+						finalSender.sendMessage(new TextComponentString("Pregen is complete"));
+					});
+				}
+				catch (NumberFormatException e)
+				{
+					sender.sendMessage(new TextComponentString("Invalid number format"));
+				}
+				break;
+			}
+			case "stop":
+			{
+				CompletableFuture<Void> runningPregen = this.getPregenManager().getRunningPregen();
+				if (runningPregen == null)
+				{
+					sender.sendMessage(new TextComponentString("Pregen is not running"));
+					return;
+				}
+				runningPregen.cancel(true);
+				break;
+			}
+			default:
+				sender.sendMessage(new TextComponentString("Unknown subcommand: " + args[1]));
+		}
+	}
+    #else
 	@Override
 	public LiteralArgumentBuilder<CommandSourceStack> buildCommand()
 	{
@@ -48,7 +159,7 @@ public class PregenCommand extends AbstractCommand
 	
 	private int pregenStatus(CommandContext<CommandSourceStack> c)
 	{
-		String statusString = this.pregenManager.getStatusString();
+		String statusString = this.getPregenManager().getStatusString();
 		//noinspection ReplaceNullCheck
 		if (statusString != null)
 		{
@@ -68,7 +179,7 @@ public class PregenCommand extends AbstractCommand
 		ColumnPos origin = ColumnPosArgument.getColumnPos(c, "origin");
 		int chunkRadius = getInteger(c, "chunkRadius");
 		
-		CompletableFuture<Void> future = this.pregenManager.startPregen(
+		CompletableFuture<Void> future = this.getPregenManager().startPregen(
 				ServerLevelWrapper.getWrapper(level),
 				new DhBlockPos2D(#if MC_VER >= MC_1_19_2 origin.x(), origin.z() #else origin.x, origin.z #endif),
 				chunkRadius
@@ -94,7 +205,7 @@ public class PregenCommand extends AbstractCommand
 	
 	private int pregenStop(CommandContext<CommandSourceStack> c)
 	{
-		CompletableFuture<Void> runningPregen = this.pregenManager.getRunningPregen();
+		CompletableFuture<Void> runningPregen = this.getPregenManager().getRunningPregen();
 		if (runningPregen == null)
 		{
 			return this.sendFailureResponse(c, "Pregen is not running");
@@ -103,5 +214,5 @@ public class PregenCommand extends AbstractCommand
 		runningPregen.cancel(true);
 		return 1;
 	}
-	
+	#endif
 }

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

@@ -1,6 +1,7 @@
 package com.seibel.distanthorizons.common.commonMixins;
 
 import com.seibel.distanthorizons.api.enums.config.EDhApiUpdateBranch;
+import com.seibel.distanthorizons.common.wrappers.gui.DhScreenUtil;
 import com.seibel.distanthorizons.common.wrappers.gui.updater.UpdateModScreen;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
@@ -9,19 +10,25 @@ import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter;
 import com.seibel.distanthorizons.core.jar.updater.SelfUpdater;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.render.RenderThreadTaskHandler;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants;
 import net.minecraft.client.Minecraft;
+#if MC_VER <= MC_1_12_2
+import net.minecraft.client.gui.GuiMainMenu;
+#else
 import net.minecraft.client.gui.screens.TitleScreen;
-
+#endif
 import java.util.ArrayList;
 
 public class DhUpdateScreenBase
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
+	#if MC_VER <= MC_1_12_2
+	private static final Minecraft MC = Minecraft.getMinecraft();
+	#else
 	private static final Minecraft MC = Minecraft.getInstance();
-	
+	#endif
-	
 	
 	public static void tryShowUpdateScreenAndRunAutoUpdateStartup(Runnable runnable)
 	{
@@ -32,12 +39,6 @@ public class DhUpdateScreenBase
 			return;
 		}
 		
-		if (!Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get())
-		{
-			LOGGER.info("Auto update disabled, ignoring new version...");
-			return;
-		}
-		
 		
 		runnable = () ->
 		{
@@ -68,19 +69,31 @@ public class DhUpdateScreenBase
 			}
 			
 			
-			try
+			// running on the render thread is required since setting the MC screen may trigger
+			// before its allowed, silently failing
+			RenderThreadTaskHandler.INSTANCE.queueRunningOnRenderThread("Update Screen", () -> 
 			{
-				MC.setScreen(new UpdateModScreen(
+				try
-					new TitleScreen(false),
+				{
-					versionId
+					#if MC_VER <= MC_1_12_2
-				));
+					DhScreenUtil.setScreen(new UpdateModScreen(
-			}
+						new GuiMainMenu(),
-			catch (Exception e)
+						versionId
-			{
+					));
-				// info instead of error since this can be ignored and probably just means
+					#else
-				// there isn't a new DH version available
+					DhScreenUtil.setScreen(new UpdateModScreen(
-				LOGGER.info("Unable to show DH update screen, reason: ["+e.getMessage()+"].");
+						new TitleScreen(false),
-			}
+						versionId
+					));
+					#endif
+				}
+				catch (Exception e)
+				{
+					// info instead of error since this can be ignored and probably just means
+					// there isn't a new DH version available
+					LOGGER.error("Unable to show DH update screen, reason: ["+e.getMessage()+"].");
+				}
+			});
 		};
 		runnable.run();
 	}

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

@@ -4,20 +4,40 @@ import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
 import com.seibel.distanthorizons.core.api.internal.ServerApi;
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
+import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
+#if MC_VER <= MC_1_12_2
+import net.minecraft.world.WorldServer;
+import net.minecraft.world.chunk.Chunk;
+#else
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ProtoChunk;
+#endif
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 public class MixinChunkMapCommon
 {
-	
+	#if MC_VER <= MC_1_12_2
+	public static void onChunkSave(WorldServer level, Chunk chunk)
+	#else
 	public static void onChunkSave(ServerLevel level, ChunkAccess chunk, CallbackInfoReturnable<Boolean> ci)
+	#endif
 	{
 		IServerLevelWrapper levelWrapper = ServerLevelWrapper.getWrapper(level);
 		
+		int chunkPosX;
+		int chunkPosZ;
+		#if MC_VER <= MC_1_21_11
+		chunkPosX = chunk.getPos().x;
+		chunkPosZ = chunk.getPos().z;
+		#else
+		chunkPosX = chunk.getPos().x();
+		chunkPosZ = chunk.getPos().z();
+		#endif
+		
 		// is this position already being updated?
-		if (SharedApi.isChunkAtChunkPosAlreadyUpdating(levelWrapper, chunk.getPos().x, chunk.getPos().z))
+		if (SharedApi.isChunkAtChunkPosAlreadyUpdating(levelWrapper, chunkPosX, chunkPosZ))
 		{
 			return;
 		}
@@ -25,7 +45,7 @@ public class MixinChunkMapCommon
 		
 		
 		// is this chunk being saved to disk?
-		boolean savingChunkToDisk = ci.getReturnValue();
+		boolean savingChunkToDisk = #if MC_VER <= MC_1_12_2 true #else ci.getReturnValue() #endif;
 		// true means a chunk was saved to disk
 		if (!savingChunkToDisk)
 		{
@@ -38,13 +58,18 @@ public class MixinChunkMapCommon
 		
 		// MC has a tendency to try saving incomplete or corrupted chunks (which show up as empty or black chunks)
 		// this logic should prevent that from happening
-		#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
+		#if MC_VER <= MC_1_12_2
+		if (!chunk.isTerrainPopulated() || !chunk.isLightPopulated())
+		{
+			return;
+		}
+		#elif MC_VER <= MC_1_17_1
 		if (chunk.isUnsaved() || chunk.getUpgradeData() != null || !chunk.isLightCorrect())
 		{
 			return;
 		}
 		#else
-		if (chunk.isUnsaved() || chunk.isUpgrading() || !chunk.isLightCorrect())
+		if (chunk.isUnsaved() || chunk.isUpgrading() || !chunk.isLightCorrect() || chunk instanceof ProtoChunk)
 		{
 			return;
 		}
@@ -55,7 +80,12 @@ public class MixinChunkMapCommon
 		// biome validation //
 		
 		// some chunks may be missing their biomes, which cause issues when attempting to save them
-		#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
+		#if MC_VER <= MC_1_12_2
+		if (chunk. getBiomeArray() == null)
+		{
+			return;
+		}
+		#elif MC_VER <= MC_1_17_1
 		if (chunk.getBiomes() == null)
 		{
 			return;

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

@@ -0,0 +1,62 @@
+package com.seibel.distanthorizons.common.commonMixins;
+
+#if MC_VER > MC_1_12_2
+import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
+import com.seibel.distanthorizons.common.wrappers.modAccessor.AbstractImmersivePortalsAccessorCommon;
+import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
+import com.seibel.distanthorizons.core.util.math.DhVec3d;
+import net.minecraft.client.Minecraft;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.phys.Vec3;
+
+public class MixinImmersivePortalsRenderStatesCommon
+{
+	/**
+	 * Used to access variables that will change when rendering
+	 * different levels with Immersive Portals 
+	 * (ie player/camera position level reference)
+	 * but that we only want for the loaded level.
+	 */
+	public static void saveVolatileOriginals()
+	{
+		Minecraft mc = Minecraft.getInstance();
+		
+		AbstractImmersivePortalsAccessorCommon.actualLevel = mc.level;
+		
+		
+		// clear everything if the player is missing
+		// (ie the world hasn't loaded yet)
+		if (mc.player == null) 
+		{
+			AbstractImmersivePortalsAccessorCommon.actualBlockPos = null;
+			AbstractImmersivePortalsAccessorCommon.actualChunkPos = null;
+			AbstractImmersivePortalsAccessorCommon.actualCameraPos = null;
+			return;
+		}
+		
+		// player block pos
+		BlockPos playerBlockPos = mc.player.blockPosition();
+		AbstractImmersivePortalsAccessorCommon.actualBlockPos = new DhBlockPos(playerBlockPos.getX(), playerBlockPos.getY(), playerBlockPos.getZ());
+		
+		// player chunk pos
+		#if MC_VER < MC_1_17_1
+        ChunkPos playerChunkPos = new ChunkPos(mc.player.blockPosition());
+        #else
+		ChunkPos playerChunkPos = mc.player.chunkPosition();
+        #endif
+		AbstractImmersivePortalsAccessorCommon.actualChunkPos = McObjectConverter.Convert(playerChunkPos);
+		
+		// camera pos
+		#if MC_VER <= MC_1_21_10
+		Vec3 cameraPos = mc.gameRenderer.getMainCamera().getPosition();
+		#elif MC_VER <= MC_26_1_2
+		Vec3 cameraPos = mc.gameRenderer.getMainCamera().position();
+		#else
+		Vec3 cameraPos = mc.gameRenderer.mainCamera().position();
+		#endif
+		AbstractImmersivePortalsAccessorCommon.actualCameraPos = new DhVec3d(cameraPos.x(), cameraPos.y(), cameraPos.z());
+	}
+	
+}
+#endif

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

@@ -0,0 +1,153 @@
+package com.seibel.distanthorizons.common.commonMixins;
+
+import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapper;
+import com.seibel.distanthorizons.core.api.internal.ClientApi;
+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.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IImmersivePortalsAccessor;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
+
+import net.minecraft.client.Minecraft;
+#if MC_VER <= MC_1_12_2
+#else
+import net.minecraft.client.Camera;
+import net.minecraft.world.effect.MobEffects;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+#endif
+
+#if MC_VER <= MC_1_12_2
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.entity.Entity;
+import net.minecraft.init.MobEffects;
+import net.minecraft.util.math.BlockPos;
+import net.minecraftforge.fluids.IFluidBlock;
+import net.minecraft.block.state.IBlockState;
+#elif MC_VER < MC_1_17_1
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.client.renderer.FogRenderer;
+import net.minecraft.client.renderer.FogRenderer.FogMode;
+import com.mojang.blaze3d.systems.RenderSystem;
+
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+#elif MC_VER < MC_1_21_3
+import net.minecraft.world.level.material.FogType;
+import net.minecraft.client.renderer.FogRenderer;
+import net.minecraft.client.renderer.FogRenderer.FogMode;
+import com.mojang.blaze3d.systems.RenderSystem;
+
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+#elif MC_VER < MC_1_21_6
+import net.minecraft.world.level.material.FogType;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import com.mojang.blaze3d.shaders.FogShape;
+import net.minecraft.client.renderer.FogRenderer;
+import net.minecraft.client.renderer.FogRenderer.FogMode;
+import net.minecraft.client.renderer.FogParameters;
+import org.joml.Vector4f;
+import com.mojang.blaze3d.systems.RenderSystem;
+
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+#else
+import net.minecraft.world.level.material.FogType;
+import net.minecraft.client.renderer.fog.FogRenderer;
+import net.minecraft.client.renderer.fog.FogData;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+#endif
+
+
+public class MixinVanillaFogCommon
+{
+	
+	#if MC_VER <= MC_1_12_2
+	public static boolean cancelFog(int startCoords, Minecraft mc)
+	#elif MC_VER < MC_1_21_6
+	public static boolean cancelFog(Camera camera, FogRenderer.FogMode fogMode)
+	#else
+	public static boolean cancelFog()
+	#endif
+	{
+		
+		#if MC_VER <= MC_1_12_2
+		EntityPlayerSP entity = mc.player;
+		#elif MC_VER < MC_1_21_6
+		Entity entity = camera.getEntity();
+		#elif MC_VER <= MC_1_21_10
+		Camera camera = Minecraft.getInstance().gameRenderer.getMainCamera();
+		Entity entity = camera.getEntity();
+		#elif MC_VER <= MC_26_1_2
+		Camera camera = Minecraft.getInstance().gameRenderer.getMainCamera();
+		Entity entity = camera.entity();	
+		#else
+		Camera camera = Minecraft.getInstance().gameRenderer.mainCamera();
+		Entity entity = camera.entity();	
+		#endif
+		
+		#if MC_VER <= MC_1_12_2
+		boolean cameraNotInFluid = cameraNotInFluid(mc);
+		#else
+		boolean cameraNotInFluid = cameraNotInFluid(camera);
+		#endif
+		
+		#if MC_VER <= MC_1_12_2
+		boolean isSpecialFog = entity.isPotionActive(MobEffects.BLINDNESS);
+		#else
+		boolean isSpecialFog = (entity instanceof LivingEntity) && ((LivingEntity) entity).hasEffect(MobEffects.BLINDNESS);
+		#endif
+		
+		boolean cancelFog = !isSpecialFog;
+		cancelFog = cancelFog && cameraNotInFluid;
+		#if MC_VER <= MC_1_12_2
+		cancelFog = cancelFog && startCoords == 0; // 0 = terrain fog
+		#elif MC_VER < MC_1_21_6
+		cancelFog = cancelFog && (fogMode == FogRenderer.FogMode.FOG_TERRAIN);
+		#endif
+		
+		cancelFog = cancelFog && !SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class).isFogStateSpecial();
+		cancelFog = cancelFog && !Config.Client.Advanced.Graphics.Fog.enableVanillaFog.get();
+		
+		
+		// since DH won't render through immersive portals 
+		// the vanilla fog should be enabled
+		IImmersivePortalsAccessor immersivePortals = ModAccessorInjector.INSTANCE.get(IImmersivePortalsAccessor.class);
+		if (immersivePortals != null
+			&& immersivePortals.isRenderingPortal())
+		{
+			cancelFog = false;
+		}
+		
+		return cancelFog;
+	}
+	#if MC_VER <= MC_1_12_2
+	private static boolean cameraNotInFluid(Minecraft mc)
+	#else
+	private static boolean cameraNotInFluid(Camera camera)
+	#endif
+	{
+		#if MC_VER <= MC_1_12_2
+		Entity view = mc.getRenderViewEntity();
+		if (view == null) return true;
+		
+		IBlockState fluidState = mc.world.getBlockState(new BlockPos(view.getPositionEyes(mc.getRenderPartialTicks())));
+		boolean cameraNotInFluid = !(fluidState.getMaterial().isLiquid() || fluidState.getBlock() instanceof IFluidBlock);
+		#elif MC_VER < MC_1_17_1
+		FluidState fluidState = camera.getFluidInCamera();
+		boolean cameraNotInFluid = fluidState.isEmpty();
+		#else
+		FogType fogTypes = camera.getFluidInCamera();
+		boolean cameraNotInFluid = fogTypes == FogType.NONE;
+		#endif
+		
+		return cameraNotInFluid;
+	}
+	
+	
+}

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDebugWireframeRenderer.java

@@ -26,34 +26,29 @@ public class BlazeDebugWireframeRenderer {}
 
 import com.mojang.blaze3d.buffers.GpuBuffer;
 import com.mojang.blaze3d.buffers.GpuBufferSlice;
-import com.mojang.blaze3d.buffers.Std140Builder;
-import com.mojang.blaze3d.buffers.Std140SizeCalculator;
 import com.mojang.blaze3d.pipeline.RenderPipeline;
-import com.mojang.blaze3d.platform.DepthTestFunction;
-import com.mojang.blaze3d.platform.PolygonMode;
-import com.mojang.blaze3d.shaders.UniformType;
 import com.mojang.blaze3d.systems.CommandEncoder;
 import com.mojang.blaze3d.systems.GpuDevice;
-import com.mojang.blaze3d.systems.RenderPass;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.VertexFormat;
-import com.seibel.distanthorizons.common.render.blaze.util.BlazeUniformUtil;
 import com.seibel.distanthorizons.common.render.blaze.util.BlazeDhVertexFormatUtil;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeVertexFormatBuilder;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPassWrapper;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPipelineBuilderWrapper;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.uniform.BlazeUniformBufferWrapper;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.render.EDhRenderDepth;
 import com.seibel.distanthorizons.core.render.renderer.AbstractDebugWireframeRenderer;
-import com.seibel.distanthorizons.core.util.math.Mat4f;
+import com.seibel.distanthorizons.core.util.math.DhMat4f;
-import com.seibel.distanthorizons.core.util.math.Vec3d;
+import com.seibel.distanthorizons.core.util.math.DhVec3d;
-import com.seibel.distanthorizons.core.util.math.Vec3f;
+import com.seibel.distanthorizons.core.util.math.DhVec3f;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
-import net.minecraft.resources.Identifier;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.AbstractDhRenderApiDefinition;
-import org.lwjgl.system.MemoryUtil;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
-import java.util.OptionalDouble;
-import java.util.OptionalInt;
 
 /**
  * Handles rendering the wireframe particles 
@@ -64,11 +59,10 @@ public class BlazeDebugWireframeRenderer extends AbstractDebugWireframeRenderer
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
+	private static final AbstractDhRenderApiDefinition RENDER_API_DEF = SingletonInjector.INSTANCE.get(AbstractDhRenderApiDefinition.class);
 	
 	public static BlazeDebugWireframeRenderer INSTANCE = new BlazeDebugWireframeRenderer();
 	
-	
-	
 	/** A box from 0,0,0 to 1,1,1 */
 	private static final float[] BOX_VERTICES = {
 		//region
@@ -103,6 +97,7 @@ public class BlazeDebugWireframeRenderer extends AbstractDebugWireframeRenderer
 		//endregion
 	};
 	
+	private static final DhMat4f TRANSFORM_MATRIX = new DhMat4f();
 	
 	
 	
@@ -114,7 +109,7 @@ public class BlazeDebugWireframeRenderer extends AbstractDebugWireframeRenderer
 	private GpuBuffer boxVertexBuffer;
 	private GpuBuffer boxIndexBuffer;
 	
-	private GpuBuffer uniformBuffer;
+	private final BlazeUniformBufferWrapper uniformBufferWrapper = new BlazeUniformBufferWrapper("debugWireframeUniformBlock");
 	
 	
 	
@@ -139,26 +134,34 @@ public class BlazeDebugWireframeRenderer extends AbstractDebugWireframeRenderer
 	}
 	private void createPipelines()
 	{
-		VertexFormat vertexFormat = VertexFormat.builder()
+		RenderPipelineBuilderWrapper pipelineBuilder = new RenderPipelineBuilderWrapper();
-			.add("vPosition", BlazeDhVertexFormatUtil.FLOAT_XYZ_POS)
-			.build();
-		
-		RenderPipeline.Builder pipelineBuilder = RenderPipeline.builder();
 		{
-			pipelineBuilder.withCull(false);
+			pipelineBuilder.withFaceCulling(false);
-			pipelineBuilder.withDepthWrite(false);
+			pipelineBuilder.withDepthWrite(true);
-			pipelineBuilder.withDepthTestFunction(DepthTestFunction.LESS_DEPTH_TEST);
+			if (RENDER_API_DEF.getRenderDepth() == EDhRenderDepth.FORWARD_Z)
+			{
+				pipelineBuilder.withDepthTest(RenderPipelineBuilderWrapper.EDhDepthTest.LESS);
+			}
+			else
+			{
+				pipelineBuilder.withDepthTest(RenderPipelineBuilderWrapper.EDhDepthTest.GREATER);
+			}
 			pipelineBuilder.withColorWrite(true);
 			pipelineBuilder.withoutBlend();
-			pipelineBuilder.withPolygonMode(PolygonMode.WIREFRAME);
+			pipelineBuilder.withPolygonMode(RenderPipelineBuilderWrapper.EDhPolygonMode.WIREFRAME);
-			pipelineBuilder.withLocation(Identifier.parse("distanthorizons:debug_wireframe_renderer"));
+			pipelineBuilder.withName("debug_wireframe_renderer");
 			
-			pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "debug/blaze/vert"));
+			pipelineBuilder.withVertexShader("debug/blaze/vert");
-			pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "debug/blaze/frag"));
+			pipelineBuilder.withFragmentShader("debug/blaze/frag");
 			
-			pipelineBuilder.withUniform("uniformBlock", UniformType.UNIFORM_BUFFER);
+			pipelineBuilder.withUniformBuffer("uniformBlock");
 			
-			pipelineBuilder.withVertexFormat(vertexFormat, VertexFormat.Mode.DEBUG_LINES);
+			
+			VertexFormat vertexFormat = new BlazeVertexFormatBuilder()
+				.add("vPosition", BlazeDhVertexFormatUtil.FLOAT_XYZ_POS)
+				.build();
+			pipelineBuilder.withVertexFormat(vertexFormat);
+			pipelineBuilder.withVertexMode(RenderPipelineBuilderWrapper.EDhVertexMode.LINES);
 		}
 		this.pipeline = pipelineBuilder.build();
 		
@@ -170,17 +173,17 @@ public class BlazeDebugWireframeRenderer extends AbstractDebugWireframeRenderer
 		
 		
 		// box vertices 
-		ByteBuffer boxVerticesBuffer = MemoryUtil.memAlloc(BOX_VERTICES.length * Float.BYTES);
+		ByteBuffer boxVerticesBuffer = ByteBuffer.allocateDirect(BOX_VERTICES.length * Float.BYTES);
+		boxVerticesBuffer.order(ByteOrder.nativeOrder());
 		boxVerticesBuffer.asFloatBuffer().put(BOX_VERTICES);
 		boxVerticesBuffer.rewind();
-		MemoryUtil.memFree(boxVerticesBuffer);
 		
 		// upload vertex data
 		{
 			int usage = GpuBuffer.USAGE_COPY_DST 
 				| GpuBuffer.USAGE_VERTEX;
 			int size = BOX_VERTICES.length * Float.BYTES;
-			this.boxVertexBuffer = GPU_DEVICE.createBuffer(() -> "distantHorizons:McDebugWireframeBox", usage, size);
+			this.boxVertexBuffer = GPU_DEVICE.createBuffer(() -> "distantHorizons:DebugWireframeBox", usage, size);
 			
 			{
 				int length = BOX_VERTICES.length * Float.BYTES;
@@ -225,15 +228,15 @@ public class BlazeDebugWireframeRenderer extends AbstractDebugWireframeRenderer
 	//region
 	
 	@Override
-	public void render(Box box)
+	public void renderBox(Box box)
 	{
 		this.init();
 		
-		if (BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper.isEmpty()
+		//if (BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper.isEmpty()
-			|| BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper.isEmpty())
+		//	|| BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper.isEmpty())
-		{
+		//{
-			return;
+		//	return;
-		}
+		//}
 		
 		// shouldn't happen, but just in case
 		if (box == null)
@@ -250,77 +253,56 @@ public class BlazeDebugWireframeRenderer extends AbstractDebugWireframeRenderer
 		
 		// uniforms
 		{
-			int uniformBufferSize = new Std140SizeCalculator()
-				.putMat4f() // uTransform
-				.putVec4() // uColor
-				.get();
-			
-			
 			// create data //
+			DhVec3d camPos = MC_RENDER.getCameraExactPosition();
+			DhVec3f camPosFloatThisFrame = new DhVec3f((float) camPos.x, (float) camPos.y, (float) camPos.z);
 			
-			Vec3d camPos = MC_RENDER.getCameraExactPosition();
+			DhMat4f boxTransform = DhMat4f.createTranslateMatrix(
-			Vec3f camPosFloatThisFrame = new Vec3f((float) camPos.x, (float) camPos.y, (float) camPos.z);
-			
-			Mat4f boxTransform = Mat4f.createTranslateMatrix(
 				box.minPos.x - camPosFloatThisFrame.x,
 				box.minPos.y - camPosFloatThisFrame.y,
 				box.minPos.z - camPosFloatThisFrame.z);
-			boxTransform.multiply(Mat4f.createScaleMatrix(
+			boxTransform.multiply(DhMat4f.createScaleMatrix(
 				box.maxPos.x - box.minPos.x,
 				box.maxPos.y - box.minPos.y,
 				box.maxPos.z - box.minPos.z));
 			
-			Mat4f transformMatrix = this.dhMvmProjMatrixThisFrame.copy();
+			TRANSFORM_MATRIX.set(this.dhMvmProjMatrixThisFrame);
-			transformMatrix.multiply(boxTransform);
+			TRANSFORM_MATRIX.multiply(boxTransform);
 			
 			
 			// upload data //
-			
+			this.uniformBufferWrapper
-			ByteBuffer buffer = ByteBuffer.allocateDirect(uniformBufferSize);
+				.putMat4f(TRANSFORM_MATRIX) // uTransform
-			buffer.order(ByteOrder.nativeOrder());
+				.putVec4f(
-			buffer = Std140Builder.intoBuffer(buffer)
-				.putMat4f(transformMatrix.createJomlMatrix()) // uTransform
-				.putVec4(
 					box.color.getRed() / 255.0f,
 					box.color.getGreen() / 255.0f,
 					box.color.getBlue() / 255.0f,
 					box.color.getAlpha() / 255.0f) // uColor
-				.get()
+				.finishAndUpload()
 			;
-			
-			this.uniformBuffer = BlazeUniformUtil.createBuffer("uniformBlock", uniformBufferSize, this.uniformBuffer);
-			GpuBufferSlice bufferSlice = new GpuBufferSlice(this.uniformBuffer, 0, uniformBufferSize);
-			
-			commandEncoder.writeToBuffer(bufferSlice, buffer);
 		}
 		
 		
 		
 		// render //
 		
-		try (RenderPass renderPass = commandEncoder.createRenderPass(
+		try (RenderPassWrapper renderPassWrapper = new RenderPassWrapper(
 			this::getRenderPassName,
-			BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper.textureView, 
+			BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper, 
-			/*optionalClearColorAsInt*/ OptionalInt.empty(),
+			BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper))
-			BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper.textureView, 
-			/*optionalDepthValueAsDouble*/ OptionalDouble.empty()))
 		{
 			// Bind instance data //
-			renderPass.setUniform("uniformBlock", this.uniformBuffer);
+			renderPassWrapper.setUniform("uniformBlock", this.uniformBufferWrapper);
 			
-			renderPass.setPipeline(this.pipeline);
+			renderPassWrapper.setPipeline(this.pipeline);
-			renderPass.setIndexBuffer(this.boxIndexBuffer, VertexFormat.IndexType.INT);
+			renderPassWrapper.setIndexBuffer(this.boxIndexBuffer);
 			
-			renderPass.setVertexBuffer(0, this.boxVertexBuffer);
+			renderPassWrapper.setVertexBuffer(this.boxVertexBuffer);
 			
-			renderPass.drawIndexed(
+			renderPassWrapper.drawIndexed(BOX_OUTLINE_INDICES.length);
-				/*indexStart*/ 0,
-				/*firstIndex*/0,
-				/*indexCount*/BOX_OUTLINE_INDICES.length,
-				/*instanceCount*/1);
 		}
 	}
-	private String getRenderPassName() { return "distantHorizons:McDebugRenderer"; }
+	private String getRenderPassName() { return "distantHorizons:DebugRenderer"; }
 	
 	//endregion
 	

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhGenericObjectRenderer.java

@@ -24,18 +24,10 @@ public class BlazeDhGenericObjectRenderer {}
 
 #else
 
-import com.mojang.blaze3d.buffers.GpuBuffer;
-import com.mojang.blaze3d.buffers.GpuBufferSlice;
-import com.mojang.blaze3d.buffers.Std140Builder;
-import com.mojang.blaze3d.buffers.Std140SizeCalculator;
 import com.mojang.blaze3d.pipeline.BlendFunction;
 import com.mojang.blaze3d.pipeline.RenderPipeline;
-import com.mojang.blaze3d.platform.DepthTestFunction;
-import com.mojang.blaze3d.platform.PolygonMode;
-import com.mojang.blaze3d.shaders.UniformType;
 import com.mojang.blaze3d.systems.CommandEncoder;
 import com.mojang.blaze3d.systems.GpuDevice;
-import com.mojang.blaze3d.systems.RenderPass;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.VertexFormat;
 import com.seibel.distanthorizons.api.enums.rendering.EDhApiBlockMaterial;
@@ -44,39 +36,41 @@ import com.seibel.distanthorizons.api.interfaces.render.IDhApiRenderableBoxGroup
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeGenericObjectRenderEvent;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeGenericRenderCleanupEvent;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeGenericRenderSetupEvent;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
 import com.seibel.distanthorizons.api.objects.math.DhApiVec3d;
 import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBox;
 import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBoxGroupShading;
 import com.seibel.distanthorizons.common.render.blaze.objects.BlazeGenericObjectVertexContainer;
 import com.seibel.distanthorizons.common.render.blaze.util.BlazeDhVertexFormatUtil;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeVertexFormatBuilder;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPassWrapper;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPipelineBuilderWrapper;
 import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper;
-import com.seibel.distanthorizons.common.render.blaze.util.BlazeUniformUtil;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.uniform.BlazeUniformBufferWrapper;
 import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.logging.f3.F3Screen;
+import com.seibel.distanthorizons.core.render.EDhRenderDepth;
 import com.seibel.distanthorizons.core.render.RenderParams;
+import com.seibel.distanthorizons.core.render.RenderThreadTaskHandler;
 import com.seibel.distanthorizons.core.render.renderer.GenericRenderObjectFactory;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.AbstractDhRenderApiDefinition;
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.IDhGenericObjectVertexBufferContainer;
 import com.seibel.distanthorizons.core.render.renderer.RenderableBoxGroup;
 import com.seibel.distanthorizons.core.util.LodUtil;
-import com.seibel.distanthorizons.core.util.math.Mat4f;
+import com.seibel.distanthorizons.core.util.math.DhMat4f;
-import com.seibel.distanthorizons.core.util.math.Vec3d;
+import com.seibel.distanthorizons.core.util.math.DhVec3d;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhGenericRenderer;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
 import com.seibel.distanthorizons.coreapi.ModInfo;
-import net.minecraft.resources.Identifier;
 
 import java.awt.*;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.OptionalDouble;
-import java.util.OptionalInt;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
@@ -90,6 +84,7 @@ public class BlazeDhGenericObjectRenderer implements IDhGenericRenderer
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
+	private static final AbstractDhRenderApiDefinition RENDER_API_DEF = SingletonInjector.INSTANCE.get(AbstractDhRenderApiDefinition.class);
 	
 	private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice();
 	private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder();
@@ -102,18 +97,19 @@ public class BlazeDhGenericObjectRenderer implements IDhGenericRenderer
 	 */
 	public static final boolean RENDER_DEBUG_OBJECTS = false;
 	
+	private static final DhApiBeforeGenericObjectRenderEvent.EventParam EVENT_PARAM = new DhApiBeforeGenericObjectRenderEvent.EventParam();
+	
+	
+	
 	private final ConcurrentHashMap<Long, RenderableBoxGroup> boxGroupById = new ConcurrentHashMap<>();
 	
 	
 	// rendering setup
 	private boolean init = false;
 	
-	private VertexFormat vertexFormat;
+	private RenderPipeline pipeline;
 	
-	private RenderPipeline opaquePipeline;
+	private final BlazeUniformBufferWrapper vertUniformBufferWrapper = new BlazeUniformBufferWrapper("vertUniformBlock");
-	private RenderPipeline transparentPipeline;
-	
-	private GpuBuffer vertUniformBuffer;
 	
 	
 	
@@ -132,12 +128,6 @@ public class BlazeDhGenericObjectRenderer implements IDhGenericRenderer
 		}
 		this.init = true;
 		
-		this.vertexFormat = VertexFormat.builder()
-			.add("vPosition", BlazeDhVertexFormatUtil.FLOAT_XYZ_POS)
-			.add("aColor", BlazeDhVertexFormatUtil.RGBA_UBYTE_COLOR)
-			.add("aMaterial", BlazeDhVertexFormatUtil.IRIS_MATERIAL)
-			.build();
-		
 		this.createPipelines();
 		
 		if (RENDER_DEBUG_OBJECTS)
@@ -147,37 +137,43 @@ public class BlazeDhGenericObjectRenderer implements IDhGenericRenderer
 	}
 	private void createPipelines()
 	{
-		RenderPipeline.Builder pipelineBuilder = RenderPipeline.builder();
+		RenderPipelineBuilderWrapper pipelineBuilder = new RenderPipelineBuilderWrapper();
 		{
-			pipelineBuilder.withCull(true);
+			pipelineBuilder.withFaceCulling(true);
 			pipelineBuilder.withDepthWrite(true);
-			pipelineBuilder.withDepthTestFunction(DepthTestFunction.LESS_DEPTH_TEST);
+			if (RENDER_API_DEF.getRenderDepth() == EDhRenderDepth.FORWARD_Z)
+			{
+				pipelineBuilder.withDepthTest(RenderPipelineBuilderWrapper.EDhDepthTest.LESS);
+			}
+			else
+			{
+				pipelineBuilder.withDepthTest(RenderPipelineBuilderWrapper.EDhDepthTest.GREATER);
+			}
+			pipelineBuilder.withBlend(BlendFunction.TRANSLUCENT); // TRANSLUCENT = new BlendFunction(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ONE_MINUS_SRC_ALPHA);
 			pipelineBuilder.withColorWrite(true);
-			pipelineBuilder.withPolygonMode(PolygonMode.FILL);
+			pipelineBuilder.withPolygonMode(RenderPipelineBuilderWrapper.EDhPolygonMode.FILL);
-			pipelineBuilder.withLocation(Identifier.parse("distanthorizons:generic"));
+			pipelineBuilder.withName("generic_objects");
 			
-			pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "generic/blaze/vert"));
+			pipelineBuilder.withVertexShader("generic/blaze/vert");
-			pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "generic/blaze/frag"));
+			pipelineBuilder.withFragmentShader("generic/blaze/frag");
 			
 			pipelineBuilder.withSampler("uLightMap");
 			
-			pipelineBuilder.withUniform("vertUniformBlock", UniformType.UNIFORM_BUFFER);
+			pipelineBuilder.withUniformBuffer("vertUniformBlock");
 			
-			pipelineBuilder.withVertexFormat(this.vertexFormat, VertexFormat.Mode.TRIANGLES);
+			VertexFormat vertexFormat = new BlazeVertexFormatBuilder()
+				.add("vPosition", BlazeDhVertexFormatUtil.FLOAT_XYZ_POS)
+				.add("aColor", BlazeDhVertexFormatUtil.RGBA_UBYTE_COLOR)
+				.add("aMaterial", BlazeDhVertexFormatUtil.IRIS_MATERIAL)
+				
+				.add("paddingOne", BlazeDhVertexFormatUtil.BYTE_PAD)
+				.add("paddingTwo", BlazeDhVertexFormatUtil.BYTE_PAD)
+				.add("paddingThree", BlazeDhVertexFormatUtil.BYTE_PAD)
+				.build();
+			pipelineBuilder.withVertexFormat(vertexFormat);
+			pipelineBuilder.withVertexMode(RenderPipelineBuilderWrapper.EDhVertexMode.TRIANGLES);
 		}
-		
+		this.pipeline = pipelineBuilder.build();
-		// opaque
-		{
-			pipelineBuilder.withoutBlend();
-			this.opaquePipeline = pipelineBuilder.build();
-		}
-		
-		// transparent
-		{
-			pipelineBuilder.withBlend(BlendFunction.TRANSLUCENT);
-			this.transparentPipeline = pipelineBuilder.build();
-		}
-		
 	}
 	private void addGenericDebugObjects()
 	{
@@ -303,7 +299,11 @@ public class BlazeDhGenericObjectRenderer implements IDhGenericRenderer
 			throw new IllegalArgumentException("Box group must be of type ["+ RenderableBoxGroup.class.getSimpleName()+"], type received: ["+(iBoxGroup != null ? iBoxGroup.getClass() : "NULL")+"].");
 		}
 		RenderableBoxGroup boxGroup = (RenderableBoxGroup) iBoxGroup;
-		
+		if (boxGroup.size() != 0)
+		{
+			// trigger a box change to make sure the initial data is uploaded
+			boxGroup.triggerBoxChange();
+		}
 		
 		long id = boxGroup.getId();
 		if (this.boxGroupById.containsKey(id))
@@ -336,204 +336,168 @@ public class BlazeDhGenericObjectRenderer implements IDhGenericRenderer
 	@Override
 	public void render(RenderParams renderEventParam, IProfilerWrapper profiler, boolean renderingWithSsao)
 	{
-		//==============//
-		// render setup //
-		//==============//
-		//#region
 		
-		profiler.push("setup");
+		try (IProfilerWrapper.IProfileBlock generic_profile = profiler.push("setup"))
-		
-		this.init();
-		
-		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeGenericRenderSetupEvent.class, renderEventParam);
-		
-		Vec3d camPos = MC_RENDER.getCameraExactPosition();
-		
-		//#endregion
-		
-		if (BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper.isEmpty()
-			|| BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper.isEmpty())
 		{
-			return;
-		}
 			
 			
+			//==============//
+			// render setup //
+			//==============//
+			//#region
 			
-		//===========//
+			this.init();
-		// rendering //
-		//===========//
-		//#region
 			
-		Collection<RenderableBoxGroup> boxList = this.boxGroupById.values();
+			ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeGenericRenderSetupEvent.class, renderEventParam.apiCopy);
-		for (RenderableBoxGroup boxGroup : boxList)
-		{
-			// validation //
 			
-			// shouldn't happen, but just in case
+			DhVec3d camPos = MC_RENDER.getCameraExactPosition();
-			if (boxGroup == null)
+			
+			//#endregion
+			
+			if (BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper.isEmpty()
+				|| BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper.isEmpty())
 			{
-				continue;
+				return;
 			}
 			
-			// skip boxes that shouldn't render this pass
+			
-			if (boxGroup.ssaoEnabled != renderingWithSsao)
+			
+			//===========//
+			// rendering //
+			//===========//
+			//#region
+			
+			Collection<RenderableBoxGroup> boxList = this.boxGroupById.values();
+			for (RenderableBoxGroup boxGroup : boxList)
 			{
-				continue;
+				// validation //
-			}
 				
-			profiler.popPush("render prep");
+				// shouldn't happen, but just in case
-			boxGroup.preRender(renderEventParam); // called even if the group is inactive, so the group can be activate if desired
+				if (boxGroup == null)
-			
-			// ignore inactive groups
-			if (!boxGroup.active)
-			{
-				continue;
-			}
-			
-			// allow API users to cancel this object's rendering
-			boolean cancelRendering = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeGenericObjectRenderEvent.class, new DhApiBeforeGenericObjectRenderEvent.EventParam(renderEventParam, boxGroup));
-			if (cancelRendering)
-			{
-				continue;
-			}
-			
-			// update instanced data if needed
-			{
-				boxGroup.tryUpdateInstancedDataAsync();
-				
-				// skip groups that haven't been uploaded yet
-				if (boxGroup.vertexBufferContainer.getState() != IDhGenericObjectVertexBufferContainer.EState.RENDER)
 				{
 					continue;
 				}
+				
+				// skip boxes that shouldn't render this pass
+				if (boxGroup.ssaoEnabled != renderingWithSsao)
+				{
+					continue;
+				}
+				
+				profiler.popPush("render prep");
+				boxGroup.preRender(renderEventParam); // called even if the group is inactive, so the group can be activate if desired
+				
+				// ignore inactive groups
+				if (!boxGroup.active)
+				{
+					continue;
+				}
+				
+				// allow API users to cancel this object's rendering
+				EVENT_PARAM.update(renderEventParam, boxGroup);
+				boolean cancelRendering = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeGenericObjectRenderEvent.class, EVENT_PARAM);
+				if (cancelRendering)
+				{
+					continue;
+				}
+				
+				// update instanced data if needed
+				{
+					boxGroup.tryUpdateInstancedDataAsync();
+					
+					// skip groups that haven't been uploaded yet
+					if (boxGroup.vertexBufferContainer.getState() != IDhGenericObjectVertexBufferContainer.EState.RENDER)
+					{
+						continue;
+					}
+				}
+				
+				
+				DhApiRenderableBoxGroupShading shading = boxGroup.shading;
+				if (shading == null)
+				{
+					shading = DEFAULT_SHADING;
+				}
+				
+				// uniforms
+				{
+					// create data //
+					
+					DhMat4f projectionMvmMatrix = new DhMat4f(renderEventParam.dhProjectionMatrix);
+					projectionMvmMatrix.multiply(renderEventParam.dhModelViewMatrix);
+					
+					
+					// upload data //
+					
+					this.vertUniformBufferWrapper
+						.putVec3i(
+							LodUtil.getChunkPosFromDouble(boxGroup.getOriginBlockPos().x),
+							LodUtil.getChunkPosFromDouble(boxGroup.getOriginBlockPos().y),
+							LodUtil.getChunkPosFromDouble(boxGroup.getOriginBlockPos().z)
+						) // uOffsetChunk
+						.putVec3f(
+							LodUtil.getSubChunkPosFromDouble(boxGroup.getOriginBlockPos().x),
+							LodUtil.getSubChunkPosFromDouble(boxGroup.getOriginBlockPos().y),
+							LodUtil.getSubChunkPosFromDouble(boxGroup.getOriginBlockPos().z)
+						) // uOffsetSubChunk
+						.putVec3i(
+							LodUtil.getChunkPosFromDouble(camPos.x),
+							LodUtil.getChunkPosFromDouble(camPos.y),
+							LodUtil.getChunkPosFromDouble(camPos.z)
+						) // uCameraPosChunk
+						.putVec3f(
+							LodUtil.getSubChunkPosFromDouble(camPos.x),
+							LodUtil.getSubChunkPosFromDouble(camPos.y),
+							LodUtil.getSubChunkPosFromDouble(camPos.z)
+						) // uCameraPosSubChunk
+						
+						.putMat4f(projectionMvmMatrix) // uProjectionMvm
+						.putInt(boxGroup.getSkyLight()) // uSkyLight
+						.putInt(boxGroup.getBlockLight()) // uBlockLight
+						
+						.putFloat(shading.north)
+						.putFloat(shading.south)
+						.putFloat(shading.east)
+						.putFloat(shading.west)
+						.putFloat(shading.top)
+						.putFloat(shading.bottom)
+						
+						.finishAndUpload()
+					;
+				}
+				
+				
+				
+				
+				// render //
+				
+				profiler.popPush("rendering");
+				try (IProfilerWrapper.IProfileBlock namespace_profile = profiler.push(boxGroup.getResourceLocationNamespace());
+					IProfilerWrapper.IProfileBlock location_profile = profiler.push(boxGroup.getResourceLocationPath()))
+				{
+					this.renderBoxGroupInstanced(renderEventParam, boxGroup, profiler);
+				}
+				
+				boxGroup.postRender(renderEventParam);
 			}
 			
-			
+			//#endregion
-			DhApiRenderableBoxGroupShading shading = boxGroup.shading;
-			if (shading == null)
-			{
-				shading = DEFAULT_SHADING;
-			}
-			
-			// uniforms
-			{
-				int uniformBufferSize = new Std140SizeCalculator()
-					.putIVec3() // uOffsetChunk
-					.putVec3() // uOffsetSubChunk
-					.putIVec3() // uCameraPosChunk
-					.putVec3() // uCameraPosSubChunk
-					
-					.putVec3() // aTranslateChunk
-					.putVec3() // aTranslateSubChunk
-					
-					.putMat4f() // uProjectionMvm
-					.putInt() // uSkyLight
-					.putInt() // uBlockLight
-					
-					.putFloat() // uNorthShading
-					.putFloat() // uSouthShading
-					.putFloat() // uEastShading
-					.putFloat() // uWestShading
-					.putFloat() // uTopShading
-					.putFloat() // uBottomShading
-					.get();
-				
-				
-				// create data //
-				
-				Mat4f projectionMvmMatrix = new Mat4f(renderEventParam.dhProjectionMatrix);
-				projectionMvmMatrix.multiply(renderEventParam.dhModelViewMatrix);
-				
-				
-				// upload data //
-				
-				ByteBuffer buffer = ByteBuffer.allocateDirect(uniformBufferSize);
-				buffer.order(ByteOrder.nativeOrder());
-				buffer = Std140Builder.intoBuffer(buffer)
-					.putIVec3(
-						LodUtil.getChunkPosFromDouble(boxGroup.getOriginBlockPos().x),
-						LodUtil.getChunkPosFromDouble(boxGroup.getOriginBlockPos().y),
-						LodUtil.getChunkPosFromDouble(boxGroup.getOriginBlockPos().z)
-					) // uOffsetChunk
-					.putVec3(
-						LodUtil.getSubChunkPosFromDouble(boxGroup.getOriginBlockPos().x),
-						LodUtil.getSubChunkPosFromDouble(boxGroup.getOriginBlockPos().y),
-						LodUtil.getSubChunkPosFromDouble(boxGroup.getOriginBlockPos().z)
-					) // uOffsetSubChunk
-					.putIVec3(
-						LodUtil.getChunkPosFromDouble(camPos.x),
-						LodUtil.getChunkPosFromDouble(camPos.y),
-						LodUtil.getChunkPosFromDouble(camPos.z)
-					) // uCameraPosChunk
-					.putVec3(
-						LodUtil.getSubChunkPosFromDouble(camPos.x),
-						LodUtil.getSubChunkPosFromDouble(camPos.y),
-						LodUtil.getSubChunkPosFromDouble(camPos.z)
-					) // uCameraPosSubChunk
-					
-					.putMat4f(projectionMvmMatrix.createJomlMatrix()) // uProjectionMvm
-					.putInt(boxGroup.getSkyLight()) // uSkyLight
-					.putInt(boxGroup.getBlockLight()) // uBlockLight
-					
-					.putFloat(shading.north)
-					.putFloat(shading.south)
-					.putFloat(shading.east)
-					.putFloat(shading.west)
-					.putFloat(shading.top)
-					.putFloat(shading.bottom)
-					
-					.get()
-				;
-				
-				this.vertUniformBuffer = BlazeUniformUtil.createBuffer("vertUniformBlock", uniformBufferSize, this.vertUniformBuffer);
-				GpuBufferSlice bufferSlice = new GpuBufferSlice(this.vertUniformBuffer, 0, uniformBufferSize);
-				
-				COMMAND_ENCODER.writeToBuffer(bufferSlice, buffer);
-			}
 			
 			
 			
+			//==========//
+			// clean up //
+			//==========//
+			//region
 			
-			// render //
+			profiler.popPush("cleanup");
 			
-			profiler.popPush("rendering");
+			ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeGenericRenderCleanupEvent.class, renderEventParam);
-			profiler.push(boxGroup.getResourceLocationNamespace());
-			profiler.push(boxGroup.getResourceLocationPath());
 			
-			try (RenderPass renderPass = COMMAND_ENCODER.createRenderPass(
+			//endregion
-				this::getRenderPassName,
-				BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper.textureView, 
-				/*optionalClearColorAsInt*/ OptionalInt.empty(),
-				BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper.textureView, 
-				/*optionalDepthValueAsDouble*/ OptionalDouble.empty()))
-			{
-				this.renderBoxGroupInstanced(renderPass, renderEventParam, boxGroup, camPos, profiler);
-			}
-			
-			profiler.pop(); // resource path
-			profiler.pop(); // resource namespace
-			
-			boxGroup.postRender(renderEventParam);
 		}
-		
-		//#endregion
-		
-		
-		
-		//==========//
-		// clean up //
-		//==========//
-		//region
-		
-		profiler.popPush("cleanup");
-		
-		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeGenericRenderCleanupEvent.class, renderEventParam);
-		
-		profiler.pop();
-		
-		//endregion
 	}
-	private String getRenderPassName() { return "distantHorizons:McGenericObjectRenderer"; }
+	private String getRenderPassName() { return "distantHorizons:GenericObjectRenderer"; }
 	
 	//endregion
 	
@@ -545,47 +509,44 @@ public class BlazeDhGenericObjectRenderer implements IDhGenericRenderer
 	//region
 	
 	private void renderBoxGroupInstanced(
-		RenderPass renderPass, RenderParams renderEventParam, 
+		RenderParams renderEventParam, 
-		RenderableBoxGroup boxGroup, Vec3d camPos,
+		RenderableBoxGroup boxGroup,
 		IProfilerWrapper profiler)
 	{
-		// update instance data //
+		try (RenderPassWrapper renderPassWrapper = new RenderPassWrapper(
-		
+			this::getRenderPassName,
-		profiler.push("vertex setup");
+			BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper,
-		
+			BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper))
-		BlazeGenericObjectVertexContainer container = (BlazeGenericObjectVertexContainer) boxGroup.vertexBufferContainer;
-		
-		LightMapWrapper lightMapWrapper = (LightMapWrapper) renderEventParam.lightmap;
-		BlazeTextureViewWrapper lightmapTextureViewWrapper = lightMapWrapper.getTextureViewWrapper();
-		renderPass.bindTexture("uLightMap", lightmapTextureViewWrapper.textureView, lightmapTextureViewWrapper.textureSampler);
-		
-		
-		
-		// Bind instance data //
-		profiler.popPush("binding");
-		
-		
-		renderPass.setUniform("vertUniformBlock", this.vertUniformBuffer);
-		
-		// set pipeline
-		renderPass.setPipeline(this.opaquePipeline); // TODO
-		renderPass.setIndexBuffer(container.indexGpuBuffer, VertexFormat.IndexType.INT);
-		
-		renderPass.setVertexBuffer(0, container.vboGpuBuffer);
-		
-		// Draw instanced
-		profiler.popPush("render");
-		if (container.uploadedBoxCount > 0)
 		{
-			renderPass.drawIndexed(
-				/*indexStart*/ 0,
-				/*firstIndex*/0,
-				/*indexCount*/container.uploadedBoxCount * 24, // TODO?
-				/*instanceCount*/1);
 			
+			// update instance data //
+			
+			BlazeGenericObjectVertexContainer container = (BlazeGenericObjectVertexContainer) boxGroup.vertexBufferContainer;
+			
+			LightMapWrapper lightMapWrapper = (LightMapWrapper) renderEventParam.lightmap;
+			BlazeTextureViewWrapper lightmapTextureViewWrapper = lightMapWrapper.getTextureViewWrapper();
+			renderPassWrapper.bindTexture("uLightMap", lightmapTextureViewWrapper);
+			
+			
+			
+			// Bind instance data //
+			
+			
+			renderPassWrapper.setUniform("vertUniformBlock", this.vertUniformBufferWrapper);
+			
+			// set pipeline
+			renderPassWrapper.setPipeline(this.pipeline);
+			renderPassWrapper.setIndexBuffer(container.indexGpuBuffer);
+			
+			renderPassWrapper.setVertexBuffer(container.vboGpuBuffer);
+			
+			// Draw instanced
+			if (container.uploadedBoxCount > 0)
+			{
+				// 36 = 6 faces * 6 verticies per face
+				renderPassWrapper.drawIndexed(container.uploadedBoxCount * 36);
+			}
 		}
-		
-		profiler.pop();
 	}
 	
 	//endregion
@@ -626,5 +587,27 @@ public class BlazeDhGenericObjectRenderer implements IDhGenericRenderer
 	
 	
 	
+	//================//
+	// base overrides //
+	//================//
+	//region
+	
+	@Override
+	public void close()
+	{
+		// close is called outside the render thread and buffer closing must be done on the render thread
+		RenderThreadTaskHandler.INSTANCE.queueRunningOnRenderThread("Generic Obj Cleanup", () ->
+		{
+			if (this.vertUniformBufferWrapper != null)
+			{
+				this.vertUniformBufferWrapper.close();
+			}
+		});
+	}
+	
+	//endregion
+	
+	
+	
 }
 #endif

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhMetaRenderer.java

@@ -6,20 +6,31 @@ public class BlazeDhMetaRenderer {}
 #else
 
 import com.mojang.blaze3d.textures.GpuTexture;
+import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiAfterColorDepthTextureCreatedEvent;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiTextureCreatedParam;
 import com.seibel.distanthorizons.common.render.blaze.apply.BlazeDhApplyRenderer;
 import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper;
+import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.render.RenderParams;
-import com.seibel.distanthorizons.core.util.ColorUtil;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.AbstractDhRenderApiDefinition;
+import com.seibel.distanthorizons.coreapi.util.ColorUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhMetaRenderer;
+import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
 import net.minecraft.client.Minecraft;
 
+import java.awt.*;
+
 public class BlazeDhMetaRenderer implements IDhMetaRenderer
 {
 	public static final BlazeDhMetaRenderer INSTANCE = new BlazeDhMetaRenderer();
 	
+	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
+	
 	
 	private BlazeDhApplyRenderer applyRenderer;
+	private final float clearDepth;
 	
 	public final BlazeTextureWrapper dhDepthTextureWrapper = BlazeTextureWrapper.createDepth("DhDepthTexture");
 	public final BlazeTextureWrapper dhColorTextureWrapper = BlazeTextureWrapper.createColor("DhColorTexture");
@@ -33,6 +44,9 @@ public class BlazeDhMetaRenderer implements IDhMetaRenderer
 	
 	private BlazeDhMetaRenderer() 
 	{
+		AbstractDhRenderApiDefinition renderApiDefinition = SingletonInjector.INSTANCE.get(AbstractDhRenderApiDefinition.class);
+		this.clearDepth = renderApiDefinition.getRenderDepth().farDepth;
+		
 		this.applyRenderer = new BlazeDhApplyRenderer(
 			"dh_apply_to_mc",
 			null,
@@ -52,9 +66,24 @@ public class BlazeDhMetaRenderer implements IDhMetaRenderer
 	@Override
 	public void runRenderPassSetup(RenderParams renderParams)
 	{
-		// textures
+		int oldWidth = this.dhDepthTextureWrapper.getWidth();
-		this.dhDepthTextureWrapper.tryCreateOrResize();
+		int oldHeight = this.dhDepthTextureWrapper.getHeight();
-		this.dhColorTextureWrapper.tryCreateOrResize();
+		
+		boolean texturesChanged = false;
+		texturesChanged = this.dhDepthTextureWrapper.tryCreateOrResize() | texturesChanged;
+		texturesChanged = this.dhColorTextureWrapper.tryCreateOrResize() | texturesChanged;
+		
+		if (texturesChanged)
+		{
+			int newTextureWidth = MC_RENDER.getTargetFramebufferViewportWidth();
+			int newTextureHeight = MC_RENDER.getTargetFramebufferViewportHeight();
+			
+			DhApiTextureCreatedParam textureCreatedParam = new DhApiTextureCreatedParam(
+				oldWidth, oldHeight,
+				newTextureWidth, newTextureHeight
+			);
+			ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterColorDepthTextureCreatedEvent.class, textureCreatedParam);
+		}
 	}
 	
 	@Override
@@ -63,7 +92,7 @@ public class BlazeDhMetaRenderer implements IDhMetaRenderer
 	@Override
 	public void applyToMcTexture(RenderParams renderParams)
 	{
-		GpuTexture mcColorTexture = Minecraft.getInstance().getMainRenderTarget().getColorTexture();
+		GpuTexture mcColorTexture = MinecraftRenderWrapper.INSTANCE.getRenderTarget().getColorTexture();
 		this.applyRenderer.render(this.dhColorTextureWrapper.texture, this.dhDepthTextureWrapper.texture, mcColorTexture);
 	}
 	
@@ -79,16 +108,15 @@ public class BlazeDhMetaRenderer implements IDhMetaRenderer
 	@Override
 	public void clearDhDepthAndColorTextures(RenderParams renderParams) 
 	{
-		// TODO use for clear color
+		this.dhDepthTextureWrapper.clearDepth(this.clearDepth);
-		//IMinecraftRenderWrapper r;
-		//r.getSkyColor()
 		
-		this.dhDepthTextureWrapper.clearDepth(1.0f);
+		Color color = MC_RENDER.getSkyColor();
-		this.dhColorTextureWrapper.clearColor(ColorUtil.argbToInt(1, 1, 1, 1)); 
+		this.dhColorTextureWrapper.clearColor(ColorUtil.toColorInt(color)); 
 	}
 	
 	//endregion
 	
 	
+	
 }
 #endif

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhRenderApiDefinition.java

@@ -5,6 +5,7 @@ public class BlazeDhRenderApiDefinition {}
 
 #else
 
+import com.seibel.distanthorizons.api.enums.config.EDhApiRenderingApi;
 import com.seibel.distanthorizons.common.render.blaze.objects.BlazeGenericObjectVertexContainer;
 import com.seibel.distanthorizons.common.render.blaze.postProcessing.BlazeDhFarFadeRenderer;
 import com.seibel.distanthorizons.common.render.blaze.postProcessing.BlazeDhFogRenderer;
@@ -13,6 +14,8 @@ import com.seibel.distanthorizons.common.render.blaze.postProcessing.BlazeVanill
 import com.seibel.distanthorizons.common.render.blaze.test.BlazeDhTestTriangleRenderer;
 import com.seibel.distanthorizons.common.render.blaze.wrappers.buffer.BlazeVertexBufferWrapper;
 import com.seibel.distanthorizons.common.render.blaze.wrappers.uniform.BlazeLodUniformBufferWrapper;
+import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
+import com.seibel.distanthorizons.core.render.EDhRenderDepth;
 import com.seibel.distanthorizons.core.render.renderer.AbstractDebugWireframeRenderer;
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.AbstractDhRenderApiDefinition;
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.IDhGenericObjectVertexBufferContainer;
@@ -20,6 +23,10 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.ILodCont
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.IVertexBufferWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.*;
 
+#if MC_VER <= MC_26_1_2
+#else
+#endif
+
 public class BlazeDhRenderApiDefinition extends AbstractDhRenderApiDefinition
 {
 	//=========//
@@ -27,7 +34,43 @@ public class BlazeDhRenderApiDefinition extends AbstractDhRenderApiDefinition
 	//=========//
 	//region
 	
-	public String getApiName() { return "Blaze3D"; }
+	private final String engineName;
+	public String getEngineName() { return this.engineName; }
+	
+	public EDhRenderDepth getRenderDepth()
+	{
+		#if MC_VER <= MC_26_1_2
+		return EDhRenderDepth.FORWARD_Z;
+		#else
+		return EDhRenderDepth.REVERSE_Z;
+		#endif
+	}
+	
+	
+	private final EDhApiRenderingApi renderApi;
+	public EDhApiRenderingApi getRenderApi() { return renderApi; }
+	public boolean isNativeRenderer() { return false; }
+	
+	//endregion
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	//region
+	
+	public BlazeDhRenderApiDefinition()
+	{
+		#if MC_VER <= MC_26_1_2
+		renderApi = EDhApiRenderingApi.OPEN_GL;
+		#else
+		// Blaze always uses the same rendering API as Minecraft
+		this.renderApi = MinecraftRenderWrapper.INSTANCE.getMcRenderingApi();
+		#endif
+		
+		this.engineName = "Blaze3D: " + this.getRenderApi();
+	}
 	
 	//endregion
 	

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/BlazeDhTerrainRenderer.java

@@ -5,73 +5,66 @@ public class BlazeDhTerrainRenderer {}
 
 #else
 
-import com.mojang.blaze3d.buffers.GpuBuffer;
-import com.mojang.blaze3d.buffers.GpuBufferSlice;
-import com.mojang.blaze3d.buffers.Std140Builder;
-import com.mojang.blaze3d.buffers.Std140SizeCalculator;
 import com.mojang.blaze3d.pipeline.BlendFunction;
 import com.mojang.blaze3d.pipeline.RenderPipeline;
-import com.mojang.blaze3d.platform.DepthTestFunction;
-import com.mojang.blaze3d.platform.PolygonMode;
-import com.mojang.blaze3d.shaders.UniformType;
 import com.mojang.blaze3d.systems.CommandEncoder;
 import com.mojang.blaze3d.systems.GpuDevice;
-import com.mojang.blaze3d.systems.RenderPass;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.VertexFormat;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeBufferRenderEvent;
+import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeRenderPassEvent;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
 import com.seibel.distanthorizons.common.render.blaze.util.BlazeDhVertexFormatUtil;
-import com.seibel.distanthorizons.common.render.blaze.util.BlazeUniformUtil;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeVertexFormatBuilder;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPassWrapper;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPipelineBuilderWrapper;
 import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper;
 import com.seibel.distanthorizons.common.render.blaze.wrappers.uniform.BlazeLodUniformBufferWrapper;
 import com.seibel.distanthorizons.common.render.blaze.wrappers.buffer.BlazeVertexBufferWrapper;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.uniform.BlazeUniformBufferWrapper;
 import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodBufferContainer;
-import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodQuadBuilder;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
-import com.seibel.distanthorizons.common.render.openGl.glObject.enums.GLEnums;
+import com.seibel.distanthorizons.core.render.EDhRenderDepth;
-import com.seibel.distanthorizons.common.render.openGl.glObject.buffer.GlQuadElementBuffer;
 import com.seibel.distanthorizons.core.render.RenderParams;
 import com.seibel.distanthorizons.core.util.RenderUtil;
-import com.seibel.distanthorizons.core.util.math.Mat4f;
+import com.seibel.distanthorizons.core.util.math.DhMat4f;
-import com.seibel.distanthorizons.core.util.math.Vec3d;
+import com.seibel.distanthorizons.core.util.math.DhVec3d;
-import com.seibel.distanthorizons.core.util.math.Vec3f;
+import com.seibel.distanthorizons.core.util.math.DhVec3f;
 import com.seibel.distanthorizons.core.util.objects.SortedArraySet;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.AbstractDhRenderApiDefinition;
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhTerrainRenderer;
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.IVertexBufferWrapper;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
-import net.minecraft.resources.Identifier;
-import org.lwjgl.opengl.GL32;
-import org.lwjgl.system.MemoryUtil;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.OptionalDouble;
-import java.util.OptionalInt;
 
 /** Renders rendering DH's LOD terrain. */
 public class BlazeDhTerrainRenderer implements IDhTerrainRenderer
 {
 	public static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
+	private static final AbstractDhRenderApiDefinition RENDER_API_DEF = SingletonInjector.INSTANCE.get(AbstractDhRenderApiDefinition.class);
+	
 	private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice();
 	private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder();
 	
 	public static final BlazeDhTerrainRenderer INSTANCE = new BlazeDhTerrainRenderer();
 	
+	private static final DhVec3f MODEL_POS = new DhVec3f();
+	/** single event object used to reduce GC pressure */
+	private static final DhApiBeforeBufferRenderEvent.EventParam BEFORE_BUFFER_RENDER_EVENT_PARAM = new DhApiBeforeBufferRenderEvent.EventParam();
+	
 	
 	private RenderPipeline opaquePipeline;
 	private RenderPipeline transparentPipeline;
 	private boolean init = false;
 	
-	private GpuBuffer indexBuffer;
+	private final BlazeUniformBufferWrapper fragUniformBufferWrapper = new BlazeUniformBufferWrapper("fragUniformBlock");
-	
+	private final BlazeUniformBufferWrapper vertSharedUniformBufferWrapper = new BlazeUniformBufferWrapper("vertSharedUniformBlock");
-	private GpuBuffer fragUniformBuffer;
-	private GpuBuffer vertSharedUniformBuffer;
 	
 	
 	
@@ -88,51 +81,71 @@ public class BlazeDhTerrainRenderer implements IDhTerrainRenderer
 		{
 			return;
 		}
-		this.init = true; // todo only set when succeeded (in case of exception)
 		
 		
-		VertexFormat vertexFormat = VertexFormat.builder()
-			.add("vPosition", BlazeDhVertexFormatUtil.SHORT_XYZ_POS)
-			.add("meta", BlazeDhVertexFormatUtil.META)
-			.add("vColor", BlazeDhVertexFormatUtil.RGBA_UBYTE_COLOR)
-			.add("irisMaterial", BlazeDhVertexFormatUtil.IRIS_MATERIAL)
-			.add("irisNormal", BlazeDhVertexFormatUtil.IRIS_NORMAL)
-			.add("paddingTwo", BlazeDhVertexFormatUtil.BYTE_PAD)
-			.add("paddingThree", BlazeDhVertexFormatUtil.BYTE_PAD) // padding is to make sure the format is a multiple of 4
-			.build();
 		
-		RenderPipeline.Builder pipelineBuilder = RenderPipeline.builder();
+		RenderPipelineBuilderWrapper opaquePipelineBuilder = new RenderPipelineBuilderWrapper();
+		RenderPipelineBuilderWrapper translucentPipelineBuilder = new RenderPipelineBuilderWrapper();
+		
+		// apply shared options to both pipelines
+		for (int i = 0; i < 2; i++)
 		{
-			pipelineBuilder.withCull(true);
+			RenderPipelineBuilderWrapper pipelineBuilder = (i == 0) 
-			pipelineBuilder.withDepthWrite(true);
+				? opaquePipelineBuilder 
-			pipelineBuilder.withDepthTestFunction(DepthTestFunction.LESS_DEPTH_TEST);
+				: translucentPipelineBuilder;
-			pipelineBuilder.withColorWrite(true);
-			pipelineBuilder.withPolygonMode(PolygonMode.FILL);
-			pipelineBuilder.withLocation(Identifier.parse("distanthorizons:lod_render"));
 			
-			pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "lod/blaze/vert"));
+			pipelineBuilder.withFaceCulling(true);
-			pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "lod/blaze/frag"));
+			pipelineBuilder.withDepthWrite(true);
+			if (RENDER_API_DEF.getRenderDepth() == EDhRenderDepth.FORWARD_Z)
+			{
+				pipelineBuilder.withDepthTest(RenderPipelineBuilderWrapper.EDhDepthTest.LESS);
+			}
+			else
+			{
+				pipelineBuilder.withDepthTest(RenderPipelineBuilderWrapper.EDhDepthTest.GREATER);
+			}
+			pipelineBuilder.withColorWrite(true);
+			pipelineBuilder.withPolygonMode(RenderPipelineBuilderWrapper.EDhPolygonMode.FILL);
 			
 			pipelineBuilder.withSampler("uLightMap");
 			
-			pipelineBuilder.withUniform("vertUniqueUniformBlock", UniformType.UNIFORM_BUFFER);
+			pipelineBuilder.withVertexShader("lod/blaze/vert");
-			pipelineBuilder.withUniform("vertSharedUniformBlock", UniformType.UNIFORM_BUFFER);
+			pipelineBuilder.withFragmentShader("lod/blaze/frag");
-			pipelineBuilder.withUniform("fragUniformBlock", UniformType.UNIFORM_BUFFER);
 			
-			pipelineBuilder.withVertexFormat(vertexFormat, VertexFormat.Mode.TRIANGLES);
+			pipelineBuilder.withUniformBuffer("vertUniqueUniformBlock");
+			pipelineBuilder.withUniformBuffer("vertSharedUniformBlock");
+			pipelineBuilder.withUniformBuffer("fragUniformBlock");
+			
+			VertexFormat vertexFormat = new BlazeVertexFormatBuilder()
+				.add("vPosition", BlazeDhVertexFormatUtil.SHORT_XYZ_POS)
+				.add("meta", BlazeDhVertexFormatUtil.META)
+				.add("vColor", BlazeDhVertexFormatUtil.RGBA_UBYTE_COLOR)
+				.add("irisMaterial", BlazeDhVertexFormatUtil.IRIS_MATERIAL)
+				.add("irisNormal", BlazeDhVertexFormatUtil.IRIS_NORMAL)
+				.add("paddingTwo", BlazeDhVertexFormatUtil.BYTE_PAD)
+				.add("paddingThree", BlazeDhVertexFormatUtil.BYTE_PAD) // padding is to make sure the format is a multiple of 4
+				.build();
+			pipelineBuilder.withVertexFormat(vertexFormat);
+			
+			pipelineBuilder.withVertexMode(RenderPipelineBuilderWrapper.EDhVertexMode.TRIANGLES);
 		}
 		
 		// opaque
 		{
-			pipelineBuilder.withoutBlend();
+			opaquePipelineBuilder.withName("opaque_terrain");
-			this.opaquePipeline = pipelineBuilder.build();
+			opaquePipelineBuilder.withoutBlend();
+			this.opaquePipeline = opaquePipelineBuilder.build();
 		}
 		
 		// transparent
 		{
-			pipelineBuilder.withBlend(BlendFunction.TRANSLUCENT);
+			translucentPipelineBuilder.withName("transparent_terrain");
-			this.transparentPipeline = pipelineBuilder.build();
+			// TRANSLUCENT = new BlendFunction(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ONE_MINUS_SRC_ALPHA);
+			translucentPipelineBuilder.withBlend(BlendFunction.TRANSLUCENT);
+			this.transparentPipeline = translucentPipelineBuilder.build();
 		}
+		
+		this.init = true;
 	}
 	
 	//endregion
@@ -153,238 +166,169 @@ public class BlazeDhTerrainRenderer implements IDhTerrainRenderer
 	{
 		this.tryInit();
 		
-		
+		try(IProfilerWrapper.IProfileBlock terrain_profile = profiler.push("terrain render"))
-		profiler.push("vert unique uniforms");
 		{
-			// create data //
+			profiler.popPush("vert unique uniforms");
-			
-			for (int lodIndex = 0; lodIndex < bufferContainers.size(); lodIndex++)
 			{
-				LodBufferContainer bufferContainer = bufferContainers.get(lodIndex);
+				// create data //
-				bufferContainer.uniformContainer.tryUpload();
-			}
-		}
-		
-		profiler.popPush("vert share uniforms");
-		{
-			Mat4f combinedMatrix = new Mat4f(renderEventParam.dhProjectionMatrix);
-			combinedMatrix.multiply(renderEventParam.dhModelViewMatrix);
-			
-			float earthCurveRatio = Config.Client.Advanced.Graphics.Experimental.earthCurveRatio.get();
-			if (earthCurveRatio < -1.0f || earthCurveRatio > 1.0f)
-			{
-				earthCurveRatio = /*6371KM*/ 6371000.0f / earthCurveRatio;
-			}
-			else
-			{
-				// disable curvature if the config value is between -1 and 1
-				earthCurveRatio = 0.0f;
-			}
-			
-			
-			// upload data //
-			
-			int uniformBufferSize = new Std140SizeCalculator()
-				.putInt() // uIsWhiteWorld
-				
-				.putFloat() // uWorldYOffset
-				.putFloat() // uMircoOffset
-				.putFloat() // uEarthRadius
-				
-				.putVec3() // uCameraPos
-				.putMat4f() // uCombinedMatrix
-				.get();
-			
-			ByteBuffer buffer = ByteBuffer.allocateDirect(uniformBufferSize);
-			buffer.order(ByteOrder.nativeOrder());
-			Std140Builder.intoBuffer(buffer)
-				.putInt(0) // uIsWhiteWorld
-				
-				.putFloat((float) renderEventParam.worldYOffset) // uWorldYOffset
-				.putFloat(0.01f) // uMircoOffset // 0.01 block offset
-				.putFloat(earthCurveRatio) // uEarthRadius
-				
-				.putVec3(
-					(float)renderEventParam.exactCameraPosition.x,
-					(float)renderEventParam.exactCameraPosition.y,
-					(float)renderEventParam.exactCameraPosition.z) // uCameraPos
-				.putMat4f(combinedMatrix.createJomlMatrix()) // uCombinedMatrix
-				.get();
-			
-			this.vertSharedUniformBuffer = BlazeUniformUtil.createBuffer("vertSharedUniformBlock", uniformBufferSize, this.vertSharedUniformBuffer);
-			GpuBufferSlice bufferSlice = new GpuBufferSlice(this.vertSharedUniformBuffer, 0, uniformBufferSize);
-			
-			COMMAND_ENCODER.writeToBuffer(bufferSlice, buffer);
-		}
-		
-		profiler.popPush("set frag uniforms");
-		{
-			int uniformBufferSize = new Std140SizeCalculator()
-				.putFloat() // uClipDistance
-				.putFloat() // uNoiseIntensity
-				.putInt() // uNoiseSteps
-				.putInt() // uNoiseDropoff
-				.putInt() // uDitherDhRendering
-				.putInt() // uNoiseEnabled
-				.get();
-			
-			
-			// create data //
-			
-			float dhNearClipDistance = RenderUtil.getNearClipPlaneInBlocks();
-			if (!Config.Client.Advanced.Debugging.lodOnlyMode.get())
-			{
-				// this added value prevents the near clip plane and discard circle from touching, which looks bad
-				dhNearClipDistance += 16f;
-			}
-			
-			
-			// upload data //
-			
-			ByteBuffer buffer = ByteBuffer.allocateDirect(uniformBufferSize);
-			buffer.order(ByteOrder.nativeOrder());
-			buffer = Std140Builder.intoBuffer(buffer)
-				.putFloat(dhNearClipDistance) // uClipDistance
-				.putFloat(Config.Client.Advanced.Graphics.NoiseTexture.noiseIntensity.get()) // uNoiseIntensity
-				.putInt(Config.Client.Advanced.Graphics.NoiseTexture.noiseSteps.get()) // uNoiseSteps
-				.putInt(Config.Client.Advanced.Graphics.NoiseTexture.noiseDropoff.get()) // uNoiseDropoff
-				.putInt(Config.Client.Advanced.Graphics.Quality.ditherDhFade.get() ? 1 : 0) // uDitherDhRendering
-				.putInt(Config.Client.Advanced.Graphics.NoiseTexture.enableNoiseTexture.get() ? 1 : 0) // uNoiseEnabled
-				.get()
-			;
-			
-			this.fragUniformBuffer = BlazeUniformUtil.createBuffer("fragUniformBlock", uniformBufferSize, this.fragUniformBuffer);
-			GpuBufferSlice bufferSlice = new GpuBufferSlice(this.fragUniformBuffer, 0, uniformBufferSize);
-			
-			COMMAND_ENCODER.writeToBuffer(bufferSlice, buffer);
-		}
-		
-		// create index buffer
-		{
-			if (this.indexBuffer == null)
-			{
-				ByteBuffer buffer = MemoryUtil.memAlloc(LodQuadBuilder.getMaxBufferByteSize() * GLEnums.getTypeSize(GL32.GL_UNSIGNED_INT) * 6);
-				GlQuadElementBuffer.buildBuffer(LodQuadBuilder.getMaxBufferByteSize(), buffer, GL32.GL_UNSIGNED_INT);
-				
-				
-				// create buffer if needed
-				if (this.indexBuffer == null
-					|| this.indexBuffer.size() < buffer.capacity())
-				{
-					int usage = GpuBuffer.USAGE_COPY_DST 
-						| GpuBuffer.USAGE_VERTEX 
-						| GpuBuffer.USAGE_INDEX 
-						| GpuBuffer.USAGE_UNIFORM;
-					this.indexBuffer = GPU_DEVICE.createBuffer(this::getIndexBufferName, usage, buffer.capacity());
-				}
-				
-				GpuBufferSlice bufferSlice = new GpuBufferSlice(this.indexBuffer, /*offset*/ 0, buffer.capacity());
-				COMMAND_ENCODER.writeToBuffer(bufferSlice, buffer);
-			}
-		}
-		
-		
-		
-		// render pass setup
-		{
-			profiler.popPush("setup");
-			
-			// create a render pass
-			OptionalInt optionalClearColorAsInt = OptionalInt.empty();
-			OptionalDouble optionalDepthValueAsDouble = OptionalDouble.empty();
-			
-			try(RenderPass renderPass = COMMAND_ENCODER.createRenderPass(
-				this::getRenderPassName,
-				BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper.textureView,
-				optionalClearColorAsInt,
-				BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper.textureView, optionalDepthValueAsDouble)
-				)
-			{
-				// bind MC Lightmap
-				//renderPass.bindTexture("uLightMap", this.mcLightTextureViewWrapper.textureView, this.mcLightTextureViewWrapper.textureSampler);
-				LightMapWrapper lightMapWrapper = (LightMapWrapper) renderEventParam.lightmap;
-				BlazeTextureViewWrapper lightmapTextureViewWrapper = lightMapWrapper.getTextureViewWrapper();
-				renderPass.bindTexture("uLightMap", lightmapTextureViewWrapper.textureView, lightmapTextureViewWrapper.textureSampler);
-				
-				// set pipeline
-				renderPass.setPipeline(opaquePass ? this.opaquePipeline : this.transparentPipeline);
-				renderPass.setIndexBuffer(this.indexBuffer, VertexFormat.IndexType.INT);
-				
-				// shared uniforms
-				renderPass.setUniform("fragUniformBlock", this.fragUniformBuffer);
-				renderPass.setUniform("vertSharedUniformBlock", this.vertSharedUniformBuffer);
-				
-				
 				
 				for (int lodIndex = 0; lodIndex < bufferContainers.size(); lodIndex++)
 				{
-					profiler.popPush("binding");
-					
 					LodBufferContainer bufferContainer = bufferContainers.get(lodIndex);
-					BlazeLodUniformBufferWrapper uniformWrapper = (BlazeLodUniformBufferWrapper)bufferContainer.uniformContainer;
+					bufferContainer.uniformContainer.tryUpload(bufferContainer);
+				}
+			}
 			
-					boolean columnBuilderDebugEnabled = Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugEnable.get();
+			profiler.popPush("vert share uniforms");
-					if (columnBuilderDebugEnabled)
+			{
-					{
+				DhMat4f combinedMatrix = new DhMat4f(renderEventParam.dhProjectionMatrix);
-						if (DhSectionPos.getDetailLevel(bufferContainer.pos) == Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugDetailLevel.get()
+				combinedMatrix.multiply(renderEventParam.dhModelViewMatrix);
-							&& DhSectionPos.getX(bufferContainer.pos) == Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugXPos.get()
-							&& DhSectionPos.getZ(bufferContainer.pos) == Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugZPos.get())
-						{
-							int breakpoint = 0;
-						}
-						else
-						{
-							continue;
-						}
-					}
 				
-					renderPass.setUniform("vertUniqueUniformBlock", uniformWrapper.gpuBuffer);
+				float earthCurveRatio = Config.Client.Advanced.Graphics.Experimental.earthCurveRatio.get();
-					
+				if (earthCurveRatio < -1.0f || earthCurveRatio > 1.0f)
-					
+				{
-					
+					earthCurveRatio = /*6371KM*/ 6371000.0f / earthCurveRatio;
-					profiler.popPush("rendering");
+				}
-					
+				else
-					// render each buffer
+				{
-					IVertexBufferWrapper[] bufferWrapperList = opaquePass ? bufferContainer.vbos : bufferContainer.vbosTransparent;
+					// disable curvature if the config value is between -1 and 1
-					for (int i = 0; i < bufferWrapperList.length; i++)
+					earthCurveRatio = 0.0f;
-					{
-						BlazeVertexBufferWrapper bufferWrapper = (BlazeVertexBufferWrapper) bufferWrapperList[i];
-						if (!bufferWrapper.uploaded
-							|| bufferWrapper.vertexCount == 0)
-						{
-							continue;
-						}
-						
-						// fire render event
-						{
-							Vec3d camPos = renderEventParam.exactCameraPosition;
-							Vec3f modelPos = new Vec3f(
-								(float) (bufferContainer.minCornerBlockPos.getX() - camPos.x),
-								(float) (bufferContainer.minCornerBlockPos.getY() - camPos.y),
-								(float) (bufferContainer.minCornerBlockPos.getZ() - camPos.z));
-							ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeBufferRenderEvent.class, new DhApiBeforeBufferRenderEvent.EventParam(renderEventParam, modelPos));
-						}
-						
-						renderPass.setVertexBuffer(0, bufferWrapper.vboGpuBuffer); // vertex buffer can only be "0" lol
-						
-						if (!bufferWrapper.vboGpuBuffer.isClosed())
-						{
-							renderPass.drawIndexed(
-								/*indexStart*/ 0,
-								/*firstIndex*/0,
-								/*indexCount*/bufferWrapper.indexCount,
-								/*instanceCount*/1);
-						}
-					}
 				}
 				
+				
+				// upload data //
+				
+				int i = Config.Client.Advanced.Debugging.enableWhiteWorld.get() ? 1 : 0;
+				
+				this.vertSharedUniformBufferWrapper
+					.putInt(i) // uIsWhiteWorld
+					
+					.putFloat((float) renderEventParam.worldYOffset) // uWorldYOffset
+					.putFloat(0.01f) // uMircoOffset // 0.01 block offset
+					.putFloat(earthCurveRatio) // uEarthRadius
+					
+					.putVec3f(
+						(float) renderEventParam.exactCameraPosition.x,
+						(float) renderEventParam.exactCameraPosition.y,
+						(float) renderEventParam.exactCameraPosition.z) // uCameraPos
+					.putMat4f(combinedMatrix) // uCombinedMatrix
+					.finishAndUpload();
+			}
+			
+			profiler.popPush("set frag uniforms");
+			{
+				// create data //
+				
+				float dhNearClipDistance = RenderUtil.getNearClipPlaneInBlocks();
+				if (!Config.Client.Advanced.Debugging.lodOnlyMode.get())
+				{
+					// this added value prevents the near clip plane and discard circle from touching, which looks bad
+					dhNearClipDistance += 16f;
+				}
+				
+				
+				// upload data //
+				this.fragUniformBufferWrapper
+					.putFloat(dhNearClipDistance) // uClipDistance
+					.putFloat(Config.Client.Advanced.Graphics.NoiseTexture.noiseIntensity.get()) // uNoiseIntensity
+					.putInt(Config.Client.Advanced.Graphics.NoiseTexture.noiseSteps.get()) // uNoiseSteps
+					.putInt(Config.Client.Advanced.Graphics.NoiseTexture.noiseDropoff.get()) // uNoiseDropoff
+					.putInt(Config.Client.Advanced.Graphics.Quality.ditherDhFade.get() ? 1 : 0) // uDitherDhRendering
+					.putInt(Config.Client.Advanced.Graphics.NoiseTexture.enableNoiseTexture.get() ? 1 : 0) // uNoiseEnabled
+					.finishAndUpload()
+				;
+			}
+			
+			
+			
+			// render pass setup
+			{
+				profiler.popPush("rendering");
+				
+				ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeRenderPassEvent.class, renderEventParam.apiCopy);
+				
+				// create a render pass
+				try (RenderPassWrapper renderPassWrapper = new RenderPassWrapper(
+					this::getRenderPassName,
+					BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper,
+					BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper)
+				)
+				{
+					LightMapWrapper lightMapWrapper = (LightMapWrapper) renderEventParam.lightmap;
+					BlazeTextureViewWrapper lightmapTextureViewWrapper = lightMapWrapper.getTextureViewWrapper();
+					renderPassWrapper.bindTexture("uLightMap", lightmapTextureViewWrapper);
+					
+					// set pipeline
+					renderPassWrapper.setPipeline(opaquePass ? this.opaquePipeline : this.transparentPipeline);
+					
+					// shared uniforms
+					renderPassWrapper.setUniform("fragUniformBlock", this.fragUniformBufferWrapper);
+					renderPassWrapper.setUniform("vertSharedUniformBlock", this.vertSharedUniformBufferWrapper);
+					
+					
+					
+					for (int lodIndex = 0; lodIndex < bufferContainers.size(); lodIndex++)
+					{
+						LodBufferContainer bufferContainer = bufferContainers.get(lodIndex);
+						BlazeLodUniformBufferWrapper uniformWrapper = (BlazeLodUniformBufferWrapper) bufferContainer.uniformContainer;
+						
+						boolean columnBuilderDebugEnabled = Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugEnable.get();
+						if (columnBuilderDebugEnabled)
+						{
+							if (DhSectionPos.getDetailLevel(bufferContainer.pos) == Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugDetailLevel.get()
+								&& DhSectionPos.getX(bufferContainer.pos) == Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugXPos.get()
+								&& DhSectionPos.getZ(bufferContainer.pos) == Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugZPos.get())
+							{
+								int breakpoint = 0;
+							}
+							else
+							{
+								continue;
+							}
+						}
+						
+						renderPassWrapper.setUniform("vertUniqueUniformBlock", uniformWrapper);
+						
+						
+						
+						// render each buffer
+						IVertexBufferWrapper[] bufferWrapperList = opaquePass ? bufferContainer.vboOpaqueWrappers : bufferContainer.vboTransparentWrappers;
+						for (int i = 0; i < bufferWrapperList.length; i++)
+						{
+							BlazeVertexBufferWrapper bufferWrapper = (BlazeVertexBufferWrapper) bufferWrapperList[i];
+							if (!bufferWrapper.uploaded
+								|| bufferWrapper.vertexCount == 0)
+							{
+								continue;
+							}
+							
+							// fire render event
+							{
+								DhVec3d camPos = renderEventParam.exactCameraPosition;
+								MODEL_POS.set(
+									(float) (bufferContainer.minCornerBlockPos.getX() - camPos.x),
+									(float) (bufferContainer.minCornerBlockPos.getY() - camPos.y),
+									(float) (bufferContainer.minCornerBlockPos.getZ() - camPos.z));
+								BEFORE_BUFFER_RENDER_EVENT_PARAM.update(renderEventParam, MODEL_POS);
+								ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeBufferRenderEvent.class, BEFORE_BUFFER_RENDER_EVENT_PARAM);
+							}
+							
+							renderPassWrapper.setIndexBuffer(bufferWrapper.getIndexGpuBuffer());
+							renderPassWrapper.setVertexBuffer(bufferWrapper.vertexGpuBuffer);
+							
+							if (!bufferWrapper.vertexGpuBuffer.isClosed())
+							{
+								renderPassWrapper.drawIndexed(bufferWrapper.indexCount);
+							}
+						}
+					}
+					
+				}
 			}
 		}
-		
-		profiler.pop();
 	}
 	private String getIndexBufferName() { return "distantHorizons:LodIndexBuffer"; }
-	private String getRenderPassName() { return "distantHorizons:McLodRenderer"; }
+	private String getRenderPassName() { return "distantHorizons:TerrainRenderer"; }
 	
 	//endregion
 	

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhApplyRenderer.java

@@ -27,27 +27,28 @@ public class BlazeDhApplyRenderer {}
 import com.mojang.blaze3d.buffers.GpuBuffer;
 import com.mojang.blaze3d.pipeline.BlendFunction;
 import com.mojang.blaze3d.pipeline.RenderPipeline;
-import com.mojang.blaze3d.platform.DepthTestFunction;
-import com.mojang.blaze3d.platform.PolygonMode;
-import com.mojang.blaze3d.shaders.UniformType;
 import com.mojang.blaze3d.systems.CommandEncoder;
 import com.mojang.blaze3d.systems.GpuDevice;
-import com.mojang.blaze3d.systems.RenderPass;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.textures.*;
 import com.mojang.blaze3d.vertex.VertexFormat;
 import com.seibel.distanthorizons.common.render.blaze.util.BlazeDhVertexFormatUtil;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeVertexFormatBuilder;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPassWrapper;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPipelineBuilderWrapper;
 import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper;
 import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.uniform.BlazeUniformBufferWrapper;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.render.EDhRenderDepth;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.AbstractDhRenderApiDefinition;
 import com.seibel.distanthorizons.coreapi.ModInfo;
-import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;
-import java.util.OptionalDouble;
-import java.util.OptionalInt;
 
 /**
  * Copies the given color texture
@@ -61,11 +62,15 @@ public class BlazeDhApplyRenderer
 {
 	public static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
+	private static final AbstractDhRenderApiDefinition RENDER_API_DEF = SingletonInjector.INSTANCE.get(AbstractDhRenderApiDefinition.class);
+	
 	private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice();
 	private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder();
 	
 	private RenderPipeline pipeline;
 	
+	private final BlazeUniformBufferWrapper fragUniformBufferWrapper = new BlazeUniformBufferWrapper("baseFragUniformBlock");
+	
 	protected GpuBuffer vboGpuBuffer;
 	
 	protected final String name;
@@ -81,6 +86,10 @@ public class BlazeDhApplyRenderer
 	private final BlazeTextureViewWrapper sourceDepthTextureViewWrapper = new BlazeTextureViewWrapper();
 	
 	private final BlazeTextureViewWrapper destinationColorTextureViewWrapper = new BlazeTextureViewWrapper();
+	/** We don't want to actually write any depth data, but blaze3D complains if we don't bind a depth texture. */
+	private final BlazeTextureWrapper dummyDepthTextureWrapper = BlazeTextureWrapper.createDepth("apply_dummy_depth");
+	
+	
 	
 	/** 
 	 * Can be set for special application shaders that need 
@@ -90,7 +99,7 @@ public class BlazeDhApplyRenderer
 	 */
 	private final String[] uniformNames;
 	/** will be an empty array if unneeded */
-	private final GpuBuffer[] uniformBuffers;
+	private final BlazeUniformBufferWrapper[] uniformBufferWrappers;
 	
 	
 	
@@ -126,7 +135,7 @@ public class BlazeDhApplyRenderer
 		this.fragmentShaderPath = fragmentShaderPath;
 		
 		this.uniformNames = uniformNames;
-		this.uniformBuffers = new GpuBuffer[this.uniformNames.length];
+		this.uniformBufferWrappers = new BlazeUniformBufferWrapper[this.uniformNames.length];
 	}
 	
 	private void tryInit(
@@ -134,8 +143,12 @@ public class BlazeDhApplyRenderer
 		GpuTexture sourceDepthTexture,
 		GpuTexture destinationColorTexture)
 	{
-		this.createPipeline();
+		// one-time setup
-		this.vboGpuBuffer = BlazePostProcessUtil.createAndUploadScreenVertexData(this.name);
+		if (this.pipeline == null)
+		{
+			this.createPipeline();
+			this.vboGpuBuffer = BlazePostProcessUtil.createAndUploadScreenVertexData(this.name);
+		}
 		
 		this.sourceColorTextureViewWrapper.tryWrap(sourceColorTexture);
 		this.sourceDepthTextureViewWrapper.tryWrap(sourceDepthTexture);
@@ -145,20 +158,11 @@ public class BlazeDhApplyRenderer
 	}
 	private void createPipeline()
 	{
-		if (this.pipeline != null)
+		RenderPipelineBuilderWrapper pipelineBuilder = new RenderPipelineBuilderWrapper();
 		{
-			return;
+			pipelineBuilder.withFaceCulling(false);
-		}
-		
-		VertexFormat vertexFormat = VertexFormat.builder()
-			.add("vPosition", BlazeDhVertexFormatUtil.SCREEN_POS)
-			.build();
-		
-		RenderPipeline.Builder pipelineBuilder = RenderPipeline.builder();
-		{
-			pipelineBuilder.withCull(false);
 			pipelineBuilder.withDepthWrite(false);
-			pipelineBuilder.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST);
+			pipelineBuilder.withDepthTest(RenderPipelineBuilderWrapper.EDhDepthTest.NONE);
 			pipelineBuilder.withColorWrite(true);
 			
 			if (this.blendFunction != null)
@@ -170,28 +174,32 @@ public class BlazeDhApplyRenderer
 				pipelineBuilder.withoutBlend();
 			}
 			
-			pipelineBuilder.withPolygonMode(PolygonMode.FILL);
+			pipelineBuilder.withPolygonMode(RenderPipelineBuilderWrapper.EDhPolygonMode.FILL);
-			pipelineBuilder.withLocation(Identifier.parse(this.identifierName)); // TODO will complain if capital letters are included
+			pipelineBuilder.withName(this.name);
 			
-			// TODO manually validate paths to confirm they exist and end with ".fsh" or ".vsh", MC silently fails if the files are missing/improperly named
+			pipelineBuilder.withVertexShader(this.vertexShaderPath);
-			pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", this.vertexShaderPath));
+			pipelineBuilder.withFragmentShader(this.fragmentShaderPath);
-			pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", this.fragmentShaderPath));
 			
 			for (int i = 0; i < this.uniformNames.length; i++)
 			{
 				String uniformName = this.uniformNames[i];
-				pipelineBuilder.withUniform(uniformName, UniformType.UNIFORM_BUFFER);
+				pipelineBuilder.withUniformBuffer(uniformName);
 			}
 			
+			pipelineBuilder.withUniformBuffer("baseFragUniformBlock");
+			
 			pipelineBuilder.withSampler("uSourceColorTexture");
 			pipelineBuilder.withSampler("uSourceDepthTexture");
 			
-			pipelineBuilder.withVertexFormat(vertexFormat, VertexFormat.Mode.TRIANGLE_FAN);
+			VertexFormat vertexFormat = new BlazeVertexFormatBuilder()
+				.add("vPosition", BlazeDhVertexFormatUtil.SCREEN_POS)
+				.build();
+			pipelineBuilder.withVertexFormat(vertexFormat);
+			pipelineBuilder.withVertexMode(RenderPipelineBuilderWrapper.EDhVertexMode.TRIANGLE_FAN);
 		}
 		this.pipeline = pipelineBuilder.build();
 	}
 	
-	
 	//endregion
 	
 	
@@ -201,7 +209,7 @@ public class BlazeDhApplyRenderer
 	//========//
 	//region
 	
-	public void setUniform(String uniformName, GpuBuffer uniformBuffer)
+	public void setUniform(String uniformName, BlazeUniformBufferWrapper uniformBufferWrapper)
 	{
 		// the uniform array should be short enough (less than 10 items)
 		// where a sequential search should be plenty fast
@@ -210,7 +218,7 @@ public class BlazeDhApplyRenderer
 			String nameAtIndex = this.uniformNames[i];
 			if (nameAtIndex.equals(uniformName))
 			{
-				this.uniformBuffers[i] = uniformBuffer;
+				this.uniformBufferWrappers[i] = uniformBufferWrapper;
 				break;
 			}
 		}
@@ -223,32 +231,40 @@ public class BlazeDhApplyRenderer
 	{
 		this.tryInit(sourceColorTexture, sourceDepthTexture, destinationColorTexture);
 		
-		try (RenderPass renderPass = COMMAND_ENCODER.createRenderPass(
+		this.dummyDepthTextureWrapper.tryCreateOrResize();
+		
+		
+		this.fragUniformBufferWrapper
+			.putInt((RENDER_API_DEF.getRenderDepth() == EDhRenderDepth.REVERSE_Z) ? 1 : 0) // uIsReverseZDepth
+			.finishAndUpload();
+		;
+		
+		try (RenderPassWrapper renderPassWrapper = new RenderPassWrapper(
 			this::getIdentifierName,
-			this.destinationColorTextureViewWrapper.textureView,
+			this.destinationColorTextureViewWrapper,
-			/*optionalClearColorAsInt*/ OptionalInt.empty(),
+			this.dummyDepthTextureWrapper))
-			/*depthTexture*/ null,
-			/*optionalDepthValueAsDouble*/ OptionalDouble.empty()))
 		{
-			renderPass.bindTexture("uSourceColorTexture", this.sourceColorTextureViewWrapper.textureView, this.sourceColorTextureViewWrapper.textureSampler);
+			renderPassWrapper.bindTexture("uSourceColorTexture", this.sourceColorTextureViewWrapper);
-			renderPass.bindTexture("uSourceDepthTexture", this.sourceDepthTextureViewWrapper.textureView, this.sourceDepthTextureViewWrapper.textureSampler);
+			renderPassWrapper.bindTexture("uSourceDepthTexture", this.sourceDepthTextureViewWrapper);
 			
 			for (int i = 0; i < this.uniformNames.length; i++)
 			{
 				String uniformName = this.uniformNames[i];
-				GpuBuffer uniformBuffer = this.uniformBuffers[i];
+				BlazeUniformBufferWrapper uniformBuffer = this.uniformBufferWrappers[i];
 				if (uniformBuffer == null)
 				{
 					throw new IllegalStateException("Missing uniform ["+uniformName+"], please set the uniform before rendering.");	
 				}
 				
-				renderPass.setUniform(uniformName, uniformBuffer);
+				renderPassWrapper.setUniform(uniformName, uniformBuffer);
 			}
 			
-			renderPass.setVertexBuffer(0, this.vboGpuBuffer);
+			renderPassWrapper.setUniform("baseFragUniformBlock", this.fragUniformBufferWrapper);
-			renderPass.setPipeline(this.pipeline);
 			
-			renderPass.draw(/*indexStart*/ 0, /*indexCount*/ 4);
+			renderPassWrapper.setVertexBuffer(this.vboGpuBuffer);
+			renderPassWrapper.setPipeline(this.pipeline);
+			
+			renderPassWrapper.draw(4);
 		}
 		
 		
@@ -256,7 +272,7 @@ public class BlazeDhApplyRenderer
 		// so we can check if they're missing during next frame's rendering
 		if (ModInfo.IS_DEV_BUILD)
 		{
-			Arrays.fill(this.uniformBuffers, null);
+			Arrays.fill(this.uniformBufferWrappers, null);
 		}
 	}
 	

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/apply/BlazeDhCopyRenderer.java

@@ -26,23 +26,17 @@ public class BlazeDhCopyRenderer {}
 
 import com.mojang.blaze3d.buffers.GpuBuffer;
 import com.mojang.blaze3d.pipeline.RenderPipeline;
-import com.mojang.blaze3d.platform.DepthTestFunction;
-import com.mojang.blaze3d.platform.PolygonMode;
 import com.mojang.blaze3d.systems.CommandEncoder;
 import com.mojang.blaze3d.systems.GpuDevice;
-import com.mojang.blaze3d.systems.RenderPass;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.textures.*;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPassWrapper;
-import com.mojang.blaze3d.vertex.VertexFormat;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPipelineBuilderWrapper;
 import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper;
 import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper;
 import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.IDhBlazeTexture;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import net.minecraft.resources.Identifier;
-
-import java.util.OptionalDouble;
-import java.util.OptionalInt;
 
 /**
  * Blindly copies one texture into another.
@@ -63,6 +57,8 @@ public class BlazeDhCopyRenderer
 	
 	private GpuBuffer vboGpuBuffer;
 	
+	private BlazeTextureWrapper dummyDepthTextureWrapper;
+	
 	
 	
 	//=============//
@@ -81,28 +77,30 @@ public class BlazeDhCopyRenderer
 		this.init = true;
 		
 		
+		this.dummyDepthTextureWrapper = BlazeTextureWrapper.createDepth("dh_copy_depth_texture");
 		
-		RenderPipeline.Builder pipelineBuilder = RenderPipeline.builder();
+		RenderPipelineBuilderWrapper pipelineBuilder = new RenderPipelineBuilderWrapper();
 		{
-			pipelineBuilder.withCull(false);
+			pipelineBuilder.withFaceCulling(false);
 			pipelineBuilder.withDepthWrite(false);
-			pipelineBuilder.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST);
+			pipelineBuilder.withDepthTest(RenderPipelineBuilderWrapper.EDhDepthTest.NONE);
 			pipelineBuilder.withColorWrite(true);
 			pipelineBuilder.withoutBlend();
-			pipelineBuilder.withPolygonMode(PolygonMode.FILL);
+			pipelineBuilder.withPolygonMode(RenderPipelineBuilderWrapper.EDhPolygonMode.FILL);
-			pipelineBuilder.withLocation(Identifier.parse("distanthorizons:copy_render"));
+			pipelineBuilder.withName("copy");
 			
-			pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "copy/blaze/vert"));
+			pipelineBuilder.withVertexShader("copy/blaze/vert");
-			pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "copy/blaze/frag"));
+			pipelineBuilder.withFragmentShader("copy/blaze/frag");
 			
 			pipelineBuilder.withSampler("uCopyTexture");
 			
-			pipelineBuilder.withVertexFormat(BlazePostProcessUtil.createVertexFormat(), VertexFormat.Mode.TRIANGLE_FAN);
+			pipelineBuilder.withVertexFormat(BlazePostProcessUtil.createVertexFormat());
+			pipelineBuilder.withVertexMode(RenderPipelineBuilderWrapper.EDhVertexMode.TRIANGLE_FAN);
 		}
 		this.pipeline = pipelineBuilder.build();
 		
 		
-		this.vboGpuBuffer = BlazePostProcessUtil.createAndUploadScreenVertexData("McCopyRenderer");
+		this.vboGpuBuffer = BlazePostProcessUtil.createAndUploadScreenVertexData("CopyRenderer");
 		
 	}
 	
@@ -116,46 +114,28 @@ public class BlazeDhCopyRenderer
 	//region
 	
 	public void render(
-		BlazeTextureWrapper sourceColorTextureWrapper,
+		IDhBlazeTexture sourceColorTextureWrapper,
-		BlazeTextureViewWrapper destinationColorTextureWrapper)
+		IDhBlazeTexture destinationColorTextureWrapper)
-	{
-		this.render(
-			sourceColorTextureWrapper.textureView, sourceColorTextureWrapper.textureSampler,
-			destinationColorTextureWrapper.textureView);
-	}
-	public void render(
-		BlazeTextureWrapper sourceColorTextureWrapper,
-		BlazeTextureWrapper destinationColorTextureWrapper)
-	{
-		this.render(
-			sourceColorTextureWrapper.textureView, sourceColorTextureWrapper.textureSampler,
-			destinationColorTextureWrapper.textureView);
-	}
-	
-	private void render(
-		GpuTextureView sourceTextureView,
-		GpuSampler sourceTextureSampler,
-		GpuTextureView destinationTextureView)
 	{
 		this.tryInit();
 		
-		try (RenderPass renderPass = COMMAND_ENCODER.createRenderPass(
+		this.dummyDepthTextureWrapper.tryCreateOrResize();
+		
+		try (RenderPassWrapper renderPassWrapper = new RenderPassWrapper(
 			this::getRenderPassName,
-			destinationTextureView,
+			destinationColorTextureWrapper,
-			/*optionalClearColorAsInt*/ OptionalInt.empty(),
+			this.dummyDepthTextureWrapper))
-			/*depthTexture*/ null,
-			/*optionalDepthValueAsDouble*/ OptionalDouble.empty()))
 		{
-			renderPass.bindTexture("uCopyTexture", sourceTextureView, sourceTextureSampler);
+			renderPassWrapper.bindTexture("uCopyTexture", sourceColorTextureWrapper);
 			
-			renderPass.setVertexBuffer(0, this.vboGpuBuffer); // vertex buffer can only be "0" lol
+			renderPassWrapper.setVertexBuffer(this.vboGpuBuffer); // vertex buffer can only be "0" lol
 			
-			renderPass.setPipeline(this.pipeline);
+			renderPassWrapper.setPipeline(this.pipeline);
-			renderPass.draw(/*indexStart*/ 0, /*indexCount*/ 4);
+			renderPassWrapper.draw(4);
 		}
 	}
 	
-	private String getRenderPassName() { return "distantHorizons:McCopyRenderer"; }
+	private String getRenderPassName() { return "distantHorizons:CopyRenderer"; }
 	
 	//endregion
 	

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/objects/BlazeGenericObjectVertexContainer.java

@@ -17,7 +17,7 @@ import com.seibel.distanthorizons.common.render.openGl.glObject.enums.GLEnums;
 import com.seibel.distanthorizons.core.render.RenderThreadTaskHandler;
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.IDhGenericObjectVertexBufferContainer;
 import com.seibel.distanthorizons.core.render.renderer.RenderableBoxGroup;
-import com.seibel.distanthorizons.core.util.ColorUtil;
+import com.seibel.distanthorizons.coreapi.util.ColorUtil;
 import org.lwjgl.opengl.GL32;
 
 import java.nio.ByteBuffer;
@@ -84,14 +84,10 @@ public class BlazeGenericObjectVertexContainer implements IDhGenericObjectVertex
 	//===========================//
 	//region
 	
+	@Override
 	public void updateVertexData(List<DhApiRenderableBox> uploadBoxList)
 	{
 		int boxCount = uploadBoxList.size();
-		if (boxCount == 0)
-		{
-			return; // TODO done just to fix a buffer empty crash
-		}
-		
 		
 		// recreate the data arrays if their size is different
 		if (this.uploadedBoxCount != boxCount)
@@ -183,20 +179,24 @@ public class BlazeGenericObjectVertexContainer implements IDhGenericObjectVertex
 				this.vertexBuffer.put(a);
 				
 				this.vertexBuffer.put(box.material);
-				// TODO make sure this all is a multiple of 4 like LodQuadBuilder (might cause issues with AMD/Mac otherwise)
+				
+				// padding so the vertex format's byte count is a multiple of 4
+				this.vertexBuffer.put((byte)0);
+				this.vertexBuffer.put((byte)0);
+				this.vertexBuffer.put((byte)0);
 			}
 		}
 		this.vertexBuffer.flip();
 		this.indexBuffer.flip();
-		
-		
-		this.state = BlazeGenericObjectVertexContainer.EState.READY_TO_UPLOAD;
 	}
 	
 	private int vertexBufferSize()
 	{
-		int faceCount = this.uploadedBoxCount * 6;
+		// minimum of 1 box to prevent trying to create a buffer of size 0
-		int vertexCount = faceCount * 6;
+		int boxCount = Math.max(this.uploadedBoxCount, 1);
+		
+		int faceCount = boxCount * 6; // 6 faces on a cube
+		int vertexCount = faceCount * 6; // 6 vertices per cube
 		
 		int byteSize = vertexCount * 3 * Float.BYTES; // x,y,z
 		byteSize += vertexCount * 4; // r,g,b,a
@@ -205,19 +205,30 @@ public class BlazeGenericObjectVertexContainer implements IDhGenericObjectVertex
 	}
 	private int indexBufferSize()
 	{
-		int quadCount = this.uploadedBoxCount * 36;
+		// minimum of 1 box to prevent trying to create a buffer of size 0
-		int byteSize = quadCount * GLEnums.getTypeSize(GL32.GL_UNSIGNED_INT) * 6;
+		int boxCount = Math.max(this.uploadedBoxCount, 1);
+		
+		int quadCount = boxCount * 6 * 6; // 6 faces with 6 vertices each
+		int byteSize = quadCount * GLEnums.getTypeSize(GL32.GL_UNSIGNED_INT);
 		return byteSize;
 	}
 	
+	@Override
 	public void uploadDataToGpu()
 	{
 		// vertex
 		{
 			int totalVertexByteSize = this.vertexBufferSize();
 			if (this.vboGpuBuffer == null
-				|| this.vboGpuBuffer.size() < totalVertexByteSize)
+				// recreating if the size changes is always necessary (even if we only need a smaller amount)
+				// due to a bug on Mac where it will attempt to render anything allocated in the buffer
+				|| this.vboGpuBuffer.size() != totalVertexByteSize)
 			{
+				if (this.vboGpuBuffer != null)
+				{
+					this.vboGpuBuffer.close();
+				}
+				
 				int usage = GpuBuffer.USAGE_COPY_DST 
 					| GpuBuffer.USAGE_VERTEX;
 				this.vboGpuBuffer = GPU_DEVICE.createBuffer(this::getVertexBufferName, usage, totalVertexByteSize);
@@ -231,12 +242,17 @@ public class BlazeGenericObjectVertexContainer implements IDhGenericObjectVertex
 		{
 			int totalVertexByteSize = this.indexBufferSize();
 			if (this.indexGpuBuffer == null
-				|| this.indexGpuBuffer.size() < totalVertexByteSize)
+				// recreating if the size changes is always necessary (even if we only need a smaller amount)
+				// due to a bug on Mac where it will attempt to render anything allocated in the buffer
+				|| this.indexGpuBuffer.size() != totalVertexByteSize)
 			{
+				if (this.indexGpuBuffer != null)
+				{
+					this.indexGpuBuffer.close();
+				}
+				
 				int usage = GpuBuffer.USAGE_COPY_DST 
-					| GpuBuffer.USAGE_VERTEX 
+					| GpuBuffer.USAGE_INDEX;
-					| GpuBuffer.USAGE_INDEX 
-					| GpuBuffer.USAGE_UNIFORM;
 				this.indexGpuBuffer = GPU_DEVICE.createBuffer(this::getIndexBufferName, usage, totalVertexByteSize);
 			}
 			
@@ -245,8 +261,6 @@ public class BlazeGenericObjectVertexContainer implements IDhGenericObjectVertex
 			
 			COMMAND_ENCODER.writeToBuffer(bufferSlice, this.indexBuffer);
 		}
-		
-		this.state = EState.RENDER;
 	}
 	private String getVertexBufferName() { return "distantHorizons:GenericVertexBuffer"; }
 	private String getIndexBufferName() { return "distantHorizons:GenericIndexBuffer"; }
@@ -263,7 +277,7 @@ public class BlazeGenericObjectVertexContainer implements IDhGenericObjectVertex
 	@Override
 	public void close()
 	{
-		RenderThreadTaskHandler.INSTANCE.queueRunningOnRenderThread(() -> 
+		RenderThreadTaskHandler.INSTANCE.queueRunningOnRenderThread("BlazeGenericObjectVertexContainer close", () -> 
 		{
 			if (this.vboGpuBuffer != null)
 			{

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFarFadeRenderer.java

@@ -25,37 +25,27 @@ public class BlazeDhFarFadeRenderer {}
 #else
 	
 import com.mojang.blaze3d.buffers.GpuBuffer;
-import com.mojang.blaze3d.buffers.GpuBufferSlice;
-import com.mojang.blaze3d.buffers.Std140Builder;
-import com.mojang.blaze3d.buffers.Std140SizeCalculator;
 import com.mojang.blaze3d.pipeline.RenderPipeline;
-import com.mojang.blaze3d.platform.DepthTestFunction;
-import com.mojang.blaze3d.platform.PolygonMode;
-import com.mojang.blaze3d.shaders.UniformType;
 import com.mojang.blaze3d.systems.CommandEncoder;
 import com.mojang.blaze3d.systems.GpuDevice;
-import com.mojang.blaze3d.systems.RenderPass;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.VertexFormat;
 import com.seibel.distanthorizons.common.render.blaze.BlazeDhMetaRenderer;
 import com.seibel.distanthorizons.common.render.blaze.apply.BlazeDhCopyRenderer;
 import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil;
-import com.seibel.distanthorizons.common.render.blaze.util.BlazeUniformUtil;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPassWrapper;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPipelineBuilderWrapper;
 import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper;
 import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.uniform.BlazeUniformBufferWrapper;
+import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.render.EDhRenderDepth;
 import com.seibel.distanthorizons.core.render.RenderParams;
 import com.seibel.distanthorizons.core.util.RenderUtil;
-import com.seibel.distanthorizons.core.util.math.Mat4f;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.AbstractDhRenderApiDefinition;
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhFarFadeRenderer;
-import net.minecraft.client.Minecraft;
-import net.minecraft.resources.Identifier;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.OptionalDouble;
-import java.util.OptionalInt;
 
 /**
  * Fades out DH's far clip plane
@@ -66,18 +56,22 @@ public class BlazeDhFarFadeRenderer implements IDhFarFadeRenderer
 	
 	private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice();
 	private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder();
+	private static final AbstractDhRenderApiDefinition RENDER_API_DEF = SingletonInjector.INSTANCE.get(AbstractDhRenderApiDefinition.class);
 	
 	public static final BlazeDhFarFadeRenderer INSTANCE = new BlazeDhFarFadeRenderer();
 	
 	private RenderPipeline pipeline;
 	private boolean init = false;
 	
-	private GpuBuffer fragUniformBuffer;
+	private final BlazeUniformBufferWrapper fragUniformBufferWrapper = new BlazeUniformBufferWrapper("fragUniformBlock");
 	
 	private GpuBuffer vboGpuBuffer;
 	
-	public final BlazeTextureWrapper dhFadeColorTextureWrapper = BlazeTextureWrapper.createColor("DhFadeColorTexture");
+	private final BlazeTextureWrapper dhFadeColorTextureWrapper = BlazeTextureWrapper.createColor("dh_far_fade_color_texture");
-	public final BlazeTextureViewWrapper mcColorTextureViewWrapper = new BlazeTextureViewWrapper();
+	/** We don't want to actually write any depth data, but blaze3D complains if we don't bind a depth texture. */
+	private final BlazeTextureWrapper dhFadeDepthTextureWrapper = BlazeTextureWrapper.createDepth("dh_far_fade_depth_texture");
+	
+	private final BlazeTextureViewWrapper mcColorTextureViewWrapper = new BlazeTextureViewWrapper();
 	
 	
 	
@@ -98,32 +92,33 @@ public class BlazeDhFarFadeRenderer implements IDhFarFadeRenderer
 		
 		
 		
-		RenderPipeline.Builder pipelineBuilder = RenderPipeline.builder();
+		RenderPipelineBuilderWrapper pipelineBuilder = new RenderPipelineBuilderWrapper();
 		{
-			pipelineBuilder.withCull(false);
+			pipelineBuilder.withFaceCulling(false);
 			pipelineBuilder.withDepthWrite(false);
-			pipelineBuilder.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST);
+			pipelineBuilder.withDepthTest(RenderPipelineBuilderWrapper.EDhDepthTest.NONE);
 			pipelineBuilder.withColorWrite(true);
 			pipelineBuilder.withoutBlend();
-			pipelineBuilder.withPolygonMode(PolygonMode.FILL);
+			pipelineBuilder.withPolygonMode(RenderPipelineBuilderWrapper.EDhPolygonMode.FILL);
-			pipelineBuilder.withLocation(Identifier.parse("distanthorizons:far_fade"));
+			pipelineBuilder.withName("far_fade");
 			
-			pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "fade/blaze/vert"));
+			pipelineBuilder.withVertexShader("fade/blaze/vert");
-			pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "fade/blaze/dh_fade"));
+			pipelineBuilder.withFragmentShader("fade/blaze/dh_fade");
 			
 			pipelineBuilder.withSampler("uMcColorTexture");
 			
 			pipelineBuilder.withSampler("uDhDepthTexture");
 			pipelineBuilder.withSampler("uDhColorTexture");
 			
-			pipelineBuilder.withUniform("fragUniformBlock", UniformType.UNIFORM_BUFFER);
+			pipelineBuilder.withUniformBuffer("fragUniformBlock");
 			
-			pipelineBuilder.withVertexFormat(BlazePostProcessUtil.createVertexFormat(), VertexFormat.Mode.TRIANGLE_FAN);
+			pipelineBuilder.withVertexFormat(BlazePostProcessUtil.createVertexFormat());
+			pipelineBuilder.withVertexMode(RenderPipelineBuilderWrapper.EDhVertexMode.TRIANGLE_FAN);
 		}
 		this.pipeline = pipelineBuilder.build();
 		
 		
-		this.vboGpuBuffer = BlazePostProcessUtil.createAndUploadScreenVertexData("McFadeRenderer");
+		this.vboGpuBuffer = BlazePostProcessUtil.createAndUploadScreenVertexData("DhFarFadeRenderer");
 	}
 	
 	//endregion
@@ -151,16 +146,11 @@ public class BlazeDhFarFadeRenderer implements IDhFarFadeRenderer
 		
 		// textures
 		this.dhFadeColorTextureWrapper.tryCreateOrResize();
-		this.mcColorTextureViewWrapper.tryWrap(Minecraft.getInstance().getMainRenderTarget().getColorTexture());
+		this.mcColorTextureViewWrapper.tryWrap(MinecraftRenderWrapper.INSTANCE.getRenderTarget().getColorTexture());
+		
+		this.dhFadeDepthTextureWrapper.tryCreateOrResize();
 		
 		{
-			int uniformBufferSize = new Std140SizeCalculator()
-				.putFloat() // uStartFadeBlockDistance
-				.putFloat() // uEndFadeBlockDistance
-				.putMat4f() // uDhInvMvmProj
-				.get();
-			
-			
 			// create data //
 			
 			float dhFarClipDistance = RenderUtil.getFarClipPlaneDistanceInBlocks();
@@ -168,30 +158,14 @@ public class BlazeDhFarFadeRenderer implements IDhFarFadeRenderer
 			float fadeEndDistance = dhFarClipDistance * 0.9f;
 			
 			
-			Mat4f dhProjectionMatrix = RenderUtil.createLodProjectionMatrix(renderParams.mcProjectionMatrix);
-			Mat4f dhModelViewMatrix = RenderUtil.createLodModelViewMatrix(renderParams.mcModelViewMatrix);
-			
-			Mat4f inverseDhMvmProjMatrix = new Mat4f(dhProjectionMatrix);
-			inverseDhMvmProjMatrix.multiply(dhModelViewMatrix);
-			inverseDhMvmProjMatrix.invert();
-			
-			
-			
 			// upload data //
-			
+			fragUniformBufferWrapper
-			ByteBuffer buffer = ByteBuffer.allocateDirect(uniformBufferSize);
-			buffer.order(ByteOrder.nativeOrder());
-			buffer = Std140Builder.intoBuffer(buffer)
 				.putFloat(fadeStartDistance) // uStartFadeBlockDistance
 				.putFloat(fadeEndDistance) // uEndFadeBlockDistance
-				.putMat4f(inverseDhMvmProjMatrix.createJomlMatrix()) // uDhInvMvmProj
+				.putMat4f(renderParams.dhInverseMvmProjectionMatrix) // uDhInvMvmProj
-				.get()
+				.putInt((RENDER_API_DEF.getRenderDepth() == EDhRenderDepth.REVERSE_Z) ? 1 : 0) // uIsReverseZDepth
+				.finishAndUpload()
 			;
-			
-			this.fragUniformBuffer = BlazeUniformUtil.createBuffer("fragUniformBlock", uniformBufferSize, this.fragUniformBuffer);
-			GpuBufferSlice bufferSlice = new GpuBufferSlice(this.fragUniformBuffer, 0, uniformBufferSize);
-			
-			COMMAND_ENCODER.writeToBuffer(bufferSlice, buffer);
 		}
 		
 		
@@ -202,29 +176,27 @@ public class BlazeDhFarFadeRenderer implements IDhFarFadeRenderer
 	
 	private void renderFadeToTexture()
 	{
-		try (RenderPass renderPass = COMMAND_ENCODER.createRenderPass(
+		try (RenderPassWrapper renderPassWrapper = new RenderPassWrapper(
 			this::getRenderPassName,
-			this.dhFadeColorTextureWrapper.textureView, 
+			this.dhFadeColorTextureWrapper, 
-			/*optionalClearColorAsInt*/ OptionalInt.empty(),
+			this.dhFadeDepthTextureWrapper))
-			/*depthTexture*/ null, 
-			/*optionalDepthValueAsDouble*/ OptionalDouble.empty()))
 		{
 			// MC texture
-			renderPass.bindTexture("uMcColorTexture", this.mcColorTextureViewWrapper.textureView, this.mcColorTextureViewWrapper.textureSampler);
+			renderPassWrapper.bindTexture("uMcColorTexture", this.mcColorTextureViewWrapper);
 			
 			// DH textures
-			renderPass.bindTexture("uDhDepthTexture", BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper.textureView, BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper.textureSampler);
+			renderPassWrapper.bindTexture("uDhDepthTexture", BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper);
-			renderPass.bindTexture("uDhColorTexture", BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper.textureView, BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper.textureSampler);
+			renderPassWrapper.bindTexture("uDhColorTexture", BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper);
 			
-			renderPass.setUniform("fragUniformBlock", this.fragUniformBuffer);
+			renderPassWrapper.setUniform("fragUniformBlock", this.fragUniformBufferWrapper);
 			
-			renderPass.setVertexBuffer(0, this.vboGpuBuffer); // vertex buffer can only be "0" lol
+			renderPassWrapper.setVertexBuffer(this.vboGpuBuffer);
-			renderPass.setPipeline(this.pipeline);
+			renderPassWrapper.setPipeline(this.pipeline);
 			
-			renderPass.draw(/*indexStart*/ 0, /*indexCount*/ 4);
+			renderPassWrapper.draw(4);
 		}
 	}
-	private String getRenderPassName() { return "distantHorizons:McFadeRenderer"; }
+	private String getRenderPassName() { return "distantHorizons:DhFarFadeRenderer"; }
 	
 	
 	//endregion

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhFogRenderer.java

@@ -24,47 +24,43 @@ public class BlazeDhFogRenderer {}
 
 #else
 
-import com.mojang.blaze3d.buffers.GpuBuffer;
-import com.mojang.blaze3d.buffers.GpuBufferSlice;
-import com.mojang.blaze3d.buffers.Std140Builder;
-import com.mojang.blaze3d.buffers.Std140SizeCalculator;
-import com.mojang.blaze3d.pipeline.BlendFunction;
-import com.mojang.blaze3d.pipeline.RenderPipeline;
-import com.mojang.blaze3d.platform.DepthTestFunction;
-import com.mojang.blaze3d.platform.DestFactor;
-import com.mojang.blaze3d.platform.PolygonMode;
-import com.mojang.blaze3d.platform.SourceFactor;
-import com.mojang.blaze3d.shaders.UniformType;
-import com.mojang.blaze3d.systems.CommandEncoder;
-import com.mojang.blaze3d.systems.GpuDevice;
-import com.mojang.blaze3d.systems.RenderPass;
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.VertexFormat;
-import com.seibel.distanthorizons.api.enums.rendering.EDhApiFogColorMode;
-import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogDirection;
 import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogMixMode;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiFogRenderParam;
 import com.seibel.distanthorizons.common.render.blaze.BlazeDhMetaRenderer;
 import com.seibel.distanthorizons.common.render.blaze.apply.BlazeDhApplyRenderer;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPassWrapper;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPipelineBuilderWrapper;
 import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper;
 import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil;
-import com.seibel.distanthorizons.common.render.blaze.util.BlazeUniformUtil;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.uniform.BlazeUniformBufferWrapper;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.render.EDhRenderDepth;
 import com.seibel.distanthorizons.core.render.RenderParams;
 import com.seibel.distanthorizons.core.util.LodUtil;
-import com.seibel.distanthorizons.core.util.math.Mat4f;
+import com.seibel.distanthorizons.core.util.math.DhMat4f;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.AbstractDhRenderApiDefinition;
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhFogRenderer;
-import net.minecraft.resources.Identifier;
 
 import java.awt.*;
-import java.nio.ByteBuffer;
+
-import java.nio.ByteOrder;
+import com.mojang.blaze3d.buffers.GpuBuffer;
-import java.util.OptionalDouble;
+import com.mojang.blaze3d.pipeline.BlendFunction;
-import java.util.OptionalInt;
+import com.mojang.blaze3d.pipeline.RenderPipeline;
+import com.mojang.blaze3d.systems.CommandEncoder;
+import com.mojang.blaze3d.systems.GpuDevice;
+import com.mojang.blaze3d.systems.RenderSystem;
+
+#if MC_VER <= MC_26_1_2
+import com.mojang.blaze3d.platform.DestFactor;
+import com.mojang.blaze3d.platform.SourceFactor;
+#else
+import com.mojang.blaze3d.platform.BlendFactor;
+#endif
 
 /**
  * Renders fog onto the LODs.
@@ -73,8 +69,7 @@ public class BlazeDhFogRenderer implements IDhFogRenderer
 {
 	public static final DhLogger LOGGER = new DhLoggerBuilder().build(); 
 	
-	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
+	private static final AbstractDhRenderApiDefinition RENDER_API_DEF = SingletonInjector.INSTANCE.get(AbstractDhRenderApiDefinition.class);
-	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
 	
 	private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice();
 	private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder();
@@ -87,11 +82,13 @@ public class BlazeDhFogRenderer implements IDhFogRenderer
 	private RenderPipeline pipeline;
 	private boolean init = false;
 	
-	private GpuBuffer fragUniformBuffer;
+	private final BlazeUniformBufferWrapper fragUniformBufferWrapper = new BlazeUniformBufferWrapper("dh_fog_frag_uniform");
 	
 	private GpuBuffer vboGpuBuffer;
 	
-	public BlazeTextureWrapper fogColorTextureWrapper = BlazeTextureWrapper.createColor("DhFogColorTexture");
+	private final BlazeTextureWrapper fogColorTextureWrapper = BlazeTextureWrapper.createColor("dh_fog_color_texture");
+	/** We don't want to actually write any depth data, but blaze3D complains if we don't bind a depth texture. */
+	private final BlazeTextureWrapper fogDepthTextureWrapper = BlazeTextureWrapper.createDepth("dh_fog_depth_texture");
 	
 	
 	
@@ -111,37 +108,43 @@ public class BlazeDhFogRenderer implements IDhFogRenderer
 		this.init = true;
 		
 		
-		
+		BlendFunction blendFunc;
+		#if MC_VER <= MC_26_1_2
+		blendFunc = new BlendFunction(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ONE_MINUS_SRC_ALPHA);
+		#else
+		blendFunc = new BlendFunction(BlendFactor.SRC_ALPHA, BlendFactor.ONE_MINUS_SRC_ALPHA, BlendFactor.ONE, BlendFactor.ONE_MINUS_SRC_ALPHA);
+		#endif
 		
 		this.applyRenderer = new BlazeDhApplyRenderer(
 			"fog_apply_to_dh",
-			new BlendFunction(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA, SourceFactor.ONE, DestFactor.ONE_MINUS_SRC_ALPHA),
+			blendFunc,
 			"apply/blaze/vert", "apply/blaze/frag"
 		);
 		
-		RenderPipeline.Builder pipelineBuilder = RenderPipeline.builder();
+		RenderPipelineBuilderWrapper pipelineBuilder = new RenderPipelineBuilderWrapper();
 		{
-			pipelineBuilder.withCull(false);
+			pipelineBuilder.withFaceCulling(false);
 			pipelineBuilder.withDepthWrite(false);
-			pipelineBuilder.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST);
+			pipelineBuilder.withDepthTest(RenderPipelineBuilderWrapper.EDhDepthTest.NONE);
 			pipelineBuilder.withColorWrite(true);
 			pipelineBuilder.withoutBlend();
-			pipelineBuilder.withPolygonMode(PolygonMode.FILL);
+			pipelineBuilder.withPolygonMode(RenderPipelineBuilderWrapper.EDhPolygonMode.FILL);
-			pipelineBuilder.withLocation(Identifier.parse("distanthorizons:fog_render"));
+			pipelineBuilder.withName("fog_render");
 			
-			pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "fog/blaze/vert"));
+			pipelineBuilder.withVertexShader("fog/blaze/vert");
-			pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "fog/blaze/frag"));
+			pipelineBuilder.withFragmentShader("fog/blaze/frag");
 			
 			pipelineBuilder.withSampler("uDhDepthTexture");
 			
-			pipelineBuilder.withUniform("fragUniformBlock", UniformType.UNIFORM_BUFFER);
+			pipelineBuilder.withUniformBuffer("fragUniformBlock");
 			
-			pipelineBuilder.withVertexFormat(BlazePostProcessUtil.createVertexFormat(), VertexFormat.Mode.TRIANGLE_FAN);
+			pipelineBuilder.withVertexFormat(BlazePostProcessUtil.createVertexFormat());
+			pipelineBuilder.withVertexMode(RenderPipelineBuilderWrapper.EDhVertexMode.TRIANGLE_FAN);
 		}
 		this.pipeline = pipelineBuilder.build();
 		
 		
-		this.vboGpuBuffer = BlazePostProcessUtil.createAndUploadScreenVertexData("McFogRenderer");
+		this.vboGpuBuffer = BlazePostProcessUtil.createAndUploadScreenVertexData("FogRenderer");
 	}
 	
 	//endregion
@@ -154,7 +157,7 @@ public class BlazeDhFogRenderer implements IDhFogRenderer
 	//region
 	
 	@Override
-	public void render(RenderParams renderParams)
+	public void render(RenderParams renderParams, DhApiFogRenderParam fogRenderParams)
 	{
 		this.tryInit();
 		
@@ -168,147 +171,71 @@ public class BlazeDhFogRenderer implements IDhFogRenderer
 		
 		
 		this.fogColorTextureWrapper.tryCreateOrResize();
-		
+		this.fogDepthTextureWrapper.tryCreateOrResize();
 		
 		{
-			int uniformBufferSize = new Std140SizeCalculator()
-				
-				// fog uniforms
-				.putVec4() // uFogColor
-				.putFloat() //uFogScale
-				.putFloat() //uFogVerticalScale
-				// only used for debugging
-				.putInt() //uFogDebugMode  // 1 = render everything with fog color // 7 = use debug rendering
-				.putInt() //uFogFalloffType
-				
-				// fog config
-				.putFloat() // uFarFogStart
-				.putFloat() // uFarFogLength
-				.putFloat() // uFarFogMin
-				.putFloat() // uFarFogRange 
-				.putFloat() // uFarFogDensity
-				
-				// height fog config
-				.putFloat() // uHeightFogStart
-				.putFloat() // uHeightFogLength
-				.putFloat() // uHeightFogMin
-				.putFloat() // uHeightFogRange
-				.putFloat() // uHeightFogDensity
-				
-				// ??
-				.putInt() // uHeightFogEnabled
-				.putInt() // uHeightFogFalloffType
-				.putInt() // uHeightBasedOnCamera
-				.putFloat() // uHeightFogBaseHeight
-				.putInt() // uHeightFogAppliesUp
-				.putInt() // uHeightFogAppliesDown
-				.putInt() // uUseSphericalFog
-				.putInt() // uHeightFogMixingMode
-				.putFloat() // uCameraBlockYPos
-				
-				.putMat4f() // uInvMvmProj
-				
-				.get();
-			
-			
 			// create data //
 			
-			
 			int lodDrawDistance = Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistanceRadius.get() * LodUtil.CHUNK_WIDTH;
 			
-			
+			DhMat4f inverseMvmProjMatrix = new DhMat4f(renderParams.dhMvmProjMatrix);
-			Mat4f inverseMvmProjMatrix = new Mat4f(renderParams.dhMvmProjMatrix);
 			inverseMvmProjMatrix.invert();
 			
-			if (renderParams.dhMvmProjMatrix == null)
+			EDhApiHeightFogMixMode heightFogMixingMode = fogRenderParams.getHeightFogMixingMode();
-			{
+			boolean heightFogEnabled = 
-				return;
+				heightFogMixingMode != EDhApiHeightFogMixMode.SPHERICAL 
-			}
+				&& heightFogMixingMode != EDhApiHeightFogMixMode.CYLINDRICAL;
-			
-			
-			Color fogColor = this.getFogColor(renderParams.partialTicks);
-			
-			// fog config
-			float farFogStart = Config.Client.Advanced.Graphics.Fog.farFogStart.get();
-			float farFogEnd = Config.Client.Advanced.Graphics.Fog.farFogEnd.get();
-			float farFogMin = Config.Client.Advanced.Graphics.Fog.farFogMin.get();
-			float farFogMax = Config.Client.Advanced.Graphics.Fog.farFogMax.get();
-			float farFogDensity = Config.Client.Advanced.Graphics.Fog.farFogDensity.get();
-			
-			// override fog if underwater
-			if (MC_RENDER.isFogStateSpecial())
-			{
-				// hide everything behind fog
-				farFogStart = 0.0f;
-				farFogEnd = 0.0f;
-			}
-			
-			
-			// height config
-			EDhApiHeightFogMixMode heightFogMixingMode = Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMixMode.get();
-			boolean heightFogEnabled = heightFogMixingMode != EDhApiHeightFogMixMode.SPHERICAL && heightFogMixingMode != EDhApiHeightFogMixMode.CYLINDRICAL;
 			boolean useSphericalFog = heightFogMixingMode == EDhApiHeightFogMixMode.SPHERICAL;
-			EDhApiHeightFogDirection heightFogCameraDirection = Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogDirection.get();
 			
-			float heightFogStart = Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogStart.get();
+			Color fogColor = fogRenderParams.getFogColor();
-			float heightFogEnd = Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogEnd.get();
+			
-			float heightFogMin = Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMin.get();
-			float heightFogMax = Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMax.get();
-			float heightFogDensity = Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogDensity.get();
 			
 			
 			// upload data //
 			
-			ByteBuffer buffer = ByteBuffer.allocateDirect(uniformBufferSize);
+			this.fragUniformBufferWrapper
-			buffer.order(ByteOrder.nativeOrder());
-			buffer = Std140Builder.intoBuffer(buffer)
-				
 				// fog uniforms
-				.putVec4(
+				.putVec4f(
 					fogColor.getRed() / 255.0f, 
 					fogColor.getGreen() / 255.0f, 
 					fogColor.getBlue() / 255.0f, 
 					fogColor.getAlpha() / 255.0f) // uFogColor
 				.putFloat(1.f / lodDrawDistance) //uFogScale
-				.putFloat(1.f / MC.getWrappedClientLevel().getMaxHeight()) //uFogVerticalScale
+				.putFloat(1.f / renderParams.clientLevelWrapper.getMaxHeight()) //uFogVerticalScale
-				// only used for debugging
+				.putInt(0) //uFogDebugMode  // 0 = normal // 1 = render everything with fog color // 7 = use debug rendering
-				.putInt(0) //uFogDebugMode  // 1 = render everything with fog color // 7 = use debug rendering
+				.putInt(fogRenderParams.getFarFogFalloff().value) //uFogFalloffType
-				.putInt(Config.Client.Advanced.Graphics.Fog.farFogFalloff.get().value) //uFogFalloffType
 				
 				// fog config
-				.putFloat(farFogStart) // uFarFogStart
+				.putFloat(fogRenderParams.getFarFogStartPercent()) // uFarFogStart
-				.putFloat(farFogEnd - farFogStart) // uFarFogLength
+				.putFloat(fogRenderParams.getFarFogEndPercent() - fogRenderParams.getFarFogStartPercent()) // uFarFogLength
-				.putFloat(farFogMin) // uFarFogMin
+				.putFloat(fogRenderParams.getFarFogMinThickness()) // uFarFogMin
-				.putFloat(farFogMax - farFogMin) // uFarFogRange 
+				.putFloat(fogRenderParams.getFarFogMaxThickness() - fogRenderParams.getFarFogMinThickness()) // uFarFogRange 
-				.putFloat(farFogDensity) // uFarFogDensity
+				.putFloat(fogRenderParams.getFarFogDensity()) // uFarFogDensity
 				
 				// height fog config
-				.putFloat(heightFogStart) // uHeightFogStart
+				.putFloat(fogRenderParams.getHeightFogStartPercent()) // uHeightFogStart
-				.putFloat(heightFogEnd - heightFogStart) // uHeightFogLength
+				.putFloat(fogRenderParams.getHeightFogEndPercent() - fogRenderParams.getHeightFogStartPercent()) // uHeightFogLength
-				.putFloat(heightFogMin) // uHeightFogMin
+				.putFloat(fogRenderParams.getHeightFogMinThickness()) // uHeightFogMin
-				.putFloat(heightFogMax - heightFogMin) // uHeightFogRange
+				.putFloat(fogRenderParams.getHeightFogMaxThickness() - fogRenderParams.getHeightFogMinThickness()) // uHeightFogRange
-				.putFloat(heightFogDensity) // uHeightFogDensity
+				.putFloat(fogRenderParams.getHeightFogDensity()) // uHeightFogDensity
 				
 				// ??
 				.putInt(heightFogEnabled ? 1 : 0) // uHeightFogEnabled
-				.putInt(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogFalloff.get().value) // uHeightFogFalloffType
+				.putInt(fogRenderParams.getHeightFogFalloff().value) // uHeightFogFalloffType
-				.putInt(heightFogCameraDirection.basedOnCamera ? 1 : 0) // uHeightBasedOnCamera
+				.putInt(fogRenderParams.getHeightFogDirection().basedOnCamera ? 1 : 0) // uHeightBasedOnCamera
-				.putFloat(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogBaseHeight.get()) // uHeightFogBaseHeight
+				.putFloat(fogRenderParams.getHeightFogBaseHeight()) // uHeightFogBaseHeight
-				.putInt(heightFogCameraDirection.fogAppliesUp ? 1 : 0) // uHeightFogAppliesUp
+				.putInt(fogRenderParams.getHeightFogDirection().fogAppliesUp ? 1 : 0) // uHeightFogAppliesUp
-				.putInt(heightFogCameraDirection.fogAppliesDown ? 1 : 0) // uHeightFogAppliesDown
+				.putInt(fogRenderParams.getHeightFogDirection().fogAppliesDown ? 1 : 0) // uHeightFogAppliesDown
 				.putInt(useSphericalFog ? 1 : 0) // uUseSphericalFog
 				.putInt(heightFogMixingMode.value) // uHeightFogMixingMode
-				.putFloat((float)MC_RENDER.getCameraExactPosition().y) // uCameraBlockYPos
+				.putFloat((float)renderParams.exactCameraPosition.y) // uCameraBlockYPos
 				
-				.putMat4f(inverseMvmProjMatrix.createJomlMatrix()) // uInvMvmProj
+				.putMat4f(inverseMvmProjMatrix) // uInvMvmProj
 				
-				.get()
+				.putInt((RENDER_API_DEF.getRenderDepth() == EDhRenderDepth.REVERSE_Z) ? 1 : 0) // uIsReverseZDepth
+				
+				.finishAndUpload()
 			;
-			
-			this.fragUniformBuffer = BlazeUniformUtil.createBuffer("fragUniformBlock", uniformBufferSize, this.fragUniformBuffer);
-			GpuBufferSlice bufferSlice = new GpuBufferSlice(this.fragUniformBuffer, 0, uniformBufferSize);
-			
-			COMMAND_ENCODER.writeToBuffer(bufferSlice, buffer);
 		}
 		
 		
@@ -317,42 +244,26 @@ public class BlazeDhFogRenderer implements IDhFogRenderer
 		
 	}
 	
-	private Color getFogColor(float partialTicks)
-	{
-		Color fogColor;
 	
-		if (Config.Client.Advanced.Graphics.Fog.colorMode.get() == EDhApiFogColorMode.USE_SKY_COLOR)
-		{
-			fogColor = MC_RENDER.getSkyColor();
-		}
-		else
-		{
-			fogColor = MC_RENDER.getFogColor(partialTicks);
-		}
-		
-		return fogColor;
-	}
 	
 	private void renderFogToTexture()
 	{
-		try (RenderPass renderPass = COMMAND_ENCODER.createRenderPass(
+		try (RenderPassWrapper renderPassWrapper = new RenderPassWrapper(
 			this::getRenderPassName,
-			this.fogColorTextureWrapper.textureView, 
+			this.fogColorTextureWrapper, 
-			/*optionalClearColorAsInt*/ OptionalInt.empty(),
+			this.fogDepthTextureWrapper))
-			/*depthTexture*/ null, 
-			/*optionalDepthValueAsDouble*/ OptionalDouble.empty()))
 		{
-			renderPass.bindTexture("uDhDepthTexture", BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper.textureView, BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper.textureSampler);
+			renderPassWrapper.bindTexture("uDhDepthTexture", BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper);
 			
-			renderPass.setUniform("fragUniformBlock", this.fragUniformBuffer);
+			renderPassWrapper.setUniform("fragUniformBlock", this.fragUniformBufferWrapper);
 			
-			renderPass.setVertexBuffer(0, this.vboGpuBuffer); // vertex buffer can only be "0" lol
+			renderPassWrapper.setVertexBuffer(this.vboGpuBuffer); // vertex buffer can only be "0" lol
-			renderPass.setPipeline(this.pipeline);
+			renderPassWrapper.setPipeline(this.pipeline);
 			
-			renderPass.draw(/*indexStart*/ 0, /*indexCount*/ 4);
+			renderPassWrapper.draw(/*indexCount*/ 4);
 		}
 	}
-	private String getRenderPassName() { return "distantHorizons:McFogRenderer"; }
+	private String getRenderPassName() { return "distantHorizons:FogRenderer"; }
 	
 	
 	//endregion

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeDhSsaoRenderer.java

@@ -24,41 +24,37 @@ public class BlazeDhSsaoRenderer {}
 
 #else
 
-import com.mojang.blaze3d.buffers.GpuBuffer;
-import com.mojang.blaze3d.buffers.GpuBufferSlice;
-import com.mojang.blaze3d.buffers.Std140Builder;
-import com.mojang.blaze3d.buffers.Std140SizeCalculator;
-import com.mojang.blaze3d.pipeline.BlendFunction;
-import com.mojang.blaze3d.pipeline.RenderPipeline;
-import com.mojang.blaze3d.platform.DepthTestFunction;
-import com.mojang.blaze3d.platform.DestFactor;
-import com.mojang.blaze3d.platform.PolygonMode;
-import com.mojang.blaze3d.platform.SourceFactor;
-import com.mojang.blaze3d.shaders.UniformType;
-import com.mojang.blaze3d.systems.CommandEncoder;
-import com.mojang.blaze3d.systems.GpuDevice;
-import com.mojang.blaze3d.systems.RenderPass;
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.VertexFormat;
 import com.seibel.distanthorizons.common.render.blaze.BlazeDhMetaRenderer;
 import com.seibel.distanthorizons.common.render.blaze.apply.BlazeDhApplyRenderer;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPassWrapper;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPipelineBuilderWrapper;
 import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper;
 import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil;
-import com.seibel.distanthorizons.common.render.blaze.util.BlazeUniformUtil;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.uniform.BlazeUniformBufferWrapper;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.render.EDhRenderDepth;
 import com.seibel.distanthorizons.core.render.RenderParams;
 import com.seibel.distanthorizons.core.util.RenderUtil;
-import com.seibel.distanthorizons.core.util.math.Mat4f;
+import com.seibel.distanthorizons.core.util.math.DhMat4f;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.AbstractDhRenderApiDefinition;
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhSsaoRenderer;
-import net.minecraft.resources.Identifier;
 
-import java.nio.ByteBuffer;
+import com.mojang.blaze3d.buffers.GpuBuffer;
-import java.nio.ByteOrder;
+import com.mojang.blaze3d.pipeline.BlendFunction;
-import java.util.OptionalDouble;
+import com.mojang.blaze3d.pipeline.RenderPipeline;
-import java.util.OptionalInt;
+import com.mojang.blaze3d.systems.CommandEncoder;
+import com.mojang.blaze3d.systems.GpuDevice;
+import com.mojang.blaze3d.systems.RenderSystem;
+
+#if MC_VER <= MC_26_1_2
+import com.mojang.blaze3d.platform.DestFactor;
+import com.mojang.blaze3d.platform.SourceFactor;
+#else
+import com.mojang.blaze3d.platform.BlendFactor;
+#endif
 
 /** Renders SSAO to the DH LODs. */
 public class BlazeDhSsaoRenderer implements IDhSsaoRenderer
@@ -66,6 +62,7 @@ public class BlazeDhSsaoRenderer implements IDhSsaoRenderer
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build(); 
 	
 	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
+	private static final AbstractDhRenderApiDefinition RENDER_API_DEF = SingletonInjector.INSTANCE.get(AbstractDhRenderApiDefinition.class);
 	
 	private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice();
 	private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder();
@@ -78,12 +75,14 @@ public class BlazeDhSsaoRenderer implements IDhSsaoRenderer
 	private RenderPipeline pipeline;
 	private boolean init = false;
 	
-	private GpuBuffer fragUniformBuffer;
+	private final BlazeUniformBufferWrapper fragUniformBufferWrapper = new BlazeUniformBufferWrapper("fragUniformBlock");
-	private GpuBuffer applyFragUniformBuffer;
+	private final BlazeUniformBufferWrapper applyFragUniformBufferWrapper = new BlazeUniformBufferWrapper("applyFragUniformBlock");
 	
 	private GpuBuffer vboGpuBuffer;
 	
-	public BlazeTextureWrapper ssaoColorTextureWrapper = BlazeTextureWrapper.createColor("DhSsaoTexture");
+	private final BlazeTextureWrapper ssaoColorTextureWrapper = BlazeTextureWrapper.createColor("dh_ssao_color_texture");
+	/** We don't want to actually write any depth data, but blaze3D complains if we don't bind a depth texture. */
+	private final BlazeTextureWrapper ssaoDepthTextureWrapper = BlazeTextureWrapper.createDepth("dh_ssao_depth_texture");
 	
 	
 	
@@ -103,31 +102,40 @@ public class BlazeDhSsaoRenderer implements IDhSsaoRenderer
 		this.init = true;
 		
 		
+		
+		BlendFunction blendFunc;
+		#if MC_VER <= MC_26_1_2
+		blendFunc = new BlendFunction(SourceFactor.ZERO, DestFactor.SRC_ALPHA, SourceFactor.ZERO, DestFactor.ONE);
+		#else
+		blendFunc = new BlendFunction(BlendFactor.ZERO, BlendFactor.SRC_ALPHA, BlendFactor.ZERO, BlendFactor.ONE);
+		#endif
+		
 		this.applyRenderer = new BlazeDhApplyRenderer(
 			"ssao_apply_to_dh",
-			new BlendFunction(SourceFactor.ZERO, DestFactor.SRC_ALPHA, SourceFactor.ZERO, DestFactor.ONE),
+			blendFunc,
 			"apply/blaze/vert", "ssao/blaze/apply",
 			/*uniforms*/ new String[] { "applyFragUniformBlock" }
 		);
 		
-		RenderPipeline.Builder pipelineBuilder = RenderPipeline.builder();
+		RenderPipelineBuilderWrapper pipelineBuilder = new RenderPipelineBuilderWrapper();
 		{
-			pipelineBuilder.withCull(false);
+			pipelineBuilder.withFaceCulling(false);
 			pipelineBuilder.withDepthWrite(false);
-			pipelineBuilder.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST);
+			pipelineBuilder.withDepthTest(RenderPipelineBuilderWrapper.EDhDepthTest.NONE);
 			pipelineBuilder.withColorWrite(true);
 			pipelineBuilder.withoutBlend();
-			pipelineBuilder.withPolygonMode(PolygonMode.FILL);
+			pipelineBuilder.withPolygonMode(RenderPipelineBuilderWrapper.EDhPolygonMode.FILL);
-			pipelineBuilder.withLocation(Identifier.parse("distanthorizons:ssao_render"));
+			pipelineBuilder.withName("ssao_render");
 			
-			pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "ssao/blaze/vert"));
+			pipelineBuilder.withVertexShader("ssao/blaze/vert");
-			pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "ssao/blaze/frag"));
+			pipelineBuilder.withFragmentShader("ssao/blaze/frag");
 			
 			pipelineBuilder.withSampler("uDhDepthTexture");
 			
-			pipelineBuilder.withUniform("fragUniformBlock", UniformType.UNIFORM_BUFFER);
+			pipelineBuilder.withUniformBuffer("fragUniformBlock");
 			
-			pipelineBuilder.withVertexFormat(BlazePostProcessUtil.createVertexFormat(), VertexFormat.Mode.TRIANGLE_FAN);
+			pipelineBuilder.withVertexFormat(BlazePostProcessUtil.createVertexFormat());
+			pipelineBuilder.withVertexMode(RenderPipelineBuilderWrapper.EDhVertexMode.TRIANGLE_FAN);
 		}
 		this.pipeline = pipelineBuilder.build();
 		
@@ -160,35 +168,18 @@ public class BlazeDhSsaoRenderer implements IDhSsaoRenderer
 		
 		// textures
 		this.ssaoColorTextureWrapper.tryCreateOrResize();
+		this.ssaoDepthTextureWrapper.tryCreateOrResize();
 		
 		// frag uniforms
 		{
-			int uniformBufferSize = new Std140SizeCalculator()
-				.putInt() // uSampleCount\
-				
-				.putFloat() // uRadius
-				.putFloat() // uStrength
-				.putFloat() // uMinLight
-				.putFloat() // uBias
-				.putFloat() // uFadeDistanceInBlocks
-				
-				.putMat4f() // uInvProj
-				.putMat4f() // uProj
-				.get();
-			
-			
 			// create data //
-			
+			DhMat4f projMatrix = new DhMat4f(renderParams.dhProjectionMatrix);
-			Mat4f projMatrix = new Mat4f(renderParams.dhProjectionMatrix);
+			DhMat4f invertedProjMatrix = new DhMat4f(renderParams.dhProjectionMatrix);
-			Mat4f invertedProjMatrix = new Mat4f(renderParams.dhProjectionMatrix);
 			invertedProjMatrix.invert();
 			
 			
 			// upload data //
-			
+			this.fragUniformBufferWrapper
-			ByteBuffer buffer = ByteBuffer.allocateDirect(uniformBufferSize);
-			buffer.order(ByteOrder.nativeOrder());
-			buffer = Std140Builder.intoBuffer(buffer)
 				.putInt(6) // uSampleCount
 				
 				.putFloat(4.0f) // uRadius
@@ -197,27 +188,16 @@ public class BlazeDhSsaoRenderer implements IDhSsaoRenderer
 				.putFloat(0.02f) // uBias
 				.putFloat(1_600.0f) // uFadeDistanceInBlocks
 				
-				.putMat4f(invertedProjMatrix.createJomlMatrix())
+				.putMat4f(invertedProjMatrix)
-				.putMat4f(projMatrix.createJomlMatrix())
+				.putMat4f(projMatrix)
-				.get()
+				
+				.putInt((RENDER_API_DEF.getRenderDepth() == EDhRenderDepth.REVERSE_Z) ? 1 : 0) // uIsReverseZDepth
+				.finishAndUpload()
 			;
-			
-			this.fragUniformBuffer = BlazeUniformUtil.createBuffer("fragUniformBlock", uniformBufferSize, this.fragUniformBuffer);
-			GpuBufferSlice bufferSlice = new GpuBufferSlice(this.fragUniformBuffer, 0, uniformBufferSize);
-			
-			COMMAND_ENCODER.writeToBuffer(bufferSlice, buffer);
 		}
 		
 		// apply frag uniforms
 		{
-			int uniformBufferSize = new Std140SizeCalculator()
-				.putVec2() // uViewSize
-				.putInt() // uBlurRadius
-				.putFloat() // uNearClipPlane
-				.putFloat() // uFarClipPlane
-				.get();
-			
-			
 			// create data //
 			
 			float viewWidth = (float)MC_RENDER.getTargetFramebufferViewportWidth();
@@ -228,51 +208,41 @@ public class BlazeDhSsaoRenderer implements IDhSsaoRenderer
 			
 			
 			// upload data //
-			
+			this.applyFragUniformBufferWrapper
-			ByteBuffer buffer = ByteBuffer.allocateDirect(uniformBufferSize);
+				.putVec2f(viewWidth, viewHeight) // uViewSize
-			buffer.order(ByteOrder.nativeOrder());
-			buffer = Std140Builder.intoBuffer(buffer)
-				.putVec2(viewWidth, viewHeight) // uViewSize
 				.putInt(2) // uBlurRadius
 				.putFloat(nearClipPlane) // uNearClipPlane
 				.putFloat(farClipPlane) // uFarClipPlane
-				.get()
+				.finishAndUpload()
 			;
-			
-			this.applyFragUniformBuffer = BlazeUniformUtil.createBuffer("applyFragUniformBlock", uniformBufferSize, this.applyFragUniformBuffer);
-			GpuBufferSlice bufferSlice = new GpuBufferSlice(this.applyFragUniformBuffer, 0, uniformBufferSize);
-			
-			COMMAND_ENCODER.writeToBuffer(bufferSlice, buffer);
 		}
 		
 		
 		this.renderSsaoToTexture();
 		
-		this.applyRenderer.setUniform("applyFragUniformBlock", this.applyFragUniformBuffer);
+		this.applyRenderer.setUniform("applyFragUniformBlock", this.applyFragUniformBufferWrapper);
 		this.applyRenderer.render(this.ssaoColorTextureWrapper.texture, BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper.texture, BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper.texture);
 		
 	}
 	
 	private void renderSsaoToTexture()
 	{
-		try (RenderPass renderPass = COMMAND_ENCODER.createRenderPass(
+		try (RenderPassWrapper renderPassWrapper = new RenderPassWrapper(
 			this::getRenderPassName,
-			this.ssaoColorTextureWrapper.textureView,
+			this.ssaoColorTextureWrapper,
-			/*optionalClearColorAsInt*/ OptionalInt.empty(),
+			this.ssaoDepthTextureWrapper))
-			/*depthTexture*/ null,
-			/*optionalDepthValueAsDouble*/ OptionalDouble.empty()))
 		{
-			renderPass.bindTexture("uDhDepthTexture", BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper.textureView, BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper.textureSampler);
+			renderPassWrapper.bindTexture("uDhDepthTexture", BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper);
 			
-			renderPass.setUniform("fragUniformBlock", this.fragUniformBuffer);
+			renderPassWrapper.setUniform("fragUniformBlock", this.fragUniformBufferWrapper);
 			
-			renderPass.setVertexBuffer(0, this.vboGpuBuffer); // vertex buffer can only be "0" lol
+			renderPassWrapper.setVertexBuffer(this.vboGpuBuffer);
 			
-			renderPass.setPipeline(this.pipeline);
+			renderPassWrapper.setPipeline(this.pipeline);
-			renderPass.draw(/*indexStart*/ 0, /*indexCount*/ 4);
+			renderPassWrapper.draw(4);
 		}
 	}
-	private String getRenderPassName() { return "distantHorizons:McSsaoRenderer"; }
+	private String getRenderPassName() { return "distantHorizons:SsaoRenderer"; }
 	
 	
 	//endregion

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/postProcessing/BlazeVanillaFadeRenderer.java

@@ -25,40 +25,30 @@ public class BlazeVanillaFadeRenderer {}
 #else
 	
 import com.mojang.blaze3d.buffers.GpuBuffer;
-import com.mojang.blaze3d.buffers.GpuBufferSlice;
-import com.mojang.blaze3d.buffers.Std140Builder;
-import com.mojang.blaze3d.buffers.Std140SizeCalculator;
 import com.mojang.blaze3d.pipeline.RenderPipeline;
-import com.mojang.blaze3d.platform.DepthTestFunction;
-import com.mojang.blaze3d.platform.PolygonMode;
-import com.mojang.blaze3d.shaders.UniformType;
 import com.mojang.blaze3d.systems.CommandEncoder;
 import com.mojang.blaze3d.systems.GpuDevice;
-import com.mojang.blaze3d.systems.RenderPass;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.VertexFormat;
 import com.seibel.distanthorizons.common.render.blaze.BlazeDhMetaRenderer;
 import com.seibel.distanthorizons.common.render.blaze.apply.BlazeDhCopyRenderer;
 import com.seibel.distanthorizons.common.render.blaze.util.BlazePostProcessUtil;
-import com.seibel.distanthorizons.common.render.blaze.util.BlazeUniformUtil;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPassWrapper;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPipelineBuilderWrapper;
 import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper;
 import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureWrapper;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.uniform.BlazeUniformBufferWrapper;
+import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.render.EDhRenderDepth;
 import com.seibel.distanthorizons.core.render.RenderParams;
 import com.seibel.distanthorizons.core.util.RenderUtil;
-import com.seibel.distanthorizons.core.util.math.Mat4f;
+import com.seibel.distanthorizons.core.util.math.DhMat4f;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.AbstractDhRenderApiDefinition;
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhVanillaFadeRenderer;
-import net.minecraft.client.Minecraft;
-import net.minecraft.resources.Identifier;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.OptionalDouble;
-import java.util.OptionalInt;
 
 /**
  * Fades the vanilla chunks
@@ -69,20 +59,25 @@ public class BlazeVanillaFadeRenderer implements IDhVanillaFadeRenderer
 	public static final DhLogger LOGGER = new DhLoggerBuilder().build(); 
 	
 	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
+	private static final AbstractDhRenderApiDefinition RENDER_API_DEF = SingletonInjector.INSTANCE.get(AbstractDhRenderApiDefinition.class);
 	
 	private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice();
 	private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder();
 	
 	public static final BlazeVanillaFadeRenderer INSTANCE = new BlazeVanillaFadeRenderer();
 	
+	
 	private RenderPipeline pipeline;
 	private boolean init = false;
 	
-	private GpuBuffer fragUniformBuffer;
+	private final BlazeUniformBufferWrapper fragUniformBufferWrapper = new BlazeUniformBufferWrapper("fragUniformBlock");
 	
 	private GpuBuffer vboGpuBuffer;
 	
-	public final BlazeTextureWrapper fadeColorTextureWrapper = BlazeTextureWrapper.createColor("DhVanillaFadeTexture");
+	public final BlazeTextureWrapper fadeColorTextureWrapper = BlazeTextureWrapper.createColor("DhVanillaFadeColorTexture");
+	/** We don't want to actually write any depth data, but blaze3D complains if we don't bind a depth texture. */
+	private final BlazeTextureWrapper fadeDepthTextureWrapper = BlazeTextureWrapper.createDepth("DhVanillaFadeDepthTexture");
+	
 	
 	public final BlazeTextureViewWrapper mcDepthTextureWrapper = new BlazeTextureViewWrapper();
 	public final BlazeTextureViewWrapper mcColorTextureWrapper = new BlazeTextureViewWrapper();
@@ -106,18 +101,18 @@ public class BlazeVanillaFadeRenderer implements IDhVanillaFadeRenderer
 		
 		
 		
-		RenderPipeline.Builder pipelineBuilder = RenderPipeline.builder();
+		RenderPipelineBuilderWrapper pipelineBuilder = new RenderPipelineBuilderWrapper();
 		{
-			pipelineBuilder.withCull(false);
+			pipelineBuilder.withFaceCulling(false);
 			pipelineBuilder.withDepthWrite(false);
-			pipelineBuilder.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST);
+			pipelineBuilder.withDepthTest(RenderPipelineBuilderWrapper.EDhDepthTest.NONE);
 			pipelineBuilder.withColorWrite(true);
 			pipelineBuilder.withoutBlend();
-			pipelineBuilder.withPolygonMode(PolygonMode.FILL);
+			pipelineBuilder.withPolygonMode(RenderPipelineBuilderWrapper.EDhPolygonMode.FILL);
-			pipelineBuilder.withLocation(Identifier.parse("distanthorizons:mc_vanilla_fade_render"));
+			pipelineBuilder.withName("vanilla_fade");
 			
-			pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "fade/blaze/vert"));
+			pipelineBuilder.withVertexShader("fade/blaze/vert");
-			pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "fade/blaze/vanilla_fade"));
+			pipelineBuilder.withFragmentShader("fade/blaze/vanilla_fade");
 			
 			pipelineBuilder.withSampler("uMcDepthTexture");
 			pipelineBuilder.withSampler("uCombinedMcDhColorTexture");
@@ -125,14 +120,15 @@ public class BlazeVanillaFadeRenderer implements IDhVanillaFadeRenderer
 			pipelineBuilder.withSampler("uDhDepthTexture");
 			pipelineBuilder.withSampler("uDhColorTexture");
 			
-			pipelineBuilder.withUniform("fragUniformBlock", UniformType.UNIFORM_BUFFER);
+			pipelineBuilder.withUniformBuffer("fragUniformBlock");
 			
-			pipelineBuilder.withVertexFormat(BlazePostProcessUtil.createVertexFormat(), VertexFormat.Mode.TRIANGLE_FAN);
+			pipelineBuilder.withVertexFormat(BlazePostProcessUtil.createVertexFormat());
+			pipelineBuilder.withVertexMode(RenderPipelineBuilderWrapper.EDhVertexMode.TRIANGLE_FAN);
 		}
 		this.pipeline = pipelineBuilder.build();
 		
 		
-		this.vboGpuBuffer = BlazePostProcessUtil.createAndUploadScreenVertexData("McFadeRenderer");
+		this.vboGpuBuffer = BlazePostProcessUtil.createAndUploadScreenVertexData("VanillaFadeRenderer");
 	}
 	
 	//endregion
@@ -158,22 +154,13 @@ public class BlazeVanillaFadeRenderer implements IDhVanillaFadeRenderer
 		
 		// textures
 		this.fadeColorTextureWrapper.tryCreateOrResize();
+		this.fadeDepthTextureWrapper.tryCreateOrResize();
 		
-		this.mcDepthTextureWrapper.tryWrap(Minecraft.getInstance().getMainRenderTarget().getDepthTexture());
+		this.mcDepthTextureWrapper.tryWrap(MinecraftRenderWrapper.INSTANCE.getRenderTarget().getDepthTexture());
-		this.mcColorTextureWrapper.tryWrap(Minecraft.getInstance().getMainRenderTarget().getColorTexture());
+		this.mcColorTextureWrapper.tryWrap(MinecraftRenderWrapper.INSTANCE.getRenderTarget().getColorTexture());
 		
 		
 		{
-			int uniformBufferSize = new Std140SizeCalculator()
-				.putInt() // uOnlyRenderLods
-				.putFloat() // uStartFadeBlockDistance
-				.putFloat() // uEndFadeBlockDistance
-				.putFloat() // uMaxLevelHeight
-				.putMat4f() // uDhInvMvmProj
-				.putMat4f() // uMcInvMvmProj
-				.get();
-			
-			
 			// create data //
 			
 			float dhNearClipDistance = RenderUtil.getNearClipPlaneInBlocks();
@@ -187,40 +174,30 @@ public class BlazeVanillaFadeRenderer implements IDhVanillaFadeRenderer
 			float fadeEndDistance = dhNearClipDistance * 1.9f;
 			
 			
-			Mat4f inverseMcModelViewProjectionMatrix = new Mat4f(renderParams.mcProjectionMatrix);
+			DhMat4f inverseMcModelViewProjectionMatrix = new DhMat4f(renderParams.mcProjectionMatrix);
 			inverseMcModelViewProjectionMatrix.multiply(renderParams.mcModelViewMatrix);
 			inverseMcModelViewProjectionMatrix.invert();
-			Mat4f inverseMcMvmProjMatrix = inverseMcModelViewProjectionMatrix;
+			DhMat4f inverseMcMvmProjMatrix = inverseMcModelViewProjectionMatrix;
 			
 			
-			Mat4f dhProjectionMatrix = RenderUtil.createLodProjectionMatrix(renderParams.mcProjectionMatrix);
+			DhMat4f inverseDhModelViewProjectionMatrix = new DhMat4f(renderParams.dhProjectionMatrix);
-			Mat4f dhModelViewMatrix = RenderUtil.createLodModelViewMatrix(renderParams.mcModelViewMatrix);
+			inverseDhModelViewProjectionMatrix.multiply(renderParams.dhModelViewMatrix);
-			
-			Mat4f inverseDhModelViewProjectionMatrix = new Mat4f(dhProjectionMatrix);
-			inverseDhModelViewProjectionMatrix.multiply(dhModelViewMatrix);
 			inverseDhModelViewProjectionMatrix.invert();
-			Mat4f inverseDhMvmProjMatrix = inverseDhModelViewProjectionMatrix;
+			DhMat4f inverseDhMvmProjMatrix = inverseDhModelViewProjectionMatrix;
 			
 			
 			
 			// upload data //
-			
+			this.fragUniformBufferWrapper
-			ByteBuffer buffer = ByteBuffer.allocateDirect(uniformBufferSize);
-			buffer.order(ByteOrder.nativeOrder());
-			buffer = Std140Builder.intoBuffer(buffer)
 				.putInt(Config.Client.Advanced.Debugging.lodOnlyMode.get() ? 1 : 0) // uOnlyRenderLods
 				.putFloat(fadeStartDistance) // uStartFadeBlockDistance
 				.putFloat(fadeEndDistance) // uEndFadeBlockDistance
 				.putFloat(renderParams.clientLevelWrapper.getMaxHeight()) // uMaxLevelHeight
-				.putMat4f(inverseDhMvmProjMatrix.createJomlMatrix()) // uDhInvMvmProj
+				.putMat4f(inverseDhMvmProjMatrix) // uDhInvMvmProj
-				.putMat4f(inverseMcMvmProjMatrix.createJomlMatrix()) // uMcInvMvmProj
+				.putMat4f(inverseMcMvmProjMatrix) // uMcInvMvmProj
-				.get()
+				.putInt((RENDER_API_DEF.getRenderDepth() == EDhRenderDepth.REVERSE_Z) ? 1 : 0) // uIsReverseZDepth
+				.finishAndUpload()
 			;
-			
-			this.fragUniformBuffer = BlazeUniformUtil.createBuffer("fragUniformBlock", uniformBufferSize, this.fragUniformBuffer);
-			GpuBufferSlice bufferSlice = new GpuBufferSlice(this.fragUniformBuffer, 0, uniformBufferSize);
-			
-			COMMAND_ENCODER.writeToBuffer(bufferSlice, buffer);
 		}
 		
 		
@@ -231,28 +208,26 @@ public class BlazeVanillaFadeRenderer implements IDhVanillaFadeRenderer
 	
 	private void renderFadeToTexture()
 	{
-		try (RenderPass renderPass = COMMAND_ENCODER.createRenderPass(
+		try (RenderPassWrapper renderPassWrapper = new RenderPassWrapper(
 			this::getRenderPassName,
-			this.fadeColorTextureWrapper.textureView,
+			this.fadeColorTextureWrapper,
-			/*optionalClearColorAsInt*/ OptionalInt.empty(),
+			this.fadeDepthTextureWrapper))
-			/*depthTexture*/ null, 
-			/*optionalDepthValueAsDouble*/ OptionalDouble.empty()))
 		{
-			renderPass.bindTexture("uMcDepthTexture", this.mcDepthTextureWrapper.textureView, this.mcDepthTextureWrapper.textureSampler);
+			renderPassWrapper.bindTexture("uMcDepthTexture", this.mcDepthTextureWrapper);
-			renderPass.bindTexture("uCombinedMcDhColorTexture", this.mcColorTextureWrapper.textureView, this.mcColorTextureWrapper.textureSampler);
+			renderPassWrapper.bindTexture("uCombinedMcDhColorTexture", this.mcColorTextureWrapper);
 			
-			renderPass.bindTexture("uDhDepthTexture", BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper.textureView, BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper.textureSampler);
+			renderPassWrapper.bindTexture("uDhDepthTexture", BlazeDhMetaRenderer.INSTANCE.dhDepthTextureWrapper);
-			renderPass.bindTexture("uDhColorTexture", BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper.textureView, BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper.textureSampler);
+			renderPassWrapper.bindTexture("uDhColorTexture", BlazeDhMetaRenderer.INSTANCE.dhColorTextureWrapper);
 			
-			renderPass.setUniform("fragUniformBlock", this.fragUniformBuffer);
+			renderPassWrapper.setUniform("fragUniformBlock", this.fragUniformBufferWrapper);
 			
-			renderPass.setVertexBuffer(0, this.vboGpuBuffer); // vertex buffer can only be "0" lol
+			renderPassWrapper.setVertexBuffer(this.vboGpuBuffer);
 			
-			renderPass.setPipeline(this.pipeline);
+			renderPassWrapper.setPipeline(this.pipeline);
-			renderPass.draw(/*indexStart*/ 0, /*indexCount*/ 4);
+			renderPassWrapper.draw(/*indexCount*/ 4);
 		}
 	}
-	private String getRenderPassName() { return "distantHorizons:McFadeRenderer"; }
+	private String getRenderPassName() { return "distantHorizons:VanillaFadeRenderer"; }
 	
 	//endregion
 	

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/test/BlazeDhTestTriangleRenderer.java

@@ -27,7 +27,6 @@ public class BlazeDhTestTriangleRenderer {}
 import com.mojang.blaze3d.buffers.GpuBuffer;
 import com.mojang.blaze3d.buffers.GpuBufferSlice;
 import com.mojang.blaze3d.pipeline.RenderPipeline;
-import com.mojang.blaze3d.platform.DepthTestFunction;
 import com.mojang.blaze3d.platform.PolygonMode;
 import com.mojang.blaze3d.systems.CommandEncoder;
 import com.mojang.blaze3d.systems.GpuDevice;
@@ -36,6 +35,11 @@ import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.textures.*;
 import com.mojang.blaze3d.vertex.VertexFormat;
 import com.seibel.distanthorizons.common.render.blaze.util.BlazeDhVertexFormatUtil;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeVertexFormatBuilder;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPassWrapper;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.RenderPipelineBuilderWrapper;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.BlazeTextureViewWrapper;
+import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.render.RenderParams;
@@ -48,6 +52,12 @@ import java.nio.ByteOrder;
 import java.util.OptionalDouble;
 import java.util.OptionalInt;
 
+#if MC_VER <= MC_1_21_11
+#else
+import com.mojang.blaze3d.pipeline.DepthStencilState;
+import com.mojang.blaze3d.platform.CompareOp;
+#endif
+
 /**
  * Renders the OpenGL/Vulkan triangle
  * to the center of the screen to confirm DH's
@@ -65,7 +75,8 @@ public class BlazeDhTestTriangleRenderer implements IDhTestTriangleRenderer
 	private RenderPipeline pipeline;
 	private boolean init = false;
 	
-	private GpuTextureView mcColorTextureView;
+	public final BlazeTextureViewWrapper mcColorTextureViewWrapper = new BlazeTextureViewWrapper();
+	public final BlazeTextureViewWrapper mcDepthTextureViewWrapper = new BlazeTextureViewWrapper();
 	
 	private GpuBuffer vboGpuBuffer;
 	
@@ -86,42 +97,28 @@ public class BlazeDhTestTriangleRenderer implements IDhTestTriangleRenderer
 		}
 		this.init = true;
 		
-		
+		RenderPipelineBuilderWrapper pipelineBuilder = new RenderPipelineBuilderWrapper();
-		
-		VertexFormat vertexFormat = VertexFormat.builder()
-			.add("vPosition", BlazeDhVertexFormatUtil.SCREEN_POS)
-			.add("vColor", BlazeDhVertexFormatUtil.RGBA_FLOAT_COLOR)
-			.build();
-		
-		//int breakpointOne = 0;
-		// needs to manually be set if the VertexFormatElement isn't registered
-		//this.vertexFormat.getOffsetsByElement()[this.posForm.id()] = 0;
-		//this.vertexFormat.getOffsetsByElement()[this.colForm.id()] = Float.BYTES * 2;
-		//
-		//int breakpointTwo = 0;
-		
-		
-		RenderPipeline.Builder pipelineBuilder = RenderPipeline.builder();
 		{
-			pipelineBuilder.withCull(false);
+			pipelineBuilder.withFaceCulling(false);
 			pipelineBuilder.withDepthWrite(false);
-			pipelineBuilder.withDepthTestFunction(DepthTestFunction.NO_DEPTH_TEST);
+			pipelineBuilder.withDepthTest(RenderPipelineBuilderWrapper.EDhDepthTest.NONE);
 			pipelineBuilder.withColorWrite(true);
 			pipelineBuilder.withoutBlend();
-			pipelineBuilder.withPolygonMode(PolygonMode.FILL);
+			pipelineBuilder.withName("triangle_test");
-			pipelineBuilder.withLocation(Identifier.parse("distanthorizons:test_render"));
 			
-			pipelineBuilder.withVertexShader(Identifier.fromNamespaceAndPath("distanthorizons", "test/blaze/vert"));
+			pipelineBuilder.withVertexShader("test/blaze/vert");
-			pipelineBuilder.withFragmentShader(Identifier.fromNamespaceAndPath("distanthorizons", "test/blaze/frag"));
+			pipelineBuilder.withFragmentShader("test/blaze/frag");
 			
-			pipelineBuilder.withVertexFormat(vertexFormat, VertexFormat.Mode.TRIANGLES);
+			VertexFormat vertexFormat = new BlazeVertexFormatBuilder()
+				.add("vPosition", BlazeDhVertexFormatUtil.SCREEN_POS)
+				.add("vColor", BlazeDhVertexFormatUtil.RGBA_FLOAT_COLOR)
+				.build();
+			pipelineBuilder.withVertexFormat(vertexFormat);
+			
+			pipelineBuilder.withVertexMode(RenderPipelineBuilderWrapper.EDhVertexMode.TRIANGLES);
 		}
 		this.pipeline = pipelineBuilder.build();
 		
-		
-		this.mcColorTextureView = GPU_DEVICE.createTextureView(Minecraft.getInstance().getMainRenderTarget().getColorTexture());
-		
-		
 		this.uploadVertexData();
 	}
 	private void uploadVertexData()
@@ -170,16 +167,17 @@ public class BlazeDhTestTriangleRenderer implements IDhTestTriangleRenderer
 	{
 		this.tryInit();
 		
-		try (RenderPass renderPass = COMMAND_ENCODER.createRenderPass(
+		this.mcColorTextureViewWrapper.tryWrap(MinecraftRenderWrapper.INSTANCE.getRenderTarget().getColorTexture());
+		this.mcDepthTextureViewWrapper.tryWrap(MinecraftRenderWrapper.INSTANCE.getRenderTarget().getDepthTexture());
+		
+		try (RenderPassWrapper renderPassWrapper = new RenderPassWrapper(
 			this::getRenderPassName,
-			this.mcColorTextureView,
+			this.mcColorTextureViewWrapper,
-			/*optionalClearColorAsInt*/ OptionalInt.empty(),
+			this.mcDepthTextureViewWrapper))
-			/*mcDepthTextureView*/ null, 
-			/*optionalDepthValueAsDouble*/ OptionalDouble.empty()))
 		{
-			renderPass.setVertexBuffer(0, this.vboGpuBuffer);
+			renderPassWrapper.setVertexBuffer(this.vboGpuBuffer);
-			renderPass.setPipeline(this.pipeline);
+			renderPassWrapper.setPipeline(this.pipeline);
-			renderPass.draw(/*indexStart*/ 0, /*indexCount*/ 3);
+			renderPassWrapper.draw(3);
 		}
 	}
 	private String getRenderPassName() { return "distantHorizons:DhTestRenderer"; }

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/util/BlazeDhVertexFormatUtil.java

@@ -6,7 +6,7 @@ public class BlazeDhVertexFormatUtil {}
 #else
 
 import com.mojang.blaze3d.vertex.VertexFormatElement;
-import com.seibel.distanthorizons.api.enums.config.EDhApiRenderApi;
+import com.seibel.distanthorizons.api.enums.config.EDhApiRenderingEngine;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodQuadBuilder;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
@@ -14,48 +14,55 @@ import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import org.jetbrains.annotations.NotNull;
+
+#if MC_VER <= MC_26_1_2
+#else
+import com.mojang.blaze3d.GpuFormat;
+#endif
 
 /**
  * @see LodQuadBuilder
  */
+@SuppressWarnings("DataFlowIssue") // ignore null setter warnings in the static constructor (those will only be null if the render API is GL and in that case we should never use these objects)
 public class BlazeDhVertexFormatUtil
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	
+	@NotNull public static final VertexFormatElement SCREEN_POS;
+	@NotNull public static final VertexFormatElement RGBA_FLOAT_COLOR;
 	
-	public static final VertexFormatElement SCREEN_POS;
+	@NotNull public static final VertexFormatElement SHORT_XYZ_POS;
-	public static final VertexFormatElement RGBA_FLOAT_COLOR;
+	@NotNull public static final VertexFormatElement BYTE_PAD;
-	
-	public static final VertexFormatElement SHORT_XYZ_POS;
-	public static final VertexFormatElement BYTE_PAD;
 	/** contains light and micro-offset */
-	public static final VertexFormatElement META;
+	@NotNull public static final VertexFormatElement META;
-	public static final VertexFormatElement RGBA_UBYTE_COLOR;
+	@NotNull public static final VertexFormatElement RGBA_UBYTE_COLOR;
-	public static final VertexFormatElement IRIS_MATERIAL;
+	@NotNull public static final VertexFormatElement IRIS_MATERIAL;
-	public static final VertexFormatElement IRIS_NORMAL;
+	@NotNull public static final VertexFormatElement IRIS_NORMAL;
 	
-	public static final VertexFormatElement FLOAT_XYZ_POS;
+	@NotNull public static final VertexFormatElement FLOAT_XYZ_POS;
 	
 	
 	
 	
 	static
 	{
-		EDhApiRenderApi renderingApi = Config.Client.Advanced.Graphics.Experimental.renderingApi.get();
+		EDhApiRenderingEngine renderingApi = Config.Client.Advanced.Graphics.Experimental.renderingEngine.get();
-		if (renderingApi == EDhApiRenderApi.AUTO)
+		if (renderingApi == EDhApiRenderingEngine.AUTO)
 		{
 			IVersionConstants versionConstants = SingletonInjector.INSTANCE.get(IVersionConstants.class);
-			renderingApi = versionConstants.getDefaultRenderingApi();
+			renderingApi = versionConstants.getDefaultRenderingEngine();
 		}
 		
-		boolean register = (renderingApi == EDhApiRenderApi.BLAZE_3D);
+		boolean register = (renderingApi == EDhApiRenderingEngine.BLAZE_3D);
 		if (register)
 		{
 			LOGGER.debug("Attempting to register ["+VertexFormatElement.class.getSimpleName()+"]...");
 			
 			try
 			{
+				#if MC_VER <= MC_1_21_11
 				SCREEN_POS = VertexFormatElement.register(/*id*/22, /*index*/0, VertexFormatElement.Type.FLOAT, VertexFormatElement.Usage.POSITION, /*count*/ 2);
 				RGBA_FLOAT_COLOR = VertexFormatElement.register(/*id*/23, /*index*/0, VertexFormatElement.Type.FLOAT, VertexFormatElement.Usage.COLOR, /*count*/ 4);
 				
@@ -68,6 +75,49 @@ public class BlazeDhVertexFormatUtil
 				IRIS_NORMAL = VertexFormatElement.register(/*id*/29, /*index*/0, VertexFormatElement.Type.BYTE, VertexFormatElement.Usage.GENERIC, /*count*/ 1);
 				
 				FLOAT_XYZ_POS = VertexFormatElement.register(/*id*/30, /*index*/0, VertexFormatElement.Type.FLOAT, VertexFormatElement.Usage.POSITION, /*count*/ 3);
+				#elif MC_VER <= MC_26_1_2
+				SCREEN_POS = VertexFormatElement.register(/*id*/22, /*index*/0, VertexFormatElement.Type.FLOAT, false, /*count*/ 2);
+				RGBA_FLOAT_COLOR = VertexFormatElement.register(/*id*/23, /*index*/0, VertexFormatElement.Type.FLOAT, false, /*count*/ 4);
+				
+				SHORT_XYZ_POS = VertexFormatElement.register(/*id*/24, /*index*/0, VertexFormatElement.Type.USHORT, false, /*count*/ 3);
+				BYTE_PAD = VertexFormatElement.register(/*id*/25, /*index*/0, VertexFormatElement.Type.BYTE, false, /*count*/ 1);
+				
+				META = VertexFormatElement.register(/*id*/26, /*index*/0, VertexFormatElement.Type.USHORT, false, /*count*/ 1);
+				RGBA_UBYTE_COLOR = VertexFormatElement.register(/*id*/27, /*index*/0, VertexFormatElement.Type.UBYTE, true, /*count*/ 4);
+				IRIS_MATERIAL = VertexFormatElement.register(/*id*/28, /*index*/0, VertexFormatElement.Type.BYTE, false, /*count*/ 1);
+				IRIS_NORMAL = VertexFormatElement.register(/*id*/29, /*index*/0, VertexFormatElement.Type.BYTE, false, /*count*/ 1);
+				
+				FLOAT_XYZ_POS = VertexFormatElement.register(/*id*/30, /*index*/0, VertexFormatElement.Type.FLOAT, false, /*count*/ 3);
+				#elif MC_VER <= MC_26_1_2
+				
+				SCREEN_POS = VertexFormatElement.register(/*id*/22, /*index*/0, GpuFormat.RG32_FLOAT); // 2 floats
+				RGBA_FLOAT_COLOR = VertexFormatElement.register(/*id*/23, /*index*/0, GpuFormat.RGBA32_FLOAT); // 4 floats
+				
+				SHORT_XYZ_POS = VertexFormatElement.register(/*id*/24, /*index*/0, GpuFormat.RGB16_UINT); // 3 ushorts
+				BYTE_PAD = VertexFormatElement.register(/*id*/25, /*index*/0, GpuFormat.R8_UINT); // 1 byte
+				
+				META = VertexFormatElement.register(/*id*/26, /*index*/0, GpuFormat.R16_UINT); // 1 ushort
+				RGBA_UBYTE_COLOR = VertexFormatElement.register(/*id*/27, /*index*/0, GpuFormat.RGBA8_UNORM); // 4 ubytes
+				IRIS_MATERIAL = VertexFormatElement.register(/*id*/28, /*index*/0, GpuFormat.R8_UINT); // 1 byte
+				IRIS_NORMAL = VertexFormatElement.register(/*id*/29, /*index*/0, GpuFormat.R8_UINT); // 1 byte
+				
+				FLOAT_XYZ_POS = VertexFormatElement.register(/*id*/30, /*index*/0, GpuFormat.RGB32_FLOAT); // 3 floats
+				
+				#else
+				
+				SCREEN_POS = new VertexFormatElement("Screen Pos", Float.BYTES * 2, GpuFormat.RG32_FLOAT);
+				RGBA_FLOAT_COLOR = new VertexFormatElement("RGBA Float Color", Float.BYTES * 4, GpuFormat.RGBA32_FLOAT);
+				
+				SHORT_XYZ_POS = new VertexFormatElement("Short XYZ Pos", Short.BYTES * 3, GpuFormat.RGB16_UINT);
+				BYTE_PAD = new VertexFormatElement("Byte Pad", 1, GpuFormat.R8_UINT);
+				
+				META = new VertexFormatElement("DH Meta", Short.BYTES, GpuFormat.R16_UINT);
+				RGBA_UBYTE_COLOR = new VertexFormatElement("Rgba Ubyte Color", 4, GpuFormat.RGBA8_UNORM);
+				IRIS_MATERIAL = new VertexFormatElement("Iris Material", 1, GpuFormat.R8_UINT);
+				IRIS_NORMAL = new VertexFormatElement("Iris Normal", 1, GpuFormat.R8_UINT);
+				
+				FLOAT_XYZ_POS = new VertexFormatElement("Float XYZ Pos", Float.BYTES * 3, GpuFormat.RGB32_FLOAT);
+				#endif
 			}
 			catch (Exception e)
 			{
@@ -84,6 +134,7 @@ public class BlazeDhVertexFormatUtil
 		}
 		else
 		{
+			// set to null so we can fail fast with a null pointer if we ever attempt to incorrectly use these
 			SCREEN_POS = null;
 			RGBA_FLOAT_COLOR = null;
 			
@@ -101,5 +152,7 @@ public class BlazeDhVertexFormatUtil
 	
 	
 	
+	
+	
 }
 #endif

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/util/BlazePostProcessUtil.java

@@ -11,6 +11,7 @@ import com.mojang.blaze3d.systems.CommandEncoder;
 import com.mojang.blaze3d.systems.GpuDevice;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.VertexFormat;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.BlazeVertexFormatBuilder;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -67,7 +68,7 @@ public class BlazePostProcessUtil
 	
 	public static VertexFormat createVertexFormat()
 	{
-		VertexFormat vertexFormat = VertexFormat.builder()
+		VertexFormat vertexFormat = new BlazeVertexFormatBuilder()
 			.add("vPosition", BlazeDhVertexFormatUtil.SCREEN_POS)
 			.build();
 		return vertexFormat;

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/util/BlazeUniformUtil.java

@@ -9,9 +9,13 @@ import com.mojang.blaze3d.buffers.GpuBuffer;
 import com.mojang.blaze3d.systems.CommandEncoder;
 import com.mojang.blaze3d.systems.GpuDevice;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 
 public class BlazeUniformUtil
 {
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	
 	private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice();
 	private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder();
 	
@@ -22,7 +26,11 @@ public class BlazeUniformUtil
 		if (vboGpuBuffer == null
 			|| vboGpuBuffer.size() < size)
 		{
-			// GpuBuffer.USAGE_UNIFORM = 128
+			if (vboGpuBuffer != null)
+			{
+				vboGpuBuffer.close();
+			}
+			
 			int usage = GpuBuffer.USAGE_COPY_DST 
 				| GpuBuffer.USAGE_VERTEX
 				| GpuBuffer.USAGE_UNIFORM;

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/BlazeVertexFormatBuilder.java

@@ -0,0 +1,58 @@
+package com.seibel.distanthorizons.common.render.blaze.wrappers;
+
+#if MC_VER <= MC_1_21_10
+public class BlazeVertexFormatBuilder {}
+#else
+
+import com.mojang.blaze3d.vertex.VertexFormat;
+import com.mojang.blaze3d.vertex.VertexFormatElement;
+import com.seibel.distanthorizons.common.render.blaze.util.BlazeDhVertexFormatUtil;
+
+public class BlazeVertexFormatBuilder
+{
+	private final VertexFormat.Builder builder;
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	//region
+	
+	public BlazeVertexFormatBuilder()
+	{
+		#if MC_VER <= MC_26_1_2
+		this.builder = VertexFormat.builder();
+		#else
+		this.builder = VertexFormat.builder(0);
+		#endif
+	}
+	
+	//endregion
+	
+	
+	
+	//==========//
+	// building //
+	//==========//
+	//region
+	
+	public BlazeVertexFormatBuilder add(String name, VertexFormatElement element)
+	{
+		#if MC_VER <= MC_26_1_2
+		this.builder.add(name, element);
+		#else
+		this.builder.addAttribute(name, element.format());
+		#endif
+		
+		return this;
+	}
+	
+	public VertexFormat build() { return this.builder.build(); }
+	
+	//endregion
+	
+	
+	
+}
+#endif

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/RenderPassWrapper.java

@@ -0,0 +1,163 @@
+package com.seibel.distanthorizons.common.render.blaze.wrappers;
+
+#if MC_VER <= MC_1_21_10
+public class RenderPassWrapper {}
+#else
+
+import com.mojang.blaze3d.buffers.GpuBuffer;
+import com.mojang.blaze3d.pipeline.RenderPipeline;
+import com.mojang.blaze3d.systems.CommandEncoder;
+import com.mojang.blaze3d.systems.GpuDevice;
+import com.mojang.blaze3d.systems.RenderPass;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.VertexFormat;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.texture.IDhBlazeTexture;
+import com.seibel.distanthorizons.common.render.blaze.wrappers.uniform.BlazeUniformBufferWrapper;
+import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+
+import java.util.Optional;
+import java.util.OptionalDouble;
+import java.util.OptionalInt;
+import java.util.function.Supplier;
+
+#if MC_VER <= MC_26_1_2
+#else
+import com.mojang.blaze3d.IndexType;
+#endif
+
+public class RenderPassWrapper implements AutoCloseable
+{
+	public static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	
+	private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice();
+	private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder();
+	
+	
+	private final RenderPass renderPass;
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	//region
+	
+	public RenderPassWrapper(
+		final Supplier<String> nameGetterFunc, 
+		final IDhBlazeTexture colorTexture, 
+		final IDhBlazeTexture depthTexture)
+	{
+		#if MC_VER <= MC_26_1_2
+		this.renderPass = COMMAND_ENCODER.createRenderPass(
+			nameGetterFunc,
+			colorTexture.getTextureView(),
+			/*optionalClearColorAsInt*/ OptionalInt.empty(),
+			depthTexture.getTextureView(),
+			/*optionalDepthValueAsDouble*/ OptionalDouble.empty());
+		#else
+		this.renderPass = COMMAND_ENCODER.createRenderPass(
+			nameGetterFunc,
+			colorTexture.getTextureView(),
+			/*clearColor*/ Optional.empty(),
+			depthTexture.getTextureView(),
+			/*clearDepth*/ OptionalDouble.empty());
+		#endif
+	}
+	
+	//endregion
+	
+	
+	
+	//=======//
+	// setup //
+	//=======//
+	//region
+	
+	public void bindTexture(
+		final String name, 
+		final IDhBlazeTexture textureView) 
+	{
+		this.renderPass.bindTexture(
+			name,
+			textureView.getTextureView(),
+			textureView.getTextureSampler());
+	}
+	
+	public void setVertexBuffer(GpuBuffer buffer)
+	{
+		#if MC_VER <= MC_26_1_2
+		this.renderPass.setVertexBuffer(/*slot*/0, buffer);
+		#else
+		this.renderPass.setVertexBuffer(/*slot*/0, buffer.slice());
+		#endif
+	}
+	
+	public void setIndexBuffer(GpuBuffer buffer)
+	{
+		#if MC_VER <= MC_26_1_2
+		this.renderPass.setIndexBuffer(buffer, VertexFormat.IndexType.INT);
+		#else
+		this.renderPass.setIndexBuffer(buffer, IndexType.INT);
+		#endif
+	}
+	
+	public void setUniform(String uniformName, BlazeUniformBufferWrapper uniformBuffer) { this.renderPass.setUniform(uniformName, uniformBuffer.getGpuBuffer()); }
+	
+	public void setPipeline(RenderPipeline pipeline) { this.renderPass.setPipeline(pipeline); }
+	
+	//endregion
+	
+	
+	
+	//===========//
+	// rendering //
+	//===========//
+	//region
+	
+	public void draw(int vertexCount)
+	{
+		#if MC_VER <= MC_26_1_2
+		this.renderPass.draw(0, vertexCount);
+		#else
+		this.renderPass.draw(vertexCount, /*instanceCount*/1, /*firstVertex*/0, /*firstInstance*/0);
+		#endif
+	}
+	
+	public void drawIndexed(int indexCount)
+	{ 
+		#if MC_VER <= MC_26_1_2
+		this.renderPass.drawIndexed(
+			/*indexStart*/ 0,
+			/*firstIndex*/0,
+			indexCount,
+			/*instanceCount*/1);
+		#else
+		this.renderPass.drawIndexed(
+			indexCount,
+			/*instanceCount*/1,
+			/*firstVertex*/0,
+			/*vertexOffset*/0,
+			/*firstInstance*/0);
+		#endif
+		
+	}
+	
+	//endregion
+	
+	
+	
+	//================//
+	// base overrides //
+	//================//
+	//region
+	
+	@Override 
+	public void close() { this.renderPass.close(); }
+	
+	//endregion
+	
+	
+	
+}
+#endif

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/RenderPipelineBuilderWrapper.java

@@ -0,0 +1,445 @@
+package com.seibel.distanthorizons.common.render.blaze.wrappers;
+
+
+#if MC_VER <= MC_1_21_10
+public class RenderPipelineBuilderWrapper {}
+
+#else
+
+import com.mojang.blaze3d.pipeline.*;
+import com.mojang.blaze3d.platform.PolygonMode;
+import com.mojang.blaze3d.shaders.UniformType;
+import com.mojang.blaze3d.vertex.VertexFormat;
+import net.minecraft.resources.Identifier;
+
+#if MC_VER <= MC_1_21_11
+import com.mojang.blaze3d.platform.DepthTestFunction;
+#elif MC_VER <= MC_26_1_2
+import com.mojang.blaze3d.platform.CompareOp;
+#else
+import com.mojang.blaze3d.platform.CompareOp;
+import com.mojang.blaze3d.GpuFormat;
+import com.mojang.blaze3d.PrimitiveTopology;
+#endif
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Optional;
+
+public class RenderPipelineBuilderWrapper
+{
+	public static final String NAME_PREFIX = "distanthorizons:";
+	
+	private static final String SHADER_RESOURCE_FOLDER = "assets/distanthorizons/shaders/";
+	
+	private static final ClassLoader CLASS_LOADER = RenderPipelineBuilderWrapper.class.getClassLoader();
+	
+	
+	private final RenderPipeline.Builder blazePipelineBuilder;
+	
+	// variables for specific builder options should be put next to their builder methods for simpler organization
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	//region
+	
+	public RenderPipelineBuilderWrapper()
+	{
+		this.blazePipelineBuilder = RenderPipeline.builder();
+	}
+	
+	//endregion
+	
+	
+	
+	//==========//
+	// building //
+	//==========//
+	//region
+	
+	private boolean writeDepth = false;
+	public RenderPipelineBuilderWrapper withDepthWrite(boolean write)
+	{
+		this.writeDepth = write;
+		return this;
+	}
+	
+	private boolean writeColor = false;
+	public RenderPipelineBuilderWrapper withColorWrite(boolean write)
+	{
+		this.writeColor = write;
+		return this;
+	}
+	
+	private BlendFunction blendFunction = null;
+	public RenderPipelineBuilderWrapper withBlend(BlendFunction blendFunction)
+	{
+		this.blendFunction = blendFunction;
+		return this;
+	}
+	public RenderPipelineBuilderWrapper withoutBlend()
+	{
+		this.blendFunction = null;
+		return this;
+	}
+	
+	private EDhDepthTest depthTest;
+	public RenderPipelineBuilderWrapper withDepthTest(EDhDepthTest depthTest)
+	{
+		this.depthTest = depthTest;
+		return this;
+	}
+	
+	public RenderPipelineBuilderWrapper withFaceCulling(boolean culling)
+	{
+		this.blazePipelineBuilder.withCull(culling);
+		return this;
+	}
+	
+	public RenderPipelineBuilderWrapper withPolygonMode(EDhPolygonMode dhMode)
+	{
+		PolygonMode blazeMode;
+		switch (dhMode)
+		{
+			case FILL:
+				blazeMode = PolygonMode.FILL;
+				break;
+			case WIREFRAME:
+				blazeMode = PolygonMode.WIREFRAME;
+				break;
+				
+			default:
+				throw new UnsupportedOperationException("No polygonMode defined for type ["+dhMode+"].");
+		}
+		
+		this.blazePipelineBuilder.withPolygonMode(blazeMode);
+		return this;
+	}
+	
+	public RenderPipelineBuilderWrapper withName(String name) throws IllegalArgumentException
+	{
+		// Identifiers must be of a specific format
+		if (!isValidIdentifier(name))
+		{
+			throw new IllegalArgumentException("Non [a-z0-9/._-] character in name: ["+name+"].");
+		}
+		
+		this.blazePipelineBuilder.withLocation(Identifier.parse(NAME_PREFIX + name));
+		return this;
+	}
+	
+	private final ArrayList<String> samplerNames = new ArrayList<>();
+	public RenderPipelineBuilderWrapper withSampler(String name) throws IllegalArgumentException
+	{
+		#if MC_VER <= MC_26_1_2
+		this.blazePipelineBuilder.withSampler(name);
+		#else
+		samplerNames.add(name);
+		#endif
+		
+		return this;
+	}
+	
+	private final ArrayList<String> uniformBufferNames = new ArrayList<>();
+	public RenderPipelineBuilderWrapper withUniformBuffer(String name) throws IllegalArgumentException
+	{
+		#if MC_VER <= MC_26_1_2
+		this.blazePipelineBuilder.withUniform(name, UniformType.UNIFORM_BUFFER);
+		#else
+		uniformBufferNames.add(name);
+		#endif
+		
+		return this;
+	}
+	
+	private VertexFormat vertexFormat = null;
+	public RenderPipelineBuilderWrapper withVertexFormat(VertexFormat vertexFormat)
+	{
+		this.vertexFormat = vertexFormat;
+		return this;
+	}
+	
+	private EDhVertexMode vertexMode = null;
+	public RenderPipelineBuilderWrapper withVertexMode(EDhVertexMode vertexMode)
+	{
+		this.vertexMode = vertexMode;
+		return this;
+	}
+	
+	public RenderPipelineBuilderWrapper withVertexShader(String scriptResourcePath) { return this.withShader(EDhShaderType.VERTEX, scriptResourcePath); }
+	public RenderPipelineBuilderWrapper withFragmentShader(String scriptResourcePath) { return this.withShader(EDhShaderType.FRAGMENT, scriptResourcePath); }
+	private RenderPipelineBuilderWrapper withShader(EDhShaderType shaderType, String scriptResourcePath)
+	{
+		String fullShaderResourcePath = SHADER_RESOURCE_FOLDER + scriptResourcePath + shaderType.fileExtension;
+		
+		// confirm the shader file exists
+		try (InputStream scriptListInputStream = CLASS_LOADER.getResourceAsStream(fullShaderResourcePath))
+		{
+			if (scriptListInputStream == null)
+			{
+				throw new NullPointerException("Failed to find the SQL Script list file [" + fullShaderResourcePath + "], no auto update scripts can be run.");
+			}
+		}
+		catch (IOException e)
+		{
+			// shouldn't happen, but just in case
+			throw new RuntimeException("Unexpected issue closing resource stream for shader type: ["+shaderType+"] at: ["+fullShaderResourcePath+"], error: ["+e.getMessage()+"].", e);
+		}
+		
+		
+		
+		if (shaderType == EDhShaderType.VERTEX)
+		{
+			this.blazePipelineBuilder.withVertexShader(Identifier.parse(NAME_PREFIX + scriptResourcePath));
+		}
+		else
+		{
+			this.blazePipelineBuilder.withFragmentShader(Identifier.parse(NAME_PREFIX + scriptResourcePath));
+		}
+		
+		return this;
+	}
+	
+	//endregion
+	
+	
+	
+	//=====//
+	// end //
+	//=====//
+	//region
+	
+	public RenderPipeline build() throws UnsupportedOperationException
+	{
+		// depth/color
+		{
+			#if MC_VER <= MC_1_21_11
+			
+			this.blazePipelineBuilder.withDepthWrite(this.writeDepth);
+			this.blazePipelineBuilder.withColorWrite(this.writeColor);
+			
+			if (this.blendFunction != null)
+			{
+				this.blazePipelineBuilder.withBlend(this.blendFunction);
+			}
+			else
+			{
+				this.blazePipelineBuilder.withoutBlend();
+			}
+			
+			DepthTestFunction depthTestFunction;
+			switch (this.depthTest)
+			{
+				case NONE:
+					depthTestFunction = DepthTestFunction.NO_DEPTH_TEST;
+					break;
+				case LESS:
+					depthTestFunction = DepthTestFunction.LESS_DEPTH_TEST;
+					break;
+				
+				default:
+					throw new UnsupportedOperationException("No depth test defined for type ["+this.depthTest+"].");
+			}
+			this.blazePipelineBuilder.withDepthTestFunction(depthTestFunction);
+			
+			#else
+			
+			CompareOp compareOp;
+			switch (this.depthTest)
+			{
+				case NONE:
+					compareOp = CompareOp.ALWAYS_PASS;
+					break;
+				case LESS:
+					compareOp = CompareOp.LESS_THAN;
+					break;
+				case GREATER:
+					compareOp = CompareOp.GREATER_THAN;
+					break;
+				
+				default:
+					throw new UnsupportedOperationException("No depth test defined for type ["+this.depthTest+"].");
+			}
+			this.blazePipelineBuilder.withDepthStencilState(new DepthStencilState(compareOp, this.writeDepth));
+			
+			#if MC_VER <= MC_26_1_2
+			this.blazePipelineBuilder.withColorTargetState(
+				new ColorTargetState(
+					Optional.ofNullable(this.blendFunction), 
+					this.writeColor ? ColorTargetState.WRITE_ALL : ColorTargetState.WRITE_NONE
+				)
+			);
+			#else
+			this.blazePipelineBuilder.withColorTargetState(
+				new ColorTargetState(
+					Optional.ofNullable(this.blendFunction),
+					GpuFormat.RGBA8_UNORM,
+					this.writeColor ? ColorTargetState.WRITE_ALL : ColorTargetState.WRITE_NONE
+				)
+			);
+			#endif
+			
+			#endif
+		}
+		
+		
+		// vertex format
+		{
+			#if MC_VER <= MC_26_1_2
+			VertexFormat.Mode blazeVertexMode;
+			switch (this.vertexMode)
+			{
+				case TRIANGLES:
+					blazeVertexMode = VertexFormat.Mode.TRIANGLES;
+					break;
+				case TRIANGLE_FAN:
+					blazeVertexMode = VertexFormat.Mode.TRIANGLE_FAN;
+					break;
+				case LINES:
+					blazeVertexMode = VertexFormat.Mode.DEBUG_LINES;
+					break;
+				
+				default:
+					throw new UnsupportedOperationException("No vertex mode defined for type ["+this.vertexMode+"].");
+			}
+			
+			this.blazePipelineBuilder.withVertexFormat(vertexFormat, blazeVertexMode);
+			#else
+			
+			PrimitiveTopology primitiveTopology;
+			switch (this.vertexMode)
+			{
+				case TRIANGLES:
+					primitiveTopology = PrimitiveTopology.TRIANGLES;
+					break;
+				case TRIANGLE_FAN:
+					primitiveTopology = PrimitiveTopology.TRIANGLE_FAN;
+					break;
+				case LINES:
+					primitiveTopology = PrimitiveTopology.DEBUG_LINES;
+					break;
+				
+				default:
+					throw new UnsupportedOperationException("No PrimitiveTopology defined for type ["+this.vertexMode+"].");
+			}
+			
+			this.blazePipelineBuilder.withVertexBinding(0, vertexFormat);
+			this.blazePipelineBuilder.withPrimitiveTopology(primitiveTopology);
+			
+			#endif
+		}
+		
+		
+		// uniform buffers
+		{
+			#if MC_VER <= MC_26_1_2
+			// handled before this point
+			#else
+			
+			BindGroupLayout.Builder bindGroupBuilder = BindGroupLayout.builder();
+			
+			for (String name : this.samplerNames)
+			{
+				bindGroupBuilder.withSampler(name);
+			}
+			
+			for (String name : this.uniformBufferNames)
+			{
+				bindGroupBuilder.withUniform(name, UniformType.UNIFORM_BUFFER);
+			}
+			
+			BindGroupLayout bindGroup = bindGroupBuilder.build();
+			this.blazePipelineBuilder.withBindGroupLayout(bindGroup);
+			#endif
+		}
+		
+		
+		return this.blazePipelineBuilder.build();
+	}
+	
+	//endregion
+	
+	
+	
+	//================//
+	// helper methods //
+	//================//
+	//region
+	
+	private static boolean isValidIdentifier(String identifier)
+	{
+		for (int i = 0; i < identifier.length(); i++)
+		{
+			char ch = identifier.charAt(i);
+			if (!isValidNamespaceChar(ch))
+			{
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	private static boolean isValidNamespaceChar(final char ch)
+	{
+		return ch == '_' 
+			|| ch == '-' 
+			// only lower case characters
+			|| (ch >= 'a' && ch <= 'z') 
+			|| (ch >= '0' && ch <= '9') 
+			|| ch == '.';
+	}
+	
+	//endregion
+	
+	
+	
+	//================//
+	// helper classes //
+	//================//
+	//region
+	
+	public enum EDhPolygonMode
+	{
+		FILL,
+		WIREFRAME;
+	}
+	
+	public enum EDhVertexMode
+	{
+		TRIANGLES,
+		TRIANGLE_FAN,
+		LINES;
+	}
+	
+	public enum EDhDepthTest
+	{
+		NONE,
+		GREATER,
+		LESS;
+	}
+	
+	private enum EDhShaderType
+	{
+		FRAGMENT(".fsh"),
+		VERTEX(".vsh");
+		
+		
+		public final String fileExtension;
+		
+		EDhShaderType(String fileExtension)
+		{
+			this.fileExtension = fileExtension;
+		}
+	}
+	
+	
+	//endregion
+	
+	
+	
+}
+#endif

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/buffer/BlazeVertexBufferWrapper.java

@@ -10,31 +10,82 @@ import com.mojang.blaze3d.buffers.GpuBufferSlice;
 import com.mojang.blaze3d.systems.CommandEncoder;
 import com.mojang.blaze3d.systems.GpuDevice;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.IndexBufferBuilder;
+import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodQuadBuilder;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.render.RenderThreadTaskHandler;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.AbstractDhRenderApiDefinition;
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.IVertexBufferWrapper;
 
 import java.nio.ByteBuffer;
+import java.util.concurrent.atomic.AtomicInteger;
 
 public class BlazeVertexBufferWrapper implements IVertexBufferWrapper
 {
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	
+	private static final AbstractDhRenderApiDefinition RENDER_DEF = SingletonInjector.INSTANCE.get(AbstractDhRenderApiDefinition.class);
+	
 	private static final GpuDevice GPU_DEVICE = RenderSystem.getDevice();
 	private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder();
 	
+	private static final AtomicInteger BUFFER_COUNT_REF = new AtomicInteger(0);
+	
 	
 	public final String name;
 	public String getName() { return this.name; }
 	
-	public GpuBuffer vboGpuBuffer = null;
+	public GpuBuffer vertexGpuBuffer = null;
+	
 	public int vertexCount = -1;
 	public int indexCount = -1;
 	public boolean uploaded = false;
 	
 	
+	private GpuBuffer indexGpuBuffer = null;
+	private static GpuBuffer GLOBAL_INDEX_GPU_BUFFER = null;
+	public GpuBuffer getIndexGpuBuffer()
+	{
+		if (RENDER_DEF.useSingleIbo())
+		{
+			return GLOBAL_INDEX_GPU_BUFFER;
+		}
+		else
+		{
+			return this.indexGpuBuffer;
+		}
+	}
+	
+	
 	
 	//=============//
 	// constructor //
 	//=============//
 	//region
 	
+	static
+	{
+		if (RENDER_DEF.useSingleIbo())
+		{
+			RenderThreadTaskHandler.INSTANCE.queueRunningOnRenderThread("Global IBO Creation", () ->
+			{
+				int maxSize = LodQuadBuilder.getMaxBufferByteSize();
+				int maxVertexCount = maxSize / LodQuadBuilder.BYTES_PER_VERTEX;
+				int maxQuadCount = (maxVertexCount / 4);
+				ByteBuffer indexBuffer = IndexBufferBuilder.createBuffer(maxQuadCount);
+				
+				int usage = GpuBuffer.USAGE_COPY_DST
+					| GpuBuffer.USAGE_INDEX;
+				GLOBAL_INDEX_GPU_BUFFER = GPU_DEVICE.createBuffer(BlazeVertexBufferWrapper::getIndexBufferName, usage, indexBuffer.capacity());
+				
+				GpuBufferSlice bufferSlice = new GpuBufferSlice(GLOBAL_INDEX_GPU_BUFFER, /*offset*/ 0, indexBuffer.capacity());
+				COMMAND_ENCODER.writeToBuffer(bufferSlice, indexBuffer);
+			});
+		}
+	}
+	
 	public BlazeVertexBufferWrapper(String name) { this.name = name; }
 	
 	//endregion
@@ -47,23 +98,83 @@ public class BlazeVertexBufferWrapper implements IVertexBufferWrapper
 	//region
 	
 	@Override
-	public void upload(ByteBuffer buffer, int vertexCount)
+	public void uploadVertexBuffer(ByteBuffer vertexBuffer, int vertexCount)
 	{
+		int oldVertexCount = this.vertexCount;
+		
 		this.vertexCount = vertexCount;
 		// 4 vertices per face, but 6 indices (IE 2 triangles) per face, aka need to multiply by 1.5
 		this.indexCount = (int)(vertexCount * 1.5);
 		this.uploaded = true;
 		
 		
-		int usage = GpuBuffer.USAGE_COPY_DST
-			| GpuBuffer.USAGE_VERTEX;
-		int byteSize = (buffer.limit() - buffer.position());
-		this.vboGpuBuffer = GPU_DEVICE.createBuffer(this::getName, usage, byteSize);
 		
-		GpuBufferSlice bufferSlice = new GpuBufferSlice(this.vboGpuBuffer, /*offset*/0, byteSize);
+		if (this.vertexGpuBuffer == null
-		COMMAND_ENCODER.writeToBuffer(bufferSlice, buffer);
+			// recreating if the size changes is always necessary (even if we only need a smaller amount)
+			// due to a bug on Mac where it will attempt to render anything allocated in the buffer
+			|| oldVertexCount != vertexCount)
+		{
+			if (this.vertexGpuBuffer == null)
+			{
+				BUFFER_COUNT_REF.incrementAndGet();
+				//LOGGER.info("Create, count: ["+BUFFER_COUNT_REF.get()+"]");
+			}
+			
+			if (this.vertexGpuBuffer != null)
+			{
+				this.vertexGpuBuffer.close();
+			}
+			
+			int usage = GpuBuffer.USAGE_COPY_DST
+				| GpuBuffer.USAGE_VERTEX;
+			int byteSize = (vertexBuffer.limit() - vertexBuffer.position());
+			this.vertexGpuBuffer = GPU_DEVICE.createBuffer(this::getName, usage, byteSize);
+			
+			GpuBufferSlice bufferSlice = new GpuBufferSlice(this.vertexGpuBuffer, /*offset*/0, byteSize);
+			COMMAND_ENCODER.writeToBuffer(bufferSlice, vertexBuffer);
+		}
 	}
 	
+	@Override 
+	public void uploadIndexBuffer(ByteBuffer indexBuffer, int vertexCount)
+	{
+		int oldIndexCount = this.indexCount;
+		// 4 vertices per face, but 6 indices (IE 2 triangles) per face, aka need to multiply by 1.5
+		this.indexCount = (int)(vertexCount * 1.5);
+		
+		if (RENDER_DEF.useSingleIbo())
+		{
+			// ignore index uploading when running a single IBO
+			return;
+		}
+		
+		
+		
+		// recreating if the size changes is always necessary (even if we only need a smaller amount)
+		// due to a bug on Mac where it will attempt to render anything allocated in the buffer
+		if (this.indexGpuBuffer == null
+			|| oldIndexCount != this.indexCount)
+		{
+			if (this.indexGpuBuffer == null)
+			{
+				BUFFER_COUNT_REF.incrementAndGet();
+			}
+
+			if (this.indexGpuBuffer != null)
+			{
+				this.indexGpuBuffer.close();
+			}
+			
+			int usage = GpuBuffer.USAGE_COPY_DST
+				| GpuBuffer.USAGE_INDEX;
+			this.indexGpuBuffer = GPU_DEVICE.createBuffer(BlazeVertexBufferWrapper::getIndexBufferName, usage, indexBuffer.capacity());
+			
+			GpuBufferSlice bufferSlice = new GpuBufferSlice(this.indexGpuBuffer, /*offset*/ 0, indexBuffer.capacity());
+			COMMAND_ENCODER.writeToBuffer(bufferSlice, indexBuffer);
+		}
+	}
+	private static String getIndexBufferName() { return "distantHorizons:LodIndexBuffer"; }
+	
 	//endregion
 	
 	
@@ -76,10 +187,19 @@ public class BlazeVertexBufferWrapper implements IVertexBufferWrapper
 	@Override
 	public void close()
 	{
-		if (this.vboGpuBuffer != null)
+		if (this.vertexGpuBuffer != null)
 		{
-			this.vboGpuBuffer.close();
+			BUFFER_COUNT_REF.decrementAndGet();
+			this.vertexGpuBuffer.close();
 		}
+		
+		if (this.indexGpuBuffer != null)
+		{
+			BUFFER_COUNT_REF.decrementAndGet();
+			this.indexGpuBuffer.close();
+		}
+		
+		//LOGGER.info("Close, count: ["+BUFFER_COUNT_REF.get()+"]");
 	}
 	
 	//endregion

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/BlazeTextureViewWrapper.java

@@ -14,7 +14,7 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 
 import java.util.OptionalDouble;
 
-public class BlazeTextureViewWrapper
+public class BlazeTextureViewWrapper implements IDhBlazeTexture
 {
 	public static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
@@ -22,8 +22,11 @@ public class BlazeTextureViewWrapper
 	private static final CommandEncoder COMMAND_ENCODER = GPU_DEVICE.createCommandEncoder();
 	
 	
-	public GpuTextureView textureView = null;
+	private GpuTextureView textureView = null;
-	public GpuSampler textureSampler = null;
+	public GpuTextureView getTextureView() { return this.textureView; }
+	
+	private GpuSampler textureSampler = null;
+	public GpuSampler getTextureSampler() { return this.textureSampler; }
 	
 	
 	

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/BlazeTextureWrapper.java

@@ -5,20 +5,27 @@ public class BlazeTextureWrapper {}
 
 #else
 
-import com.mojang.blaze3d.buffers.GpuBuffer;
-import com.mojang.blaze3d.systems.CommandEncoder;
-import com.mojang.blaze3d.systems.GpuDevice;
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.textures.*;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.util.ColorUtil;
+import com.seibel.distanthorizons.coreapi.util.ColorUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 
 import java.util.OptionalDouble;
 
-public class BlazeTextureWrapper
+import com.mojang.blaze3d.systems.CommandEncoder;
+import com.mojang.blaze3d.systems.GpuDevice;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.textures.*;
+
+#if MC_VER <= MC_26_1_2
+
+#else
+import com.mojang.blaze3d.GpuFormat;
+import org.joml.Vector4f;
+#endif
+
+public class BlazeTextureWrapper implements IDhBlazeTexture
 {
 	public static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
@@ -29,11 +36,20 @@ public class BlazeTextureWrapper
 	
 	
 	public final String name;
+	#if MC_VER <= MC_26_1_2
 	public final TextureFormat textureFormat;
+	#else
+	public final GpuFormat textureFormat;
+	#endif
 	
 	public GpuTexture texture = null;
-	public GpuTextureView textureView = null;
+	
-	public GpuSampler textureSampler = null;
+	private GpuTextureView textureView = null;
+	public GpuTextureView getTextureView() { return this.textureView; }
+	
+	private GpuSampler textureSampler = null;
+	public GpuSampler getTextureSampler() { return this.textureSampler; }
+	
 	
 	private int width = -1;
 	private int height = -1;
@@ -45,10 +61,27 @@ public class BlazeTextureWrapper
 	//==============//
 	//region
 	
-	public static BlazeTextureWrapper createDepth(String name) { return new BlazeTextureWrapper(name, TextureFormat.DEPTH32); }
+	public static BlazeTextureWrapper createDepth(String name) 
-	public static BlazeTextureWrapper createColor(String name) { return new BlazeTextureWrapper(name, TextureFormat.RGBA8); }
+	{ 
+		#if MC_VER <= MC_26_1_2
+		return new BlazeTextureWrapper(name, TextureFormat.DEPTH32);
+		#else
+		return new BlazeTextureWrapper(name, GpuFormat.D32_FLOAT);
+		#endif 
+	}
+	public static BlazeTextureWrapper createColor(String name) 
+	{ 
+		#if MC_VER <= MC_26_1_2
+		return new BlazeTextureWrapper(name, TextureFormat.RGBA8);
+		#else
+		return new BlazeTextureWrapper(name, GpuFormat.RGBA8_UNORM);
+		#endif 
+	}
 	
-	private BlazeTextureWrapper(String name, TextureFormat textureFormat)
+	private BlazeTextureWrapper(
+		String name, 
+		#if MC_VER <= MC_26_1_2 TextureFormat #else GpuFormat #endif textureFormat
+		)
 	{
 		this.name = name;
 		this.textureFormat = textureFormat;
@@ -79,42 +112,54 @@ public class BlazeTextureWrapper
 	//=======//
 	//region
 	
-	/** does nothing if the texture is already created and the correct size */
+	/** 
-	public void tryCreateOrResize()
+	 * does nothing if the texture is already created and the correct size 
+	 * @return true if the texture was (re)created
+	 */
+	public boolean tryCreateOrResize()
 	{
-		this.tryCreateTexture();
+		boolean textureChanged = this.tryCreateTexture();
 		this.tryCreateSampler();
+		return textureChanged;
 	}
-	private void tryCreateTexture()
+	private boolean tryCreateTexture()
 	{
 		int viewWidth = MC_RENDER.getTargetFramebufferViewportWidth();
 		int viewHeight = MC_RENDER.getTargetFramebufferViewportHeight();
 		
-		if (this.texture == null
+		if (this.texture != null
-			|| this.width != viewWidth
+			&& this.width == viewWidth
-			|| this.height != viewHeight)
+			&& this.height == viewHeight)
 		{
-			if (this.texture != null)
+			// no changes needed
-			{
+			return false;
-				this.texture.close();
-				this.textureView.close();
-			}
-			
-			this.width = viewWidth;
-			this.height = viewHeight;
-			
-			int usage = GpuBuffer.USAGE_HINT_CLIENT_STORAGE 
-				| GpuBuffer.USAGE_COPY_DST 
-				| GpuBuffer.USAGE_VERTEX 
-				| GpuBuffer.USAGE_UNIFORM;
-			this.texture = GPU_DEVICE.createTexture(this.name,
-				usage,
-				this.textureFormat,
-				viewWidth, viewHeight,
-				/*depthOrLayers*/ 1,  /*mipLevels*/ 1
-			);
-			this.textureView = GPU_DEVICE.createTextureView(this.texture);
 		}
+		
+		
+		if (this.texture != null)
+		{
+			this.texture.close();
+			this.textureView.close();
+		}
+		
+		this.width = viewWidth;
+		this.height = viewHeight;
+		
+		int usage = GpuTexture.USAGE_COPY_DST
+			| GpuTexture.USAGE_TEXTURE_BINDING
+			| GpuTexture.USAGE_COPY_SRC
+			| GpuTexture.USAGE_RENDER_ATTACHMENT;
+		
+		this.texture = GPU_DEVICE.createTexture(
+			this.name,
+			usage,
+			this.textureFormat,
+			viewWidth, viewHeight,
+			/*depthOrLayers*/ 1, /*mipLevels*/ 1
+		);
+		this.textureView = GPU_DEVICE.createTextureView(this.texture);
+		
+		return true;
 	}
 	private void tryCreateSampler()
 	{
@@ -146,7 +191,18 @@ public class BlazeTextureWrapper
 	{
 		if (this.texture != null)
 		{
+			#if MC_VER <= MC_26_1_2
 			COMMAND_ENCODER.clearColorTexture(this.texture, clearArgbColor);
+			#else
+			Vector4f clearColor = new Vector4f(
+				// color values should be between 0.0 and 1.0
+				ColorUtil.getRed(clearArgbColor) / 255.0f,
+				ColorUtil.getGreen(clearArgbColor) / 255.0f,
+				ColorUtil.getBlue(clearArgbColor) / 255.0f,
+				ColorUtil.getAlpha(clearArgbColor) / 255.0f
+			);
+			COMMAND_ENCODER.clearColorTexture(this.texture, clearColor);
+			#endif
 		}
 	}
 	

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/texture/IDhBlazeTexture.java

@@ -0,0 +1,17 @@
+package com.seibel.distanthorizons.common.render.blaze.wrappers.texture;
+
+#if MC_VER <= MC_1_21_10
+public interface IDhBlazeTexture {}
+#else
+
+import com.mojang.blaze3d.textures.GpuSampler;
+import com.mojang.blaze3d.textures.GpuTextureView;
+
+public interface IDhBlazeTexture
+{
+	
+	GpuTextureView getTextureView();
+	GpuSampler getTextureSampler();
+	
+}
+#endif

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/BlazeLodUniformBufferWrapper.java

@@ -5,14 +5,10 @@ public class BlazeLodUniformBufferWrapper {}
 
 #else
 
-import com.mojang.blaze3d.buffers.Std140Builder;
-import com.mojang.blaze3d.buffers.Std140SizeCalculator;
 import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodBufferContainer;
-import com.seibel.distanthorizons.core.util.math.Vec3f;
+import com.seibel.distanthorizons.core.util.math.DhVec3f;
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.ILodContainerUniformBufferWrapper;
 
-import java.nio.ByteBuffer;
-
 public class BlazeLodUniformBufferWrapper extends BlazeUniformBufferWrapper implements ILodContainerUniformBufferWrapper
 {
 	
@@ -32,45 +28,34 @@ public class BlazeLodUniformBufferWrapper extends BlazeUniformBufferWrapper impl
 	
 	
 	//========//
-	// ??? //
+	// upload //
 	//========//
 	//region
 	
 	@Override
-	public void createUniformData(LodBufferContainer bufferContainer)
+	public void tryUpload(LodBufferContainer bufferContainer)
-	{
-		Vec3f modelOffset = new Vec3f(
-			(float) (bufferContainer.minCornerBlockPos.getX()),
-			(float) (bufferContainer.minCornerBlockPos.getY()),
-			(float) (bufferContainer.minCornerBlockPos.getZ()));
-		
-		// upload data //
-		
-		int uniformBufferSize = new Std140SizeCalculator()
-			.putVec3() // uModelOffset
-			.get();
-		
-		ByteBuffer buffer = this.getOrCreateBuffer(uniformBufferSize);
-		Std140Builder.intoBuffer(buffer)
-			.putVec3(modelOffset.x, modelOffset.y, modelOffset.z) // uModelOffset
-			.get();
-		
-	}
-	
-	@Override
-	public void tryUpload()
 	{
 		if (this.uploaded)
 		{
 			return;
 		}
 		
-		this.upload();
+		DhVec3f modelOffset = new DhVec3f(
+			(float) (bufferContainer.minCornerBlockPos.getX()),
+			(float) (bufferContainer.minCornerBlockPos.getY()),
+			(float) (bufferContainer.minCornerBlockPos.getZ()));
+		
+		// upload data //
+		this
+			.putVec3f(modelOffset.x, modelOffset.y, modelOffset.z) // uModelOffset
+			.finishAndUpload();
 		
 		this.uploaded = true;
 	}
 	
 	//endregion
 	
+	
+	
 }
 #endif

common/src/main/java/com/seibel/distanthorizons/common/render/blaze/wrappers/uniform/BlazeUniformBufferWrapper.java

@@ -7,17 +7,22 @@ public class BlazeUniformBufferWrapper {}
 
 import com.mojang.blaze3d.buffers.GpuBuffer;
 import com.mojang.blaze3d.buffers.GpuBufferSlice;
+import com.mojang.blaze3d.buffers.Std140Builder;
+import com.mojang.blaze3d.buffers.Std140SizeCalculator;
 import com.mojang.blaze3d.systems.CommandEncoder;
 import com.mojang.blaze3d.systems.GpuDevice;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
+import com.seibel.distanthorizons.common.render.blaze.util.BlazeUniformUtil;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.IUniformBufferWrapper;
+import com.seibel.distanthorizons.core.util.math.DhMat4f;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.util.ArrayList;
 
-public class BlazeUniformBufferWrapper implements IUniformBufferWrapper
+public class BlazeUniformBufferWrapper implements AutoCloseable
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
@@ -27,11 +32,22 @@ public class BlazeUniformBufferWrapper implements IUniformBufferWrapper
 	
 	private final String name;
 	
-	private int cpuBufferSize = 0;
+	/** measured in bytes */
-	private int gpuBufferSize = 0;
+	private int bufferSize = 0;
 	
 	private ByteBuffer cpuBuffer = null;
-	public GpuBuffer gpuBuffer = null;
+	
+	private GpuBuffer gpuBuffer = null;
+	public GpuBuffer getGpuBuffer() { return this.gpuBuffer; }
+	private GpuBufferSlice bufferSlice = null;
+	
+	/** the element count the current CPU Buffer is sized for */
+	private int previousElementCount = 0;
+	/** how many elements are currently in flight (ie being added to the buffer right now) */
+	private int elementCount = 0;
+	/** used to resize the buffers dur first-time setup */
+	private final ArrayList<EUniformElement> uniformElementTypes = new ArrayList<>(0);
+	private Std140Builder uniformBufferBuilder = null;
 	
 	
 	
@@ -46,63 +62,135 @@ public class BlazeUniformBufferWrapper implements IUniformBufferWrapper
 	
 	
 	
-	//========//
+	//=================//
-	// render //
+	// element builder //
-	//========//
+	//=================//
 	//region
 	
-	protected ByteBuffer getOrCreateBuffer(int size)
+	public BlazeUniformBufferWrapper putVec2f(float x, float y)
 	{
-		if (this.cpuBuffer == null 
+		this.putElement(EUniformElement.VEC2f);
-			|| this.cpuBufferSize != size)
+		this.uniformBufferBuilder.putVec2(x,y);
-		{
+		return this;
-			this.cpuBuffer = ByteBuffer.allocateDirect(size);
-			this.cpuBuffer.order(ByteOrder.nativeOrder());
-			
-			this.cpuBufferSize = size;
-		}
-		
-		return this.cpuBuffer;
 	}
-	
+	public BlazeUniformBufferWrapper putVec3i(int x, int y, int z)
-	@Override
-	public void upload() throws IllegalStateException
 	{
-		if (this.cpuBuffer == null)
+		this.putElement(EUniformElement.VEC3i);
+		this.uniformBufferBuilder.putIVec3(x,y,z);
+		return this;
+	}
+	public BlazeUniformBufferWrapper putVec3f(float x, float y, float z)
+	{
+		this.putElement(EUniformElement.VEC3f);
+		this.uniformBufferBuilder.putVec3(x,y,z);
+		return this;
+	}
+	public BlazeUniformBufferWrapper putVec4f(float x, float y, float z, float w)
+	{
+		this.putElement(EUniformElement.VEC4f);
+		this.uniformBufferBuilder.putVec4(x,y,z,w);
+		return this;
+	}
+	public BlazeUniformBufferWrapper putMat4f(DhApiMat4f matrix)
+	{
+		this.putElement(EUniformElement.MAT4f);
+		this.uniformBufferBuilder.putMat4f(DhMat4f.createJomlMatrix(matrix));
+		return this;
+	}
+	public BlazeUniformBufferWrapper putFloat(float f)
+	{
+		this.putElement(EUniformElement.FLOAT);
+		this.uniformBufferBuilder.putFloat(f);
+		return this;
+	}
+	public BlazeUniformBufferWrapper putInt(int i)
+	{
+		this.putElement(EUniformElement.INT);
+		this.uniformBufferBuilder.putInt(i);
+		return this;
+	}
+	private void putElement(EUniformElement elementTypeEnum)
+	{
+		this.uniformElementTypes.add(elementTypeEnum);
+		
+		boolean createNewBuilder = (this.elementCount == 0);
+		this.elementCount++;
+		if (this.elementCount > this.previousElementCount)
 		{
-			throw new IllegalStateException("Upload called before buffer was created");
+			this.recreateCpuBuffer();
+			createNewBuilder = true;
 		}
 		
-		if (this.gpuBuffer == null
+		if (createNewBuilder)
-			|| this.gpuBufferSize != this.cpuBufferSize)
 		{
-			if (this.gpuBuffer != null)
+			this.uniformBufferBuilder = Std140Builder.intoBuffer(this.cpuBuffer);
+		}
+	}
+	private void recreateCpuBuffer()
+	{
+		ByteBuffer oldBuffer = this.cpuBuffer;
+		
+		int size = calcBufferSize(this.uniformElementTypes);
+		this.cpuBuffer = ByteBuffer.allocateDirect(size);
+		this.cpuBuffer.order(ByteOrder.nativeOrder());
+		
+		if (oldBuffer != null)
+		{
+			oldBuffer.position(0);
+			this.cpuBuffer.put(oldBuffer);
+		}
+		
+		this.bufferSize = size;
+		this.previousElementCount = this.elementCount;
+	}
+	private static int calcBufferSize(ArrayList<EUniformElement> uniformElements)
+	{
+		Std140SizeCalculator calculator = new Std140SizeCalculator();
+		
+		for (int i = 0; i < uniformElements.size(); i++)
+		{
+			EUniformElement element = uniformElements.get(i);
+			switch (element)
 			{
-				this.gpuBuffer.close();
+				case VEC2f -> calculator.putVec2();
+				case VEC3i -> calculator.putIVec3();
+				case VEC3f -> calculator.putVec3();
+				case VEC4f -> calculator.putVec4();
+				case MAT4f -> calculator.putMat4f();
+				case INT -> calculator.putInt();
+				case FLOAT -> calculator.putFloat();
+				
+				default -> throw new UnsupportedOperationException("No definition for element type ["+element.name()+"]");
 			}
-			
-			int usage = GpuBuffer.USAGE_COPY_DST
-				| GpuBuffer.USAGE_VERTEX
-				| GpuBuffer.USAGE_UNIFORM;
-			this.gpuBuffer = GPU_DEVICE.createBuffer(this::getBufferName, usage, this.cpuBufferSize);
-			
-			this.gpuBufferSize = this.cpuBufferSize;
 		}
 		
-		
+		return calculator.get();
-		
+	}
-		int byteSize = (this.cpuBuffer.limit() - this.cpuBuffer.position());
+	
-		GpuBufferSlice bufferSlice = new GpuBufferSlice(this.gpuBuffer, /*offset*/0, byteSize);
+	
-		if (!bufferSlice.buffer().isClosed())
+	
-		{
+	public void finishAndUpload()
-			COMMAND_ENCODER.writeToBuffer(bufferSlice, this.cpuBuffer);
+	{
-		}
+		// re-create the GPU buffer if needed
-		else
+		GpuBuffer oldGpuBuffer = this.gpuBuffer;
-		{
+		this.gpuBuffer = BlazeUniformUtil.createBuffer(this.name, this.bufferSize, this.gpuBuffer);
-			LOGGER.warn("Uploading to buffer ["+this.name+"] failed due to already being closed");
+		
-		}
+		boolean createNewBufferSlice = (this.bufferSlice == null || this.gpuBuffer != oldGpuBuffer);
+		if (createNewBufferSlice)
+		{
+			this.bufferSlice = new GpuBufferSlice(this.gpuBuffer, 0, this.bufferSize);
+		}
+		
+		// upload to GPU
+		this.cpuBuffer.position(0);
+		COMMAND_ENCODER.writeToBuffer(this.bufferSlice, this.cpuBuffer);
+		
+		
+		// clear the element tracking for next time
+		this.elementCount = 0;
+		this.uniformElementTypes.clear();
+		this.uniformBufferBuilder = null;
 	}
-	private String getBufferName() { return this.name; }
 	
 	//endregion
 	
@@ -126,5 +214,24 @@ public class BlazeUniformBufferWrapper implements IUniformBufferWrapper
 	
 	
 	
+	//================//
+	// helper classes //
+	//================//
+	//region
+	
+	private enum EUniformElement
+	{
+		VEC2f,
+		VEC3f,
+		VEC3i,
+		VEC4f,
+		MAT4f,
+		INT,
+		FLOAT,
+	}
+	
+	//endregion
+	
+	
 }
 #endif

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/GlDhDebugWireframeRenderer.java

@@ -20,7 +20,7 @@
 package com.seibel.distanthorizons.common.render.openGl;
 
 import com.seibel.distanthorizons.api.enums.config.EDhApiGpuUploadMethod;
-import com.seibel.distanthorizons.common.render.openGl.glObject.buffer.GLElementBuffer;
+import com.seibel.distanthorizons.common.render.openGl.glObject.buffer.GLIndexBuffer;
 import com.seibel.distanthorizons.common.render.openGl.glObject.buffer.GLVertexBuffer;
 import com.seibel.distanthorizons.common.render.openGl.glObject.shader.GlShaderProgram;
 import com.seibel.distanthorizons.common.render.openGl.glObject.vertexAttribute.GlAbstractVertexAttribute;
@@ -30,7 +30,7 @@ import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.render.RenderParams;
 import com.seibel.distanthorizons.core.render.renderer.AbstractDebugWireframeRenderer;
-import com.seibel.distanthorizons.core.util.math.Mat4f;
+import com.seibel.distanthorizons.core.util.math.DhMat4f;
 import org.lwjgl.opengl.GL32;
 
 import java.nio.ByteBuffer;
@@ -53,7 +53,7 @@ public class GlDhDebugWireframeRenderer extends AbstractDebugWireframeRenderer
 	// rendering setup
 	private GlShaderProgram basicShader;
 	private GLVertexBuffer vertexBuffer;
-	private GLElementBuffer indexBuffer;
+	private GLIndexBuffer indexBuffer;
 	private GlAbstractVertexAttribute va;
 	private boolean init = false;
 	
@@ -140,7 +140,7 @@ public class GlDhDebugWireframeRenderer extends AbstractDebugWireframeRenderer
 		boxOutlineBuffer.order(ByteOrder.nativeOrder());
 		boxOutlineBuffer.asIntBuffer().put(BOX_OUTLINE_INDICES);
 		boxOutlineBuffer.rewind();
-		this.indexBuffer = new GLElementBuffer(false);
+		this.indexBuffer = new GLIndexBuffer(false);
 		this.indexBuffer.uploadBuffer(boxOutlineBuffer, EDhApiGpuUploadMethod.DATA, BOX_OUTLINE_INDICES.length * Integer.BYTES, GL32.GL_STATIC_DRAW);
 		
 	}
@@ -178,10 +178,10 @@ public class GlDhDebugWireframeRenderer extends AbstractDebugWireframeRenderer
 	@Override
 	public void renderBox(Box box)
 	{
-		Mat4f boxTransform = Mat4f.createTranslateMatrix(box.minPos.x - this.camPosFloatThisFrame.x, box.minPos.y - this.camPosFloatThisFrame.y, box.minPos.z - this.camPosFloatThisFrame.z);
+		DhMat4f boxTransform = DhMat4f.createTranslateMatrix(box.minPos.x - this.camPosFloatThisFrame.x, box.minPos.y - this.camPosFloatThisFrame.y, box.minPos.z - this.camPosFloatThisFrame.z);
-		boxTransform.multiply(Mat4f.createScaleMatrix(box.maxPos.x - box.minPos.x, box.maxPos.y - box.minPos.y, box.maxPos.z - box.minPos.z));
+		boxTransform.multiply(DhMat4f.createScaleMatrix(box.maxPos.x - box.minPos.x, box.maxPos.y - box.minPos.y, box.maxPos.z - box.minPos.z));
 
-		Mat4f transformMatrix = this.dhMvmProjMatrixThisFrame.copy();
+		DhMat4f transformMatrix = this.dhMvmProjMatrixThisFrame.copy();
 		transformMatrix.multiply(boxTransform);
 		this.basicShader.setUniform(this.basicShader.getUniformLocation("uTransform"), transformMatrix);
 

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/GlDhMetaRenderer.java

@@ -8,13 +8,12 @@ import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhAp
 import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiTextureCreatedParam;
 import com.seibel.distanthorizons.common.render.openGl.glObject.GLProxy;
 import com.seibel.distanthorizons.common.render.openGl.glObject.GlDhFramebuffer;
-import com.seibel.distanthorizons.common.render.openGl.glObject.buffer.GlQuadElementBuffer;
 import com.seibel.distanthorizons.common.render.openGl.glObject.texture.*;
 import com.seibel.distanthorizons.common.render.openGl.postProcessing.apply.GlDhApplyShader;
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftGLWrapper;
 import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper;
 import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodQuadBuilder;
+import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
@@ -22,7 +21,7 @@ import com.seibel.distanthorizons.core.render.DhApiRenderProxy;
 import com.seibel.distanthorizons.core.render.RenderParams;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.AbstractOptifineAccessor;
+import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhMetaRenderer;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.OverrideInjector;
@@ -46,6 +45,8 @@ public class GlDhMetaRenderer implements IDhMetaRenderer
 	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
 	private static final MinecraftGLWrapper GLMC = MinecraftGLWrapper.INSTANCE;
 	
+	private static final IOptifineAccessor OPTIFINE_ACCESSOR = ModAccessorInjector.INSTANCE.get(IOptifineAccessor.class);
+	
 	
 	private int activeFramebufferId = -1;
 	private int activeColorTextureId = -1;
@@ -70,6 +71,11 @@ public class GlDhMetaRenderer implements IDhMetaRenderer
 	/** used in case there's an API override */
 	public IDhApiShaderProgram shaderProgramForThisFrame;
 	
+	/** Older MC versions assume GL state is unchanged, so we must restore it after DH rendering */
+	#if MC_VER <= MC_1_12_2
+	private int previousBoundTextureId;
+	private int previousDepthFunc;
+	#endif
 	
 	
 	//============//
@@ -96,7 +102,7 @@ public class GlDhMetaRenderer implements IDhMetaRenderer
 			this.renderObjectsCreated = true;
 		}
 		
-		this.shaderProgramForThisFrame = GlDhTerrainShaderProgram.INSTANCE;
+		this.shaderProgramForThisFrame = GlDhTerrainRenderer.INSTANCE.getTerrainShaderProgram();
 		IDhApiShaderProgram lodShaderProgramOverride = OverrideInjector.INSTANCE.get(IDhApiShaderProgram.class);
 		if (lodShaderProgramOverride != null && this.shaderProgramForThisFrame.overrideThisFrame())
 		{
@@ -106,13 +112,17 @@ public class GlDhMetaRenderer implements IDhMetaRenderer
 		
 		this.setGLState(renderParams, firstPass);
 		
-		GlDhTerrainShaderProgram.INSTANCE.quadIBO.bind();
 		this.bindLightmap(renderParams.lightmap);
 	}
 	private void setGLState(
 		DhApiRenderParam renderEventParam,
 		boolean firstPass)
 	{
+		#if MC_VER <= MC_1_12_2
+		this.previousBoundTextureId = GLMC.getActiveTexture();
+		this.previousDepthFunc = GLMC.getActiveDepthFunc();
+		#endif
+		
 		//===================//
 		// framebuffer setup //
 		//===================//
@@ -242,12 +252,9 @@ public class GlDhMetaRenderer implements IDhMetaRenderer
 		
 		LOGGER.info("Setting up renderer");
 		
-		GlDhTerrainShaderProgram.INSTANCE.quadIBO = new GlQuadElementBuffer();
-		GlDhTerrainShaderProgram.INSTANCE.quadIBO.reserve(LodQuadBuilder.getMaxBufferByteSize());
-		
 		
 		// create or get the frame buffer
-		if (AbstractOptifineAccessor.optifinePresent())
+		if (OPTIFINE_ACCESSOR != null)
 		{
 			// use MC/Optifine's default Framebuffer so shaders won't remove the LODs
 			int currentFramebufferId = MC_RENDER.getTargetFramebuffer();
@@ -360,9 +367,10 @@ public class GlDhMetaRenderer implements IDhMetaRenderer
 			}
 		}
 		
-		
+		#if MC_VER <= MC_1_12_2
+		GLMC.glDepthFunc(previousDepthFunc);
+		#endif
 		this.unbindLightmap();
-		GlDhTerrainShaderProgram.INSTANCE.quadIBO.unbind();
 		this.shaderProgramForThisFrame.unbind();
 	}
 	
@@ -389,31 +397,26 @@ public class GlDhMetaRenderer implements IDhMetaRenderer
 		
 		
 		
-		// needs to be fired after all the textures have been created/bound
+		GL32.glClearDepth(1.0);
-		boolean clearTextures = !ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeTextureClearEvent.class, renderParams);
+		
-		if (clearTextures)
+		float[] clearColorValues = new float[4];
+		GL32.glGetFloatv(GL32.GL_COLOR_CLEAR_VALUE, clearColorValues);
+		GL32.glClearColor(clearColorValues[0], clearColorValues[1], clearColorValues[2], 1.0f);
+		
+		if (this.usingMcFramebuffer 
+			&& framebufferOverride == null)
 		{
-			GL32.glClearDepth(1.0);
+			//// Due to using MC/Optifine's framebuffer we need to re-bind the depth texture,
-			
+			//// otherwise we'll be writing to MC/Optifine's depth texture which causes rendering issues
-			float[] clearColorValues = new float[4];
+			//this.framebuffer.addDepthAttachment(this.depthTexture.getTextureId(), EDhDepthBufferFormat.DEPTH32F.isCombinedStencil());
-			GL32.glGetFloatv(GL32.GL_COLOR_CLEAR_VALUE, clearColorValues);
-			GL32.glClearColor(clearColorValues[0], clearColorValues[1], clearColorValues[2], 1.0f);
-			
-			if (this.usingMcFramebuffer 
-				&& framebufferOverride == null)
-			{
-				//// Due to using MC/Optifine's framebuffer we need to re-bind the depth texture,
-				//// otherwise we'll be writing to MC/Optifine's depth texture which causes rendering issues
-				//this.framebuffer.addDepthAttachment(this.depthTexture.getTextureId(), EDhDepthBufferFormat.DEPTH32F.isCombinedStencil());
 			
 			
-				// don't clear the color texture, that removes the sky 
+			// don't clear the color texture, that removes the sky 
-				GL32.glClear(GL32.GL_DEPTH_BUFFER_BIT);
+			GL32.glClear(GL32.GL_DEPTH_BUFFER_BIT);
-			}
+		}
-			else if (firstPass)
+		else if (firstPass)
-			{
+		{
-				GL32.glClear(GL32.GL_COLOR_BUFFER_BIT | GL32.GL_DEPTH_BUFFER_BIT);
+			GL32.glClear(GL32.GL_COLOR_BUFFER_BIT | GL32.GL_DEPTH_BUFFER_BIT);
-			}
 		}
 		
 	}
@@ -465,7 +468,11 @@ public class GlDhMetaRenderer implements IDhMetaRenderer
 	public void unbindLightmap() 
 	{
 		// strange that we don't call "glActiveTexture" here but since it's working James isn't going to change it right now (2026-03-10)
+		#if MC_VER <= MC_1_12_2
+		GLMC.glBindTexture(previousBoundTextureId);
+		#else
 		GLMC.glBindTexture(0);
+		#endif
 	}
 	
 	//endregion

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/GlDhRenderApiDefinition.java

@@ -1,5 +1,7 @@
 package com.seibel.distanthorizons.common.render.openGl;
 
+import com.seibel.distanthorizons.api.enums.config.EDhApiRenderingApi;
+import com.seibel.distanthorizons.api.enums.config.EDhApiRenderingEngine;
 import com.seibel.distanthorizons.common.render.openGl.generic.GlGenericObjectRenderer;
 import com.seibel.distanthorizons.common.render.openGl.generic.GlGenericObjectVertexContainer;
 import com.seibel.distanthorizons.common.render.openGl.glObject.GlDummyUniformData;
@@ -9,6 +11,7 @@ import com.seibel.distanthorizons.common.render.openGl.postProcessing.fade.GlVan
 import com.seibel.distanthorizons.common.render.openGl.postProcessing.fog.GlDhFogRenderer;
 import com.seibel.distanthorizons.common.render.openGl.postProcessing.ssao.GlDhSSAORenderer;
 import com.seibel.distanthorizons.common.render.openGl.test.GlTestTriangleRenderer;
+import com.seibel.distanthorizons.core.render.EDhRenderDepth;
 import com.seibel.distanthorizons.core.render.renderer.AbstractDebugWireframeRenderer;
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.AbstractDhRenderApiDefinition;
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.IDhGenericObjectVertexBufferContainer;
@@ -23,7 +26,17 @@ public class GlDhRenderApiDefinition extends AbstractDhRenderApiDefinition
 	//=========//
 	//region
 	
-	public String getApiName() { return "OpenGL"; }
+	public String getEngineName() { return "OpenGL"; }
+	
+	public EDhRenderDepth getRenderDepth() 
+	{
+		// reversed Z shouldn't be supported on OpenGL due
+		// to that breaking Iris shaders
+		return EDhRenderDepth.FORWARD_Z; 
+	}
+	
+	public EDhApiRenderingApi getRenderApi() { return EDhApiRenderingApi.OPEN_GL; }
+	public boolean isNativeRenderer() { return true; }
 	
 	//endregion
 	
@@ -35,7 +48,7 @@ public class GlDhRenderApiDefinition extends AbstractDhRenderApiDefinition
 	//region
 	
 	@Override public IDhMetaRenderer getMetaRenderer() { return GlDhMetaRenderer.INSTANCE; }
-	@Override public IDhTerrainRenderer getTerrainRenderer() { return GlDhTerrainShaderProgram.INSTANCE; }
+	@Override public IDhTerrainRenderer getTerrainRenderer() { return GlDhTerrainRenderer.INSTANCE; }
 	@Override public IDhSsaoRenderer getSsaoRenderer() { return GlDhSSAORenderer.INSTANCE; }
 	@Override public IDhFogRenderer getFogRenderer() { return GlDhFogRenderer.INSTANCE; }
 	@Override public IDhFarFadeRenderer getFarFadeRenderer() { return GlDhFarFadeRenderer.INSTANCE; }
@@ -53,7 +66,7 @@ public class GlDhRenderApiDefinition extends AbstractDhRenderApiDefinition
 	//===========//
 	//region
 	
-	@Override public IDhGenericRenderer createGenericRenderer() { return GlGenericObjectRenderer.INSTANCE; }
+	@Override public IDhGenericRenderer createGenericRenderer() { return new GlGenericObjectRenderer(); }
 	
 	@Override public IVertexBufferWrapper createVboWrapper(String name) { return new GLVertexBuffer(); }
 	@Override public ILodContainerUniformBufferWrapper createLodContainerUniformWrapper() { return new GlDummyUniformData(); }

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/GlDhTerrainRenderer.java

@@ -0,0 +1,67 @@
+package com.seibel.distanthorizons.common.render.openGl;
+
+import com.seibel.distanthorizons.common.render.openGl.terrain.GlDhTerrainShaderProgram;
+import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodBufferContainer;
+import com.seibel.distanthorizons.core.render.RenderParams;
+import com.seibel.distanthorizons.core.util.objects.SortedArraySet;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhTerrainRenderer;
+
+public class GlDhTerrainRenderer implements IDhTerrainRenderer
+{
+	public static final GlDhTerrainRenderer INSTANCE = new GlDhTerrainRenderer();
+	
+	private GlDhTerrainShaderProgram terrainShaderProgram = null;
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	//region
+	
+	private GlDhTerrainRenderer() {}
+	
+	//endregion
+	
+	
+	//=========//
+	// getters //
+	//=========//
+	//region
+	
+	/** must be called on the render thread the first time so GL can run it's setup */
+	public GlDhTerrainShaderProgram getTerrainShaderProgram()
+	{
+		if (this.terrainShaderProgram == null)
+		{
+			this.terrainShaderProgram = new GlDhTerrainShaderProgram();
+		}
+		
+		return this.terrainShaderProgram;
+	}
+	
+	
+	//endregion
+	
+	
+	
+	//========//
+	// render //
+	//========//
+	//region
+	
+	@Override 
+	public void render(RenderParams renderEventParam, boolean opaquePass, SortedArraySet<LodBufferContainer> bufferContainers, IProfilerWrapper profiler)
+	{
+		this.getTerrainShaderProgram();
+		
+		this.terrainShaderProgram.tryInit();
+		this.terrainShaderProgram.render(renderEventParam, opaquePass, bufferContainers, profiler);
+	}
+	
+	//endregion
+	
+	
+	
+}

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/generic/GlGenericObjectRenderer.java

@@ -30,7 +30,7 @@ import com.seibel.distanthorizons.api.objects.math.DhApiVec3d;
 import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBox;
 import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBoxGroupShading;
 import com.seibel.distanthorizons.common.render.openGl.glObject.GLProxy;
-import com.seibel.distanthorizons.common.render.openGl.glObject.buffer.GLElementBuffer;
+import com.seibel.distanthorizons.common.render.openGl.glObject.buffer.GLIndexBuffer;
 import com.seibel.distanthorizons.common.render.openGl.glObject.buffer.GLVertexBuffer;
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftGLWrapper;
 import com.seibel.distanthorizons.core.config.Config;
@@ -45,7 +45,7 @@ import com.seibel.distanthorizons.core.render.renderer.RenderableBoxGroup;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper;
-import com.seibel.distanthorizons.core.util.math.Vec3d;
+import com.seibel.distanthorizons.core.util.math.DhVec3d;
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhGenericRenderer;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.OverrideInjector;
@@ -53,10 +53,10 @@ import com.seibel.distanthorizons.coreapi.ModInfo;
 import org.lwjgl.opengl.ARBInstancedArrays;
 import org.lwjgl.opengl.GL32;
 import org.lwjgl.opengl.GL33;
-import org.lwjgl.system.MemoryUtil;
 
 import java.awt.*;
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -75,8 +75,7 @@ public class GlGenericObjectRenderer implements IDhGenericRenderer
 	
 	private static final DhApiRenderableBoxGroupShading DEFAULT_SHADING = DhApiRenderableBoxGroupShading.getUnshaded();
 	
-	
+	private static final DhApiBeforeGenericObjectRenderEvent.EventParam EVENT_PARAM = new DhApiBeforeGenericObjectRenderEvent.EventParam();
-	public static final GlGenericObjectRenderer INSTANCE = new GlGenericObjectRenderer();
 	
 	/** 
 	 * Can be used to troubleshoot the renderer. 
@@ -91,7 +90,7 @@ public class GlGenericObjectRenderer implements IDhGenericRenderer
 	private IDhApiGenericObjectShaderProgram instancedShaderProgram;
 	private IDhApiGenericObjectShaderProgram directShaderProgram;
 	private GLVertexBuffer boxVertexBuffer;
-	private GLElementBuffer boxIndexBuffer;
+	private GLIndexBuffer boxIndexBuffer;
 	
 	private boolean instancedRenderingAvailable;
 	private boolean vertexAttribDivisorSupported;
@@ -176,7 +175,7 @@ public class GlGenericObjectRenderer implements IDhGenericRenderer
 	//=============//
 	//region
 	
-	private GlGenericObjectRenderer() { }
+	public GlGenericObjectRenderer() { }
 	
 	public void init()
 	{
@@ -195,6 +194,13 @@ public class GlGenericObjectRenderer implements IDhGenericRenderer
 		this.vertexAttribDivisorSupported = GLProxy.getInstance().vertexAttribDivisorSupported;
 		this.instancedArraysSupported = GLProxy.getInstance().instancedArraysSupported;
 		boolean isMac = (EPlatform.get() == EPlatform.MACOS);
+		if (isMac)
+		{
+			LOGGER.warn("Generic rendering not supported by Mac. Clouds, beacons, and some other effects will be disabled.");
+			Config.Client.Advanced.Graphics.GenericRendering.enableGenericRendering.setApiValue(false);
+			return;
+		}
+		
 		this.instancedRenderingAvailable = (this.vertexAttribDivisorSupported || this.instancedArraysSupported) && !isMac;
 		if (!this.instancedRenderingAvailable)
 		{
@@ -220,22 +226,22 @@ public class GlGenericObjectRenderer implements IDhGenericRenderer
 	private void createBuffers()
 	{
 		// box vertices 
-		ByteBuffer boxVerticesBuffer = MemoryUtil.memAlloc(BOX_VERTICES.length * Float.BYTES);
+		ByteBuffer boxVerticesBuffer = ByteBuffer.allocateDirect(BOX_VERTICES.length * Float.BYTES);
+		boxVerticesBuffer.order(ByteOrder.nativeOrder());
 		boxVerticesBuffer.asFloatBuffer().put(BOX_VERTICES);
 		boxVerticesBuffer.rewind();
 		this.boxVertexBuffer = new GLVertexBuffer(false);
 		this.boxVertexBuffer.bind();
 		this.boxVertexBuffer.uploadBuffer(boxVerticesBuffer, 8, EDhApiGpuUploadMethod.DATA, BOX_VERTICES.length * Float.BYTES);
-		MemoryUtil.memFree(boxVerticesBuffer);
 		
 		// box vertex indexes
-		ByteBuffer solidIndexBuffer = MemoryUtil.memAlloc(BOX_INDICES.length * Integer.BYTES);
+		ByteBuffer solidIndexBuffer = ByteBuffer.allocateDirect(BOX_INDICES.length * Integer.BYTES);
+		solidIndexBuffer.order(ByteOrder.nativeOrder());
 		solidIndexBuffer.asIntBuffer().put(BOX_INDICES);
 		solidIndexBuffer.rewind();
-		this.boxIndexBuffer = new GLElementBuffer(false);
+		this.boxIndexBuffer = new GLIndexBuffer(false);
 		this.boxIndexBuffer.uploadBuffer(solidIndexBuffer, EDhApiGpuUploadMethod.DATA, BOX_INDICES.length * Integer.BYTES, GL32.GL_STATIC_DRAW);
 		this.boxIndexBuffer.bind();
-		MemoryUtil.memFree(solidIndexBuffer);
 	}
 	private void addGenericDebugObjects()
 	{
@@ -361,6 +367,11 @@ public class GlGenericObjectRenderer implements IDhGenericRenderer
 			throw new IllegalArgumentException("Box group must be of type ["+ RenderableBoxGroup.class.getSimpleName()+"], type received: ["+(iBoxGroup != null ? iBoxGroup.getClass() : "NULL")+"].");
 		}
 		RenderableBoxGroup boxGroup = (RenderableBoxGroup) iBoxGroup;
+		if (boxGroup.size() != 0)
+		{
+			// trigger a box change to make sure the initial data is uploaded
+			boxGroup.triggerBoxChange();
+		}
 		
 		
 		long id = boxGroup.getId();
@@ -394,136 +405,141 @@ public class GlGenericObjectRenderer implements IDhGenericRenderer
 	@Override
 	public void render(RenderParams renderEventParam, IProfilerWrapper profiler, boolean renderingWithSsao)
 	{
+		// generic rendering (both instanced and direct) is extremely unstable on Mac, so don't render anything
+		if (EPlatform.get() == EPlatform.MACOS)
+		{
+			return;
+		}
+		
+		
+		
 		// render setup //
-		profiler.push("setup");
+		try (IProfilerWrapper.IProfileBlock setup_profile = profiler.push("setup"))
-		
-		this.init();
-		
-		boolean useInstancedRendering = this.instancedRenderingAvailable
-				&& Config.Client.Advanced.Graphics.GenericRendering.enableInstancedRendering.get();
-		
-		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeGenericRenderSetupEvent.class, renderEventParam);
-		
-		
-		boolean renderWireframe = Config.Client.Advanced.Debugging.renderWireframe.get();
-		if (renderWireframe)
 		{
-			GL32.glPolygonMode(GL32.GL_FRONT_AND_BACK, GL32.GL_LINE);
-			GLMC.disableFaceCulling();
-		}
-		else
-		{
-			GL32.glPolygonMode(GL32.GL_FRONT_AND_BACK, GL32.GL_FILL);
-			GLMC.enableFaceCulling();
-		}
 			
-		GLMC.enableBlend();
+			this.init();
-		GL32.glBlendEquation(GL32.GL_FUNC_ADD);
-		GLMC.glBlendFuncSeparate(GL32.GL_SRC_ALPHA, GL32.GL_ONE_MINUS_SRC_ALPHA, GL32.GL_ONE, GL32.GL_ONE_MINUS_SRC_ALPHA);
 			
-		IDhApiGenericObjectShaderProgram shaderProgram = useInstancedRendering ? this.instancedShaderProgram : this.directShaderProgram;
+			ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeGenericRenderSetupEvent.class, renderEventParam.apiCopy);
-		IDhApiGenericObjectShaderProgram shaderProgramOverride = OverrideInjector.INSTANCE.get(IDhApiGenericObjectShaderProgram.class);
-		if (shaderProgramOverride != null && shaderProgram.overrideThisFrame())
-		{
-			shaderProgram = shaderProgramOverride;
-		}
-		
-		shaderProgram.bind(renderEventParam);
-		shaderProgram.bindVertexBuffer(this.boxVertexBuffer.getId());
-		
-		this.boxIndexBuffer.bind();
-		
-		Vec3d camPos = MC_RENDER.getCameraExactPosition();
 			
 			
-		
+			boolean renderWireframe = Config.Client.Advanced.Debugging.renderWireframe.get();
-		// rendering //
+			if (renderWireframe)
-		
-		Collection<RenderableBoxGroup> boxList = this.boxGroupById.values();
-		for (RenderableBoxGroup boxGroup : boxList)
-		{
-			// validation //
-			
-			// shouldn't happen, but just in case
-			if (boxGroup == null)
 			{
-				continue;
+				GL32.glPolygonMode(GL32.GL_FRONT_AND_BACK, GL32.GL_LINE);
-			}
+				GLMC.disableFaceCulling();
-			
-			// skip boxes that shouldn't render this pass
-			if (boxGroup.ssaoEnabled != renderingWithSsao)
-			{
-				continue;
-			}
-			
-			profiler.popPush("render prep");
-			boxGroup.preRender(renderEventParam); // called even if the group is inactive, so the group can be activate if desired
-
-			// ignore inactive groups
-			if (!boxGroup.active)
-			{
-				continue;
-			}
-			
-			// allow API users to cancel this object's rendering
-			boolean cancelRendering = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeGenericObjectRenderEvent.class, new DhApiBeforeGenericObjectRenderEvent.EventParam(renderEventParam, boxGroup));
-			if (cancelRendering)
-			{
-				continue;
-			}
-			
-			// update instanced data if needed
-			if (useInstancedRendering)
-			{
-				boxGroup.tryUpdateInstancedDataAsync();	
-				
-				// skip groups that haven't been uploaded yet
-				if (boxGroup.vertexBufferContainer.getState() != GlGenericObjectVertexContainer.EState.RENDER)
-				{
-					continue;
-				}
-			}
-			
-			
-			
-			// render //
-			
-			profiler.popPush("rendering");
-			profiler.push(boxGroup.getResourceLocationNamespace());
-			profiler.push(boxGroup.getResourceLocationPath());
-			if (useInstancedRendering)
-			{
-				this.renderBoxGroupInstanced(shaderProgram, renderEventParam, boxGroup, camPos, profiler);
 			}
 			else
 			{
-				this.renderBoxGroupDirect(shaderProgram, renderEventParam, boxGroup, camPos, profiler);
+				GL32.glPolygonMode(GL32.GL_FRONT_AND_BACK, GL32.GL_FILL);
+				GLMC.enableFaceCulling();
 			}
-			profiler.pop(); // resource path
-			profiler.pop(); // resource namespace
 			
-			boxGroup.postRender(renderEventParam);
+			GLMC.enableBlend();
+			GL32.glBlendEquation(GL32.GL_FUNC_ADD);
+			GLMC.glBlendFuncSeparate(GL32.GL_SRC_ALPHA, GL32.GL_ONE_MINUS_SRC_ALPHA, GL32.GL_ONE, GL32.GL_ONE_MINUS_SRC_ALPHA);
+			
+			IDhApiGenericObjectShaderProgram shaderProgram = this.instancedRenderingAvailable ? this.instancedShaderProgram : this.directShaderProgram;
+			IDhApiGenericObjectShaderProgram shaderProgramOverride = OverrideInjector.INSTANCE.get(IDhApiGenericObjectShaderProgram.class);
+			if (shaderProgramOverride != null && shaderProgram.overrideThisFrame())
+			{
+				shaderProgram = shaderProgramOverride;
+			}
+			
+			shaderProgram.bind(renderEventParam);
+			shaderProgram.bindVertexBuffer(this.boxVertexBuffer.getId());
+			
+			this.boxIndexBuffer.bind();
+			
+			
+			
+			// rendering //
+			
+			Collection<RenderableBoxGroup> boxList = this.boxGroupById.values();
+			for (RenderableBoxGroup boxGroup : boxList)
+			{
+				// validation //
+				
+				// shouldn't happen, but just in case
+				if (boxGroup == null)
+				{
+					continue;
+				}
+				
+				// skip boxes that shouldn't render this pass
+				if (boxGroup.ssaoEnabled != renderingWithSsao)
+				{
+					continue;
+				}
+				
+				profiler.popPush("render prep");
+				boxGroup.preRender(renderEventParam); // called even if the group is inactive, so the group can be activate if desired
+				
+				// ignore inactive groups
+				if (!boxGroup.active)
+				{
+					continue;
+				}
+				
+				// allow API users to cancel this object's rendering
+				EVENT_PARAM.update(renderEventParam, boxGroup);
+				boolean cancelRendering = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeGenericObjectRenderEvent.class, EVENT_PARAM);
+				if (cancelRendering)
+				{
+					continue;
+				}
+				
+				// update instanced data if needed
+				if (this.instancedRenderingAvailable)
+				{
+					boxGroup.tryUpdateInstancedDataAsync();
+					
+					// skip groups that haven't been uploaded yet
+					if (boxGroup.vertexBufferContainer.getState() != GlGenericObjectVertexContainer.EState.RENDER)
+					{
+						continue;
+					}
+				}
+				
+				
+				
+				// render //
+				
+				profiler.popPush("rendering");
+				try (IProfilerWrapper.IProfileBlock namespace_profile = profiler.push(boxGroup.getResourceLocationNamespace());
+					IProfilerWrapper.IProfileBlock location_profile = profiler.push(boxGroup.getResourceLocationPath()))
+				{
+					if (this.instancedRenderingAvailable)
+					{
+						this.renderBoxGroupInstanced(shaderProgram, renderEventParam, boxGroup, renderEventParam.exactCameraPosition, profiler);
+					}
+					else
+					{
+						this.renderBoxGroupDirect(shaderProgram, renderEventParam, boxGroup, renderEventParam.exactCameraPosition, profiler);
+					}
+				}
+				
+				boxGroup.postRender(renderEventParam);
+			}
+			
+			
+			
+			//==========//
+			// clean up //
+			//==========//
+			
+			profiler.popPush("cleanup");
+			
+			ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeGenericRenderCleanupEvent.class, renderEventParam.apiCopy);
+			
+			if (renderWireframe)
+			{
+				// default back to GL_FILL since all other rendering uses it 
+				GL32.glPolygonMode(GL32.GL_FRONT_AND_BACK, GL32.GL_FILL);
+				GLMC.enableFaceCulling();
+			}
+			
+			shaderProgram.unbind();
 		}
-		
-		
-		//==========//
-		// clean up //
-		//==========//
-		
-		profiler.popPush("cleanup");
-		
-		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeGenericRenderCleanupEvent.class, renderEventParam);
-		
-		if (renderWireframe)
-		{
-			// default back to GL_FILL since all other rendering uses it 
-			GL32.glPolygonMode(GL32.GL_FRONT_AND_BACK, GL32.GL_FILL);
-			GLMC.enableFaceCulling();
-		}
-		
-		shaderProgram.unbind();
-		
-		profiler.pop();
 	}
 	
 	//endregion
@@ -537,75 +553,74 @@ public class GlGenericObjectRenderer implements IDhGenericRenderer
 	
 	private void renderBoxGroupInstanced(
 			IDhApiGenericObjectShaderProgram shaderProgram, DhApiRenderParam renderEventParam, 
-			RenderableBoxGroup boxGroup, Vec3d camPos,
+			RenderableBoxGroup boxGroup, DhVec3d camPos,
 			IProfilerWrapper profiler)
 	{
-		// update instance data //
+		try (IProfilerWrapper.IProfileBlock render_profile = profiler.push("vertex setup"))
-		
-		profiler.push("vertex setup");
-		
-		DhApiRenderableBoxGroupShading shading = boxGroup.shading;
-		if (shading == null)
 		{
-			shading = DEFAULT_SHADING;
-		}
 			
-		shaderProgram.fillIndirectUniformData(
+			// update instance data //
+			DhApiRenderableBoxGroupShading shading = boxGroup.shading;
+			if (shading == null)
+			{
+				shading = DEFAULT_SHADING;
+			}
+			
+			shaderProgram.fillIndirectUniformData(
 				renderEventParam,
 				shading, boxGroup,
 				camPos);
 			
 			
 			
-		// Bind instance data //
+			// Bind instance data //
-		profiler.popPush("binding");
+			profiler.popPush("binding");
 			
-		GlGenericObjectVertexContainer container = (GlGenericObjectVertexContainer)(boxGroup.vertexBufferContainer);
+			GlGenericObjectVertexContainer container = (GlGenericObjectVertexContainer) (boxGroup.vertexBufferContainer);
 			
-		GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, container.color);
+			GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, container.color);
-		GL32.glEnableVertexAttribArray(1);
+			GL32.glEnableVertexAttribArray(1);
-		GL32.glVertexAttribPointer(1, 4, GL32.GL_FLOAT, false, 4 * Float.BYTES, 0);
+			GL32.glVertexAttribPointer(1, 4, GL32.GL_FLOAT, false, 4 * Float.BYTES, 0);
-		this.vertexAttribDivisor(1, 1);
+			this.vertexAttribDivisor(1, 1);
 			
-		GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, container.scale);
+			GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, container.scale);
-		GL32.glEnableVertexAttribArray(2);
+			GL32.glEnableVertexAttribArray(2);
-		this.vertexAttribDivisor(2, 1);
+			this.vertexAttribDivisor(2, 1);
-		GL32.glVertexAttribPointer(2, 3, GL32.GL_FLOAT, false, 3 * Float.BYTES, 0);
+			GL32.glVertexAttribPointer(2, 3, GL32.GL_FLOAT, false, 3 * Float.BYTES, 0);
 			
-		GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, container.chunkPos);
+			GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, container.chunkPos);
-		GL32.glEnableVertexAttribArray(3);
+			GL32.glEnableVertexAttribArray(3);
-		this.vertexAttribDivisor(3, 1);
+			this.vertexAttribDivisor(3, 1);
-		GL32.glVertexAttribIPointer(3, 3, GL32.GL_INT, 3 * Integer.BYTES, 0);
+			GL32.glVertexAttribIPointer(3, 3, GL32.GL_INT, 3 * Integer.BYTES, 0);
 			
-		GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, container.subChunkPos);
+			GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, container.subChunkPos);
-		GL32.glEnableVertexAttribArray(4);
+			GL32.glEnableVertexAttribArray(4);
-		this.vertexAttribDivisor(4, 1);
+			this.vertexAttribDivisor(4, 1);
-		GL32.glVertexAttribPointer(4, 3, GL32.GL_FLOAT, false, 3 * Float.BYTES, 0);
+			GL32.glVertexAttribPointer(4, 3, GL32.GL_FLOAT, false, 3 * Float.BYTES, 0);
 			
-		GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, container.material);
+			GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, container.material);
-		GL32.glEnableVertexAttribArray(5);
+			GL32.glEnableVertexAttribArray(5);
-		this.vertexAttribDivisor(5, 1);
+			this.vertexAttribDivisor(5, 1);
-		GL32.glVertexAttribIPointer(5, 1, GL32.GL_BYTE, Byte.BYTES, 0);
+			GL32.glVertexAttribIPointer(5, 1, GL32.GL_BYTE, Byte.BYTES, 0);
 			
 			
-		// Draw instanced
+			// Draw instanced
-		profiler.popPush("render");
+			profiler.popPush("render");
-		if (container.uploadedBoxCount > 0)
+			if (container.uploadedBoxCount > 0)
-		{
+			{
-			GL32.glDrawElementsInstanced(GL32.GL_TRIANGLES, BOX_INDICES.length, GL32.GL_UNSIGNED_INT, 0, container.uploadedBoxCount);
+				GL32.glDrawElementsInstanced(GL32.GL_TRIANGLES, BOX_INDICES.length, GL32.GL_UNSIGNED_INT, 0, container.uploadedBoxCount);
+			}
+			
+			
+			// Clean up
+			profiler.popPush("cleanup");
+			
+			GL32.glDisableVertexAttribArray(1);
+			GL32.glDisableVertexAttribArray(2);
+			GL32.glDisableVertexAttribArray(3);
+			GL32.glDisableVertexAttribArray(4);
+			GL32.glDisableVertexAttribArray(5);
 		}
-		
-		
-		// Clean up
-		profiler.popPush("cleanup");
-		
-		GL32.glDisableVertexAttribArray(1);
-		GL32.glDisableVertexAttribArray(2);
-		GL32.glDisableVertexAttribArray(3);
-		GL32.glDisableVertexAttribArray(4);
-		GL32.glDisableVertexAttribArray(5);
-		
-		profiler.pop();
 	}
 	/** 
 	 * Clean way to handle both {@link GL33#glVertexAttribDivisor} and {@link ARBInstancedArrays#glVertexAttribDivisorARB}
@@ -639,7 +654,7 @@ public class GlGenericObjectRenderer implements IDhGenericRenderer
 	private void renderBoxGroupDirect(
 		IDhApiGenericObjectShaderProgram shaderProgram, 
 		DhApiRenderParam renderEventParam, 
-		RenderableBoxGroup boxGroup, Vec3d camPos,
+		RenderableBoxGroup boxGroup, DhVec3d camPos,
 		IProfilerWrapper profiler)
 	{
 		profiler.popPush("shared uniforms");
@@ -673,8 +688,6 @@ public class GlGenericObjectRenderer implements IDhGenericRenderer
 				break;
 			}
 		}
-		
-		profiler.pop();
 	}
 	
 	//endregion
@@ -735,4 +748,27 @@ public class GlGenericObjectRenderer implements IDhGenericRenderer
 	
 	
 	
+	//================//
+	// base overrides //
+	//================//
+	//region
+	
+	@Override 
+	public void close()
+	{
+		if (this.boxVertexBuffer != null)
+		{
+			this.boxVertexBuffer.close();
+		}
+		
+		if (this.boxIndexBuffer != null)
+		{
+			this.boxIndexBuffer.close();
+		}
+	}
+	
+	//endregion
+	
+	
+	
 }

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/generic/GlGenericObjectShaderProgram.java

@@ -12,8 +12,8 @@ import com.seibel.distanthorizons.common.render.openGl.glObject.vertexAttribute.
 import com.seibel.distanthorizons.common.render.openGl.glObject.vertexAttribute.GlVertexPointer;
 import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper;
 import com.seibel.distanthorizons.core.util.LodUtil;
-import com.seibel.distanthorizons.core.util.math.Mat4f;
+import com.seibel.distanthorizons.core.util.math.DhMat4f;
-import com.seibel.distanthorizons.core.util.math.Vec3f;
+import com.seibel.distanthorizons.core.util.math.DhVec3f;
 
 public class GlGenericObjectShaderProgram extends GlShaderProgram implements IDhApiGenericObjectShaderProgram
 {
@@ -123,7 +123,7 @@ public class GlGenericObjectShaderProgram extends GlShaderProgram implements IDh
 			DhApiVec3d camPos
 		)
 	{
-		Mat4f projectionMvmMatrix = new Mat4f(renderParameters.dhProjectionMatrix);
+		DhMat4f projectionMvmMatrix = new DhMat4f(renderParameters.dhProjectionMatrix);
 		projectionMvmMatrix.multiply(renderParameters.dhModelViewMatrix);
 		
 		super.bind();
@@ -138,7 +138,7 @@ public class GlGenericObjectShaderProgram extends GlShaderProgram implements IDh
 						LodUtil.getChunkPosFromDouble(boxGroup.getOriginBlockPos().z)
 				));
 		this.setUniform(this.instancedShaderOffsetSubChunkUniform,
-				new Vec3f(
+				new DhVec3f(
 						LodUtil.getSubChunkPosFromDouble(boxGroup.getOriginBlockPos().x),
 						LodUtil.getSubChunkPosFromDouble(boxGroup.getOriginBlockPos().y),
 						LodUtil.getSubChunkPosFromDouble(boxGroup.getOriginBlockPos().z)
@@ -151,7 +151,7 @@ public class GlGenericObjectShaderProgram extends GlShaderProgram implements IDh
 						LodUtil.getChunkPosFromDouble(camPos.z)
 				));
 		this.setUniform(this.instancedShaderCameraSubChunkPosUniform,
-				new Vec3f(
+				new DhVec3f(
 						LodUtil.getSubChunkPosFromDouble(camPos.x),
 						LodUtil.getSubChunkPosFromDouble(camPos.y),
 						LodUtil.getSubChunkPosFromDouble(camPos.z)
@@ -201,14 +201,14 @@ public class GlGenericObjectShaderProgram extends GlShaderProgram implements IDh
 			IDhApiRenderableBoxGroup boxGroup, DhApiRenderableBox box, 
 			DhApiVec3d camPos)
 	{
-		Mat4f projectionMvmMatrix = new Mat4f(renderParameters.dhProjectionMatrix);
+		DhMat4f projectionMvmMatrix = new DhMat4f(renderParameters.dhProjectionMatrix);
 		projectionMvmMatrix.multiply(renderParameters.dhModelViewMatrix);
 		
-		Mat4f boxTransform = Mat4f.createTranslateMatrix(
+		DhMat4f boxTransform = DhMat4f.createTranslateMatrix(
 				(float) (box.minPos.x + boxGroup.getOriginBlockPos().x - camPos.x),
 				(float) (box.minPos.y + boxGroup.getOriginBlockPos().y - camPos.y),
 				(float) (box.minPos.z + boxGroup.getOriginBlockPos().z - camPos.z));
-		boxTransform.multiply(Mat4f.createScaleMatrix(
+		boxTransform.multiply(DhMat4f.createScaleMatrix(
 				(float) (box.maxPos.x - box.minPos.x),
 				(float) (box.maxPos.y - box.minPos.y),
 				(float) (box.maxPos.z - box.minPos.z)));

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/generic/GlGenericObjectVertexContainer.java

@@ -105,10 +105,9 @@ public class GlGenericObjectVertexContainer implements IDhGenericObjectVertexBuf
 			
 			this.materialData[i] = box.material;
 		}
-		
-		this.state = GlGenericObjectVertexContainer.EState.READY_TO_UPLOAD;
 	}
 	
+	@Override
 	public void uploadDataToGpu()
 	{
 		this.tryCreateBuffers();
@@ -128,8 +127,6 @@ public class GlGenericObjectVertexContainer implements IDhGenericObjectVertexBuf
 		// Upload materials
 		GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, this.material);
 		GL32.glBufferData(GL32.GL_ARRAY_BUFFER, this.materialData, GL32.GL_DYNAMIC_DRAW);
-		
-		this.state = EState.RENDER;
 	}
 	/** needs to be done on the render thread */
 	private void tryCreateBuffers()

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/GLProxy.java

@@ -21,13 +21,18 @@ package com.seibel.distanthorizons.common.render.openGl.glObject;
 
 import com.seibel.distanthorizons.api.enums.config.EDhApiGLErrorHandlingMode;
 import com.seibel.distanthorizons.api.enums.config.EDhApiGpuUploadMethod;
+import com.seibel.distanthorizons.api.enums.config.EDhApiRenderingApi;
+import com.seibel.distanthorizons.api.enums.config.EDhApiRenderingEngine;
 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.jar.EPlatform;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.util.objects.GLMessages.*;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IIrisAccessor;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.AbstractDhRenderApiDefinition;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import org.lwjgl.glfw.GLFW;
 import org.lwjgl.opengl.GL;
@@ -46,10 +51,33 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class GLProxy
 {
-	public static final DhLogger LOGGER = new DhLoggerBuilder()
+	private static final IIrisAccessor IRIS_ACCESSOR = ModAccessorInjector.INSTANCE.get(IIrisAccessor.class);
-			.fileLevelConfig(Config.Common.Logging.logRendererGLEventToFile)
+	private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
-			.chatLevelConfig(Config.Common.Logging.logRendererGLEventToChat)
+	private static final AbstractDhRenderApiDefinition RENDER_API_DEF = SingletonInjector.INSTANCE.get(AbstractDhRenderApiDefinition.class);
-			.build();
+	
+	
+	public static final DhLogger LOGGER;
+	static
+	{
+		DhLoggerBuilder loggerBuilder = new DhLoggerBuilder();
+		loggerBuilder.fileLevelConfig(Config.Common.Logging.logRendererGLEventToFile);
+		
+		// don't send chat messages if Iris is present since
+		// Iris is known to cause (harmless) GL errors
+		// and this can confuse users
+		boolean irisPresent = (IRIS_ACCESSOR != null);
+		if (!irisPresent)
+		{
+			loggerBuilder.chatLevelConfig(Config.Common.Logging.logRendererGLEventToChat);
+		}
+		
+		LOGGER = loggerBuilder.build();
+		
+		if (irisPresent)
+		{
+			LOGGER.info("Iris detected, Distant Horizons OpenGL error logging won't be sent in the chat due to Iris throwing known (harmless) OpenGL errors. This is a bug with Iris, not Distant Horizons.");
+		}
+	}
 	
 	public static final Set<String> LOGGED_GL_MESSAGES = Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>());
 	
@@ -102,13 +130,22 @@ public class GLProxy
 	
 	private GLProxy() throws IllegalStateException
 	{
+		if (RENDER_API_DEF.getRenderApi() != EDhApiRenderingApi.OPEN_GL)
+		{
+			throw new IllegalStateException("[" + GLProxy.class.getSimpleName() + "] was created with the wrong Rendering API ["+RENDER_API_DEF.getRenderApi()+"]!"); 
+		}
+		
+		
 		// this must be created on minecraft's render context to work correctly
 		if (GLFW.glfwGetCurrentContext() == 0L)
 		{
-			throw new IllegalStateException(GLProxy.class.getSimpleName() + " was created outside the render thread!");
+			String message = "[" + GLProxy.class.getSimpleName() + "] was created outside the render thread!";
+			IllegalStateException exception = new IllegalStateException(message);
+			MC_CLIENT.crashMinecraft(message, exception);
+			throw exception;
 		}
 		
-		LOGGER.info("Creating " + GLProxy.class.getSimpleName() + "... If this is the last message you see there must have been an OpenGL error.");
+		LOGGER.info("Creating [" + GLProxy.class.getSimpleName() + "]... If this is the last message you see there must have been an OpenGL error.");
 		LOGGER.info("Lod Render OpenGL version [" + GL32.glGetString(GL32.GL_VERSION) + "].");
 		
 		
@@ -220,16 +257,7 @@ public class GLProxy
 		return instance;
 	}
 	
-	public EDhApiGpuUploadMethod getGpuUploadMethod() 
+	public EDhApiGpuUploadMethod getGpuUploadMethod() { return this.preferredUploadMethod; }
-	{
-		EDhApiGpuUploadMethod uploadOverride = Config.Client.Advanced.Debugging.OpenGl.glUploadMode.get();
-		if (uploadOverride == EDhApiGpuUploadMethod.AUTO)
-		{
-			return this.preferredUploadMethod;
-		}
-		
-		return uploadOverride;
-	}
 	
 	public static boolean runningOnRenderThread()
 	{
@@ -247,7 +275,7 @@ public class GLProxy
 	//region
 	
 	/** this method is called on the render thread at the point of the GL Error */
-	private static void logMessage(GLMessage msg)
+	private static void logMessage(GLMessage glMessage)
 	{
 		EDhApiGLErrorHandlingMode errorHandlingMode = Config.Client.Advanced.Debugging.OpenGl.glErrorHandlingMode.get();
 		if (errorHandlingMode == EDhApiGLErrorHandlingMode.IGNORE)
@@ -258,19 +286,26 @@ public class GLProxy
 		
 		
 		boolean onlyLogOnce = Config.Client.Advanced.Debugging.OpenGl.onlyLogGlErrorsOnce.get();
-		String errorMessage = "GL ERROR [" + msg.id + "] from [" + msg.source + "]: [" + msg.message + "]"+(onlyLogOnce ? " this message will only be logged once" : "")+".";
 		if (onlyLogOnce
-			&& !LOGGED_GL_MESSAGES.add(errorMessage))
+			&& !LOGGED_GL_MESSAGES.add(glMessage.message))
 		{
 			// this message has already been logged
 			return;
 		}
 		
+		String errorMessage = "GL ERROR [" + glMessage.id + "] from [" + glMessage.source + "]: [" + glMessage.message + "].";
+		if (onlyLogOnce)
+		{
+			errorMessage += " This message will only be logged once.";
+			errorMessage += " Note: Distant Horizons will catch and log OpenGL errors from other mods, not just DH itself; if everything is rendering correctly these errors can probably be ignored.";
+		}
+		
+		
 		
 		// create an exception so we get a stacktrace of where the message was triggered from
 		RuntimeException exception = new RuntimeException(errorMessage);
 		
-		if (msg.type == EGLMessageType.ERROR || msg.type == EGLMessageType.UNDEFINED_BEHAVIOR)
+		if (glMessage.type == EGLMessageType.ERROR || glMessage.type == EGLMessageType.UNDEFINED_BEHAVIOR)
 		{
 			// critical error
 			
@@ -287,7 +322,7 @@ public class GLProxy
 		{
 			// non-critical log
 			
-			EGLMessageSeverity severity = msg.severity;
+			EGLMessageSeverity severity = glMessage.severity;
 			if (severity == null)
 			{
 				// just in case the message was malformed

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/GLState.java

@@ -97,7 +97,9 @@ public class GLState implements AutoCloseable
 		{
 			this.frameBufferTexture0 = GL32.glGetFramebufferAttachmentParameteri(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, GL32.GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME);
 			this.frameBufferTexture1 = GL32.glGetFramebufferAttachmentParameteri(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT1, GL32.GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME);
-			this.frameBufferDepthTexture = GL32.glGetFramebufferAttachmentParameteri(GL32.GL_FRAMEBUFFER, GL32.GL_DEPTH_ATTACHMENT, GL32.GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME);
+			
+			int depthType = GL32.glGetFramebufferAttachmentParameteri(GL32.GL_FRAMEBUFFER, GL32.GL_DEPTH_ATTACHMENT, GL32.GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE);
+			this.frameBufferDepthTexture = (depthType == GL32.GL_TEXTURE) ? GL32.glGetFramebufferAttachmentParameteri(GL32.GL_FRAMEBUFFER, GL32.GL_DEPTH_ATTACHMENT, GL32.GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME) : 0;
 		}
 		else
 		{
@@ -179,9 +181,21 @@ public class GLState implements AutoCloseable
 		// attempting to set textures on the default frame buffer (ID 0) will throw errors
 		if (frameBufferSet)
 		{
-			GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, GL32.GL_TEXTURE_2D, this.frameBufferTexture0, 0);
+			if (GL32.glIsTexture(this.frameBufferTexture0))
-			GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT1, GL32.GL_TEXTURE_2D, this.frameBufferTexture1, 0);
+			{
-			GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_DEPTH_ATTACHMENT, GL32.GL_TEXTURE_2D, this.frameBufferDepthTexture, 0);
+				GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, GL32.GL_TEXTURE_2D, this.frameBufferTexture0, 0);
+			}
+			
+			if (this.frameBufferTexture1 != 0 && GL32.glIsTexture(this.frameBufferTexture1))
+			{
+				GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT1, GL32.GL_TEXTURE_2D, this.frameBufferTexture1, 0);
+			}
+			
+			if (GL32.glIsTexture(this.frameBufferDepthTexture))
+			{
+				GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_DEPTH_ATTACHMENT, GL32.GL_TEXTURE_2D, this.frameBufferDepthTexture, 0);
+			}
+				
 		}
 		
 		GL32.glBindVertexArray(GL32.glIsVertexArray(this.vao) ? this.vao : 0);

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/GlDummyUniformData.java

@@ -9,9 +9,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.ILodCont
  */
 public class GlDummyUniformData implements ILodContainerUniformBufferWrapper
 {
-	@Override public void createUniformData(LodBufferContainer bufferContainer) { }
+	@Override public void tryUpload(LodBufferContainer bufferContainer) { }
-	@Override public void tryUpload() { }
-	@Override public void upload() { }
 	@Override public void close() { }
 	
 }

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/buffer/GLBuffer.java

@@ -23,11 +23,17 @@ import com.seibel.distanthorizons.api.enums.config.EDhApiGpuUploadMethod;
 import com.seibel.distanthorizons.common.render.openGl.glObject.GLProxy;
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftGLWrapper;
 import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.jar.EPlatform;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.logging.f3.F3Screen;
 import com.seibel.distanthorizons.core.render.RenderThreadTaskHandler;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.util.ThreadUtil;
+import com.seibel.distanthorizons.core.util.objects.Pair;
+import com.seibel.distanthorizons.core.util.objects.pooling.PhantomLoggingHelper;
+import com.seibel.distanthorizons.coreapi.ModInfo;
+import com.seibel.distanthorizons.coreapi.util.StringUtil;
 import org.lwjgl.opengl.GL32;
 import org.lwjgl.opengl.GL44;
 
@@ -35,9 +41,12 @@ import java.lang.ref.PhantomReference;
 import java.lang.ref.Reference;
 import java.lang.ref.ReferenceQueue;
 import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.StampedLock;
 
 public class GLBuffer implements AutoCloseable
 {
@@ -49,26 +58,57 @@ public class GLBuffer implements AutoCloseable
 	private static final MinecraftGLWrapper GLMC = MinecraftGLWrapper.INSTANCE;
 	
 	
+	// TODO move to a shared location that can be handled by both GL and Blaze3D buffers
+	/** if enabled the number of GC'ed buffers will be logged */
+	private static final boolean LOG_PHANTOM_RECOVERY = ModInfo.IS_DEV_BUILD;
+	/** If enabled buffers allocation/upload stacks will be logged when GC'ed. */
+	private static final boolean LOG_PHANTOM_ALLOCATION_STACKS = false; // disabled by default due to the increased GC load
+	
 	public static final double BUFFER_EXPANSION_MULTIPLIER = 1.3;
 	public static final double BUFFER_SHRINK_TRIGGER = BUFFER_EXPANSION_MULTIPLIER * BUFFER_EXPANSION_MULTIPLIER;
+
+	/**
+	 * On macOS the legacy OpenGL -> Metal bridge crashes with SIGBUS in
+	 * {@code _platform_memmove} when {@code glBufferData} or {@code glBufferSubData}
+	 * are called with a large ByteBuffer in one shot. To work around it, we split
+	 * the upload into smaller sub-data calls that each fit comfortably inside the
+	 * driver's internal staging path. <br>
+	 * 256 KiB tuned empirically against macOS 26.5 — a 1 MiB chunk still
+	 * tripped the same {@code _platform_memmove} crash inside
+	 * {@code glBufferSubData_Exec}, but 256 KiB consistently survives.
+	 */
+	public static final int MAC_UPLOAD_CHUNK_BYTES = 256 * 1024;
+	/** Threshold above which the chunked path kicks in on macOS. */
+	public static final int MAC_UPLOAD_CHUNK_THRESHOLD = MAC_UPLOAD_CHUNK_BYTES;
 	/** the number of active buffers, can be used for debugging */
 	public static AtomicInteger bufferCount = new AtomicInteger(0);
 	
 	private static final int PHANTOM_REF_CHECK_TIME_IN_MS = 5 * 1000;
 	private static final ConcurrentHashMap<PhantomReference<? extends GLBuffer>, Integer> PHANTOM_TO_BUFFER_ID = new ConcurrentHashMap<>();
 	private static final ConcurrentHashMap<Integer, PhantomReference<? extends GLBuffer>> BUFFER_ID_TO_PHANTOM = new ConcurrentHashMap<>();
+	private static final ConcurrentHashMap<Integer, String> BUFFER_ID_TO_ALLOCATION_STRING = new ConcurrentHashMap<>();
 	private static final ReferenceQueue<GLBuffer> PHANTOM_REFERENCE_QUEUE = new ReferenceQueue<>();
 	private static final ThreadPoolExecutor CLEANUP_THREAD = ThreadUtil.makeSingleDaemonThreadPool("GLBuffer Cleanup");
 	
 	
-	protected int id;
+	protected volatile int id = 0;
 	public final int getId() { return this.id; }
 	protected int size = 0;
 	public int getSize() { return this.size; }
 	protected boolean bufferStorage;
-	public final boolean isBufferStorage() { return this.bufferStorage; }
 	protected boolean isMapped = false;
 	
+	/**
+	 * Locking on the render thread isn't great, but is needed due to an inconsistent
+	 * race condition where VBOs can be marked as deleted outside the render thread. <br><br>
+	 * 
+	 * But, due to being a read-write lock the chance of freezing
+	 * the render thread is very low
+	 * and since this is a stamped lock, the optimistic read time is basically zero.
+	 * (The optimistic lock time doesn't even appear in the profiler).
+	 */
+	public final StampedLock renderStampLock = new StampedLock();
+	
 	
 	
 	//==============//
@@ -78,7 +118,7 @@ public class GLBuffer implements AutoCloseable
 	
 	static { CLEANUP_THREAD.execute(() -> runPhantomReferenceCleanupLoop()); }
 	
-	public GLBuffer(boolean isBufferStorage) { this.create(isBufferStorage); }
+	public GLBuffer(boolean isBufferStorage) { this.destroyOldAndCreate(isBufferStorage); }
 	
 	//endregion
 	
@@ -104,74 +144,126 @@ public class GLBuffer implements AutoCloseable
 	//====================//
 	//region
 	
-	protected void create(boolean asBufferStorage)
+	protected void destroyOldAndCreate(boolean asBufferStorage)
 	{
 		if (!GLProxy.runningOnRenderThread())
 		{
 			LodUtil.assertNotReach("Thread ["+Thread.currentThread()+"] tried to create a GLBuffer outside the MC render thread.");
 		}
 		
-		// destroy the old buffer if one is present
+		
-		// (as of 2024-12-31 James didn't see this happen, but just in case)
+		// lock to prevent the render thread from accessing the buffer's ID
-		if (this.id != 0)
+		// while we are removing it
+		long writeStamp = renderStampLock.writeLock();
+		try
 		{
-			destroyBufferIdAsync(this.id);
+			final int oldId = this.id;
+			this.id = GLMC.glGenBuffers();
+			//LOGGER.info("created [" + newId + "].");
+			
+			// destroy the old buffer
+			// after the new one has been created 
+			// to hopefully prevent a rare race conditions where the old ID
+			// is still used somewhere
+			if (oldId != 0)
+			{
+				// this ID doesn't need to be tracked anymore
+				tryRemoveBufferIdFromPhantom(oldId);
+				destroyBufferIdNow(oldId, "destroyOldAndCreate");
+			}
+			
+			
+			this.bufferStorage = asBufferStorage;
+			bufferCount.getAndIncrement();
+			
+			PhantomReference<GLBuffer> phantom = new PhantomReference<>(this, PHANTOM_REFERENCE_QUEUE);
+			PHANTOM_TO_BUFFER_ID.put(phantom, this.id);
+			BUFFER_ID_TO_PHANTOM.put(this.id, phantom);
+			
+			this.updateAllocationStackTrace();
+		}
+		finally
+		{
+			renderStampLock.unlock(writeStamp);
 		}
-		
-		this.id = GLMC.glGenBuffers();
-		this.bufferStorage = asBufferStorage;
-		bufferCount.getAndIncrement();
-		
-		PhantomReference<GLBuffer> phantom = new PhantomReference<>(this, PHANTOM_REFERENCE_QUEUE);
-		PHANTOM_TO_BUFFER_ID.put(phantom, this.id);
-		BUFFER_ID_TO_PHANTOM.put(this.id, phantom);
-		
 	}
 	
 	protected void destroyAsync()
 	{
-		if (this.id == 0)
+		// lock to prevent the render thread from accessing the buffer's ID
+		// while we are removing it
+		long writeStamp = renderStampLock.writeLock();
+		try
 		{
-			// the buffer has already been closed
+			if (this.id == 0)
+			{
+				// the buffer has already been closed
+				return;
+			}
+			
+			final int idToDelete = this.id; // saving the ID to a separate variable is necessary so it can be captured by the lambda
+			
+			// remove the phantom tracking now so the phantom doesn't have the chance to
+			// get garbage collected before the render thread task runs
+			// (this can happen if MC is running at extremely low framerates like 1 fps via mods)
+			tryRemoveBufferIdFromPhantom(idToDelete);
+			
+			// mark the old data is invalid before deleting to prevent a rare race condition
+			// where the queued on render thread task runs before the ID is cleared
+			this.id = 0;
+			this.size = 0;
+			
+			//LOGGER.info("async destroy [" + idToDelete + "].");
+			RenderThreadTaskHandler.INSTANCE.queueRunningOnRenderThread("GLBuffer destroyAsync", () -> { destroyBufferIdNow(idToDelete, "destroyAsync"); });
+		}
+		finally
+		{
+			renderStampLock.unlock(writeStamp);
+		}
+	}
+	
+	private static void destroyBufferIdNow(int id, String cause)
+	{
+		// only delete valid buffers
+		if (id == 0)
+		{
+			LOGGER.warn("Attempted to destroy a buffer with ID 0, VRAM memory leaks may occur, cause: ["+cause+"].");
 			return;
 		}
 		
-		destroyBufferIdAsync(this.id);
+		bufferCount.decrementAndGet();
+		GLMC.glDeleteBuffers(id);
 		
-		this.id = 0;
+		if (Config.Client.Advanced.Debugging.logBufferGarbageCollection.get())
-		this.size = 0;
-	}
-	private static void destroyBufferIdAsync(int id)
-	{
-		// remove and clear the phantom reference if present
-		if (BUFFER_ID_TO_PHANTOM.containsKey(id))
 		{
-			Reference<? extends GLBuffer> phantom = BUFFER_ID_TO_PHANTOM.get(id);
+			LOGGER.info("destroyed buffer [" + id + "], remaining: [" + BUFFER_ID_TO_PHANTOM.size() + "], cause: ["+cause+"].");
+		}
+	}
 	
+	/** should be called before {@link GLBuffer#destroyBufferIdNow} */
+	private static void tryRemoveBufferIdFromPhantom(int id)
+	{
+		// will contain nothing if stack tracking isn't enabled
+		BUFFER_ID_TO_ALLOCATION_STRING.remove(id);
+		
+		PhantomReference<? extends GLBuffer> phantom = BUFFER_ID_TO_PHANTOM.remove(id);
+		if (phantom != null)
+		{
 			// if we are manually closing this buffer, we don't want the phantom reference to accidentally close it again
 			// this can cause a race condition were we accidentally delete an in-use buffer and cause NVIDIA
 			// to throw an EXCEPTION_ACCESS_VIOLATION when we attempt to render it
 			phantom.clear();
 			
-			PHANTOM_TO_BUFFER_ID.remove(phantom);
+			Integer phantomId = PHANTOM_TO_BUFFER_ID.remove(phantom);
-			BUFFER_ID_TO_PHANTOM.remove(id);
+			if (phantomId == null)
-		}
-		
-		RenderThreadTaskHandler.INSTANCE.queueRunningOnRenderThread(() -> 
-		{
-			// destroy the buffer if it exists,
-			// the buffer may not exist if the destroy method is called twice
-			if (GL32.glIsBuffer(id))
 			{
-				GLMC.glDeleteBuffers(id);
+				LOGGER.warn("No Phantom->ID binding stored for ID ["+id+"]");
-				bufferCount.decrementAndGet();
-				
-				if (Config.Client.Advanced.Debugging.logBufferGarbageCollection.get())
-				{
-					LOGGER.info("destroyed buffer [" + id + "], remaining: [" + BUFFER_ID_TO_PHANTOM.size() + "]");
-				}
 			}
-		});
+		}
+		else
+		{
+			LOGGER.warn("Unable to remove phantom GLBuffer with ID ["+id+"], buffer may have already been deleted.");
+		}
 	}
 	
 	//endregion
@@ -202,36 +294,51 @@ public class GLBuffer implements AutoCloseable
 			return;
 		}
 		
-		// make sure the buffer is ready for uploading
-		this.createOrChangeBufferTypeForUpload(uploadMethod);
 		
-		switch (uploadMethod)
+		
+		// re-binding the old buffers is necessary for old MC versions for the following reasons:
+		// for 16.5 and older the screen may be black when on the home menu
+		// and for 1.19.2 - 1.21.4 the inventory/UI will render without a background
+		int vao = GL32.glGetInteger(GL32.GL_VERTEX_ARRAY_BINDING);
+		int vbo = GL32.glGetInteger(GL32.GL_ARRAY_BUFFER_BINDING);
+		int ebo = GL32.glGetInteger(GL32.GL_ELEMENT_ARRAY_BUFFER_BINDING);
+		
+		try
 		{
-			//case NONE:
+			// make sure the buffer is ready for uploading
-			//	return;
+			this.createOrChangeBufferTypeForUpload(uploadMethod);
-			case AUTO:
+			
-				LodUtil.assertNotReach("GpuUploadMethod AUTO must be resolved before call to uploadBuffer()!");
+			switch (uploadMethod)
-			case BUFFER_STORAGE:
+			{
-				this.uploadBufferStorage(bb, bufferHint);
+				case AUTO:
-				break;
+					LodUtil.assertNotReach("GpuUploadMethod AUTO must be resolved before call to uploadBuffer()!");
-			case DATA:
+				case BUFFER_STORAGE:
-				this.uploadBufferData(bb, bufferHint);
+					this.uploadBufferStorage(bb);
-				break;
+					break;
-			case SUB_DATA:
+				case DATA:
-				this.uploadSubData(bb, maxExpansionSize, bufferHint);
+					this.uploadBufferData(bb, bufferHint);
-				break;
+					break;
-			default:
+				case SUB_DATA:
-				LodUtil.assertNotReach("Unknown GpuUploadMethod!");
+					this.uploadSubData(bb, maxExpansionSize, bufferHint);
+					break;
+				default:
+					LodUtil.assertNotReach("Unknown GpuUploadMethod!");
+			}
+		}
+		finally
+		{
+			GL32.glBindVertexArray(GL32.glIsVertexArray(vao) ? vao : 0);
+			GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, GL32.glIsBuffer(vbo) ? vbo : 0);
+			GL32.glBindBuffer(GL32.GL_ELEMENT_ARRAY_BUFFER, GL32.glIsBuffer(ebo) ? ebo: 0);
 		}
 	}
 	/** Requires the buffer to be bound */
-	protected void uploadBufferStorage(ByteBuffer bb, int bufferStorageHint)
+	protected void uploadBufferStorage(ByteBuffer bb)
 	{
 		LodUtil.assertTrue(this.bufferStorage, "Buffer is not bufferStorage but its trying to use bufferStorage upload method!");
 		
 		int bbSize = bb.limit() - bb.position();
-		this.destroyAsync();
+		this.destroyOldAndCreate(true);
-		this.create(true);
 		this.bind();
 		GL44.glBufferStorage(this.getBufferBindingTarget(), bb, 0);
 		this.size = bbSize;
@@ -242,8 +349,25 @@ public class GLBuffer implements AutoCloseable
 		LodUtil.assertTrue(!this.bufferStorage, "Buffer is bufferStorage but its trying to use bufferData upload method!");
 		
 		int bbSize = bb.limit() - bb.position();
-		GL32.glBufferData(this.getBufferBindingTarget(), bb, bufferDataHint);
+		int target = this.getBufferBindingTarget();
+		
+		if (shouldUploadToGpuInChunks(bbSize))
+		{
+			// Two-step path used on macOS to dodge the Apple OpenGL -> Metal
+			// memmove SIGBUS triggered by uploading a large ByteBuffer in one
+			// glBufferData call:
+			//   1) allocate-only with the size overload (no memcpy)
+			//   2) fill the buffer through chunked glBufferSubData calls
+			GL32.glBufferData(target, (long) bbSize, bufferDataHint);
+			subDataUploadInChunks(target, 0, bb, MAC_UPLOAD_CHUNK_BYTES);
+		}
+		else
+		{
+			GL32.glBufferData(target, bb, bufferDataHint);
+		}
 		this.size = bbSize;
+		
+		this.updateAllocationStackTrace();
 	}
 	/** Requires the buffer to be bound */
 	protected void uploadSubData(ByteBuffer bb, int maxExpansionSize, int bufferDataHint)
@@ -251,14 +375,30 @@ public class GLBuffer implements AutoCloseable
 		LodUtil.assertTrue(!this.bufferStorage, "Buffer is bufferStorage but its trying to use subData upload method!");
 		
 		int bbSize = bb.limit() - bb.position();
+		int target = this.getBufferBindingTarget();
 		if (this.size < bbSize || this.size > bbSize * BUFFER_SHRINK_TRIGGER)
 		{
 			int newSize = (int) (bbSize * BUFFER_EXPANSION_MULTIPLIER);
-			if (newSize > maxExpansionSize) newSize = maxExpansionSize;
+			if (newSize > maxExpansionSize)
-			GL32.glBufferData(this.getBufferBindingTarget(), newSize, bufferDataHint);
+			{
+				newSize = maxExpansionSize;
+			}
+			
+			// allocate-only — no memcpy, safe on macOS regardless of size
+			GL32.glBufferData(target, (long) newSize, bufferDataHint);
 			this.size = newSize;
 		}
-		GL32.glBufferSubData(this.getBufferBindingTarget(), 0, bb);
+		
+		if (shouldUploadToGpuInChunks(bbSize))
+		{
+			subDataUploadInChunks(target, 0, bb, MAC_UPLOAD_CHUNK_BYTES);
+		}
+		else
+		{
+			GL32.glBufferSubData(target, 0, bb);
+		}
+		
+		this.updateAllocationStackTrace();
 	}
 	
 	//endregion
@@ -300,8 +440,7 @@ public class GLBuffer implements AutoCloseable
 		{
 			// recreate if the buffer storage type changed
 			this.bind();
-			this.destroyAsync();
+			this.destroyOldAndCreate(uploadMethod.useBufferStorage);
-			this.create(uploadMethod.useBufferStorage);
 			this.bind();
 		}
 		else
@@ -310,13 +449,98 @@ public class GLBuffer implements AutoCloseable
 			// This can happen if the buffer was deleted previously.
 			if (this.id == 0)
 			{
-				this.create(this.bufferStorage);
+				this.destroyOldAndCreate(this.bufferStorage);
 			}
 			
 			this.bind();
 		}
 	}
 	
+	/**
+	 * macOS-only mitigation for the SIGBUS in
+	 * {@code libsystem_platform.dylib _platform_memmove} that happens when the
+	 * Apple OpenGL -> Metal translation layer copies a single large ByteBuffer
+	 * out of LWJGL into driver memory. Splitting the copy into
+	 * {@link #MAC_UPLOAD_CHUNK_BYTES} slices keeps every memmove inside a size
+	 * the bridge handles reliably.
+	 */
+	private static boolean shouldUploadToGpuInChunks(int byteCount)
+	{
+		return EPlatform.get() == EPlatform.MACOS
+			&& byteCount > MAC_UPLOAD_CHUNK_THRESHOLD;
+	}
+	
+	/**
+	 * Uploads {@code bb} into the currently bound buffer at {@code baseOffset}
+	 * using a sequence of {@link GL32#glBufferSubData(int, long, ByteBuffer)}
+	 * calls of at most {@code chunkBytes} each. The buffer's position/limit are
+	 * restored before returning.
+	 */
+	private static void subDataUploadInChunks(int target, int baseOffset, ByteBuffer bb, int chunkBytes)
+	{
+		final int origPos = bb.position();
+		final int origLimit = bb.limit();
+		try
+		{
+			final int total = origLimit - origPos;
+			int uploaded = 0;
+			while (uploaded < total)
+			{
+				int chunk = Math.min(chunkBytes, total - uploaded);
+				bb.position(origPos + uploaded);
+				bb.limit(origPos + uploaded + chunk);
+				GL32.glBufferSubData(target, (long) (baseOffset + uploaded), bb);
+				uploaded += chunk;
+				// Force the driver to drain its command queue between chunks
+				// so the OpenGL -> Metal bridge processes (and frees) each
+				// staging copy before the next sub-data call piles another
+				// memmove on top of it.
+				if (uploaded < total)
+				{
+					GL32.glFlush();
+				}
+			}
+		}
+		finally
+		{
+			bb.limit(origLimit);
+			bb.position(origPos);
+		}
+	}
+	
+	/** 
+	 * used to help track down leaks where the buffer isn't properly closed
+	 * Note: this probably needs extending to accept a stack trace from outside where it's being called
+	 * since it's often called on the render thread in an un-helpful location.
+	 */
+	public void updateAllocationStackTrace()
+	{
+		if (LOG_PHANTOM_ALLOCATION_STACKS)
+		{
+			String stack;
+			
+			RenderThreadTaskHandler.QueuedRunnable parentQueuedRunnable;
+			// if this is running on the render thread, try getting the render task's stack trace instead
+			// since it's a lot more helpful than wherever the render thread tasks themselves are being run from
+			if (RenderThreadTaskHandler.INSTANCE.isCurrentThread()
+				&& (parentQueuedRunnable = RenderThreadTaskHandler.INSTANCE.getCurrentlyRunningTask()) != null
+				&& parentQueuedRunnable.stackTrace != null)
+			{
+				// trim off the getStacktrace() and queueRunningOnRenderThread() methods
+				StackTraceElement[] trimmedElements = Arrays.copyOfRange(parentQueuedRunnable.stackTrace, 2, parentQueuedRunnable.stackTrace.length);
+				stack = StringUtil.join("\n", trimmedElements).intern();
+			}
+			else
+			{
+				// not running on the render thread, use the normal stack trace
+				StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
+				stack = StringUtil.join("\n", stackTraceElements).intern();
+			}
+			
+			BUFFER_ID_TO_ALLOCATION_STRING.put(this.id, stack);
+		}
+	}
+	
 	//endregion
 	
 	
@@ -328,8 +552,13 @@ public class GLBuffer implements AutoCloseable
 	
 	private static void runPhantomReferenceCleanupLoop()
 	{
+		// these arrays are stored here so they don't have to be re-allocated each loop
+		ArrayList<Pair<String, AtomicInteger>> allocationStackTraceCountPairList = new ArrayList<>();
+		
 		while (true)
 		{
+			allocationStackTraceCountPairList.clear();
+			
 			try
 			{
 				try
@@ -338,20 +567,53 @@ public class GLBuffer implements AutoCloseable
 				}
 				catch (InterruptedException ignore) { }
 				
+				int collectedCount = 0;
 				
 				Reference<? extends GLBuffer> phantomRef = PHANTOM_REFERENCE_QUEUE.poll();
 				while (phantomRef != null)
 				{
 					// destroy the buffer if it hasn't been cleared yet
-					if (PHANTOM_TO_BUFFER_ID.containsKey(phantomRef))
+					Integer idRef = PHANTOM_TO_BUFFER_ID.remove((PhantomReference<? extends GLBuffer>)phantomRef); // cast to make IntelliJ happy
+					if (idRef != null)
 					{
-						int id = PHANTOM_TO_BUFFER_ID.get(phantomRef);
+						BUFFER_ID_TO_PHANTOM.remove(idRef);
-						destroyBufferIdAsync(id);
+						final int id = idRef;
-						//LOGGER.warn("Buffer Phantom collected, ID: ["+id+"]");
+						RenderThreadTaskHandler.INSTANCE.queueRunningOnRenderThread("GLBuffer phantom destroy", () -> { destroyBufferIdNow(id, "runPhantomReferenceCleanupLoop"); });
+						//LOGGER.info("Buffer Phantom collected, ID: ["+id+"]");
+						
+						if (LOG_PHANTOM_ALLOCATION_STACKS) // stack trace shouldn't be null, but just in case
+						{
+							String stack = BUFFER_ID_TO_ALLOCATION_STRING.get(idRef);
+							PhantomLoggingHelper.putAndIncrementTrackingString(stack, allocationStackTraceCountPairList);
+						}
+					}
+					else
+					{
+						LOGGER.warn("Failed to find Buffer ID for phantom reference: ["+phantomRef+"]");
 					}
 					
+					
+					collectedCount++;
 					phantomRef = PHANTOM_REFERENCE_QUEUE.poll();
 				}
+				
+				
+				
+				if (LOG_PHANTOM_RECOVERY)
+				{
+					// we only want to log when something has been returned
+					if (collectedCount != 0)
+					{
+						LOGGER.warn("GLBuffer phantom recovered: ["+ F3Screen.NUMBER_FORMAT.format(collectedCount)+"].");
+						
+						// log stack traces if present
+						if (LOG_PHANTOM_ALLOCATION_STACKS)
+						{
+							PhantomLoggingHelper.LogAllocationStackTracePairCounts(LOGGER, allocationStackTraceCountPairList);
+						}
+					}
+				}
+				
 			}
 			catch (Exception e)
 			{

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/buffer/GLIndexBuffer.java

@@ -22,27 +22,26 @@ package com.seibel.distanthorizons.common.render.openGl.glObject.buffer;
 import org.lwjgl.opengl.GL32;
 
 /**
- * This is a container for a OpenGL
+ * AKA the GLElementBuffer
- * VBO (Vertex Buffer Object).
  *
  * @author James Seibel
  * @version 11-20-2021
  */
-public class GLElementBuffer extends GLBuffer
+public class GLIndexBuffer extends GLBuffer
 {
 	/**
 	 * When uploading to a buffer that is too small, recreate it this many times
 	 * bigger than the upload payload
 	 */
 	protected int indicesCount = 0;
-	public int getIndicesCount() { return this.indicesCount; }
+	protected int glType = GL32.GL_UNSIGNED_INT;
-	protected int type = GL32.GL_UNSIGNED_INT;
+	public int getGlType() { return this.glType; }
-	public int getType() { return type; }
+	
+	
+	
+	public GLIndexBuffer(boolean isBufferStorage) { super(isBufferStorage); }
+	
 	
-	public GLElementBuffer(boolean isBufferStorage)
-	{
-		super(isBufferStorage);
-	}
 	
 	@Override
 	public void destroyAsync()
@@ -52,9 +51,6 @@ public class GLElementBuffer extends GLBuffer
 	}
 	
 	@Override
-	public int getBufferBindingTarget()
+	public int getBufferBindingTarget() { return GL32.GL_ELEMENT_ARRAY_BUFFER; }
-	{
-		return GL32.GL_ELEMENT_ARRAY_BUFFER;
-	}
 	
 }

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/buffer/GLVertexBuffer.java

@@ -22,7 +22,11 @@ package com.seibel.distanthorizons.common.render.openGl.glObject.buffer;
 import java.nio.ByteBuffer;
 
 import com.seibel.distanthorizons.common.render.openGl.glObject.GLProxy;
+import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.IndexBufferBuilder;
 import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodQuadBuilder;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.render.RenderThreadTaskHandler;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.AbstractDhRenderApiDefinition;
 import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.IVertexBufferWrapper;
 import org.lwjgl.opengl.GL32;
 
@@ -37,6 +41,8 @@ import com.seibel.distanthorizons.api.enums.config.EDhApiGpuUploadMethod;
  */
 public class GLVertexBuffer extends GLBuffer implements IVertexBufferWrapper
 {
+	private static final AbstractDhRenderApiDefinition RENDER_DEF = SingletonInjector.INSTANCE.get(AbstractDhRenderApiDefinition.class);
+	
 	/**
 	 * When uploading to a buffer that is too small, recreate it this many times
 	 * bigger than the upload payload
@@ -45,12 +51,45 @@ public class GLVertexBuffer extends GLBuffer implements IVertexBufferWrapper
 	public int getVertexCount() { return this.vertexCount; }
 	
 	
+	private GlQuadIndexBuffer quadIBO = null;
+	private static GlQuadIndexBuffer GLOBAL_QUAD_IBO = null;
+	public GlQuadIndexBuffer getQuadIBO()
+	{
+		if (RENDER_DEF.useSingleIbo())
+		{
+			return GLOBAL_QUAD_IBO;
+		}
+		else
+		{
+			return this.quadIBO;
+		}
+	}
+	
+	
 	
 	//=============//
 	// constructor //
 	//=============//
 	//region
 	
+	static
+	{
+		if (RENDER_DEF.useSingleIbo())
+		{
+			RenderThreadTaskHandler.INSTANCE.queueRunningOnRenderThread("Global IBO Creation", () ->
+			{
+				GLOBAL_QUAD_IBO = new GlQuadIndexBuffer();
+				
+				int maxSize = LodQuadBuilder.getMaxBufferByteSize();
+				int maxVertexCount = maxSize / LodQuadBuilder.BYTES_PER_VERTEX;
+				int maxQuadCount = (maxVertexCount / 4);
+				
+				ByteBuffer buffer = IndexBufferBuilder.createBuffer(maxQuadCount);
+				GLOBAL_QUAD_IBO.upload(buffer, maxQuadCount);
+			});
+		}
+	}
+	
 	public GLVertexBuffer() { this(GLProxy.getInstance().getGpuUploadMethod() == EDhApiGpuUploadMethod.BUFFER_STORAGE); }
 	public GLVertexBuffer(boolean isBufferStorage) { super(isBufferStorage); }
 	
@@ -67,7 +106,7 @@ public class GLVertexBuffer extends GLBuffer implements IVertexBufferWrapper
 	public int getBufferBindingTarget() { return GL32.GL_ARRAY_BUFFER; }
 	
 	@Override
-	public void upload(ByteBuffer buffer, int vertexCount)
+	public void uploadVertexBuffer(ByteBuffer buffer, int vertexCount)
 	{
 		EDhApiGpuUploadMethod uploadMethod = GLProxy.getInstance().getGpuUploadMethod();
 		int maxBufferSize = LodQuadBuilder.getMaxBufferByteSize();
@@ -89,19 +128,60 @@ public class GLVertexBuffer extends GLBuffer implements IVertexBufferWrapper
 		// If size is zero, just ignore it.
 		if (byteBuffer.limit() - byteBuffer.position() != 0)
 		{
-			boolean useBuffStorage = uploadMethod.useBufferStorage;
+			super.uploadBuffer(byteBuffer, uploadMethod, maxExpansionSize, uploadMethod.useBufferStorage ? 0 : GL32.GL_STATIC_DRAW);
-			super.uploadBuffer(byteBuffer, uploadMethod, maxExpansionSize, useBuffStorage ? 0 : GL32.GL_STATIC_DRAW);
 		}
+		
 		this.vertexCount = vertexCount;
 	}
 	
 	
+	@Override
+	public void uploadIndexBuffer(ByteBuffer buffer, int vertexCount)
+	{
+		if (RENDER_DEF.useSingleIbo())
+		{
+			// ignore index uploading when running a single IBO
+			return;
+		}
+		
+		// If size is zero, just ignore it.
+		if (vertexCount == 0)
+		{
+			return;
+		}
+		
+		
+		
+		if (this.quadIBO != null)
+		{
+			this.quadIBO.close();
+		}
+		
+		this.quadIBO = new GlQuadIndexBuffer();
+		
+		int quadCount = (vertexCount / 4);
+		this.quadIBO.upload(buffer, quadCount);
+	}
+	
+	//endregion
+	
+	
+	
+	//================//
+	// base overrides //
+	//================//
+	//region
+	
 	@Override
 	public void close() { this.destroyAsync(); }
 	@Override
 	public void destroyAsync()
 	{
 		super.destroyAsync();
+		if (this.quadIBO != null)
+		{
+			this.quadIBO.destroyAsync();
+		}
 		this.vertexCount = 0;
 	}
 	

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/buffer/GlQuadElementBuffer.java

@@ -1,192 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.render.openGl.glObject.buffer;
-
-import com.seibel.distanthorizons.api.enums.config.EDhApiGpuUploadMethod;
-import com.seibel.distanthorizons.common.render.openGl.glObject.enums.GLEnums;
-import com.seibel.distanthorizons.core.logging.DhLogger;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import org.lwjgl.opengl.GL32;
-import org.lwjgl.system.MemoryUtil;
-
-import java.nio.ByteBuffer;
-
-/** AKA Index Buffer TODO RENAME */
-public class GlQuadElementBuffer extends GLElementBuffer
-{
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	//region
-	
-	public GlQuadElementBuffer() { super(false); }
-	
-	public void reserve(int quadCount)
-	{
-		if (quadCount < 0)
-		{
-			throw new IllegalArgumentException("quadCount must be greater than 0");
-		}
-		if (quadCount == 0)
-		{
-			// shouldn't happen, but just in case
-			return;
-		}
-		
-		this.indicesCount = quadCount * 6; // 2 triangles per quad
-		if (this.indicesCount >= this.getCapacity()
-			&& this.indicesCount < this.getCapacity() * BUFFER_SHRINK_TRIGGER)
-		{
-			return;
-		}
-		int vertexCount = quadCount * 4; // 4 vertices per quad
-		
-		if (vertexCount < 255)
-		{
-			// Reserve 1 for the reset index
-			this.type = GL32.GL_UNSIGNED_BYTE;
-		}
-		else if (vertexCount < 65535)
-		{
-			// Reserve 1 for the reset index
-			this.type = GL32.GL_UNSIGNED_SHORT;
-		}
-		else
-		{
-			this.type = GL32.GL_UNSIGNED_INT;
-		}
-		
-		ByteBuffer buffer = MemoryUtil.memAlloc(this.indicesCount * GLEnums.getTypeSize(this.type));
-		buildBuffer(quadCount, buffer, this.type);
-		this.bind();
-		super.uploadBuffer(buffer, EDhApiGpuUploadMethod.DATA,
-			this.indicesCount * GLEnums.getTypeSize(this.type), GL32.GL_STATIC_DRAW);
-		
-		MemoryUtil.memFree(buffer);
-	}
-	
-	//endregion
-	
-	
-	
-	//=========//
-	// getters //
-	//=========//
-	//region
-	
-	public int getCapacity() { return super.getSize() / GLEnums.getTypeSize(this.getType()); }
-	
-	//endregion
-	
-	
-	
-	//==========//
-	// building //
-	//==========//
-	//region
-	
-	public static void buildBuffer(int quadCount, ByteBuffer buffer, int type)
-	{
-		switch (type)
-		{
-			case GL32.GL_UNSIGNED_BYTE:
-				buildBufferByte(quadCount, buffer);
-				break;
-			case GL32.GL_UNSIGNED_SHORT:
-				buildBufferShort(quadCount, buffer);
-				break;
-			case GL32.GL_UNSIGNED_INT:
-				buildBufferInt(quadCount, buffer);
-				break;
-			default:
-				throw new IllegalStateException("Unknown buffer type: [" + type + "].");
-		}
-	}
-	
-	private static void buildBufferByte(int quadCount, ByteBuffer buffer)
-	{
-		for (int i = 0; i < quadCount; i++)
-		{
-			int vIndex = i * 4;
-			// First triangle
-			buffer.put((byte) (vIndex));
-			buffer.put((byte) (vIndex + 1));
-			buffer.put((byte) (vIndex + 2));
-			// Second triangle
-			buffer.put((byte) (vIndex + 2));
-			buffer.put((byte) (vIndex + 3));
-			buffer.put((byte) (vIndex));
-		}
-		if (buffer.hasRemaining())
-		{
-			throw new IllegalStateException("QuadElementBuffer is not full somehow after building");
-		}
-		buffer.rewind();
-	}
-	private static void buildBufferShort(int quadCount, ByteBuffer buffer)
-	{
-		for (int i = 0; i < quadCount; i++)
-		{
-			int vIndex = i * 4;
-			// First triangle
-			buffer.putShort((short) (vIndex));
-			buffer.putShort((short) (vIndex + 1));
-			buffer.putShort((short) (vIndex + 2));
-			// Second triangle
-			buffer.putShort((short) (vIndex + 2));
-			buffer.putShort((short) (vIndex + 3));
-			buffer.putShort((short) (vIndex));
-		}
-		if (buffer.hasRemaining())
-		{
-			throw new IllegalStateException("QuadElementBuffer is not full somehow after building");
-		}
-		buffer.rewind();
-	}
-	private static void buildBufferInt(int quadCount, ByteBuffer buffer)
-	{
-		for (int i = 0; i < quadCount; i++)
-		{
-			int vIndex = i * 4;
-			// First triangle
-			buffer.putInt(vIndex);
-			buffer.putInt(vIndex + 1);
-			buffer.putInt(vIndex + 2);
-			// Second triangle
-			buffer.putInt(vIndex + 2);
-			buffer.putInt(vIndex + 3);
-			buffer.putInt(vIndex);
-		}
-		if (buffer.hasRemaining())
-		{
-			throw new IllegalStateException("QuadElementBuffer is not full somehow after building");
-		}
-		buffer.rewind();
-	}
-	
-	//endregion
-	
-	
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/buffer/GlQuadIndexBuffer.java

@@ -0,0 +1,83 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.common.render.openGl.glObject.buffer;
+
+import com.seibel.distanthorizons.api.enums.config.EDhApiGpuUploadMethod;
+import com.seibel.distanthorizons.common.render.openGl.glObject.enums.GLEnums;
+import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import org.lwjgl.opengl.GL32;
+
+import java.nio.ByteBuffer;
+
+/** aka GlQuadElementBuffer */
+public class GlQuadIndexBuffer extends GLIndexBuffer
+{
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	//region
+	
+	public GlQuadIndexBuffer() { super(false); }
+	
+	public void upload(ByteBuffer buffer, int quadCount)
+	{
+		if (quadCount < 0)
+		{
+			throw new IllegalArgumentException("quadCount must be greater than 0");
+		}
+		if (quadCount == 0)
+		{
+			// shouldn't happen, but just in case
+			return;
+		}
+		
+		this.indicesCount = quadCount * 6; // 2 triangles per quad
+		if (this.indicesCount >= this.getCapacity()
+			&& this.indicesCount < this.getCapacity() * BUFFER_SHRINK_TRIGGER)
+		{
+			return;
+		}
+		
+		this.glType = GL32.GL_UNSIGNED_INT;
+		super.uploadBuffer(buffer, EDhApiGpuUploadMethod.DATA,
+			this.indicesCount * GLEnums.getTypeSize(this.glType), GL32.GL_STATIC_DRAW);
+	}
+	
+	//endregion
+	
+	
+	
+	//=========//
+	// getters //
+	//=========//
+	//region
+	
+	public int getCapacity() { return super.getSize() / GLEnums.getTypeSize(this.getGlType()); }
+	
+	//endregion
+	
+	
+	
+}

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/glObject/shader/GlShaderProgram.java

@@ -22,12 +22,13 @@ package com.seibel.distanthorizons.common.render.openGl.glObject.shader;
 import java.awt.Color;
 import java.nio.FloatBuffer;
 
+import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
 import com.seibel.distanthorizons.api.objects.math.DhApiVec3i;
 import org.lwjgl.opengl.GL32;
 import org.lwjgl.system.MemoryStack;
 
-import com.seibel.distanthorizons.core.util.math.Mat4f;
+import com.seibel.distanthorizons.core.util.math.DhMat4f;
-import com.seibel.distanthorizons.core.util.math.Vec3f;
+import com.seibel.distanthorizons.core.util.math.DhVec3f;
 
 
 /**
@@ -181,27 +182,51 @@ public class GlShaderProgram
 	public void trySetUniform(int location, float value) { if (location != -1) { this.setUniform(location, value); } }
 	
 	/** Requires a bound ShaderProgram. */
-	public void setUniform(int location, Vec3f value) { GL32.glUniform3f(location, value.x, value.y, value.z); }
+	public void setUniform(int location, DhVec3f value) { GL32.glUniform3f(location, value.x, value.y, value.z); }
-	/** @see GlShaderProgram#setUniform(int, Vec3f) */
+	/** @see GlShaderProgram#setUniform(int, DhVec3f) */
-	public void trySetUniform(int location, Vec3f value) { if (location != -1) { this.setUniform(location, value); } }
+	public void trySetUniform(int location, DhVec3f value) { if (location != -1) { this.setUniform(location, value); } }
 	
 	/** Requires a bound ShaderProgram. */
 	public void setUniform(int location, DhApiVec3i value) { GL32.glUniform3i(location, value.x, value.y, value.z); }
-	/** @see GlShaderProgram#setUniform(int, Mat4f) */
+	/** @see GlShaderProgram#setUniform(int, DhApiMat4f) */
 	public void trySetUniform(int location, DhApiVec3i value) { if (location != -1) { this.setUniform(location, value); } }
 	
 	/** Requires a bound ShaderProgram. */
-	public void setUniform(int location, Mat4f value)
+	public void setUniform(int location, DhApiMat4f value)
 	{
 		try (MemoryStack stack = MemoryStack.stackPush())
 		{
-			FloatBuffer buffer = stack.mallocFloat(4 * 4);
+			FloatBuffer buffer = stack.mallocFloat(16);
-			value.store(buffer);
+			storeMatrixInBuffer(value, buffer);
 			GL32.glUniformMatrix4fv(location, false, buffer);
 		}
 	}
-	/** @see GlShaderProgram#setUniform(int, Mat4f) */
+	private static void storeMatrixInBuffer(DhApiMat4f matrix, FloatBuffer floatBuffer)
-	public void trySetUniform(int location, Mat4f value) { if (location != -1) { this.setUniform(location, value); } }
+	{
+		floatBuffer.put(bufferIndex(0, 0), matrix.m00);
+		floatBuffer.put(bufferIndex(0, 1), matrix.m01);
+		floatBuffer.put(bufferIndex(0, 2), matrix.m02);
+		floatBuffer.put(bufferIndex(0, 3), matrix.m03);
+		
+		floatBuffer.put(bufferIndex(1, 0), matrix.m10);
+		floatBuffer.put(bufferIndex(1, 1), matrix.m11);
+		floatBuffer.put(bufferIndex(1, 2), matrix.m12);
+		floatBuffer.put(bufferIndex(1, 3), matrix.m13);
+		
+		floatBuffer.put(bufferIndex(2, 0), matrix.m20);
+		floatBuffer.put(bufferIndex(2, 1), matrix.m21);
+		floatBuffer.put(bufferIndex(2, 2), matrix.m22);
+		floatBuffer.put(bufferIndex(2, 3), matrix.m23);
+		
+		floatBuffer.put(bufferIndex(3, 0), matrix.m30);
+		floatBuffer.put(bufferIndex(3, 1), matrix.m31);
+		floatBuffer.put(bufferIndex(3, 2), matrix.m32);
+		floatBuffer.put(bufferIndex(3, 3), matrix.m33);
+	}
+	private static int bufferIndex(int xIndex, int zIndex) { return (zIndex * 4) + xIndex; }
+	
+	/** @see GlShaderProgram#setUniform(int, DhApiMat4f) */
+	public void trySetUniform(int location, DhMat4f value) { if (location != -1) { this.setUniform(location, value); } }
 	
 	/**
 	 * Converts the color's RGBA values into values between 0 and 1. <br>

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/GlScreenQuad.java

@@ -24,9 +24,9 @@ import com.seibel.distanthorizons.common.render.openGl.glObject.buffer.GLVertexB
 import com.seibel.distanthorizons.common.render.openGl.glObject.vertexAttribute.GlAbstractVertexAttribute;
 import com.seibel.distanthorizons.common.render.openGl.glObject.vertexAttribute.GlVertexPointer;
 import org.lwjgl.opengl.GL32;
-import org.lwjgl.system.MemoryUtil;
 
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 
 /**
  * Renders a full-screen textured quad to the screen. 
@@ -76,14 +76,14 @@ public class GlScreenQuad
 	}
 	private void createBuffer()
 	{
-		ByteBuffer buffer = MemoryUtil.memAlloc(BOX_VERTICES.length * Float.BYTES);
+		ByteBuffer buffer = ByteBuffer.allocateDirect(BOX_VERTICES.length * Float.BYTES);
+		buffer.order(ByteOrder.nativeOrder());
 		buffer.asFloatBuffer().put(BOX_VERTICES);
 		buffer.rewind();
 		
 		this.boxBuffer = new GLVertexBuffer(false);
 		this.boxBuffer.bind();
 		this.boxBuffer.uploadBuffer(buffer, BOX_VERTICES.length, EDhApiGpuUploadMethod.DATA, BOX_VERTICES.length * Float.BYTES);
-		MemoryUtil.memFree(buffer);
 	}
 	
 	//endregion

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/apply/GlDhApplyShader.java

@@ -57,7 +57,7 @@ public class GlDhApplyShader extends GlAbstractShaderRenderer
 	public void onInit()
 	{
 		this.shader = new GlShaderProgram(
-			"assets/distanthorizons/shaders/shared/gl/quadApply.vert",
+			"assets/distanthorizons/shaders/shared/gl/quad_apply.vert",
 			"assets/distanthorizons/shaders/shared/gl/apply.frag",
 			"vPosition"
 		);
@@ -132,7 +132,7 @@ public class GlDhApplyShader extends GlAbstractShaderRenderer
 	}
 	private void renderToMcTexture()
 	{
-		int targetColorTextureId = MC_RENDER.getColorTextureId();
+		int targetColorTextureId = MC_RENDER.getGlColorTextureId();
 		if (targetColorTextureId == -1)
 		{
 			return;

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhFarFadeApplyShader.java

@@ -59,7 +59,7 @@ public class GlDhFarFadeApplyShader extends GlAbstractShaderRenderer
 	public void onInit()
 	{
 		this.shader = new GlShaderProgram(
-			"assets/distanthorizons/shaders/shared/gl/quadApply.vert",
+			"assets/distanthorizons/shaders/shared/gl/quad_apply.vert",
 			"assets/distanthorizons/shaders/fade/gl/apply.frag",
 			"vPosition"
 		);

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhFarFadeRenderer.java

@@ -122,8 +122,6 @@ public class GlDhFarFadeRenderer implements IDhFarFadeRenderer
 	{
 		try
 		{
-			//profiler.push("Fade Generate");
-			
 			this.init();
 			
 			// resize the framebuffer if necessary
@@ -138,11 +136,9 @@ public class GlDhFarFadeRenderer implements IDhFarFadeRenderer
 			
 			
 			GlDhFarFadeShader.INSTANCE.frameBuffer = this.fadeFramebuffer;
-			GlDhFarFadeShader.INSTANCE.setProjectionMatrix(renderParams.mcModelViewMatrix, renderParams.mcProjectionMatrix);
+			GlDhFarFadeShader.INSTANCE.setProjectionMatrix(renderParams);
 			GlDhFarFadeShader.INSTANCE.render(renderParams);
 			
-			//profiler.popPush("Fade Apply");
-			
 			GlDhFarFadeApplyShader.INSTANCE.fadeTexture = this.fadeTexture;
 			GlDhFarFadeApplyShader.INSTANCE.readFramebuffer = GlDhFarFadeShader.INSTANCE.frameBuffer;
 			GlDhFarFadeApplyShader.INSTANCE.drawFramebuffer = GlDhMetaRenderer.INSTANCE.getActiveFramebufferId();
@@ -152,10 +148,6 @@ public class GlDhFarFadeRenderer implements IDhFarFadeRenderer
 		{
 			LOGGER.error("Unexpected error during fade render, error: ["+e.getMessage()+"].", e);
 		}
-		finally
-		{
-			//profiler.pop();
-		}
 	}
 	
 	//emdregion

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhFarFadeShader.java

@@ -28,7 +28,6 @@ import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.common.render.openGl.util.GlAbstractShaderRenderer;
 import com.seibel.distanthorizons.core.render.RenderParams;
 import com.seibel.distanthorizons.core.util.RenderUtil;
-import com.seibel.distanthorizons.core.util.math.Mat4f;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import org.lwjgl.opengl.GL32;
 
@@ -42,7 +41,7 @@ public class GlDhFarFadeShader extends GlAbstractShaderRenderer
 	
 	public int frameBuffer = -1;
 	
-	private Mat4f inverseDhMvmProjMatrix;
+	private DhApiMat4f inverseDhMvmProjMatrix;
 	
 	
 	// Uniforms
@@ -69,8 +68,8 @@ public class GlDhFarFadeShader extends GlAbstractShaderRenderer
 	public void onInit()
 	{
 		this.shader = new GlShaderProgram(
-			"assets/distanthorizons/shaders/shared/gl/quadApply.vert",
+			"assets/distanthorizons/shaders/shared/gl/quad_apply.vert",
-			"assets/distanthorizons/shaders/fade/gl/dhFade.frag",
+			"assets/distanthorizons/shaders/fade/gl/dh_fade.frag",
 			"vPosition"
 		);
 		
@@ -110,15 +109,9 @@ public class GlDhFarFadeShader extends GlAbstractShaderRenderer
 		
 	}
 	
-	public void setProjectionMatrix(DhApiMat4f mcModelViewMatrix, DhApiMat4f mcProjectionMatrix)
+	public void setProjectionMatrix(RenderParams renderParams)
 	{
-		Mat4f dhProjectionMatrix = RenderUtil.createLodProjectionMatrix(mcProjectionMatrix);
+		this.inverseDhMvmProjMatrix = renderParams.dhInverseMvmProjectionMatrix;
-		Mat4f dhModelViewMatrix = RenderUtil.createLodModelViewMatrix(mcModelViewMatrix);
-		
-		Mat4f inverseDhModelViewProjectionMatrix = new Mat4f(dhProjectionMatrix);
-		inverseDhModelViewProjectionMatrix.multiply(dhModelViewMatrix);
-		inverseDhModelViewProjectionMatrix.invert();
-		this.inverseDhMvmProjMatrix = inverseDhModelViewProjectionMatrix;
 	}
 	
 	
@@ -153,7 +146,7 @@ public class GlDhFarFadeShader extends GlAbstractShaderRenderer
 		GL32.glUniform1i(this.uDhDepthTexture, 0);
 		
 		GLMC.glActiveTexture(GL32.GL_TEXTURE1);
-		GLMC.glBindTexture(MC_RENDER.getColorTextureId());
+		GLMC.glBindTexture(MC_RENDER.getGlColorTextureId());
 		GL32.glUniform1i(this.uMcColorTexture, 1);
 		
 		GLMC.glActiveTexture(GL32.GL_TEXTURE2);

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlDhVanillaFadeShader.java

@@ -29,7 +29,6 @@ import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.common.render.openGl.util.GlAbstractShaderRenderer;
 import com.seibel.distanthorizons.core.render.RenderParams;
 import com.seibel.distanthorizons.core.util.RenderUtil;
-import com.seibel.distanthorizons.core.util.math.Mat4f;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import org.lwjgl.opengl.GL32;
 
@@ -43,8 +42,8 @@ public class GlDhVanillaFadeShader extends GlAbstractShaderRenderer
 	
 	public int frameBuffer = -1;
 	
-	private Mat4f inverseMcMvmProjMatrix;
+	private DhApiMat4f inverseMcMvmProjMatrix;
-	private Mat4f inverseDhMvmProjMatrix;
+	private DhApiMat4f inverseDhMvmProjMatrix;
 	private float levelMaxHeight;
 	
 	
@@ -77,8 +76,8 @@ public class GlDhVanillaFadeShader extends GlAbstractShaderRenderer
 	public void onInit()
 	{
 		this.shader = new GlShaderProgram(
-			"assets/distanthorizons/shaders/shared/gl/quadApply.vert",
+			"assets/distanthorizons/shaders/shared/gl/quad_apply.vert",
-			"assets/distanthorizons/shaders/fade/gl/vanillaFade.frag",
+			"assets/distanthorizons/shaders/fade/gl/vanilla_fade.frag",
 			"vPosition"
 		);
 		
@@ -136,21 +135,10 @@ public class GlDhVanillaFadeShader extends GlAbstractShaderRenderer
 		this.shader.setUniform(this.uOnlyRenderLods, Config.Client.Advanced.Debugging.lodOnlyMode.get());
 	}
 	
-	public void setProjectionMatrix(DhApiMat4f mcModelViewMatrix, DhApiMat4f mcProjectionMatrix)
+	public void setProjectionMatrix(RenderParams renderParams)
 	{
-		Mat4f inverseMcModelViewProjectionMatrix = new Mat4f(mcProjectionMatrix);
+		this.inverseMcMvmProjMatrix = renderParams.mcInverseMvmProjectionMatrix;
-		inverseMcModelViewProjectionMatrix.multiply(mcModelViewMatrix);
+		this.inverseDhMvmProjMatrix = renderParams.dhInverseMvmProjectionMatrix;
-		inverseMcModelViewProjectionMatrix.invert();
-		this.inverseMcMvmProjMatrix = inverseMcModelViewProjectionMatrix;
-		
-		
-		Mat4f dhProjectionMatrix = RenderUtil.createLodProjectionMatrix(mcProjectionMatrix);
-		Mat4f dhModelViewMatrix = RenderUtil.createLodModelViewMatrix(mcModelViewMatrix);
-		
-		Mat4f inverseDhModelViewProjectionMatrix = new Mat4f(dhProjectionMatrix);
-		inverseDhModelViewProjectionMatrix.multiply(dhModelViewMatrix);
-		inverseDhModelViewProjectionMatrix.invert();
-		this.inverseDhMvmProjMatrix = inverseDhModelViewProjectionMatrix;
 	}
 	public void setLevelMaxHeight(int levelMaxHeight) { this.levelMaxHeight = levelMaxHeight; }
 	
@@ -185,7 +173,7 @@ public class GlDhVanillaFadeShader extends GlAbstractShaderRenderer
 		GLMC.disableBlend();
 		
 		GLMC.glActiveTexture(GL32.GL_TEXTURE0);
-		GLMC.glBindTexture(MC_RENDER.getDepthTextureId());
+		GLMC.glBindTexture(MC_RENDER.getGlDepthTextureId());
 		GL32.glUniform1i(this.uMcDepthTexture, 0);
 		
 		GLMC.glActiveTexture(GL32.GL_TEXTURE1);
@@ -193,7 +181,7 @@ public class GlDhVanillaFadeShader extends GlAbstractShaderRenderer
 		GL32.glUniform1i(this.uDhDepthTexture, 1);
 		
 		GLMC.glActiveTexture(GL32.GL_TEXTURE2);
-		GLMC.glBindTexture(MC_RENDER.getColorTextureId());
+		GLMC.glBindTexture(MC_RENDER.getGlColorTextureId());
 		GL32.glUniform1i(this.uCombinedMcDhColorTexture, 2);
 		
 		GLMC.glActiveTexture(GL32.GL_TEXTURE3);

common/src/main/java/com/seibel/distanthorizons/common/render/openGl/postProcessing/fade/GlVanillaFadeRenderer.java

@@ -108,7 +108,7 @@ public class GlVanillaFadeRenderer implements IDhVanillaFadeRenderer
 		}
 		else
 		{
-			GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, GL32.GL_TEXTURE_2D, MC_RENDER.getColorTextureId(), 0);
+			GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, GL32.GL_TEXTURE_2D, MC_RENDER.getGlColorTextureId(), 0);
 		}
 	}
 	
@@ -135,14 +135,9 @@ public class GlVanillaFadeRenderer implements IDhVanillaFadeRenderer
 		
 		
 		IProfilerWrapper profiler = MC_CLIENT.getProfiler();
-		profiler.pop(); // get out of "terrain"
+		try (IProfilerWrapper.IProfileBlock fade_profile = profiler.push("DH-Vanilla Fade");
-		profiler.push("DH-Vanilla Fade");
+			GLState mcState = new GLState())
-		
-		
-		try(GLState mcState = new GLState())
 		{
-			profiler.push("Vanilla Fade Generate");
-			
 			this.init();
 			
 			// resize the framebuffer if necessary
@@ -157,7 +152,7 @@ public class GlVanillaFadeRenderer implements IDhVanillaFadeRenderer
 			
 			
 			GlDhVanillaFadeShader.INSTANCE.frameBuffer = this.fadeFramebuffer;
-			GlDhVanillaFadeShader.INSTANCE.setProjectionMatrix(renderParams.mcModelViewMatrix, renderParams.mcProjectionMatrix);
+			GlDhVanillaFadeShader.INSTANCE.setProjectionMatrix(renderParams);
 			GlDhVanillaFadeShader.INSTANCE.setLevelMaxHeight(renderParams.clientLevelWrapper.getMaxHeight());
 			GlDhVanillaFadeShader.INSTANCE.render(renderParams);
 			
@@ -165,19 +160,15 @@ public class GlVanillaFadeRenderer implements IDhVanillaFadeRenderer
 			// otherwise we can directly render to their texture
 			if (MC_RENDER.mcRendersToFrameBuffer())
 			{
-				profiler.popPush("Vanilla Fade Apply");
-				
 				GlDhFarFadeApplyShader.INSTANCE.fadeTexture = this.fadeTexture;
-				GlDhFarFadeApplyShader.INSTANCE.readFramebuffer = GlDhFarFadeShader.INSTANCE.frameBuffer;
+				GlDhFarFadeApplyShader.INSTANCE.readFramebuffer = GlDhVanillaFadeShader.INSTANCE.frameBuffer;
 				GlDhFarFadeApplyShader.INSTANCE.drawFramebuffer = MC_RENDER.getTargetFramebuffer();
 				GlDhFarFadeApplyShader.INSTANCE.render(renderParams);
 			}
-			
-			profiler.pop(); 
 		}
 		catch (Exception e)
 		{
-			LOGGER.error("Unexpected error during fade render, error: ["+e.getMessage()+"].", e);
+			LOGGER.error("Unexpected error during fade render, error: [" + e.getMessage() + "].", e);
 		}
 	}