Restore ordering of session config entries

Refactor session config
Fix crash on F3 when commit hash was failed to retrieve
2024-09-08 21:21:42 +05:00 · 2024-09-08 19:05:47 +05:00 · 2024-09-07 21:47:45 +05:00 · 2024-09-06 00:12:09 +05:00 · 2024-09-05 23:45:08 +05:00 · 2024-09-05 14:22:08 +05:00
115 changed files with 3293 additions and 1846 deletions
@@ -538,7 +538,7 @@ ij_groovy_wrap_chain_calls_after_dot = false
 ij_groovy_wrap_long_lines = false

 [{*.har,*.json,*.png.mcmeta,mcmod.info,pack.mcmeta}]
-indent_size = 4
+indent_size = 2
 ij_json_array_wrapping = split_into_lines
 ij_json_keep_blank_lines_in_code = 0
 ij_json_keep_indents_on_empty_lines = false
@@ -688,7 +688,7 @@ ij_markdown_wrap_text_inside_blockquotes = true
 ij_toml_keep_indents_on_empty_lines = false

 [{*.yaml,*.yml}]
-indent_size = 4
+indent_size = 2
 ij_yaml_align_values_properties = do_not_align
 ij_yaml_autoinsert_sequence_marker = true
 ij_yaml_block_mapping_on_new_line = false
@@ -18,19 +18,24 @@ variables:
 .build_java:
  #image: eclipse-temurin:17
  cache:
-    key: "gradleCache"
+    key: "gradleCache_$CI_JOB_NAME_SLUG"
    policy: pull-push
    paths:
      - .gradle
      - cache/
  allow_failure: true
+  retry:
+      max: 2
+      when:
+          - runner_system_failure
+          - stuck_or_timeout_failure


 build:
  stage: build
  parallel:
    matrix:
-      - MC_VER: ["1.16.5", "1.17.1", "1.18.2", "1.19.2", "1.19.4", "1.20.1", "1.20.2", "1.20.4", "1.20.6", "1.21"]
+      - MC_VER: ["1.16.5", "1.17.1", "1.18.2", "1.19.2", "1.19.4", "1.20.1", "1.20.2", "1.20.4", "1.20.6", "1.21.1"]
  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/;
@@ -63,7 +68,7 @@ build:
  extends: .build_java


-api:
+.api:
  stage: api
  needs: []
  script:
@@ -87,7 +92,7 @@ api:


 # generate and publish API javadocs
-pages:
+.pages:
  stage: pages
  needs: []
  script:
@@ -1,3 +1,3 @@
 [submodule "coreSubProjects"]
 	path = coreSubProjects
-	url = https://gitlab.com/jeseibel/distant-horizons-core.git
+	url = https://gitlab.com/jeseibel/distant-horizons-core.git
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Fabric Client &amp; Server" type="CompoundRunConfigurationType">
+    <toRun name="Fabric Client (:fabric)" type="Application" />
+    <toRun name="Fabric Server (:fabric)" type="Application" />
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Forge Client &amp; Server" type="CompoundRunConfigurationType">
+    <toRun name="Forge Client (gradle)" type="GradleRunConfiguration" />
+    <toRun name="Forge Server (gradle)" type="GradleRunConfiguration" />
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Forge Client (gradle)" 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="forge:runClient" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Forge Server (gradle)" 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="forge:runServer" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,7 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Neoforge Client &amp; Server" type="CompoundRunConfigurationType">
+    <toRun name="Neoforge Client (gradle)" type="GradleRunConfiguration" />
+    <toRun name="Neoforge Server (gradle)" type="GradleRunConfiguration" />
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Neoforge Client (gradle)" 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="neoforge:runClient" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Neoforge Server (gradle)" 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="neoforge:runServer" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>
@@ -12,8 +12,6 @@ plugins {

    // Architectury is used here only as a replacement for forge's own loom
    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
-
-    id 'xyz.wagyourtail.jvmdowngrader' version '0.9.1' apply true
 }


@@ -35,11 +33,11 @@ def writeBuildGradlePredefine(List<String> mcVers, int mcIndex)
    {
        String verStr = mcVers[i].replace(".", "_");
        sb.append("MC_" + verStr + "=" + i.toString() + "\n");
-
+        
        if (mcIndex == i)
            sb.append("MC_VER=" + i.toString() + "\n");
    }
-
+    

    // Check if this is a development build
    if (mod_version.toLowerCase().contains("dev"))
@@ -104,13 +102,16 @@ subprojects { p ->
    // Apply plugins
    apply plugin: "java"
    apply plugin: "com.github.johnrengelman.shadow"
-    apply plugin: "xyz.wagyourtail.jvmdowngrader"
    if (isMinecraftSubProject)
        apply plugin: "systems.manifold.manifold-gradle-plugin"

    // Apply forge's loom
-    if ( (findProject(":forge") && p == project(":forge")) || (findProject(":neoforge") && p == project(":neoforge")) )
+    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)
@@ -173,12 +174,12 @@ subprojects { p ->
        //=====================//
        // shared dependencies //
        //=====================//
-
+        
        // Manifold
        if (isMinecraftSubProject) {
            annotationProcessor("systems.manifold:manifold-preprocessor:${rootProject.manifold_version}")
        }
-
+        
        // Log4j
        // TODO: Change to shadowMe later to work in the standalone jar
        // We cannot do this now as it would break Quilt
@@ -217,16 +218,15 @@ subprojects { p ->
 //        forgeShadowMe("com.formdev:svgSalamander:${rootProject.svgSalamander_version}")

        // Netty
-        // Breaks 1.16.5
-        //forgeShadowMe("io.netty:netty-all:${rootProject.netty_version}")
+        implementation("io.netty:netty-buffer:${rootProject.netty_version}")

        // Remember, for lwjgl dependencies that arent included in Minecraft, you need to also need to add it to the ShadowJar thing
        forgeShadowMe("org.lwjgl:lwjgl-jawt:${rootProject.lwjgl_version}") {
            exclude group: "org.lwjgl", module: "lwjgl" // This module is imported by Minecraft so exclude it
        }
-
-
-
+        
+        
+        
        //==========================//
        // conditional dependencies //
        //==========================//
@@ -306,25 +306,13 @@ subprojects { p ->
 //        relocate "com.kitfox.svg", "${librariesLocation}.kitfox.svg"

        // Netty
-        relocate "io.netty", "${librariesLocation}.netty"
+        // Don't relocate, it causes problems with using MC's FriendlyByteBufs
+//        relocate "io.netty", "${librariesLocation}.netty"

        mergeServiceFiles()
    }
-
-    // For downgrading the Java version of our project to match the minimum Java version required by the selected Minecraft version.
-    task jarDowngrade(type: xyz.wagyourtail.jvmdg.gradle.task.DowngradeJar) {
-        inputFile = tasks.shadowJar.archiveFile
-        downgradeTo = JavaVersion.toVersion(rootProject.java_version as Integer)
-        archiveClassifier = "downgraded-${rootProject.java_version}"
-    }
-    task apiDowngrade(type: xyz.wagyourtail.jvmdg.gradle.task.ShadeJar) {
-        inputFile = jarDowngrade.archiveFile
-        downgradeTo = JavaVersion.toVersion(rootProject.java_version as Integer)
-        archiveClassifier = "downgraded-${rootProject.java_version}-shaded-java-api"
-    }
-    // We're using a custom downgrade task so we disable the original downgrade tasks
-    downgradeJar.enabled = false
-    shadeDowngradedApi.enabled = false
+    // Using jar.finalizedBy(shadowJar) causes issues so we do this scuffed bypass
+    jar.dependsOn(shadowJar)


    // Put stuff from gradle.properties into the mod info
@@ -341,7 +329,7 @@ subprojects { p ->
                                "META-INF/neoforge.mods.toml",

                                // The mixins for each of the loaders
-                                "DistantHorizons."+ p.name +".fabricLike.mixins.json"
+                                "DistantHorizons." + p.name + ".fabricLike.mixins.json"
        ]
        def intoTargets = ["$buildDir/resources/main/"] // Location of the built resources folder

@@ -364,7 +352,7 @@ subprojects { p ->
        // TODO: Find something we can use so we can basically re-map only when the jar is shadowed and relocated
 //        println p.tasks.findByName('shadowJar')

-
+        
        // These "hasProperty"'s are so that they can be passed through the cli (ie in the CI)
        try {
            if (infoGitCommit == "null")
@@ -443,9 +431,11 @@ subprojects { p ->
    jar {
        from "LICENSE.txt"
        manifest {
-            attributes 'Implementation-Title': rootProject.mod_name,
-                    'Implementation-Version': rootProject.mod_version,
-                    'Main-Class': 'com.seibel.distanthorizons.core.jar.JarMain' // When changing the main of the jar change this line
+            attributes( 
+                'Implementation-Title': rootProject.mod_name,
+                'Implementation-Version': rootProject.mod_version,
+                'Main-Class': 'com.seibel.distanthorizons.core.jar.JarMain' // When changing the main of the jar change this line
+            )
        }
    }

@@ -475,11 +465,11 @@ allprojects { p ->

    apply plugin: "java"
    apply plugin: "maven-publish"
-
+    
    archivesBaseName = rootProject.mod_name
    version = 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
@@ -567,6 +557,44 @@ allprojects { p ->
        // TODO: If neoforged is ever needed, should we use that, or call it a forge mod?
    }

+    // Adds some dependencies that are in vanilla but not in core
+    if (p == project(":core")) {
+        OperatingSystem os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem;
+
+        // Set the OS lwjgl is using to the current os
+        project.ext.lwjglNatives = "natives-" + os.toFamilyName()
+
+        dependencies { // All of these dependencies are in Vanilla Minecraft, but we need to depend on it as we arent importing Minecraft in the core
+            // Imports most of lwjgl's libraries (well, only the ones that we need)
+            implementation platform("org.lwjgl:lwjgl-bom:${rootProject.lwjgl_version}") // TODO: Use Minecraft's version for lwjgl_version (which changes in nearly every version) instead of a hard defined version for all versions
+
+            // REMEMBER: Dont shadow stuff here, these are just the libs that are included in Minecraft so that the core can use
+            implementation "org.lwjgl:lwjgl"
+            implementation "org.lwjgl:lwjgl-assimp"
+            implementation "org.lwjgl:lwjgl-glfw"
+            implementation "org.lwjgl:lwjgl-openal"
+            implementation "org.lwjgl:lwjgl-opengl"
+            implementation "org.lwjgl:lwjgl-stb"
+            implementation "org.lwjgl:lwjgl-tinyfd"
+            runtimeOnly "org.lwjgl:lwjgl::$lwjglNatives"
+            runtimeOnly "org.lwjgl:lwjgl-assimp::$lwjglNatives"
+            runtimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives"
+            runtimeOnly "org.lwjgl:lwjgl-openal::$lwjglNatives"
+            runtimeOnly "org.lwjgl:lwjgl-opengl::$lwjglNatives"
+            runtimeOnly "org.lwjgl:lwjgl-stb::$lwjglNatives"
+            runtimeOnly "org.lwjgl:lwjgl-tinyfd::$lwjglNatives"
+            implementation "org.joml:joml:${rootProject.joml_version}"
+
+
+            // Some other dependencies
+            implementation("org.jetbrains:annotations:16.0.2")
+            implementation("com.google.code.findbugs:jsr305:3.0.2")
+            implementation("com.google.common:google-collect:0.5")
+            implementation("com.google.guava:guava:31.1-jre")
+        }
+    }
+
+
    task copyCommonLoaderResources(type: Copy) {
        from project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener")
        into(file(p.file("build/resources/main")))
@@ -588,17 +616,16 @@ allprojects { p ->

    tasks.withType(JavaCompile) {
        if (isMinecraftSubProject) {
-            options.release = rootProject.java_version as Integer // Neoforge complains without this
+            options.release = rootProject.java_version as Integer
            options.compilerArgs += ["-Xplugin:Manifold"]
+        } else {
+            options.release = 8; // Core & Api should use Java 8 no matter what
+            //options.release = rootProject.java_version as Integer // But if you want to test some stuff, then this can be enabled
        }
        options.encoding = "UTF-8"
    }

-    // Sets the project's actual Java version (it's recommended to use this over the `options.release` method above)
    java {
-        sourceCompatibility = rootProject.java_version
-        targetCompatibility = rootProject.java_version
-
        withSourcesJar()
    }
 }
@@ -612,4 +639,4 @@ task cleanMergedJars() {
    }
 }
 // add cleanMergedJars to the end of the "clean" task
-tasks["clean"].finalizedBy(cleanMergedJars)
+tasks["clean"].finalizedBy(cleanMergedJars)
@@ -1,7 +1,8 @@
 #!/bin/sh

 echo "==================== Note: All build jars will be in the folder called 'buildAllJars' ===================="
-mkdir -p buildAllJars | true
+mkdir -p buildAllJars
+rm -rf buildAllJars/*

 # Loop trough everything in the version properties folder
 for d in versionProperties/*; do
@@ -11,12 +12,17 @@ for d in versionProperties/*; do
  # Clean out the folders, build it, and merge it
  # (We could use "./" to run gradlew, but as it is a shell script im going to be running it with the "sh" command)
  echo "==================== Cleaning workspace to build $version ===================="
-  sh gradlew clean -PmcVer=$version --no-daemon || true
+  sh gradlew clean -PmcVer=$version
+  if [ $? != 0 ]; then continue; fi
+
  echo "====================Building $version ===================="
-  sh gradlew build -PmcVer=$version --no-daemon || true
+  sh gradlew build -PmcVer=$version
+  if [ $? != 0 ]; then continue; fi
+
  echo "==================== Merging $version ===================="
-  sh gradlew mergeJars -PmcVer=$version --no-daemon || true
+  sh gradlew mergeJars -PmcVer=$version
+  if [ $? != 0 ]; then continue; fi
+
  echo "==================== Moving jar ===================="
-  mv Merged/*.jar buildAllJars/ || true
-  # The "| true" at the end of those are just to make sure the script continues even if a build fails
+  mv Merged/*.jar buildAllJars/
 done
@@ -1,3 +1,10 @@
+buildscript {
+    configurations.configureEach {
+        resolutionStrategy {
+            force 'org.spongepowered:vanillagradle:0.2.1-20240507.024226-82'
+        }
+    }
+}

 // temporary fix for broken spongepowered version
 buildscript {
@@ -35,5 +42,4 @@ publishing {
    repositories {
        // Add repositories to publish to here.
    }
-}
-
+}
@@ -1,18 +1,30 @@
 package com.seibel.distanthorizons.common;

+import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.arguments.*;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiAfterDhInitEvent;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeDhInitEvent;
 import com.seibel.distanthorizons.common.wrappers.DependencySetup;
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftDedicatedServerWrapper;
+import com.seibel.distanthorizons.common.wrappers.misc.ServerPlayerWrapper;
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.config.ConfigBase;
 import com.seibel.distanthorizons.core.config.eventHandlers.presets.ThreadPresetConfigEventHandler;
+import com.seibel.distanthorizons.core.config.types.AbstractConfigType;
+import com.seibel.distanthorizons.core.config.types.ConfigEntry;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.jar.ModJarInfo;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.network.messages.MessageRegistry;
+import com.seibel.distanthorizons.core.network.messages.base.CodecCrashMessage;
+import com.seibel.distanthorizons.core.util.objects.Pair;
+import com.seibel.distanthorizons.core.world.DhServerWorld;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModAccessor;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
@@ -23,9 +35,25 @@ import net.minecraft.server.dedicated.DedicatedServer;
 import org.apache.logging.log4j.Logger;

 import java.lang.invoke.MethodHandles;
+import java.util.HashMap;
+import java.util.Objects;
+import java.util.function.BiFunction;
 import java.util.function.Consumer;
+import java.util.function.Function;
 import java.util.function.Supplier;

+import static com.mojang.brigadier.arguments.DoubleArgumentType.doubleArg;
+import static com.mojang.brigadier.arguments.IntegerArgumentType.integer;
+import static com.seibel.distanthorizons.core.network.messages.MessageRegistry.DEBUG_ENABLE_CODEC_CRASH_MESSAGE;
+import static net.minecraft.commands.Commands.argument;
+import static net.minecraft.commands.Commands.literal;
+
+#if MC_VER >= MC_1_19_2
+import net.minecraft.network.chat.Component;
+#else // < 1.19.2
+import net.minecraft.network.chat.TranslatableComponent;
+#endif
+
 /**
 * Base for all mod loader initializers 
 * and handles most setup. 
@@ -67,7 +95,7 @@ public abstract class AbstractModInitializer
 		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null);
 		
 		this.startup();
-		this.printModInfo(true);
+		this.printModInfo();
 		
 		this.createClientProxy().registerEvents();
 		this.createServerProxy(false).registerEvents();
@@ -91,7 +119,7 @@ public abstract class AbstractModInitializer
 		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null);
 		
 		this.startup();
-		this.printModInfo(false);
+		this.printModInfo();
 		
 		// This prevents returning uninitialized Config values,
 		// resulting from a circular reference mid-initialization in a static class
@@ -100,10 +128,12 @@ public abstract class AbstractModInitializer
 		
 		this.createServerProxy(true).registerEvents();
 		
+		this.initializeModCompat();
+		
 		LOGGER.info(ModInfo.READABLE_NAME + " Initialized");
 		ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null);
 		
-		this.subscribeRegisterCommandsEvent(dispatcher -> this.commandDispatcher = dispatcher);
+		this.subscribeRegisterCommandsEvent(dispatcher -> { this.commandDispatcher = dispatcher; });
 		
 		this.subscribeServerStartingEvent(server -> 
 		{
@@ -130,17 +160,14 @@ public abstract class AbstractModInitializer
 		this.createInitialBindings();
 	}
 	
-	private void printModInfo(boolean printGitInfo)
+	private void printModInfo()
 	{
 		LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
 		
-		if (printGitInfo)
-		{
-			// Useful for dev builds
-			LOGGER.info("DH Branch: " + ModJarInfo.Git_Branch);
-			LOGGER.info("DH Commit: " + ModJarInfo.Git_Commit);
-			LOGGER.info("DH Jar Build Source: " + ModJarInfo.Build_Source);
-		}
+		// Useful for dev builds
+		LOGGER.info("DH Branch: " + ModJarInfo.Git_Branch);
+		LOGGER.info("DH Commit: " + ModJarInfo.Git_Commit);
+		LOGGER.info("DH Jar Build Source: " + ModJarInfo.Build_Source);
 	}
 	
 	protected <T extends IModAccessor> void tryCreateModCompatAccessor(String modId, Class<? super T> accessorClass, Supplier<T> accessorConstructor)
@@ -166,7 +193,136 @@ public abstract class AbstractModInitializer
 		LOGGER.info("Mod Post-Initialized");
 	}
 	
-	private void initCommands() { /* currently unimplemented */ }
+	@SuppressWarnings({"rawtypes", "unchecked"})
+	private void initCommands()
+	{
+		LiteralArgumentBuilder<CommandSourceStack> builder = literal("dhconfig")
+				.requires(source -> source.hasPermission(4));
+		
+		for (AbstractConfigType<?, ?> type : ConfigBase.INSTANCE.entries)
+		{
+			if (!(type instanceof ConfigEntry))
+			{
+				continue;
+			}
+			//noinspection PatternVariableCanBeUsed
+			ConfigEntry configEntry = (ConfigEntry) type;
+			if (configEntry.getServersideShortName() == null)
+			{
+				continue;
+			}
+			
+			Function<
+					Function<CommandContext<CommandSourceStack>, Object>,
+					Command<CommandSourceStack>
+					> makeConfigUpdater = getter -> c -> {
+				Object value = getter.apply(c);
+				
+				c.getSource().sendSuccess(
+						#if MC_VER >= MC_1_20_1
+						() -> Component.literal("Changed the value of "+configEntry.getServersideShortName()+" to "+value),
+						#elif MC_VER >= MC_1_19_2
+						Component.literal("Changed the value of "+configEntry.getServersideShortName()+" to "+value),
+						#else
+						new TranslatableComponent("Changed the value of "+configEntry.getServersideShortName()+" to "+value),
+						#endif
+						true);
+				configEntry.set(value);
+				return 1;
+			};
+			
+			LiteralArgumentBuilder<CommandSourceStack> subcommand = literal(configEntry.getServersideShortName())
+					.executes(c -> {
+						#if MC_VER >= MC_1_20_1
+						c.getSource().sendSuccess(() -> Component.literal("Current value of "+configEntry.getServersideShortName()+" is "+configEntry.get()), true);
+						#elif MC_VER >= MC_1_19_2
+						c.getSource().sendSuccess(Component.literal("Current value of "+configEntry.getServersideShortName()+" is "+configEntry.get()), true);
+						#else // < 1.19.2
+						c.getSource().sendSuccess(new TranslatableComponent("Current value of "+configEntry.getServersideShortName()+" is "+configEntry.get()), true);
+						#endif
+						return 1;
+					});
+			
+			if (Enum.class.isAssignableFrom(configEntry.getType()))
+			{
+				for (Object choice : configEntry.getType().getEnumConstants())
+				{
+					subcommand.then(
+							literal(choice.toString())
+									.executes(makeConfigUpdater.apply(c -> choice))
+					);
+				}
+			}
+			else
+			{
+				boolean setterAdded = false;
+				
+				for (java.util.Map.Entry<Class<?>, Pair<Supplier<ArgumentType<?>>, BiFunction<CommandContext<?>, String, ?>>> pair : new HashMap<
+						Class<?>,
+						Pair<
+								Supplier<ArgumentType<?>>,
+								BiFunction<CommandContext<?>, String, ?>>
+						>() {{
+					this.put(Integer.class, new Pair<>(() -> integer((int) configEntry.getMin(), (int) configEntry.getMax()), IntegerArgumentType::getInteger));
+					this.put(Double.class, new Pair<>(() -> doubleArg((double) configEntry.getMin(), (double) configEntry.getMax()), DoubleArgumentType::getDouble));
+					this.put(Boolean.class, new Pair<>(BoolArgumentType::bool, BoolArgumentType::getBool));
+					this.put(String.class, new Pair<>(StringArgumentType::string, StringArgumentType::getString));
+				}}.entrySet())
+				{
+					if (!pair.getKey().isAssignableFrom(configEntry.getType()))
+					{
+						continue;
+					}
+					
+					subcommand.then(argument("value", pair.getValue().first.get())
+							.executes(makeConfigUpdater.apply(c -> pair.getValue().second.apply(c, "value"))));
+					
+					setterAdded = true;
+					break;
+				}
+				
+				if (!setterAdded)
+				{
+					throw new RuntimeException("Config type of "+type.getName()+" is not supported: "+configEntry.getType().getSimpleName());
+				}
+			}
+			
+			builder.then(subcommand);
+		}
+		
+		this.commandDispatcher.register(builder);
+		
+		if (DEBUG_ENABLE_CODEC_CRASH_MESSAGE)
+		{
+			LiteralArgumentBuilder<CommandSourceStack> dhcrash = literal("dhcrash")
+					.requires(source -> source.hasPermission(4))
+					.then(literal("encode")
+							.executes(c -> {
+								assert SharedApi.getIDhServerWorld() != null;
+								((DhServerWorld) SharedApi.getIDhServerWorld()).remotePlayerConnectionHandler
+										#if MC_VER >= MC_1_19_2
+										.getConnectedPlayer(ServerPlayerWrapper.getWrapper(Objects.requireNonNull(c.getSource().getPlayer())))
+										#else
+										.getConnectedPlayer(ServerPlayerWrapper.getWrapper(Objects.requireNonNull(c.getSource().getPlayerOrException())))
+										#endif
+										.session.sendMessage(new CodecCrashMessage(CodecCrashMessage.ECrashPhase.ENCODE));
+								return 1;
+							}))
+					.then(literal("decode")
+							.executes(c -> {
+								assert SharedApi.getIDhServerWorld() != null;
+								((DhServerWorld) SharedApi.getIDhServerWorld()).remotePlayerConnectionHandler
+										#if MC_VER >= MC_1_19_2
+										.getConnectedPlayer(ServerPlayerWrapper.getWrapper(Objects.requireNonNull(c.getSource().getPlayer())))
+										#else
+										.getConnectedPlayer(ServerPlayerWrapper.getWrapper(Objects.requireNonNull(c.getSource().getPlayerOrException())))
+										#endif
+										.session.sendMessage(new CodecCrashMessage(CodecCrashMessage.ECrashPhase.DECODE));
+								return 1;
+							}));
+			this.commandDispatcher.register(dhcrash);
+		}
+	}
 	
 	
 	
@@ -179,4 +335,4 @@ public abstract class AbstractModInitializer
 		void registerEvents();
 	}
 	
-}
+}
@@ -0,0 +1,114 @@
+package com.seibel.distanthorizons.common;
+
+import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.logging.ConfigBasedLogger;
+import com.seibel.distanthorizons.core.network.event.internal.IncompatibleMessageEvent;
+import com.seibel.distanthorizons.core.network.event.internal.ProtocolErrorEvent;
+import com.seibel.distanthorizons.core.network.messages.MessageRegistry;
+import com.seibel.distanthorizons.core.network.messages.NetworkMessage;
+import com.seibel.distanthorizons.core.network.messages.base.CloseReasonMessage;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
+import com.seibel.distanthorizons.coreapi.ModInfo;
+import io.netty.buffer.ByteBufUtil;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.level.ServerPlayer;
+import org.apache.logging.log4j.LogManager;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.IOException;
+import java.util.Objects;
+
+public abstract class AbstractPluginPacketSender implements IPluginPacketSender
+{
+	private static final ConfigBasedLogger LOGGER = new ConfigBasedLogger(LogManager.getLogger(),
+			() -> Config.Client.Advanced.Logging.logNetworkEvent.get());
+	
+	#if MC_VER >= MC_1_21_1
+	public static final ResourceLocation WRAPPER_PACKET_RESOURCE = ResourceLocation.fromNamespaceAndPath(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH);
+	#else
+	public static final ResourceLocation WRAPPER_PACKET_RESOURCE = new ResourceLocation(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH);
+	#endif
+	
+	
+	@Override
+	public final void sendPluginPacketServer(IServerPlayerWrapper serverPlayer, NetworkMessage message)
+	{
+		this.sendPluginPacketServer((ServerPlayer) serverPlayer.getWrappedMcObject(), message);
+	}
+	
+	@Override
+	public abstract void sendPluginPacketClient(NetworkMessage message);
+	public abstract void sendPluginPacketServer(ServerPlayer serverPlayer, NetworkMessage message);
+	
+	@Nullable
+	public static NetworkMessage decodeMessage(FriendlyByteBuf in)
+	{
+		NetworkMessage message = null;
+		
+		try
+		{
+			in.markReaderIndex();
+			
+			int protocolVersion = in.readShort();
+			if (protocolVersion != ModInfo.PROTOCOL_VERSION)
+			{
+				return new IncompatibleMessageEvent(protocolVersion);
+			}
+			
+			message = MessageRegistry.INSTANCE.createMessage(in.readUnsignedShort());
+			message.decode(in);
+			
+			if (in.isReadable())
+			{
+				throw new IOException("Buffer has not been fully read");
+			}
+			
+			return message;
+		}
+		catch (Exception e)
+		{
+			in.resetReaderIndex();
+			
+			LOGGER.error("Failed to decode message", e);
+			LOGGER.error("Buffer: {}", in);
+			LOGGER.error("Buffer contents: [{}]", ByteBufUtil.hexDump(in));
+			
+			return new ProtocolErrorEvent(e, message, true);
+		}
+		finally
+		{
+			// Prevent connection crashing if not entire buffer has been read
+			in.readerIndex(in.writerIndex());
+		}
+	}
+	
+	public static void encodeMessage(FriendlyByteBuf out, NetworkMessage message)
+	{
+		// This is intentionally unhandled, because errors related to this are unlikely to appear in wild
+		Objects.requireNonNull(message);
+		out.writeShort(ModInfo.PROTOCOL_VERSION);
+		
+		try
+		{
+			out.markWriterIndex();
+			out.writeShort(MessageRegistry.INSTANCE.getMessageId(message));
+			message.encode(out);
+		}
+		catch (Exception e)
+		{
+			LOGGER.error("Failed to encode message", e);
+			LOGGER.error("Message: {}", message);
+			
+			message.getSession().tryHandleMessage(new ProtocolErrorEvent(e, message, false));
+			
+			// Encode close reason message instead
+			out.resetWriterIndex();
+			message = new CloseReasonMessage("Internal error on other side");
+			out.writeShort(MessageRegistry.INSTANCE.getMessageId(message));
+			message.encode(out);
+		}
+	}
+	
+}
@@ -0,0 +1,45 @@
+package com.seibel.distanthorizons.common;
+
+#if MC_VER >= MC_1_20_6
+
+import com.seibel.distanthorizons.core.network.messages.NetworkMessage;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public record CommonPacketPayload(
+		@Nullable NetworkMessage message
+) implements CustomPacketPayload
+{
+	public static final Type<CommonPacketPayload> TYPE = new Type<>(AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE);
+	
+	@NotNull
+	@Override
+	public Type<? extends CustomPacketPayload> type()
+	{
+		return TYPE;
+	}
+	
+	
+	public static class Codec implements StreamCodec<FriendlyByteBuf, CommonPacketPayload>
+	{
+		@NotNull
+		@Override
+		public CommonPacketPayload decode(@NotNull FriendlyByteBuf in)
+		{
+			return new CommonPacketPayload(AbstractPluginPacketSender.decodeMessage(in));
+		}
+		
+		@Override
+		public void encode(@NotNull FriendlyByteBuf out, CommonPacketPayload payload)
+		{
+			AbstractPluginPacketSender.encodeMessage(out, payload.message());
+		}
+		
+	}
+	
+}
+
+#endif
@@ -0,0 +1,85 @@
+package com.seibel.distanthorizons.common.commonMixins;
+
+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 net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.chunk.ChunkAccess;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+public class MixinChunkMapCommon
+{
+	
+	public static void onChunkSave(ServerLevel level, ChunkAccess chunk, CallbackInfoReturnable<Boolean> ci)
+	{
+		// is this position already being updated?
+		if (SharedApi.isChunkAtChunkPosAlreadyUpdating(chunk.getPos().x, chunk.getPos().z))
+		{
+			return;
+		}
+		
+		
+		
+		// is this chunk being saved to disk?
+		boolean savingChunkToDisk = ci.getReturnValue();
+		// true means a chunk was saved to disk
+		if (!savingChunkToDisk)
+		{
+			return;
+		}
+		
+		// TODO are the following validations necessary since we are checking above if 
+		//  the callback return value should state if the chunk was actually saved or not?
+		//  Do we trust it to always be correct?
+		
+		
+		
+		// corrupt/incomplete chunk validation //
+		
+		// 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 (chunk.isUnsaved() || chunk.getUpgradeData() != null || !chunk.isLightCorrect())
+		{
+			return;
+		}
+		#else
+		if (chunk.isUnsaved() || chunk.isUpgrading() || !chunk.isLightCorrect())
+		{
+			return;
+		}
+		#endif
+		
+		
+		
+		// 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 (chunk.getBiomes() == null)
+		{
+			return;
+		}
+		#else
+		try
+		{
+			// this will throw an exception if the biomes aren't set up
+			chunk.getNoiseBiome(0,0,0);
+		}
+		catch (Exception e)
+		{
+			return;
+		}
+		#endif
+		
+		
+		
+		// submit the update event
+		ServerApi.INSTANCE.serverChunkSaveEvent(
+				new ChunkWrapper(chunk, level, ServerLevelWrapper.getWrapper(level)),
+				ServerLevelWrapper.getWrapper(level)
+		);
+	}
+	
+}
@@ -26,6 +26,6 @@ public class DependencySetupDoneCheck
 	// TODO move to DependencySetup
 	public static boolean isDone = false;
 	// TODO why is this here and what is its purpose?
-	public static Supplier<Boolean> getIsCurrentThreadDistantGeneratorThread = (() -> false);
+	public static Supplier<Boolean> getIsCurrentThreadDistantGeneratorThread = (() -> { return false; });
 	
 }
@@ -20,11 +20,9 @@
 package com.seibel.distanthorizons.common.wrappers;

 import java.nio.FloatBuffer;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;

 import com.seibel.distanthorizons.core.enums.EDhDirection;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
+import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.util.math.Mat4f;

@@ -102,17 +100,33 @@ public class McObjectConverter
 		lodDirections = new EDhDirection[lodDirs.length];
 		for (EDhDirection lodDir : lodDirs)
 		{
-			Direction dir = switch (lodDir.name().toUpperCase()) {
-                case "DOWN" -> Direction.DOWN;
-                case "UP" -> Direction.UP;
-                case "NORTH" -> Direction.NORTH;
-                case "SOUTH" -> Direction.SOUTH;
-                case "WEST" -> Direction.WEST;
-                case "EAST" -> Direction.EAST;
-                default -> null;
-            };
-
-            if (dir == null)
+			Direction dir;
+			switch (lodDir.name().toUpperCase())
+			{
+				case "DOWN":
+					dir = Direction.DOWN;
+					break;
+				case "UP":
+					dir = Direction.UP;
+					break;
+				case "NORTH":
+					dir = Direction.NORTH;
+					break;
+				case "SOUTH":
+					dir = Direction.SOUTH;
+					break;
+				case "WEST":
+					dir = Direction.WEST;
+					break;
+				case "EAST":
+					dir = Direction.EAST;
+					break;
+				default:
+					dir = null;
+					break;
+			}
+			
+			if (dir == null)
 			{
 				throw new IllegalArgumentException("Invalid direction on init mapping: " + lodDir);
 			}
@@ -121,41 +135,10 @@ public class McObjectConverter
 		}
 	}
 	
-	public static BlockPos Convert(DhBlockPos wrappedPos)
-	{
-		return new BlockPos(wrappedPos.x, wrappedPos.y, wrappedPos.z);
-	}
-	public static ChunkPos Convert(DhChunkPos wrappedPos)
-	{
-		return new ChunkPos(wrappedPos.x, wrappedPos.z);
-	}
+	public static BlockPos Convert(DhBlockPos wrappedPos) { return new BlockPos(wrappedPos.getX(), wrappedPos.getY(), wrappedPos.getZ()); }
+	public static ChunkPos Convert(DhChunkPos wrappedPos) { return new ChunkPos(wrappedPos.getX(), wrappedPos.getZ()); }
 	
-	public static Direction Convert(EDhDirection lodDirection)
-	{
-		return directions[lodDirection.ordinal()];
-	}
-	public static EDhDirection Convert(Direction direction)
-	{
-		return lodDirections[direction.ordinal()];
-	}
-	public static void DebugCheckAllPackers()
-	{
-		BiConsumer<Integer, Integer> func = (x, z) -> DhChunkPos._DebugCheckPacker(x, z, ChunkPos.asLong(x, z));
-		func.accept(0, 0);
-		func.accept(12345, 134);
-		func.accept(-12345, -134);
-		func.accept(-30000000 / 16, 30000000 / 16);
-		func.accept(30000000 / 16, -30000000 / 16);
-		func.accept(30000000 / 16, 30000000 / 16);
-		func.accept(-30000000 / 16, -30000000 / 16);
-		Consumer<BlockPos> func2 = (p) -> DhBlockPos._DebugCheckPacker(p.getX(), p.getY(), p.getZ(), p.asLong());
-		func2.accept(new BlockPos(0, 0, 0));
-		func2.accept(new BlockPos(12345, 134, 123));
-		func2.accept(new BlockPos(-12345, -134, -80));
-		func2.accept(new BlockPos(-30000000, 2047, 30000000));
-		func2.accept(new BlockPos(30000000, -2048, -30000000));
-		func2.accept(new BlockPos(30000000, 2047, 30000000));
-		func2.accept(new BlockPos(-30000000, -2048, -30000000));
-	}
+	public static Direction Convert(EDhDirection lodDirection) { return directions[lodDirection.ordinal()]; }
+	public static EDhDirection Convert(Direction direction) { return lodDirections[direction.ordinal()]; }
 	
 }
@@ -155,41 +155,33 @@ public class WrapperFactory implements IWrapperFactory
 			}
 		}
 		
-		#if MC_VER <= MC_1_21
+		//#if MC_VER <= MC_1_XX_X
 		else if (objectArray.length == 2)
 		{
 			// correct number of parameters from the API
 			
 			// chunk
-			if (!(objectArray[0] instanceof ChunkAccess chunk))
+			if (!(objectArray[0] instanceof ChunkAccess))
 			{
 				throw new ClassCastException(createChunkWrapperErrorMessage(objectArray));
 			}
+			ChunkAccess chunk = (ChunkAccess) objectArray[0];
 			
 			// level / light source
-			if (!(objectArray[1] instanceof Level level))
+			if (!(objectArray[1] instanceof Level))
 			{
 				throw new ClassCastException(createChunkWrapperErrorMessage(objectArray));
 			}
 			// the level is needed for the DH level wrapper...
+			Level level = (Level) objectArray[1];
 			// ...the LevelReader is needed for chunk lighting
 			LevelReader lightSource = level;
 			
 			
 			// level wrapper
-			ILevelWrapper levelWrapper;
-			if (level instanceof ServerLevel)
-			{
-				levelWrapper = ServerLevelWrapper.getWrapper((ServerLevel)level);
-			}
-			else if (level instanceof ClientLevel)
-			{
-				levelWrapper = ClientLevelWrapper.getWrapper((ClientLevel)level);
-			}
-			else
-			{
-				throw new ClassCastException(createChunkWrapperErrorMessage(objectArray));
-			}
+			ILevelWrapper levelWrapper = level.isClientSide()
+					? ClientLevelWrapper.getWrapper((ClientLevel)level)
+					: ServerLevelWrapper.getWrapper((ServerLevel)level);
 			
 			
 			return new ChunkWrapper(chunk, lightSource, levelWrapper);
@@ -199,16 +191,7 @@ public class WrapperFactory implements IWrapperFactory
 		{
 			throw new ClassCastException(createChunkWrapperErrorMessage(objectArray));
 		}
-		#else
-			// Intentional compiler error to bring attention to the missing wrapper function.
-			// If you need to work on an unimplemented version but don't have the ability to implement this yet
-			// you can comment it out, but please don't commit it. Someone will have to implement it.
-
-			// After implementing the new version please read this method's javadocs for instructions
-			// on what other locations also need to be updated, the DhAPI specifically needs to
-			// be updated to state which objects this method accepts.
-			not implemented for this version of Minecraft!
-		#endif
+		//#endif
 	}
 	/**
 	 * Note: when this is updated for different MC versions,
@@ -218,16 +201,13 @@ public class WrapperFactory implements IWrapperFactory
 	{
 		String[] expectedClassNames;
 		
-		#if MC_VER <= MC_1_21
+		//#if MC_VER <= MC_1_XX_X
 		expectedClassNames = new String[] 
 		{
 			ChunkAccess.class.getName(),
-			ServerLevel.class.getName() + "] or [" + ClientLevel.class.getName()
+			"[ServerLevel] or [ClientLevel]" // Classes are not referenced by names to avoid exception when one of them is missing
 		};
-		#else
-			// See preprocessor comment in createChunkWrapper() for full documentation
-			not implemented for this version of Minecraft!
-		#endif
+		//#endif
 		
 		return createWrapperErrorMessage("Chunk wrapper", expectedClassNames, objectArray);
 	}
@@ -243,10 +223,11 @@ public class WrapperFactory implements IWrapperFactory
 	public IDhApiBiomeWrapper getBiomeWrapper(Object[] objectArray, IDhApiLevelWrapper levelWrapper) 
 	{
 		// confirm the API level wrapper is also a Core wrapper 
-		if (!(levelWrapper instanceof ILevelWrapper coreLevelWrapper))
+		if (!(levelWrapper instanceof ILevelWrapper))
 		{
 			throw new ClassCastException("Invalid ["+IDhApiLevelWrapper.class.getSimpleName()+"] value given. Level wrapper object must be one given by the DH API (it can't be a custom implementation), specifically of type ["+ILevelWrapper.class.getName()+"].");
 		}
+		ILevelWrapper coreLevelWrapper = (ILevelWrapper) levelWrapper;
 		
 		
 		
@@ -265,7 +246,7 @@ public class WrapperFactory implements IWrapperFactory
 		
 		Biome biome = (Biome) objectArray[0];
 		return BiomeWrapper.getBiomeWrapper(biome, coreLevelWrapper);
-		#elif MC_VER <= MC_1_21
+		#else
 		if (!(objectArray[0] instanceof Holder) || !(((Holder<?>) objectArray[0]).value() instanceof Biome))
 		{
 			throw new ClassCastException(createBiomeWrapperErrorMessage(objectArray));
@@ -273,9 +254,6 @@ public class WrapperFactory implements IWrapperFactory
 		
 		Holder<Biome> biomeHolder = (Holder<Biome>) objectArray[0];
 		return BiomeWrapper.getBiomeWrapper(biomeHolder, coreLevelWrapper);
-		#else
-		// See preprocessor comment in createChunkWrapper() for full documentation (not a typo, check createChunkWrapper()'s else statement for full documentation)
-		not implemented for this version of Minecraft!
 		#endif
 	}
 	/**
@@ -288,11 +266,8 @@ public class WrapperFactory implements IWrapperFactory
 		
 		#if MC_VER < MC_1_18_2
 		expectedClassNames = new String[] { Biome.class.getName() };
-		#elif MC_VER <= MC_1_21
-		expectedClassNames = new String[] { Holder.class.getName()+"<"+Biome.class.getName()+">" };
 		#else
-			// See preprocessor comment in createChunkWrapper() for full documentation
-			not implemented for this version of Minecraft!
+		expectedClassNames = new String[] { Holder.class.getName()+"<"+Biome.class.getName()+">" };
 		#endif
 		
 		return createWrapperErrorMessage("Biome wrapper", expectedClassNames, objectArray);
@@ -301,28 +276,27 @@ public class WrapperFactory implements IWrapperFactory
 	public IDhApiBlockStateWrapper getBlockStateWrapper(Object[] objectArray, IDhApiLevelWrapper levelWrapper)
 	{
 		// confirm the API level wrapper is also a Core wrapper 
-		if (!(levelWrapper instanceof ILevelWrapper coreLevelWrapper))
+		if (!(levelWrapper instanceof ILevelWrapper))
 		{
 			throw new ClassCastException("Invalid ["+IDhApiLevelWrapper.class.getSimpleName()+"] value given. Level wrapper object must be one given by the DH API (it can't be a custom implementation), specifically of type ["+ILevelWrapper.class.getName()+"].");
 		}
+		ILevelWrapper coreLevelWrapper = (ILevelWrapper) levelWrapper;
 		
 		
 		
-		#if MC_VER <= MC_1_21
+		//#if MC_VER <= MC_1_XX_X
 		if (objectArray.length != 1)
 		{
 			throw new ClassCastException(createBlockStateWrapperErrorMessage(objectArray));
 		}
-		if (!(objectArray[0] instanceof BlockState blockState))
+		if (!(objectArray[0] instanceof BlockState))
 		{
 			throw new ClassCastException(createBlockStateWrapperErrorMessage(objectArray));
 		}
 		
+		BlockState blockState = (BlockState) objectArray[0];
 		return BlockStateWrapper.fromBlockState(blockState, coreLevelWrapper);
-		#else
-		// See preprocessor comment in createChunkWrapper() for full documentation (not a typo, check createChunkWrapper()'s else statement for full documentation)
-		not implemented for this version of Minecraft!
-		#endif
+		//#endif
 	}
 	/**
 	 * Note: when this is updated for different MC versions,
@@ -334,11 +308,8 @@ public class WrapperFactory implements IWrapperFactory
 		
 		#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
 		expectedClassNames = new String[] { Biome.class.getName() };
-		#elif MC_VER <= MC_1_21
-		expectedClassNames = new String[] { Holder.class.getName()+"<"+Biome.class.getName()+">" };
 		#else
-		// See preprocessor comment in createChunkWrapper() for full documentation
-		not implemented for this version of Minecraft!
+		expectedClassNames = new String[] { Holder.class.getName()+"<"+Biome.class.getName()+">" };
 		#endif
 		
 		return createWrapperErrorMessage("BlockState wrapper", expectedClassNames, objectArray);
@@ -266,7 +266,7 @@ public class BiomeWrapper implements IBiomeWrapper
 			}
 			return EMPTY_WRAPPER;
 		}
-		else if (resourceLocationString.trim().isEmpty() || resourceLocationString.isEmpty())
+		else if (resourceLocationString.trim().isEmpty() || resourceLocationString.equals(""))
 		{
 			LOGGER.warn("Null biome string deserialized.");
 			return EMPTY_WRAPPER;
@@ -293,7 +293,7 @@ public class BiomeWrapper implements IBiomeWrapper
 			ResourceLocation resourceLocation;
 			try
 			{
-				#if MC_VER < MC_1_21
+				#if MC_VER < MC_1_21_1
 				resourceLocation = new ResourceLocation(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1));
 				#else
 				resourceLocation = ResourceLocation.fromNamespaceAndPath(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1));
@@ -30,11 +30,11 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrappe
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BlockTags;
+import net.minecraft.world.level.block.BeaconBeamBlock;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.state.properties.Property;
 import org.apache.logging.log4j.Logger;

 import java.awt.*;
@@ -54,7 +54,6 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.core.Registry;
 import net.minecraft.world.level.EmptyBlockGetter;
 #else
-import net.minecraft.client.Minecraft;
 import net.minecraft.world.level.Level;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.registries.Registries;
@@ -103,8 +102,9 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	private byte blockMaterialId = 0;
 	
 	private final boolean isBeaconBlock; 
-	private final boolean isBeaconBaseBlock; 
-	private final boolean isGlassBlock; 
+	private final boolean isBeaconBaseBlock;
+	/** null if this block can't tint beacons */
+	private final Color beaconTintColor; 
 	private final Color mapColor;
 	
 	
@@ -140,6 +140,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		this.hashCode = Objects.hash(this.serialString);
 		this.blockMaterialId = this.calculateEDhApiBlockMaterialId().index;
 		
+		// beacon blocks
 		String lowercaseSerial = this.serialString.toLowerCase();
 		boolean isBeaconBaseBlock = false;
 		for (int i = 0; i < LodUtil.BEACON_BASE_BLOCK_NAME_LIST.size(); i++)
@@ -153,7 +154,28 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		}
 		this.isBeaconBaseBlock = isBeaconBaseBlock;
 		this.isBeaconBlock = lowercaseSerial.contains("minecraft:beacon");
-		this.isGlassBlock = lowercaseSerial.contains("glass");
+		
+		// beacon tint color
+		Color beaconTintColor = null;
+		if (this.blockState != null
+			// beacon blocks also show up here, but since they block the beacon beam we don't want their color		
+			&& !this.isBeaconBlock)
+		{
+			Block block = this.blockState.getBlock();
+			if (block instanceof BeaconBeamBlock)
+			{
+				int colorInt;
+				#if MC_VER <= MC_1_19_4
+				colorInt = ((BeaconBeamBlock) block).getColor().getMaterialColor().col;
+				#else 
+				colorInt = ((BeaconBeamBlock) block).getColor().getMapColor().col;
+				#endif
+				
+				beaconTintColor = ColorUtil.toColorObjRGB(colorInt);
+			}
+		}
+		this.beaconTintColor = beaconTintColor;
+		
 		
 		int mcColor = 0;
 		if (this.blockState != null)
@@ -234,7 +256,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		String ignoreBlockCsv = config.get();
 		if (ignoreBlockCsv != null)
 		{
-			blockStringList.addAll(List.of(ignoreBlockCsv.split(",")));
+			blockStringList.addAll(Arrays.asList(ignoreBlockCsv.split(",")));
 		}
 		
 		return getBlockWrappers(blockStringList, levelWrapper);
@@ -400,10 +422,12 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	@Override
 	public boolean isBeaconBaseBlock() { return this.isBeaconBaseBlock; }
 	@Override
-	public boolean isGlassBlock() { return this.isGlassBlock; }
+	public boolean isBeaconTintBlock() { return this.beaconTintColor != null; }
 	
 	@Override
 	public Color getMapColor() { return this.mapColor; }
+	@Override
+	public Color getBeaconTintColor() { return this.beaconTintColor; }
 	
 	@Override
 	public byte getMaterialId() { return this.blockMaterialId; }
@@ -462,7 +486,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		// we need the final string for the concurrent hash map later
 		final String finalResourceStateString = resourceStateString;
 		
-		if (finalResourceStateString.equals(AIR_STRING) || finalResourceStateString.isEmpty()) // the empty string shouldn't normally happen, but just in case
+		if (finalResourceStateString.equals(AIR_STRING) || finalResourceStateString.equals("")) // the empty string shouldn't normally happen, but just in case
 		{
 			return AIR;
 		}
@@ -499,7 +523,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 			ResourceLocation resourceLocation;
 			try
 			{
-				#if MC_VER < MC_1_21
+				#if MC_VER < MC_1_21_1
 				resourceLocation = new ResourceLocation(resourceStateString.substring(0, separatorIndex), resourceStateString.substring(separatorIndex + 1));
 				#else
 				resourceLocation = ResourceLocation.fromNamespaceAndPath(resourceStateString.substring(0, separatorIndex), resourceStateString.substring(separatorIndex + 1));
@@ -517,9 +541,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 			{
 				
 				#if MC_VER > MC_1_17_1
-				// use the given level if possible, otherwise try using the currently loaded one 
-				Level level = (levelWrapper != null ? (Level) levelWrapper.getWrappedMcObject() : null);
-				level = (level == null ? Minecraft.getInstance().level : level);
+			Level level = (Level)Objects.requireNonNull(levelWrapper.getWrappedMcObject());
 				#endif
 				
 				Block block;
@@ -603,7 +625,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		
 		// alphabetically sort the list so they are always in the same order
 		List<net.minecraft.world.level.block.state.properties.Property<?>> sortedBlockPropteryList = new ArrayList<>(blockPropertyCollection);
-		sortedBlockPropteryList.sort(Comparator.comparing(Property::getName));
+		sortedBlockPropteryList.sort((a, b) -> a.getName().compareTo(b.getName()));
 		
 		
 		StringBuilder stringBuilder = new StringBuilder();
@@ -734,4 +756,4 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		}
 	}
 	
-}
+}
@@ -0,0 +1,485 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020-2023 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.common.wrappers.block;
+
+import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
+import com.seibel.distanthorizons.core.util.ColorUtil;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.FlowerBlock;
+import net.minecraft.world.level.block.LeavesBlock;
+import net.minecraft.world.level.block.RotatedPillarBlock;
+#if MC_VER >= MC_1_19_2
+import net.minecraft.util.RandomSource;
+#else
+import java.util.Random;
+#endif
+import net.minecraft.world.level.block.state.BlockState;
+import org.apache.logging.log4j.Logger;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * This stores and calculates the colors
+ * the given {@link BlockState} should have based
+ * on the given {@link IClientLevelWrapper}.
+ * 
+ * @see ColorUtil
+ */
+public class ClientBlockStateColorCache
+{
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	
+	private static final HashSet<BlockState> BLOCK_STATES_THAT_NEED_LEVEL = new HashSet<>();
+	private static final HashSet<BlockState> BROKEN_BLOCK_STATES = new HashSet<>();
+	
+	/** 
+	 * Methods using MC's "RandomSource" object aren't thread safe <br>
+	 * so we need to put locks around that logic. <br>
+	 * specifically:
+	 * <code>
+	 * getBlockModel(this.blockState).getQuads(this.blockState, direction, RANDOM)
+	 * </code>
+	 */
+	private static final ReentrantLock RESOLVE_LOCK = new ReentrantLock();
+	
+	
+	/** This is the order each direction on a block is processed when attempting to get the texture/color */
+	private static final Direction[] COLOR_RESOLUTION_DIRECTION_ORDER = { Direction.UP, Direction.NORTH, Direction.EAST, Direction.WEST, Direction.SOUTH, Direction.DOWN };
+	
+	private static final int FLOWER_COLOR_SCALE = 5;
+	
+	
+	
+	#if MC_VER < MC_1_19_2
+	private static final Random RANDOM = new Random(0);
+	#else
+	/** Note: this object isn't thread safe and must be put in a lock */
+	private static final RandomSource RANDOM = RandomSource.create();
+	#endif
+	
+	private final IClientLevelWrapper levelWrapper;
+	private final BlockState blockState;
+	private final LevelReader level;
+	
+	private boolean isColorResolved = false;
+	private int baseColor = 0;
+	private boolean needShade = true;
+	private boolean needPostTinting = false;
+	private int tintIndex = 0;
+	
+	
+	
+	//===========//
+	// constants //
+	//===========//
+	
+	private static final int MIN_SRGB_BITS = 0x39000000; // 2^(-13)
+	private static final int MAX_SRGB_BITS = 0x3f7fffff; // 1.0 - f32::EPSILON
+	private static final float MIN_SRGB_BOUND = Float.intBitsToFloat(MIN_SRGB_BITS);
+	private static final float MAX_SRGB_BOUND = Float.intBitsToFloat(MAX_SRGB_BITS);
+	
+	private static final int[] linearToSrgbTable = new int[] 
+		{
+			0x0073000d, 0x007a000d, 0x0080000d, 0x0087000d, 0x008d000d, 0x0094000d, 0x009a000d, 0x00a1000d,
+			0x00a7001a, 0x00b4001a, 0x00c1001a, 0x00ce001a, 0x00da001a, 0x00e7001a, 0x00f4001a, 0x0101001a,
+			0x010e0033, 0x01280033, 0x01410033, 0x015b0033, 0x01750033, 0x018f0033, 0x01a80033, 0x01c20033,
+			0x01dc0067, 0x020f0067, 0x02430067, 0x02760067, 0x02aa0067, 0x02dd0067, 0x03110067, 0x03440067,
+			0x037800ce, 0x03df00ce, 0x044600ce, 0x04ad00ce, 0x051400ce, 0x057b00c5, 0x05dd00bc, 0x063b00b5,
+			0x06970158, 0x07420142, 0x07e30130, 0x087b0120, 0x090b0112, 0x09940106, 0x0a1700fc, 0x0a9500f2,
+			0x0b0f01cb, 0x0bf401ae, 0x0ccb0195, 0x0d950180, 0x0e56016e, 0x0f0d015e, 0x0fbc0150, 0x10630143,
+			0x11070264, 0x1238023e, 0x1357021d, 0x14660201, 0x156601e9, 0x165a01d3, 0x174401c0, 0x182401af,
+			0x18fe0331, 0x1a9602fe, 0x1c1502d2, 0x1d7e02ad, 0x1ed4028d, 0x201a0270, 0x21520256, 0x227d0240,
+			0x239f0443, 0x25c003fe, 0x27bf03c4, 0x29a10392, 0x2b6a0367, 0x2d1d0341, 0x2ebe031f, 0x304d0300,
+			0x31d105b0, 0x34a80555, 0x37520507, 0x39d504c5, 0x3c37048b, 0x3e7c0458, 0x40a8042a, 0x42bd0401,
+			0x44c20798, 0x488e071e, 0x4c1c06b6, 0x4f76065d, 0x52a50610, 0x55ac05cc, 0x5892058f, 0x5b590559,
+			0x5e0c0a23, 0x631c0980, 0x67db08f6, 0x6c55087f, 0x70940818, 0x74a007bd, 0x787d076c, 0x7c330723,
+		};
+	
+	private static final float[] srgbToLinearTable = new float[] 
+		{
+			0.0f, 0.000303527f, 0.000607054f, 0.00091058103f, 0.001214108f, 0.001517635f, 0.0018211621f, 0.002124689f,
+			0.002428216f, 0.002731743f, 0.00303527f, 0.0033465356f, 0.003676507f, 0.004024717f, 0.004391442f,
+			0.0047769533f, 0.005181517f, 0.0056053917f, 0.0060488326f, 0.006512091f, 0.00699541f, 0.0074990317f,
+			0.008023192f, 0.008568125f, 0.009134057f, 0.009721218f, 0.010329823f, 0.010960094f, 0.011612245f,
+			0.012286487f, 0.012983031f, 0.013702081f, 0.014443844f, 0.015208514f, 0.015996292f, 0.016807375f,
+			0.017641952f, 0.018500218f, 0.019382361f, 0.020288562f, 0.02121901f, 0.022173883f, 0.023153365f,
+			0.02415763f, 0.025186857f, 0.026241222f, 0.027320892f, 0.028426038f, 0.029556843f, 0.03071345f, 0.03189604f,
+			0.033104774f, 0.03433981f, 0.035601325f, 0.036889452f, 0.038204376f, 0.039546248f, 0.04091521f, 0.042311423f,
+			0.043735042f, 0.045186214f, 0.046665095f, 0.048171833f, 0.049706575f, 0.051269468f, 0.052860655f, 0.05448028f,
+			0.056128494f, 0.057805434f, 0.05951124f, 0.06124607f, 0.06301003f, 0.06480328f, 0.06662595f, 0.06847818f,
+			0.07036011f, 0.07227186f, 0.07421358f, 0.07618539f, 0.07818743f, 0.08021983f, 0.082282715f, 0.084376216f,
+			0.086500466f, 0.088655606f, 0.09084173f, 0.09305898f, 0.095307484f, 0.09758736f, 0.09989874f, 0.10224175f,
+			0.10461649f, 0.10702311f, 0.10946172f, 0.111932434f, 0.11443538f, 0.116970696f, 0.11953845f, 0.12213881f,
+			0.12477186f, 0.12743773f, 0.13013652f, 0.13286836f, 0.13563336f, 0.13843165f, 0.14126332f, 0.1441285f,
+			0.1470273f, 0.14995982f, 0.15292618f, 0.1559265f, 0.15896086f, 0.16202943f, 0.16513224f, 0.16826946f,
+			0.17144115f, 0.17464745f, 0.17788847f, 0.1811643f, 0.18447503f, 0.1878208f, 0.19120172f, 0.19461787f,
+			0.19806935f, 0.2015563f, 0.20507877f, 0.2086369f, 0.21223079f, 0.21586053f, 0.21952623f, 0.22322798f,
+			0.22696589f, 0.23074007f, 0.23455065f, 0.23839766f, 0.2422812f, 0.2462014f, 0.25015837f, 0.25415218f,
+			0.2581829f, 0.26225072f, 0.26635566f, 0.27049786f, 0.27467737f, 0.27889434f, 0.2831488f, 0.2874409f,
+			0.2917707f, 0.29613832f, 0.30054384f, 0.30498737f, 0.30946895f, 0.31398875f, 0.31854683f, 0.32314324f,
+			0.32777813f, 0.33245158f, 0.33716366f, 0.34191445f, 0.3467041f, 0.3515327f, 0.35640025f, 0.36130688f,
+			0.3662527f, 0.37123778f, 0.37626222f, 0.3813261f, 0.38642952f, 0.39157256f, 0.3967553f, 0.40197787f,
+			0.4072403f, 0.4125427f, 0.41788515f, 0.42326775f, 0.42869055f, 0.4341537f, 0.43965724f, 0.44520125f,
+			0.45078585f, 0.45641106f, 0.46207705f, 0.46778384f, 0.47353154f, 0.47932023f, 0.48514998f, 0.4910209f,
+			0.49693304f, 0.5028866f, 0.50888145f, 0.5149178f, 0.5209957f, 0.52711535f, 0.5332766f, 0.5394797f,
+			0.5457247f, 0.5520116f, 0.5583406f, 0.5647117f, 0.57112503f, 0.57758063f, 0.5840786f, 0.590619f, 0.597202f,
+			0.60382754f, 0.61049575f, 0.61720675f, 0.62396055f, 0.63075733f, 0.637597f, 0.6444799f, 0.6514058f,
+			0.65837497f, 0.66538745f, 0.67244333f, 0.6795426f, 0.68668544f, 0.69387203f, 0.70110214f, 0.70837605f,
+			0.7156938f, 0.72305536f, 0.730461f, 0.7379107f, 0.7454045f, 0.75294244f, 0.76052475f, 0.7681514f, 0.77582246f,
+			0.78353804f, 0.79129815f, 0.79910296f, 0.8069525f, 0.8148468f, 0.822786f, 0.8307701f, 0.83879924f, 0.84687346f,
+			0.8549928f, 0.8631574f, 0.87136734f, 0.8796226f, 0.8879232f, 0.89626956f, 0.90466136f, 0.913099f, 0.92158204f,
+			0.93011117f, 0.9386859f, 0.9473069f, 0.9559735f, 0.9646866f, 0.9734455f, 0.98225087f, 0.9911022f, 1.0f
+		};
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	
+	public ClientBlockStateColorCache(BlockState blockState, IClientLevelWrapper samplingLevel)
+	{
+		this.blockState = blockState;
+		this.levelWrapper = samplingLevel;
+		this.level = (LevelReader) samplingLevel.getWrappedMcObject();
+		this.resolveColors();
+	}
+	
+	
+	
+	//===================//
+	// color calculation //
+	//===================//
+	
+	private void resolveColors()
+	{
+		if (this.isColorResolved)
+		{
+			return;
+		}
+		
+		try
+		{
+			// getQuads() isn't thread safe so we need to put this logic in a lock
+			RESOLVE_LOCK.lock();
+			
+			if (this.blockState.getFluidState().isEmpty())
+			{
+				// look for the first non-empty direction
+				List<BakedQuad> quads = null;
+				for (Direction direction : COLOR_RESOLUTION_DIRECTION_ORDER)
+				{
+					quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
+							getBlockModel(this.blockState).getQuads(this.blockState, direction, RANDOM);
+					
+					if (quads != null && !quads.isEmpty()
+						&& !(
+							this.blockState.getBlock() instanceof RotatedPillarBlock
+							&& direction == Direction.UP
+							)
+						)
+					{
+						break;
+					}
+				}
+				
+				if (quads == null || quads.isEmpty())
+				{
+					quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
+							getBlockModel(this.blockState).getQuads(this.blockState, null, RANDOM);
+				}
+				
+				if (quads != null && !quads.isEmpty())
+				{
+					this.needPostTinting = quads.get(0).isTinted();
+					this.needShade = quads.get(0).isShade();
+					this.tintIndex = quads.get(0).getTintIndex();
+					this.baseColor = calculateColorFromTexture(
+	                        #if MC_VER < MC_1_17_1 quads.get(0).sprite,
+							#else quads.get(0).getSprite(), #endif
+							ColorMode.getColorMode(this.blockState.getBlock()));
+				}
+				else
+				{
+					// Backup method.
+					this.needPostTinting = false;
+					this.needShade = false;
+					this.tintIndex = 0;
+					this.baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(this.blockState),
+							ColorMode.getColorMode(this.blockState.getBlock()));
+				}
+			}
+			else
+			{
+				// Liquid Block
+				this.needPostTinting = true;
+				this.needShade = false;
+				this.tintIndex = 0;
+				this.baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(this.blockState),
+						ColorMode.getColorMode(this.blockState.getBlock()));
+			}
+			
+			this.isColorResolved = true;
+		}
+		finally
+		{
+			RESOLVE_LOCK.unlock();
+		}
+	}
+	//TODO: Perhaps make this not just use the first frame?
+	private static int calculateColorFromTexture(TextureAtlasSprite texture, ColorMode colorMode)
+	{
+		int count = 0;
+		int alpha = 0;
+		double red = 0;
+		double green = 0;
+		double blue = 0;
+		int tempColor;
+		
+		// don't render Chiseled blocks.
+		// Since ColorMode is set per block, you only need to check this once.
+		if (colorMode != ColorMode.Chisel)
+		{
+			// textures normally use u and v instead of x and y
+			for (int v = 0; v < getTextureHeight(texture); v++)
+			{
+				for (int u = 0; u < getTextureWidth(texture); u++)
+				{
+					//note: Minecraft color format is: 0xAA BB GG RR
+					//________ DH mod color format is: 0xAA RR GG BB
+					//OpenGL RGBA format native order: 0xRR GG BB AA
+					//_ OpenGL RGBA format Java Order: 0xAA BB GG RR
+					tempColor = TextureAtlasSpriteWrapper.getPixelRGBA(texture, 0, u, v);
+					
+					int r = (tempColor & 0x000000FF);
+					int g = (tempColor & 0x0000FF00) >>> 8;
+					int b = (tempColor & 0x00FF0000) >>> 16;
+					int a = (tempColor & 0xFF000000) >>> 24;
+					int scale = 1;
+					if (colorMode == ColorMode.Leaves)
+					{
+						//switch (//FIXME add config option)
+						//	case BLACK:
+						//	a = 255; //simulate black background of fast leaves
+						//		break;
+						//	case IGNORE:
+							if (a == 0) {
+								continue; //same long grass
+							}
+							else
+							{
+								a = 255; //just in case there are semi transparent pixels
+							}					
+						//		break;
+						//	case TRANSPARENT:
+						//		break; //do nothing, let it count towards transparency
+						
+					}
+					else if (a == 0 && colorMode != ColorMode.Glass)
+					{
+						continue;
+					}
+					else if (colorMode == ColorMode.Flower && (g + 25 < b || g + 25 < r))
+					{
+						scale = FLOWER_COLOR_SCALE;
+					}
+					count += scale;
+					//apparently alpha is linear
+					alpha += a * scale;
+					//gamma correction is complicated
+					red += srgbToLinearTable[r] * a * scale;
+					green += srgbToLinearTable[g] * a * scale;
+					blue += srgbToLinearTable[b] * a * scale;
+				}
+			}
+		}
+		
+		if (count == 0)
+		{
+			// this block is entirely transparent
+			tempColor = ColorUtil.rgbToInt(0, 255, 255, 255);
+		}
+		else
+		{
+			// determine the average color
+			tempColor = ColorUtil.rgbToInt(
+					alpha / count,
+					linearToSrgb((float) (red / (double) alpha)),
+					linearToSrgb((float) (green / (double) alpha)),
+					linearToSrgb((float) (blue / (double) alpha)));
+		}
+		
+		//check if not missing texture
+		if (tempColor == ColorUtil.rgbToInt(255, 182, 0, 182))
+		{
+			//make it not render at all
+			tempColor = ColorUtil.rgbToInt(0, 255, 255, 255);
+		}
+		return tempColor;
+	}
+	private static int getTextureWidth(TextureAtlasSprite texture)
+	{
+        #if MC_VER < MC_1_19_4
+		return texture.getWidth();
+        #else
+		return texture.contents().width();
+        #endif
+	}
+	private static int getTextureHeight(TextureAtlasSprite texture)
+	{
+        #if MC_VER < MC_1_19_4
+		return texture.getHeight();
+        #else
+		return texture.contents().height();
+        #endif
+	}
+	/**
+	 * This method was suggested by IMS from the Iris/Sodium team. 
+	 * That's where the numbers and code are based.
+	 */
+	private static int linearToSrgb(float c)
+	{
+		if (!(c > MIN_SRGB_BOUND)) {
+			c = MIN_SRGB_BOUND;
+		}
+		
+		if (c > MAX_SRGB_BOUND) {
+			c = MAX_SRGB_BOUND;
+		}
+		int inputBits = Float.floatToRawIntBits(c);
+		int entry = linearToSrgbTable[((inputBits - MIN_SRGB_BITS) >> 20)];
+		
+		int bias = (entry >>> 16) << 9;
+		int scale = entry & 0xffff;
+		int t = (inputBits >>> 12) & 0xff;
+		
+		return (bias + (scale * t)) >>> 16;
+	}
+	
+	
+	
+	//===============//
+	// public getter //
+	//===============//
+	
+	public int getColor(BiomeWrapper biome, DhBlockPos pos)
+	{
+		// only get the tint if the block needs to be tinted
+		if (!this.needPostTinting)
+		{
+			return this.baseColor;
+		}
+		
+		// don't try tinting blocks that don't support our method of tint getting
+		if (BROKEN_BLOCK_STATES.contains(this.blockState))
+		{
+			return this.baseColor;
+		}
+		
+		
+		// attempt to get the tint
+		int tintColor = -1;
+		try
+		{
+			// try to use the fast tint getter logic first
+			if (!BLOCK_STATES_THAT_NEED_LEVEL.contains(this.blockState))
+			{
+				try
+				{
+					tintColor = Minecraft.getInstance().getBlockColors()
+							.getColor(this.blockState, new TintWithoutLevelOverrider(biome, this.levelWrapper), McObjectConverter.Convert(pos), this.tintIndex);
+				}
+				catch (UnsupportedOperationException e)
+				{
+					// this exception generally occurs if the tint requires other blocks besides itself
+					LOGGER.debug("Unable to use ["+TintWithoutLevelOverrider.class.getSimpleName()+"] to get the block tint for block: [" + this.blockState + "] and biome: [" + biome + "] at pos: " + pos + ". Error: [" + e.getMessage() + "]. Attempting to use backup method...", e);
+					BLOCK_STATES_THAT_NEED_LEVEL.add(this.blockState);
+				}
+			}
+			
+			// use the level logic only if requested
+			if (BLOCK_STATES_THAT_NEED_LEVEL.contains(this.blockState))
+			{
+				// this logic can't be used all the time due to it breaking some blocks tinting
+				// specifically oceans don't render correctly
+				tintColor = Minecraft.getInstance().getBlockColors()
+						.getColor(this.blockState, new TintGetterOverrideFast(this.level), McObjectConverter.Convert(pos), this.tintIndex);
+			}
+		}
+		catch (Exception e)
+		{
+			// only display the error once per block/biome type to reduce log spam
+			if (!BROKEN_BLOCK_STATES.contains(this.blockState))
+			{
+				LOGGER.warn("Failed to get block color for block: [" + this.blockState + "] and biome: [" + biome + "] at pos: " + pos + ". Error: ["+e.getMessage() + "]. Note: future errors for this block/biome will be ignored.", e);
+				BROKEN_BLOCK_STATES.add(this.blockState);
+			}
+		}
+		
+		
+		
+		if (tintColor != -1)
+		{
+			return ColorUtil.multiplyARGBwithRGB(this.baseColor, tintColor);
+		}
+		else
+		{
+			// unable to get the tinted color, use the base color instead
+			return this.baseColor;
+		}
+	}
+	
+	
+	
+	//================//
+	// helper classes //
+	//================//
+	
+	enum ColorMode
+	{
+		Default,
+		Flower,
+		Leaves,
+		Chisel,
+		Glass;
+		
+		static ColorMode getColorMode(Block block)
+		{
+			if (block instanceof LeavesBlock) return Leaves;
+			if (block instanceof FlowerBlock) return Flower;
+			if (block.toString().contains("glass")) return Glass;
+			if (block.toString().equals("Block{chiselsandbits:chiseled}")) return Chisel;
+			return Default;
+		}
+	}
+	
+	
+	
+}
@@ -1,48 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.block.cache;
-
-import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
-import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
-import net.minecraft.world.level.block.state.BlockState;
-
-import java.util.concurrent.ConcurrentHashMap;
-
-public class ClientBlockDetailMap
-{
-	private final ConcurrentHashMap<BlockState, ClientBlockStateCache> blockCache = new ConcurrentHashMap<>();
-	//private final ConcurrentHashMap<#if MC_VER < MC_1_18_2 Biome #else Holder<Biome> #endif, Biome> biomeMap = new ConcurrentHashMap<>();
-	private final ClientLevelWrapper level;
-	public ClientBlockDetailMap(ClientLevelWrapper level) { this.level = level; }
-	
-	public ClientBlockStateCache getBlockStateData(BlockState state, DhBlockPos pos)
-	{ //TODO: Allow a per pos unique setting
-		return blockCache.computeIfAbsent(state, (s) -> new ClientBlockStateCache(s, level, pos));
-	}
-	
-	public void clear() { blockCache.clear(); }
-	
-	public int getColor(BlockState state, BiomeWrapper biome, DhBlockPos pos)
-	{
-		return getBlockStateData(state, pos).getAndResolveFaceColor(biome, pos);
-	}
-	
-}
@@ -1,412 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.block.cache;
-
-import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
-import com.seibel.distanthorizons.common.wrappers.block.TextureAtlasSpriteWrapper;
-import com.seibel.distanthorizons.common.wrappers.block.TintWithoutLevelOverrider;
-import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
-import com.seibel.distanthorizons.common.wrappers.block.*;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
-import com.seibel.distanthorizons.core.util.ColorUtil;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.block.model.BakedQuad;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.FlowerBlock;
-import net.minecraft.world.level.block.LeavesBlock;
-import net.minecraft.world.level.block.RotatedPillarBlock;
-#if MC_VER >= MC_1_19_2
-import net.minecraft.util.RandomSource;
-#else
-import java.util.Random;
-#endif
-import net.minecraft.world.level.block.state.BlockState;
-import org.apache.logging.log4j.Logger;
-
-import java.util.HashSet;
-import java.util.List;
-
-/**
- * @version 2022-9-16
- */
-public class ClientBlockStateCache
-{
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
-	
-	private static final HashSet<BlockState> BLOCK_STATES_THAT_NEED_LEVEL = new HashSet<>();
-	private static final HashSet<BlockState> BROKEN_BLOCK_STATES = new HashSet<>();
-	
-	#if MC_VER < MC_1_19_2
-	public static final Random random = new Random(0);
-	#else
-	public static final RandomSource random = RandomSource.create();
-	#endif
-	
-	public final IClientLevelWrapper levelWrapper;
-	public final BlockState blockState;
-	public final LevelReader level;
-	public final BlockPos pos;
-	
-	
-	
-	public ClientBlockStateCache(BlockState blockState, IClientLevelWrapper samplingLevel, DhBlockPos samplingPos)
-	{
-		this.blockState = blockState;
-		this.levelWrapper = samplingLevel;
-		this.level = (LevelReader) samplingLevel.getWrappedMcObject();
-		this.pos = McObjectConverter.Convert(samplingPos);
-		this.resolveColors();
-		//LOGGER.info("ClientBlocKCache created for {}", blockState);
-	}
-	
-	boolean isColorResolved = false;
-	int baseColor = 0; //TODO: Impl per-face color
-	boolean needShade = true;
-	boolean needPostTinting = false;
-	int tintIndex = 0;
-	
-	
-	public static final int FLOWER_COLOR_SCALE = 5;
-	
-	enum ColorMode
-	{
-		Default,
-		Flower,
-		Leaves,
-		Chisel,
-		Glass;
-		static ColorMode getColorMode(Block b)
-		{
-			if (b instanceof LeavesBlock) return Leaves;
-			if (b instanceof FlowerBlock) return Flower;
-			if (b.toString().contains("glass")) return Glass;
-			if (b.toString().equals("Block{chiselsandbits:chiseled}")) return Chisel;
-			return Default;
-		}
-	}
-
-	//Way to efficiently do this was suggested by IMS from sodium. This is where those numbers and support code was lifted from.
-	private static final int MIN_BITS = 0x39000000; // 2^(-13)
-	private static final int MAX_BITS = 0x3f7fffff; // 1.0 - f32::EPSILON
-	private static final float MIN_BOUND = Float.intBitsToFloat(MIN_BITS);
-	private static final float MAX_BOUND = Float.intBitsToFloat(MAX_BITS);
-
-	private static final int[] linearToSrgbTable = new int[] {
-			0x0073000d, 0x007a000d, 0x0080000d, 0x0087000d, 0x008d000d, 0x0094000d, 0x009a000d, 0x00a1000d,
-			0x00a7001a, 0x00b4001a, 0x00c1001a, 0x00ce001a, 0x00da001a, 0x00e7001a, 0x00f4001a, 0x0101001a,
-			0x010e0033, 0x01280033, 0x01410033, 0x015b0033, 0x01750033, 0x018f0033, 0x01a80033, 0x01c20033,
-			0x01dc0067, 0x020f0067, 0x02430067, 0x02760067, 0x02aa0067, 0x02dd0067, 0x03110067, 0x03440067,
-			0x037800ce, 0x03df00ce, 0x044600ce, 0x04ad00ce, 0x051400ce, 0x057b00c5, 0x05dd00bc, 0x063b00b5,
-			0x06970158, 0x07420142, 0x07e30130, 0x087b0120, 0x090b0112, 0x09940106, 0x0a1700fc, 0x0a9500f2,
-			0x0b0f01cb, 0x0bf401ae, 0x0ccb0195, 0x0d950180, 0x0e56016e, 0x0f0d015e, 0x0fbc0150, 0x10630143,
-			0x11070264, 0x1238023e, 0x1357021d, 0x14660201, 0x156601e9, 0x165a01d3, 0x174401c0, 0x182401af,
-			0x18fe0331, 0x1a9602fe, 0x1c1502d2, 0x1d7e02ad, 0x1ed4028d, 0x201a0270, 0x21520256, 0x227d0240,
-			0x239f0443, 0x25c003fe, 0x27bf03c4, 0x29a10392, 0x2b6a0367, 0x2d1d0341, 0x2ebe031f, 0x304d0300,
-			0x31d105b0, 0x34a80555, 0x37520507, 0x39d504c5, 0x3c37048b, 0x3e7c0458, 0x40a8042a, 0x42bd0401,
-			0x44c20798, 0x488e071e, 0x4c1c06b6, 0x4f76065d, 0x52a50610, 0x55ac05cc, 0x5892058f, 0x5b590559,
-			0x5e0c0a23, 0x631c0980, 0x67db08f6, 0x6c55087f, 0x70940818, 0x74a007bd, 0x787d076c, 0x7c330723,
-	};
-	
-	private static final float[] srgbToLinearTable = new float[] {
-		0.0f, 0.000303527f, 0.000607054f, 0.00091058103f, 0.001214108f, 0.001517635f, 0.0018211621f, 0.002124689f,
-		0.002428216f, 0.002731743f, 0.00303527f, 0.0033465356f, 0.003676507f, 0.004024717f, 0.004391442f,
-		0.0047769533f, 0.005181517f, 0.0056053917f, 0.0060488326f, 0.006512091f, 0.00699541f, 0.0074990317f,
-		0.008023192f, 0.008568125f, 0.009134057f, 0.009721218f, 0.010329823f, 0.010960094f, 0.011612245f,
-		0.012286487f, 0.012983031f, 0.013702081f, 0.014443844f, 0.015208514f, 0.015996292f, 0.016807375f,
-		0.017641952f, 0.018500218f, 0.019382361f, 0.020288562f, 0.02121901f, 0.022173883f, 0.023153365f,
-		0.02415763f, 0.025186857f, 0.026241222f, 0.027320892f, 0.028426038f, 0.029556843f, 0.03071345f, 0.03189604f,
-		0.033104774f, 0.03433981f, 0.035601325f, 0.036889452f, 0.038204376f, 0.039546248f, 0.04091521f, 0.042311423f,
-		0.043735042f, 0.045186214f, 0.046665095f, 0.048171833f, 0.049706575f, 0.051269468f, 0.052860655f, 0.05448028f,
-		0.056128494f, 0.057805434f, 0.05951124f, 0.06124607f, 0.06301003f, 0.06480328f, 0.06662595f, 0.06847818f,
-		0.07036011f, 0.07227186f, 0.07421358f, 0.07618539f, 0.07818743f, 0.08021983f, 0.082282715f, 0.084376216f,
-		0.086500466f, 0.088655606f, 0.09084173f, 0.09305898f, 0.095307484f, 0.09758736f, 0.09989874f, 0.10224175f,
-		0.10461649f, 0.10702311f, 0.10946172f, 0.111932434f, 0.11443538f, 0.116970696f, 0.11953845f, 0.12213881f,
-		0.12477186f, 0.12743773f, 0.13013652f, 0.13286836f, 0.13563336f, 0.13843165f, 0.14126332f, 0.1441285f,
-		0.1470273f, 0.14995982f, 0.15292618f, 0.1559265f, 0.15896086f, 0.16202943f, 0.16513224f, 0.16826946f,
-		0.17144115f, 0.17464745f, 0.17788847f, 0.1811643f, 0.18447503f, 0.1878208f, 0.19120172f, 0.19461787f,
-		0.19806935f, 0.2015563f, 0.20507877f, 0.2086369f, 0.21223079f, 0.21586053f, 0.21952623f, 0.22322798f,
-		0.22696589f, 0.23074007f, 0.23455065f, 0.23839766f, 0.2422812f, 0.2462014f, 0.25015837f, 0.25415218f,
-		0.2581829f, 0.26225072f, 0.26635566f, 0.27049786f, 0.27467737f, 0.27889434f, 0.2831488f, 0.2874409f,
-		0.2917707f, 0.29613832f, 0.30054384f, 0.30498737f, 0.30946895f, 0.31398875f, 0.31854683f, 0.32314324f,
-		0.32777813f, 0.33245158f, 0.33716366f, 0.34191445f, 0.3467041f, 0.3515327f, 0.35640025f, 0.36130688f,
-		0.3662527f, 0.37123778f, 0.37626222f, 0.3813261f, 0.38642952f, 0.39157256f, 0.3967553f, 0.40197787f,
-		0.4072403f, 0.4125427f, 0.41788515f, 0.42326775f, 0.42869055f, 0.4341537f, 0.43965724f, 0.44520125f,
-		0.45078585f, 0.45641106f, 0.46207705f, 0.46778384f, 0.47353154f, 0.47932023f, 0.48514998f, 0.4910209f,
-		0.49693304f, 0.5028866f, 0.50888145f, 0.5149178f, 0.5209957f, 0.52711535f, 0.5332766f, 0.5394797f,
-		0.5457247f, 0.5520116f, 0.5583406f, 0.5647117f, 0.57112503f, 0.57758063f, 0.5840786f, 0.590619f, 0.597202f,
-		0.60382754f, 0.61049575f, 0.61720675f, 0.62396055f, 0.63075733f, 0.637597f, 0.6444799f, 0.6514058f,
-		0.65837497f, 0.66538745f, 0.67244333f, 0.6795426f, 0.68668544f, 0.69387203f, 0.70110214f, 0.70837605f,
-		0.7156938f, 0.72305536f, 0.730461f, 0.7379107f, 0.7454045f, 0.75294244f, 0.76052475f, 0.7681514f, 0.77582246f,
-		0.78353804f, 0.79129815f, 0.79910296f, 0.8069525f, 0.8148468f, 0.822786f, 0.8307701f, 0.83879924f, 0.84687346f,
-		0.8549928f, 0.8631574f, 0.87136734f, 0.8796226f, 0.8879232f, 0.89626956f, 0.90466136f, 0.913099f, 0.92158204f,
-		0.93011117f, 0.9386859f, 0.9473069f, 0.9559735f, 0.9646866f, 0.9734455f, 0.98225087f, 0.9911022f, 1.0f
-    };
-
-	private static int linearToSrgb(float c) {
-		if (!(c > MIN_BOUND)) {
-			c = MIN_BOUND;
-		}
-
-		if (c > MAX_BOUND) {
-			c = MAX_BOUND;
-		}
-		int inputBits = Float.floatToRawIntBits(c);
-		int entry = linearToSrgbTable[((inputBits - MIN_BITS) >> 20)];
-
-		int bias = (entry >>> 16) << 9;
-		int scale = entry & 0xffff;
-		int t = (inputBits >>> 12) & 0xff;
-
-		return (bias + (scale * t)) >>> 16;
-	}
-	//////////////
-	
-	private static int getWidth(TextureAtlasSprite texture)
-	{
-        #if MC_VER < MC_1_19_4
-		return texture.getWidth();
-        #else
-		return texture.contents().width();
-        #endif
-	}
-	
-	private static int getHeight(TextureAtlasSprite texture)
-	{
-        #if MC_VER < MC_1_19_4
-		return texture.getHeight();
-        #else
-		return texture.contents().height();
-        #endif
-	}
-
-	
-	//TODO: Perhaps make this not just use the first frame?
-	private static int calculateColorFromTexture(TextureAtlasSprite texture, ColorMode colorMode)
-	{
-		int count = 0;
-		int alpha = 0;
-		double red = 0;
-		double green = 0;
-		double blue = 0;
-		int tempColor;
-		//make Chiseled block not render. Since ColorMode is set per block, you only need to check it once
-		if (colorMode != ColorMode.Chisel)
-		{
-			// textures normally use u and v instead of x and y
-			for (int v = 0; v < getHeight(texture); v++)
-			{
-				for (int u = 0; u < getWidth(texture); u++)
-				{
-					//note: Minecraft color format is: 0xAA BB GG RR
-					//________ DH mod color format is: 0xAA RR GG BB
-					//OpenGL RGBA format native order: 0xRR GG BB AA
-					//_ OpenGL RGBA format Java Order: 0xAA BB GG RR
-					tempColor = TextureAtlasSpriteWrapper.getPixelRGBA(texture, 0, u, v);
-					
-					int r = (tempColor & 0x000000FF);
-					int g = (tempColor & 0x0000FF00) >>> 8;
-					int b = (tempColor & 0x00FF0000) >>> 16;
-					int a = (tempColor & 0xFF000000) >>> 24;
-					int scale = 1;
-					if (colorMode == ColorMode.Leaves)
-					{
-						//switch (//FIXME add config option)
-						//	case BLACK:
-						//	a = 255; //simulate black background of fast leaves
-						//		break;
-						//	case IGNORE:
-							if (a == 0) {
-								continue; //same long grass
-							}
-							else
-							{
-								a = 255; //just in case there are semi transparent pixels
-							}					
-						//		break;
-						//	case TRANSPARENT:
-						//		break; //do nothing, let it count towards transparency
-						
-					}
-					else if (a == 0 && colorMode != ColorMode.Glass)
-					{
-						continue;
-					}
-					else if (colorMode == ColorMode.Flower && (g + 25 < b || g + 25 < r))
-					{
-						scale = FLOWER_COLOR_SCALE;
-					}
-					count += scale;
-					//apparently alpha is linear
-					alpha += a * scale;
-					//gamma correction is complicated
-					red += srgbToLinearTable[r] * a * scale;
-					green += srgbToLinearTable[g] * a * scale;
-					blue += srgbToLinearTable[b] * a * scale;
-				}
-			}
-		}
-		
-		if (count == 0)
-			// this block is entirely transparent
-			tempColor = ColorUtil.rgbToInt(0, 255, 255, 255);
-		else
-		{
-			// determine the average color
-			tempColor = ColorUtil.rgbToInt(
-					alpha / count,
-					linearToSrgb((float) (red / (double) alpha)),
-					linearToSrgb((float) (green / (double) alpha)),
-					linearToSrgb((float) (blue / (double) alpha)));
-		}
-		//check if not missing texture
-		if (tempColor == ColorUtil.rgbToInt(255, 182, 0, 182))
-		{
-			//make it not render at all
-			tempColor = ColorUtil.rgbToInt(0, 255, 255, 255);
-		}
-		return tempColor;
-	}
-	private static final Direction[] DIRECTION_ORDER = {Direction.UP, Direction.NORTH, Direction.EAST, Direction.WEST, Direction.SOUTH, Direction.DOWN};
-	
-	private void resolveColors()
-	{
-		if (isColorResolved) return;
-		if (blockState.getFluidState().isEmpty())
-		{
-			List<BakedQuad> quads = null;
-			for (Direction direction : DIRECTION_ORDER)
-			{
-				quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
-						getBlockModel(blockState).getQuads(blockState, direction, random); // TODO getQuads sometimes throws a "makeThreadingException", is there anything we can do about that? Note: this isn't a critical issue, it just prints an ugly error and the render data will need to be regenered.
-				if (quads != null && !quads.isEmpty() &&
-						!(blockState.getBlock() instanceof RotatedPillarBlock && direction == Direction.UP))
-					break;
-			} ;
-			if (quads == null || quads.isEmpty())
-			{
-				quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
-						getBlockModel(blockState).getQuads(blockState, null, random);
-			}
-			if (quads != null && !quads.isEmpty())
-			{
-				needPostTinting = quads.getFirst().isTinted();
-				needShade = quads.getFirst().isShade();
-				tintIndex = quads.getFirst().getTintIndex();
-				baseColor = calculateColorFromTexture(
-                        #if MC_VER < MC_1_17_1 quads.get(0).sprite,
-						#else quads.getFirst().getSprite(), #endif
-						ColorMode.getColorMode(blockState.getBlock()));
-			}
-			else
-			{ // Backup method.
-				needPostTinting = false;
-				needShade = false;
-				tintIndex = 0;
-				baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(blockState),
-						ColorMode.getColorMode(blockState.getBlock()));
-			}
-		}
-		else
-		{ // Liquid Block
-			needPostTinting = true;
-			needShade = false;
-			tintIndex = 0;
-			baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(blockState),
-					ColorMode.getColorMode(blockState.getBlock()));
-		}
-		isColorResolved = true;
-	}
-	
-	public int getAndResolveFaceColor(BiomeWrapper biome, DhBlockPos pos)
-	{
-		// FIXME: impl per-face colors
-		
-		// only get the tint if the block needs to be tinted
-		if (!this.needPostTinting)
-		{
-			return this.baseColor;
-		}
-		
-		// don't try tinting blocks that don't support our method of tint getting
-		if (BROKEN_BLOCK_STATES.contains(this.blockState))
-		{
-			return this.baseColor;
-		}
-		
-		
-		// attempt to get the tint
-		int tintColor = -1;
-		try
-		{
-			// try to use the fast tint getter logic first
-			if (!BLOCK_STATES_THAT_NEED_LEVEL.contains(this.blockState))
-			{
-				try
-				{
-					tintColor = Minecraft.getInstance().getBlockColors()
-							.getColor(this.blockState, new TintWithoutLevelOverrider(biome, this.levelWrapper), McObjectConverter.Convert(pos), this.tintIndex);
-				}
-				catch (UnsupportedOperationException e)
-				{
-					// this exception generally occurs if the tint requires other blocks besides itself
-					LOGGER.debug("Unable to use ["+TintWithoutLevelOverrider.class.getSimpleName()+"] to get the block tint for block: [" + this.blockState + "] and biome: [" + biome + "] at pos: " + pos + ". Error: [" + e.getMessage() + "]. Attempting to use backup method...", e);
-					BLOCK_STATES_THAT_NEED_LEVEL.add(this.blockState);
-				}
-			}
-			
-			// use the level logic only if requested
-			if (BLOCK_STATES_THAT_NEED_LEVEL.contains(this.blockState))
-			{
-				// this logic can't be used all the time due to it breaking some blocks tinting
-				// specifically oceans don't render correctly
-				tintColor = Minecraft.getInstance().getBlockColors()
-						.getColor(this.blockState, new TintGetterOverrideFast(this.level), McObjectConverter.Convert(pos), this.tintIndex);
-			}
-		}
-		catch (Exception e)
-		{
-			// only display the error once per block/biome type to reduce log spam
-			if (!BROKEN_BLOCK_STATES.contains(this.blockState))
-			{
-				LOGGER.warn("Failed to get block color for block: [" + this.blockState + "] and biome: [" + biome + "] at pos: " + pos + ". Error: ["+e.getMessage() + "]. Note: future errors for this block/biome will be ignored.", e);
-				BROKEN_BLOCK_STATES.add(this.blockState);
-			}
-		}
-		
-		
-		
-		if (tintColor != -1)
-		{
-			return ColorUtil.multiplyARGBwithRGB(this.baseColor, tintColor);
-		}
-		else
-		{
-			// unable to get the tinted color, use the base color instead
-			return this.baseColor;
-		}
-	}
-	
-}
@@ -1,43 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.block.cache;
-
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
-import net.minecraft.world.level.block.state.BlockState;
-
-
-public class ServerBlockDetailMap
-{
-	private final ConcurrentHashMap<BlockState, ServerBlockStateCache> blockCache = new ConcurrentHashMap<>();
-	//private final ConcurrentHashMap<#if MC_VER < MC_1_18_2 Biome #else Holder<Biome> #endif, Biome> biomeMap = new ConcurrentHashMap<>();
-	private final ServerLevelWrapper level;
-	public ServerBlockDetailMap(ServerLevelWrapper level) { this.level = level; }
-	
-	public ServerBlockStateCache getBlockStateData(BlockState state, DhBlockPos pos)
-	{ //TODO: Allow a per pos unique setting
-		return blockCache.computeIfAbsent(state, (s) -> new ServerBlockStateCache(s, level, new DhBlockPos(0, 0, 0)));
-	}
-	
-	public void clear() { blockCache.clear(); }
-	
-}
@@ -1,104 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020-2023 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.block.cache;
-
-import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import org.apache.logging.log4j.Logger;
-
-import java.util.Arrays;
-
-/**
- * @version 2022-9-16
- */
-public class ServerBlockStateCache
-{
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
-	
-	public final BlockState state;
-	public final LevelReader level;
-	public final BlockPos pos;
-	
-	public ServerBlockStateCache(BlockState blockState, ILevelWrapper samplingLevel, DhBlockPos samplingPos)
-	{
-		state = blockState;
-		level = (LevelReader) samplingLevel.getWrappedMcObject();
-		pos = McObjectConverter.Convert(samplingPos);
-		resolveShapes();
-		//LOGGER.info("ServerBlockState created for {}", blockState);
-	}
-	
-	boolean noCollision = false;
-	boolean[] occludeFaces = null;
-	boolean[] fullFaces = null;
-	boolean isShapeResolved = false;
-	public void resolveShapes()
-	{
-		if (isShapeResolved) return;
-		if (state.getFluidState().isEmpty())
-		{
-			noCollision = state.getCollisionShape(level, pos).isEmpty();
-			occludeFaces = new boolean[6];
-			if (state.canOcclude())
-			{
-				for (Direction dir : Direction.values())
-				{
-					// Note: isEmpty() isn't quite correct... best would be a isFull() or something...
-					occludeFaces[McObjectConverter.Convert(dir).ordinal()]
-							= !state.getFaceOcclusionShape(level, pos, dir).isEmpty();
-				}
-			}
-			
-			VoxelShape voxelShape = state.getShape(level, pos);
-			fullFaces = new boolean[6];
-			if (!voxelShape.isEmpty())
-			{
-				for (Direction dir : Direction.values())
-				{
-					VoxelShape faceShape = voxelShape.getFaceShape(dir);
-					AABB aabb = faceShape.bounds();
-					boolean xFull = aabb.minX <= 0.01 && aabb.maxX >= 0.99;
-					boolean yFull = aabb.minY <= 0.01 && aabb.maxY >= 0.99;
-					boolean zFull = aabb.minZ <= 0.01 && aabb.maxZ >= 0.99;
-					fullFaces[McObjectConverter.Convert(dir).ordinal()] =
-							(xFull || dir.getAxis().equals(Direction.Axis.X))
-									&& (yFull || dir.getAxis().equals(Direction.Axis.Y))
-									&& (zFull || dir.getAxis().equals(Direction.Axis.Z));
-				}
-			}
-		}
-		else
-		{ // Liquid Block. Treat as full block
-			occludeFaces = new boolean[6];
-			Arrays.fill(occludeFaces, true);
-			fullFaces = new boolean[6];
-			Arrays.fill(fullFaces, true);
-		}
-	}
-	
-}
@@ -22,9 +22,12 @@ package com.seibel.distanthorizons.common.wrappers.chunk;
 import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
 import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
+import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
+import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
+import com.seibel.distanthorizons.core.util.LodUtil;
+import com.seibel.distanthorizons.core.world.EWorldEnvironment;
 import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.ChunkLightStorage;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
@@ -83,7 +86,7 @@ public class ChunkWrapper implements IChunkWrapper
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	/** can be used for interactions with the underlying chunk where creating new BlockPos objects could cause issues for the garbage collector. */
-	private static final ThreadLocal<BlockPos.MutableBlockPos> MUTABLE_BLOCK_POS_REF = ThreadLocal.withInitial(BlockPos.MutableBlockPos::new);
+	private static final ThreadLocal<BlockPos.MutableBlockPos> MUTABLE_BLOCK_POS_REF = ThreadLocal.withInitial(() -> new BlockPos.MutableBlockPos());
 	
 	
 	private final ChunkAccess chunk;
@@ -140,7 +143,8 @@ public class ChunkWrapper implements IChunkWrapper
 		
 		// FIXME +1 is to handle the fact that LodDataBuilder adds +1 to all block lighting calculations, also done in the relative position validator

-		chunksNeedingClientLightUpdating.add(this);
+		if (SharedApi.getEnvironment() != EWorldEnvironment.Server_Only)
+			chunksNeedingClientLightUpdating.add(this);
 	}
 	
 	
@@ -305,7 +309,7 @@ public class ChunkWrapper implements IChunkWrapper
 	public ChunkStatus getStatus() { return getStatus(this.getChunk()); }
 	public static ChunkStatus getStatus(ChunkAccess chunk)
 	{
-		#if MC_VER < MC_1_21 
+		#if MC_VER < MC_1_21_1 
 		return chunk.getStatus();
 		#else
 		return chunk.getPersistedStatus(); 
@@ -345,9 +349,10 @@ public class ChunkWrapper implements IChunkWrapper
 		#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
 		return false; // MC's lighting engine doesn't work consistently enough to trust for 1.16 or 1.17
 		#else
-		if (this.chunk instanceof LevelChunk levelChunk)
+		if (this.chunk instanceof LevelChunk)
 		{
-			if (levelChunk.getLevel() instanceof ClientLevel)
+			LevelChunk levelChunk = (LevelChunk) this.chunk;
+			if (levelChunk.getLevel().isClientSide())
 			{
 				// connected to a server
 				return this.isMcClientLightingCorrect;
@@ -389,6 +394,8 @@ public class ChunkWrapper implements IChunkWrapper
 		return this.blockLightStorage;
 	}
 	public void setBlockLightStorage(ChunkLightStorage lightStorage) { this.blockLightStorage = lightStorage; }
+	@Override
+	public void clearDhBlockLighting() { this.getBlockLightStorage().clear(); }
 	
 	
 	@Override
@@ -403,6 +410,8 @@ public class ChunkWrapper implements IChunkWrapper
 		this.throwIndexOutOfBoundsIfRelativePosOutsideChunkBounds(relX, y, relZ);
 		this.getSkyLightStorage().set(relX, y, relZ, lightValue);
 	}
+	@Override
+	public void clearDhSkyLighting() { this.getSkyLightStorage().clear(); }
 	
 	private ChunkLightStorage getSkyLightStorage()
 	{
@@ -458,7 +467,7 @@ public class ChunkWrapper implements IChunkWrapper
 	 *  before the list has finished populating.
 	 */
 	@Override
-	public synchronized ArrayList<DhBlockPos> getBlockLightPosList()
+	public synchronized ArrayList<DhBlockPos> getWorldBlockLightPosList()
 	{
 		// only populate the list once
 		if (this.blockLightPosList == null)
@@ -473,7 +482,15 @@ public class ChunkWrapper implements IChunkWrapper
 			});
 			#else
 			this.chunk.findBlockLightSources((blockPos, blockState) ->
-					this.blockLightPosList.add(new DhBlockPos(blockPos.getX(), blockPos.getY(), blockPos.getZ())));
+			{
+				DhBlockPos pos = new DhBlockPos(blockPos.getX(), blockPos.getY(), blockPos.getZ());
+				
+				// this can be uncommented if MC decides to return relative block positions in the future instead of world positions
+				//pos.mutateToChunkRelativePos(pos);
+				//pos.mutateOffset(this.chunkPos.getMinBlockX(), 0, this.chunkPos.getMinBlockZ(), pos);
+				
+				this.blockLightPosList.add(pos);
+			});
 			#endif
 		}
 		
@@ -504,8 +521,9 @@ public class ChunkWrapper implements IChunkWrapper
 	/** Should be called after client light updates are triggered. */
 	private void updateIsClientLightingCorrect()
 	{
-		if (this.chunk instanceof LevelChunk levelChunk && ((LevelChunk) this.chunk).getLevel() instanceof ClientLevel)
+		if (this.chunk instanceof LevelChunk && ((LevelChunk) this.chunk).getLevel() instanceof ClientLevel)
 		{
+			LevelChunk levelChunk = (LevelChunk) this.chunk;
 			ClientChunkCache clientChunkCache = ((ClientLevel) levelChunk.getLevel()).getChunkSource();
 			this.isMcClientLightingCorrect = clientChunkCache.getChunkForLighting(this.chunk.getPos().x, this.chunk.getPos().z) != null &&
 					#if MC_VER <= MC_1_17_1
@@ -591,4 +609,4 @@ public class ChunkWrapper implements IChunkWrapper
 	//	return this.blockBiomeHashCode;
 	//}
 	
-}
+}
@@ -145,9 +145,9 @@ public class ClassicConfigGUI
 					case 0:
 						((EntryInfo) info.guiValue).error = null; break;
 					case -1:
-						((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cMinimum length is " + ((ConfigEntry<?>) info).getMin())); break;
+						((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cMinimum length is " + ((ConfigEntry) info).getMin())); break;
 					case 1:
-						((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cMaximum length is " + ((ConfigEntry<?>) info).getMax())); break;
+						((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cMaximum length is " + ((ConfigEntry) info).getMax())); break;
 					case 2:
 						((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cValue is invalid")); break;
 				}
@@ -235,7 +235,7 @@ public class ClassicConfigGUI
 			ConfigBase.INSTANCE.configFileINSTANCE.saveToFile();
 			Objects.requireNonNull(this.minecraft).setScreen(this.parent);
 			
-			CONFIG_CORE_INTERFACE.onScreenChangeListenerList.forEach(Runnable::run);
+			CONFIG_CORE_INTERFACE.onScreenChangeListenerList.forEach((listener) -> listener.run());
 		}
 		
 		@Override
@@ -259,7 +259,7 @@ public class ClassicConfigGUI
 						0, 0,
 						// Some textuary stuff
 						0, 
-						#if MC_VER < MC_1_21 
+						#if MC_VER < MC_1_21_1
 						new ResourceLocation(ModInfo.ID, "textures/gui/changelog.png"),
 						#else
 						ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "textures/gui/changelog.png"),
@@ -319,7 +319,7 @@ public class ClassicConfigGUI
 			
 			
 			
-			CONFIG_CORE_INTERFACE.onScreenChangeListenerList.forEach(Runnable::run);
+			CONFIG_CORE_INTERFACE.onScreenChangeListenerList.forEach((listener) -> listener.run());
 			
 		}
 		
@@ -332,7 +332,7 @@ public class ClassicConfigGUI
 			if (ConfigEntry.class.isAssignableFrom(info.getClass()))
 			{
 				Button.OnPress btnAction = button -> {
-					((ConfigEntry) info).uiSetWithoutSaving(((ConfigEntry<?>) info).getDefaultValue());
+					((ConfigEntry) info).uiSetWithoutSaving(((ConfigEntry) info).getDefaultValue());
 					((EntryInfo) info.guiValue).index = 0;
 					this.reload = true;
 					Objects.requireNonNull(minecraft).setScreen(this);
@@ -376,7 +376,9 @@ public class ClassicConfigGUI
 			}
 			if (ConfigUIButton.class.isAssignableFrom(info.getClass()))
 			{
-				Button widget = MakeBtn(name, this.width / 2 - 100, this.height - 28, 100 * 2, 20, (button -> ((ConfigUIButton) info).runAction()));
+				Button widget = MakeBtn(name, this.width / 2 - 100, this.height - 28, 100 * 2, 20, (button -> {
+					((ConfigUIButton) info).runAction();
+				}));
 				this.list.addButton(widget, null, null, null);
 				return;
 			}
@@ -25,18 +25,19 @@ public class GetConfigScreen
 		// This shouldn't be here, but I need a way to test it after Minecraft inits its assets
 		//System.out.println(ConfigBase.INSTANCE.generateLang(false, true));
 		
-		return switch (useScreen)
+		switch (useScreen)
 		{
-			case Classic -> ClassicConfigGUI.getScreen(ConfigBase.INSTANCE, parent, "client");
-			case OpenGL ->
-			{
+			case Classic:
+				return ClassicConfigGUI.getScreen(ConfigBase.INSTANCE, parent, "client");
+			case OpenGL:
 				MinecraftScreen.getScreen(parent, new OpenGLConfigScreen(), ModInfo.ID + ".title");
-				yield null;
-			}
+				return null;
 //            case JavaFX -> MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new JavaScreenHandlerScreen.ExampleScreen()), ModInfo.ID + ".title");
-			case JavaFX -> MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new ConfigScreen()), ModInfo.ID + ".title");
-			default -> throw new IllegalArgumentException("No config screen implementation defined for [" + useScreen + "].");
-		};
+			case JavaFX:
+				return MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new ConfigScreen()), ModInfo.ID + ".title");
+			default:
+				throw new IllegalArgumentException("No config screen implementation defined for ["+useScreen+"].");
+		}
 	}
 	
 }
@@ -134,7 +134,9 @@ public class ChangelogScreen extends DhScreen
 		
 		
 		this.addBtn( // Close
-				MakeBtn(Translatable(ModInfo.ID + ".general.back"), 5, this.height - 25, 100, 20, (btn) -> this.onClose())
+				MakeBtn(Translatable(ModInfo.ID + ".general.back"), 5, this.height - 25, 100, 20, (btn) -> {
+					this.onClose();
+				})
 		);
 		
 		
@@ -76,7 +76,7 @@ public class UpdateModScreen extends DhScreen
 					0, 0,
 					// Some textuary stuff
 					0, 
-					#if MC_VER < MC_1_21 
+					#if MC_VER < MC_1_21_1
 					new ResourceLocation(ModInfo.ID, "logo.png"),
 					#else
 					ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "logo.png"),
@@ -107,7 +107,7 @@ public class UpdateModScreen extends DhScreen
 					0, 0,
 					// Some textuary stuff
 					0, 
-					#if MC_VER < MC_1_21 
+					#if MC_VER < MC_1_21_1
 					new ResourceLocation(ModInfo.ID, "textures/gui/changelog.png"),
 					#else
 					ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "textures/gui/changelog.png"),
@@ -135,7 +135,9 @@ public class UpdateModScreen extends DhScreen
 				})
 		);
 		this.addBtn( // Later (not now)
-				MakeBtn(Translatable(ModInfo.ID + ".updater.later"), this.width / 2 + 2, this.height / 2 + 70, 100, 20, (btn) -> this.onClose())
+				MakeBtn(Translatable(ModInfo.ID + ".updater.later"), this.width / 2 + 2, this.height / 2 + 70, 100, 20, (btn) -> {
+					this.onClose();
+				})
 		);
 		this.addBtn( // Never
 				MakeBtn(Translatable(ModInfo.ID + ".updater.never"), this.width / 2 - 102, this.height / 2 + 70, 100, 20, (btn) -> {
@@ -1,21 +1,20 @@
 package com.seibel.distanthorizons.common.wrappers.level;

-import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
 import com.seibel.distanthorizons.core.level.IKeyedClientLevelManager;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import net.minecraft.client.multiplayer.ClientLevel;
-
-import java.util.Objects;
+import org.jetbrains.annotations.Nullable;

 public class KeyedClientLevelManager implements IKeyedClientLevelManager
 {
 	public static final KeyedClientLevelManager INSTANCE = new KeyedClientLevelManager();
 	
 	/** This is set and managed by the ClientApi for servers with support for DH. */
-	private IServerKeyedClientLevel overrideWrapper = null;
-	private boolean useOverrideWrapper = false;
+	@Nullable
+	private IServerKeyedClientLevel serverKeyedLevel = null;
+	private boolean enabled = false;
+	
 	
 	
 	//=============//
@@ -30,25 +29,39 @@ public class KeyedClientLevelManager implements IKeyedClientLevelManager
 	// level override logic //
 	//======================//
 	
-	@Override
-	public void setServerKeyedLevel(IServerKeyedClientLevel clientLevel) { this.overrideWrapper = clientLevel; }
-	@Override
-	public IServerKeyedClientLevel getOverrideWrapper() { return this.overrideWrapper; }
 	
 	@Override
-	public IServerKeyedClientLevel getServerKeyedLevel(ILevelWrapper level, String serverLevelKey)
+	@Nullable
+	public IServerKeyedClientLevel getServerKeyedLevel()
 	{
-		Objects.requireNonNull(level);
-		Objects.requireNonNull(serverLevelKey);
-		return new ServerKeyedClientLevel((ClientLevel) level.getWrappedMcObject(), serverLevelKey);
+		return this.serverKeyedLevel;
 	}
 	
+	@Override
+	public IServerKeyedClientLevel setServerKeyedLevel(IClientLevelWrapper clientLevel, String levelKey)
+	{
+		IServerKeyedClientLevel keyedLevel = new ServerKeyedClientLevel((ClientLevel) clientLevel.getWrappedMcObject(), levelKey);
+		this.serverKeyedLevel = keyedLevel;
+		this.enabled = true;
+		return keyedLevel;
+	}
 	
 	@Override
-	public void setUseOverrideWrapper(boolean useOverrideWrapper) { this.useOverrideWrapper = useOverrideWrapper; }
+	public void clearServerKeyedLevel()
+	{
+		this.serverKeyedLevel = null;
+	}
+	
 	@Override
-	public boolean getUseOverrideWrapper() { return this.useOverrideWrapper; }
-	
+	public boolean isEnabled()
+	{
+		return this.enabled;
+	}
 	
+	@Override
+	public void disable()
+	{
+		this.enabled = false;
+	}
 	
 }
@@ -18,4 +18,11 @@ public class ServerKeyedClientLevel extends ClientLevelWrapper implements IServe
 	@Override
 	public String getServerLevelKey() { return this.serverLevelKey; }
 	
-}
+	
+	@Override
+	public String getDimensionName()
+	{
+		return this.getServerLevelKey();
+	}
+
+}
@@ -39,14 +39,14 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftCli
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
+import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;

 import net.minecraft.CrashReport;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.client.resources.model.ModelManager;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 #if MC_VER < MC_1_19_2
@@ -54,6 +54,7 @@ import net.minecraft.network.chat.TextComponent;
 #endif
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.ChunkPos;
+import org.apache.commons.lang3.NotImplementedException;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;

@@ -127,12 +128,20 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 				}
 			
 			case ENABLED:
-                return switch (lodDirection) {
-                    case DOWN -> 0.5F;
-                    default -> 1.0F;
-                    case NORTH, SOUTH -> 0.8F;
-                    case WEST, EAST -> 0.6F;
-                };
+				switch (lodDirection)
+				{
+					case DOWN:
+						return 0.5F;
+					default:
+					case UP:
+						return 1.0F;
+					case NORTH:
+					case SOUTH:
+						return 0.8F;
+					case WEST:
+					case EAST:
+						return 0.6F;
+				}
 			
 			case DISABLED:
 				return 1.0F;
@@ -215,12 +224,20 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	@Override
 	public IClientLevelWrapper getWrappedClientLevel()
 	{
-		if (MINECRAFT.level == null)
+		return this.getWrappedClientLevel(false);
+	}
+	
+	@Override
+	@Nullable
+	public IClientLevelWrapper getWrappedClientLevel(boolean bypassMultiverse)
+	{
+		ClientLevel level = MINECRAFT.level;
+		if (level == null)
 		{
 			return null;
 		}
 		
-		return ClientLevelWrapper.getWrapperIgnoringOverride(MINECRAFT.level);
+		return ClientLevelWrapper.getWrapper(level, bypassMultiverse);
 	}
 	
 	@Override
@@ -242,7 +259,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	@Override
 	public ArrayList<ILevelWrapper> getAllServerWorlds()
 	{
-		ArrayList<ILevelWrapper> worlds = new ArrayList<>();
+		ArrayList<ILevelWrapper> worlds = new ArrayList<ILevelWrapper>();
 		
 		Iterable<ServerLevel> serverWorlds = MINECRAFT.getSingleplayerServer().getAllLevels();
 		for (ServerLevel world : serverWorlds)
@@ -259,7 +276,10 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	public void sendChatMessage(String string)
 	{
 		LocalPlayer player = this.getPlayer();
-		if (player == null) return;
+		if (player == null)
+		{
+			return;
+		}
        #if MC_VER < MC_1_19_2
 		player.sendMessage(new TextComponent(string), getPlayer().getUUID());
        #else
@@ -299,4 +319,10 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	@Override
 	public void executeOnRenderThread(Runnable runnable) { MINECRAFT.execute(runnable); }
 	
+	@Override
+	public boolean isWorldInitialized()
+	{
+		throw new NotImplementedException("TODO");
+	}
+	
 }
@@ -21,11 +21,17 @@ public class MinecraftDedicatedServerWrapper implements IMinecraftSharedWrapper
 			throw new IllegalStateException("Trying to get Installation Direction before Dedicated server complete initialization!");
 		}
 		
-		#if MC_VER < MC_1_21
+		#if MC_VER < MC_1_21_1
 		return this.dedicatedServer.getServerDirectory();
 		#else
 		return this.dedicatedServer.getServerDirectory().toFile();
 		#endif
 	}
 	
-}
+	@Override
+	public boolean isWorldInitialized()
+	{
+		return this.dedicatedServer.getWorldData().overworldData().isInitialized();
+	}
+	
+}
@@ -21,29 +21,26 @@ package com.seibel.distanthorizons.common.wrappers.minecraft;

 import java.awt.Color;
 import java.lang.invoke.MethodHandles;
-import java.util.Collection;
-import java.util.HashSet;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;

 import com.mojang.blaze3d.pipeline.RenderTarget;
 import com.mojang.blaze3d.platform.NativeImage;
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.WrapperFactory;
 import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper;
-import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;

 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper;

+#if MC_VER >= MC_1_17_1
+import net.minecraft.client.renderer.FogRenderer;
+import com.mojang.blaze3d.systems.RenderSystem;
+#endif
+
 #if MC_VER < MC_1_19_4
 import org.joml.Matrix4f;
 import org.joml.Vector3f;
 #else
-import org.joml.Matrix4f;
-import org.joml.Vector3f;
 #endif
 #if MC_VER >= MC_1_20_2
 import net.minecraft.client.renderer.chunk.SectionRenderDispatcher;
@@ -53,20 +50,14 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.AbstractOpt
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IDimensionTypeWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import com.seibel.distanthorizons.core.util.math.Mat4f;
 import com.seibel.distanthorizons.core.util.math.Vec3d;
 import com.seibel.distanthorizons.core.util.math.Vec3f;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
-import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;

 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.FogRenderer;
-import net.minecraft.client.renderer.LevelRenderer;
-import net.minecraft.core.BlockPos;
 import net.minecraft.world.effect.MobEffects;
 #if MC_VER < MC_1_17_1
 import net.minecraft.tags.FluidTags;
@@ -76,7 +67,6 @@ import org.lwjgl.opengl.GL15;
 #else
 import net.minecraft.world.level.material.FogType;
 #endif
-import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import org.apache.logging.log4j.Logger;

@@ -120,14 +110,6 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 		return new Vec3f(camera.getLookVector().x(), camera.getLookVector().y(), camera.getLookVector().z());
 	}
 	
-	@Override
-	public DhBlockPos getCameraBlockPosition()
-	{
-		Camera camera = MC.gameRenderer.getMainCamera();
-		BlockPos blockPos = camera.getBlockPosition();
-		return new DhBlockPos(blockPos.getX(), blockPos.getY(), blockPos.getZ());
-	}
-	
 	@Override
 	/** Unless you really need to know if the player is blind, use {@link MinecraftRenderWrapper#isFogStateSpecial()}/{@link IMinecraftRenderWrapper#isFogStateSpecial()} instead */
 	public boolean playerHasBlindingEffect()
@@ -148,43 +130,6 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 		return new Vec3d(projectedView.x, projectedView.y, projectedView.z);
 	}
 	
-	@Override
-	public Mat4f getWorldViewMatrix()
-	{
-		Camera camera = MC.gameRenderer.getMainCamera();
-		Vector3f cameraVec3 = new Vector3f(
-				(float)camera.getPosition().x,
-				(float)camera.getPosition().y,
-				(float)camera.getPosition().z);
-		cameraVec3 = cameraVec3.negate();
-		
-		Matrix4f matWorldView = new Matrix4f()
-				.rotateX((float)Math.toRadians(camera.getXRot()))
-				.rotateY((float)Math.toRadians(camera.getYRot() + 180f))
-				.translate(cameraVec3);
-		return new Mat4f(matWorldView);
-	}
-	
-	@Override
-	public Mat4f getDefaultProjectionMatrix(float partialTicks)
-	{
-		#if MC_VER < MC_1_17_1
-		return McObjectConverter.Convert(Minecraft.getInstance().gameRenderer.getProjectionMatrix(Minecraft.getInstance().gameRenderer.getMainCamera(), partialTicks, true));
-		#else
-		return McObjectConverter.Convert(MC.gameRenderer.getProjectionMatrix(MC.gameRenderer.getFov(MC.gameRenderer.getMainCamera(), partialTicks, true)));
-		#endif
-	}
-	
-	@Override
-	public double getGamma()
-	{
-		#if MC_VER < MC_1_19_2
-		return MC.options.gamma;
-		#else
-		return MC.options.gamma().get();
-		#endif
-	}
-	
 	@Override
 	public Color getFogColor(float partialTicks)
 	{
@@ -210,7 +155,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 		if (MC.level.dimensionType().hasSkyLight())
 		{
 			float frameTime;
-			#if MC_VER < MC_1_21
+			#if MC_VER < MC_1_21_1
 			frameTime = MC.getFrameTime();
 			#else
 			frameTime = MC.getTimer().getRealtimeDeltaTicks();
@@ -314,77 +259,6 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 		return getRenderTarget().viewHeight;
 	}
 	
-	/**
-	 * This method returns the ChunkPos of all chunks that Minecraft
-	 * is going to render this frame. <br><br>
-	 * <p>
-	 */
-	
-	public boolean usingBackupGetVanillaRenderedChunks = false;
-	@Override
-	public HashSet<DhChunkPos> getVanillaRenderedChunks()
-	{
-		ISodiumAccessor sodium = ModAccessorInjector.INSTANCE.get(ISodiumAccessor.class);
-		if (sodium != null)
-		{
-			return sodium.getNormalRenderedChunks();
-		}
-		IOptifineAccessor optifine = ModAccessorInjector.INSTANCE.get(IOptifineAccessor.class);
-		if (optifine != null)
-		{
-			HashSet<DhChunkPos> pos = optifine.getNormalRenderedChunks();
-			if (pos == null)
-				pos = getMaximumRenderedChunks();
-			return pos;
-		}
-		if (!usingBackupGetVanillaRenderedChunks)
-		{
-			try
-			{
-				#if MC_VER < MC_1_20_2
-				LevelRenderer levelRenderer = MC.levelRenderer;
-				Collection<LevelRenderer.RenderChunkInfo> chunks =
-					#if MC_VER < MC_1_18_2 levelRenderer.renderChunks;
-					#else levelRenderer.renderChunkStorage.get().renderChunks; #endif
-				
-				return (chunks.stream().map((chunk) -> {
-					AABB chunkBoundingBox =
-						#if MC_VER < MC_1_18_2 chunk.chunk.bb;
-						#else chunk.chunk.getBoundingBox(); #endif
-					return new DhChunkPos(Math.floorDiv((int) chunkBoundingBox.minX, 16),
-							Math.floorDiv((int) chunkBoundingBox.minZ, 16));
-				}).collect(Collectors.toCollection(HashSet::new)));
-				#else
-				LevelRenderer levelRenderer = MC.levelRenderer;
-				Collection<SectionRenderDispatcher.RenderSection> chunks = levelRenderer.visibleSections;
-				
-				return (chunks.stream().map((chunk) -> {
-					AABB chunkBoundingBox = chunk.getBoundingBox();
-					return new DhChunkPos(Math.floorDiv((int) chunkBoundingBox.minX, 16),
-							Math.floorDiv((int) chunkBoundingBox.minZ, 16));
-				}).collect(Collectors.toCollection(HashSet::new)));
-				#endif
-			}
-			catch (LinkageError e)
-			{
-				try
-				{
-					MinecraftClientWrapper.INSTANCE.sendChatMessage(
-							"\u00A7e\u00A7l\u00A7uWARNING: Distant Horizons: getVanillaRenderedChunks method failed."
-									+ " Using Backup Method.");
-					MinecraftClientWrapper.INSTANCE.sendChatMessage(
-							"\u00A7eOverdraw prevention will be worse than normal.");
-				}
-				catch (Exception e2)
-				{
-				}
-				LOGGER.error("getVanillaRenderedChunks Error: ", e);
-				usingBackupGetVanillaRenderedChunks = true;
-			}
-		}
-		return getMaximumRenderedChunks();
-	}
-	
 	@Override
 	public ILightMapWrapper getLightmapWrapper(ILevelWrapper level) { return this.lightmapByDimensionType.get(level.getDimensionType()); }
 	
@@ -0,0 +1,11 @@
+package com.seibel.distanthorizons.common.wrappers.misc;
+
+import net.minecraft.server.level.ServerLevel;
+import org.jetbrains.annotations.Nullable;
+
+public interface IMixinServerPlayer
+{
+	@Nullable
+	ServerLevel distantHorizons$getDimensionChangeDestination();
+	
+}
@@ -1,54 +1,120 @@
 package com.seibel.distanthorizons.common.wrappers.misc;

+import com.google.common.base.Objects;
 import com.google.common.collect.MapMaker;
 import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
+import com.seibel.distanthorizons.core.util.math.Vec3d;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.network.ServerGamePacketListenerImpl;
+import net.minecraft.world.phys.Vec3;

-import java.util.UUID;
+import java.net.SocketAddress;
 import java.util.concurrent.ConcurrentMap;

+/**
+ * This wrapper transparently ensures that underlying {@link ServerPlayer} is always valid,
+ * unless the player has disconnected.
+ */
 public class ServerPlayerWrapper implements IServerPlayerWrapper
 {
-	private static final ConcurrentMap<ServerPlayer, ServerPlayerWrapper>
-			serverPlayerWrapperMap = new MapMaker().weakKeys().makeMap();
+	private static final ConcurrentMap<ServerGamePacketListenerImpl, ServerPlayerWrapper> serverPlayerWrapperMap = new MapMaker().weakKeys().weakValues().makeMap();
 	
-	private final ServerPlayer serverPlayer;
+	private final ServerGamePacketListenerImpl connection;
+	private ServerPlayer serverPlayer()
+	{
+		return this.connection.player;
+	}
 	
 	public static ServerPlayerWrapper getWrapper(ServerPlayer serverPlayer)
 	{
-		return serverPlayerWrapperMap.computeIfAbsent(serverPlayer, ServerPlayerWrapper::new);
+		return serverPlayerWrapperMap.computeIfAbsent(serverPlayer.connection, ignored -> new ServerPlayerWrapper(serverPlayer.connection));
 	}
 	
-	private ServerPlayerWrapper(ServerPlayer serverPlayer)
+	private ServerPlayerWrapper(ServerGamePacketListenerImpl connection)
 	{
-		this.serverPlayer = serverPlayer;
+		this.connection = connection;
 	}
 	
-	public UUID getUUID()
+	
+	@Override
+	public String getName()
 	{
-		return serverPlayer.getUUID();
+		return this.serverPlayer().getName().getString();
 	}
 	
+	@Override
 	public IServerLevelWrapper getLevel()
 	{
-		#if MC_VER < MC_1_20_1
-		return ServerLevelWrapper.getWrapper(this.serverPlayer.getLevel());
-		#else
-		return ServerLevelWrapper.getWrapper(this.serverPlayer.serverLevel());
+		ServerLevel level = ((IMixinServerPlayer) this.serverPlayer()).distantHorizons$getDimensionChangeDestination();
+		if (level == null)
+		{
+			#if MC_VER < MC_1_20_1
+			level = this.serverPlayer().getLevel();
+			#else
+			level = this.serverPlayer().serverLevel();
+			#endif
+		}
+		
+		return ServerLevelWrapper.getWrapper(level);
+	}
+	
+	@Override
+	public Vec3d getPosition()
+	{
+		Vec3 position = this.serverPlayer().position();
+		return new Vec3d(position.x, position.y, position.z);
+	}
+	
+	@Override
+	public int getViewDistance()
+	{
+		return this.serverPlayer().server.getPlayerList().getViewDistance();
+	}
+	
+	@Override
+	public SocketAddress getRemoteAddress()
+	{
+		#if MC_VER >= MC_1_19_4
+		return this.serverPlayer().connection.getRemoteAddress();
+		#else // < 1.19.4
+		return this.serverPlayer().connection.connection.getRemoteAddress();
 		#endif
 	}
 	
+	@Override
 	public Object getWrappedMcObject()
 	{
-		return serverPlayer;
+		return this.serverPlayer();
 	}
 	
 	@Override
 	public String toString()
 	{
-		return "Wrapped{" + serverPlayer.toString() + "}";
+		return "Wrapped{" + this.serverPlayer() + "}";
 	}
 	
-}
+	@Override
+	public boolean equals(Object o)
+	{
+		if (this == o)
+		{
+			return true;
+		}
+		if (!(o instanceof ServerPlayerWrapper))
+		{
+			return false;
+		}
+		ServerPlayerWrapper that = (ServerPlayerWrapper) o;
+		return Objects.equal(this.connection, that.connection);
+	}
+	
+	@Override
+	public int hashCode()
+	{
+		return Objects.hashCode(this.connection);
+	}
+	
+}
@@ -5,13 +5,13 @@ import com.seibel.distanthorizons.api.interfaces.render.IDhApiCustomRenderRegist
 import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
 import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper;
-import com.seibel.distanthorizons.common.wrappers.block.cache.ClientBlockDetailMap;
+import com.seibel.distanthorizons.common.wrappers.block.ClientBlockStateColorCache;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
-import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapper;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.level.*;
+import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
+import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
@@ -22,12 +22,15 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapp
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkSource;
+import net.minecraft.world.phys.Vec3;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

+import java.awt.*;
 import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;

@@ -46,7 +49,7 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	private static final Minecraft MINECRAFT = Minecraft.getInstance();
 	
 	private final ClientLevel level;
-	private final ClientBlockDetailMap blockMap = new ClientBlockDetailMap(this);
+	private final ConcurrentHashMap<BlockState, ClientBlockStateColorCache> blockCache = new ConcurrentHashMap<>();
 	
 	private BlockStateWrapper dirtBlockWrapper;
 	private BiomeWrapper plainsBiomeWrapper;
@@ -67,23 +70,31 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	// wrapper logic //
 	//===============//
 	
-	@Nullable
-	public static IClientLevelWrapper getWrapper(@Nullable ClientLevel level)
+	public static IClientLevelWrapper getWrapper(@NotNull ClientLevel level)
 	{
-		if (level == null)
-		{
-			return null;
-		}
-		
-		// used if the client is connected to a server that defines the currently loaded level
-		if (KEYED_CLIENT_LEVEL_MANAGER.getUseOverrideWrapper())
-		{
-			return KEYED_CLIENT_LEVEL_MANAGER.getOverrideWrapper();
-		}
-		
-		return getWrapperIgnoringOverride(level);
+		return getWrapper(level, false);
+	}
+	
+	@Nullable
+	public static IClientLevelWrapper getWrapper(@Nullable ClientLevel level, boolean bypassLevelKeyManager)
+	{
+		if (!bypassLevelKeyManager)
+		{
+			if (level == null)
+			{
+				return null;
+			}
+			
+			// used if the client is connected to a server that defines the currently loaded level
+			IServerKeyedClientLevel overrideLevel = KEYED_CLIENT_LEVEL_MANAGER.getServerKeyedLevel();
+			if (overrideLevel != null)
+			{
+				return overrideLevel;
+			}
+		}
+		
+		return LEVEL_WRAPPER_BY_CLIENT_LEVEL.computeIfAbsent(level, ClientLevelWrapper::new);
 	}
-	public static IClientLevelWrapper getWrapperIgnoringOverride(@NotNull ClientLevel level) { return LEVEL_WRAPPER_BY_CLIENT_LEVEL.computeIfAbsent(level, ClientLevelWrapper::new); }
 	
 	@Nullable
 	@Override
@@ -111,21 +122,23 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 		}
 		catch (Exception e)
 		{
-			LOGGER.error("Failed to get server side wrapper for client level: " + level);
+			LOGGER.error("Failed to get server side wrapper for client level: " + this.level);
 			return null;
 		}
 	}
 	
-	
-	
 	//====================//
 	// base level methods //
 	//====================//
 	
 	@Override
-	public int computeBaseColor(DhBlockPos pos, IBiomeWrapper biome, IBlockStateWrapper blockState)
+	public int getBlockColor(DhBlockPos pos, IBiomeWrapper biome, IBlockStateWrapper blockWrapper)
 	{
-		return this.blockMap.getColor(((BlockStateWrapper) blockState).blockState, (BiomeWrapper) biome, pos);
+		ClientBlockStateColorCache blockColorCache = this.blockCache.computeIfAbsent(
+				((BlockStateWrapper) blockWrapper).blockState,
+				(block) -> new ClientBlockStateColorCache(block, this));
+		
+		return blockColorCache.getColor((BiomeWrapper) biome, pos);
 	}
 	
 	@Override
@@ -145,9 +158,12 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 			}
 		}
 		
-		return this.blockMap.getColor(this.dirtBlockWrapper.blockState, BiomeWrapper.EMPTY_WRAPPER, DhBlockPos.ZERO);
+		return this.getBlockColor(DhBlockPos.ZERO,BiomeWrapper.EMPTY_WRAPPER, this.dirtBlockWrapper);
 	}
 	
+	@Override 
+	public void clearBlockColorCache() { this.blockCache.clear(); }
+	
 	@Override
 	public IBiomeWrapper getPlainsBiomeWrapper()
 	{
@@ -170,6 +186,13 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	
 	@Override
 	public IDimensionTypeWrapper getDimensionType() { return DimensionTypeWrapper.getDimensionTypeWrapper(this.level.dimensionType()); }
+
+	
+	@Override
+	public String getDimensionName()
+	{
+		return this.level.dimension().location().toString();
+	}
 	
 	@Override
 	public EDhApiLevelType getLevelType() { return EDhApiLevelType.CLIENT_LEVEL; }
@@ -198,12 +221,12 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	@Override
 	public IChunkWrapper tryGetChunk(DhChunkPos pos)
 	{
-		if (!this.level.hasChunk(pos.x, pos.z))
+		if (!this.level.hasChunk(pos.getX(), pos.getZ()))
 		{
 			return null;
 		}
 		
-		ChunkAccess chunk = this.level.getChunk(pos.x, pos.z, ChunkStatus.EMPTY, false);
+		ChunkAccess chunk = this.level.getChunk(pos.getX(), pos.getZ(), ChunkStatus.EMPTY, false);
 		if (chunk == null)
 		{
 			return null;
@@ -258,6 +281,13 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 		return this.parentDhLevel.getGenericRenderer();
 	}
 	
+	@Override
+	public Color getCloudColor(float tickDelta)
+	{
+		Vec3 colorVec3 = this.level.getCloudColor(tickDelta);
+		return new Color((float)colorVec3.x, (float)colorVec3.y, (float)colorVec3.z);
+	}
+	
 	
 	
 	//================//
@@ -272,7 +302,7 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 			return "Wrapped{null}";
 		}
 		
-		return "Wrapped{" + this.level.toString() + "@" + this.getDimensionType().getDimensionName() + "}";
+		return "Wrapped{" + this.level.toString() + "@" + this.getDimensionName() + "}";
 	}
 	
-}
+}
@@ -44,7 +44,9 @@ public class DimensionTypeWrapper implements IDimensionTypeWrapper
 	{
 		//first we check if the biome has already been wrapped
 		if (dimensionTypeWrapperMap.containsKey(dimensionType) && dimensionTypeWrapperMap.get(dimensionType) != null)
+		{
 			return dimensionTypeWrapperMap.get(dimensionType);
+		}
 		
 		
 		//if it hasn't been created yet, we create it and save it in the map
@@ -61,22 +63,26 @@ public class DimensionTypeWrapper implements IDimensionTypeWrapper
 	}
 	
 	
-	@Override
-	public String getDimensionName()
+	private String getDimensionName()
 	{
-		return dimensionType.effectsLocation().getPath();
+		#if MC_VER >= MC_1_17_1
+		return this.dimensionType.effectsLocation().getPath();
+		#else // < 1.17.1
+		// effectsLocation() is marked as client only, so using the backing field directly
+		return dimensionType.effectsLocation.getPath();
+		#endif
 	}
 	
 	@Override
 	public boolean hasCeiling()
 	{
-		return dimensionType.hasCeiling();
+		return this.dimensionType.hasCeiling();
 	}
 	
 	@Override
 	public boolean hasSkyLight()
 	{
-		return dimensionType.hasSkyLight();
+		return this.dimensionType.hasSkyLight();
 	}
 	
 	@Override
@@ -85,7 +91,15 @@ public class DimensionTypeWrapper implements IDimensionTypeWrapper
 		return this.dimensionType;
 	}
 	
-	
+	@Override
+	public double getTeleportationScale(IDimensionTypeWrapper to)
+	{
+		return DimensionType.getTeleportationScale(this.dimensionType, (DimensionType) to.getWrappedMcObject());
+	}
+
+	// there's definitely a better way of doing this, but it should work well enough for now
+	@Override
+	public boolean isTheEnd() { return this.getDimensionName().equalsIgnoreCase("the_end"); }
 	
 	@Override
 	public boolean equals(Object obj)
@@ -102,4 +116,4 @@ public class DimensionTypeWrapper implements IDimensionTypeWrapper
 	}
 	
 	
-}
+}
@@ -27,17 +27,14 @@ import com.seibel.distanthorizons.api.interfaces.render.IDhApiCustomRenderRegist
 import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
 import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper;
-import com.seibel.distanthorizons.common.wrappers.block.cache.ServerBlockDetailMap;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
-import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapper;
 import com.seibel.distanthorizons.core.level.IDhLevel;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pos.DhBlockPos;
+import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;

 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
 import net.minecraft.server.level.ServerLevel;
@@ -51,7 +48,6 @@ import net.minecraft.world.level.chunk.status.ChunkStatus;
 #endif

 import org.apache.logging.log4j.Logger;
-import org.jetbrains.annotations.Nullable;

 /**
 * @version 2022-9-16
@@ -87,13 +83,19 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	@Override
 	public File getSaveFolder()
 	{
-		return level.getChunkSource().getDataStorage().dataFolder;
+		return this.level.getChunkSource().getDataStorage().dataFolder;
 	}
 	
 	@Override
 	public DimensionTypeWrapper getDimensionType()
 	{
-		return DimensionTypeWrapper.getDimensionTypeWrapper(level.dimensionType());
+		return DimensionTypeWrapper.getDimensionTypeWrapper(this.level.dimensionType());
+	}
+
+	@Override
+	public String getDimensionName()
+	{
+		return this.level.dimension().location().toString();
 	}
 	
 	@Override
@@ -101,25 +103,25 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	
 	public ServerLevel getLevel()
 	{
-		return level;
+		return this.level;
 	}
 	
 	@Override
 	public boolean hasCeiling()
 	{
-		return level.dimensionType().hasCeiling();
+		return this.level.dimensionType().hasCeiling();
 	}
 	
 	@Override
 	public boolean hasSkyLight()
 	{
-		return level.dimensionType().hasSkyLight();
+		return this.level.dimensionType().hasSkyLight();
 	}
 	
 	@Override
 	public int getMaxHeight()
 	{
-		return level.getHeight();
+		return this.level.getHeight();
 	}
 	
 	@Override
@@ -128,37 +130,43 @@ public class ServerLevelWrapper implements IServerLevelWrapper
        #if MC_VER < MC_1_17_1
        return 0;
        #else
-		return level.getMinBuildHeight();
+		return this.level.getMinBuildHeight();
        #endif
 	}
 	
 	@Override
 	public IChunkWrapper tryGetChunk(DhChunkPos pos)
 	{
-		if (!level.hasChunk(pos.x, pos.z)) return null;
-		ChunkAccess chunk = level.getChunk(pos.x, pos.z, ChunkStatus.FULL, false);
-		if (chunk == null) return null;
-		return new ChunkWrapper(chunk, level, this);
+		if (!this.level.hasChunk(pos.getX(), pos.getZ()))
+		{
+			return null;
+		}
+		ChunkAccess chunk = this.level.getChunk(pos.getX(), pos.getZ(), ChunkStatus.FULL, false);
+		if (chunk == null)
+		{
+			return null;
+		}
+		return new ChunkWrapper(chunk, this.level, this);
 	}
 	
 	@Override
 	public boolean hasChunkLoaded(int chunkX, int chunkZ)
 	{
 		// world.hasChunk(chunkX, chunkZ); THIS DOES NOT WORK FOR CLIENT LEVEL CAUSE MOJANG ALWAYS RETURN TRUE FOR THAT!
-		ChunkSource source = level.getChunkSource();
+		ChunkSource source = this.level.getChunkSource();
 		return source.hasChunk(chunkX, chunkZ);
 	}
 	
 	@Override
 	public IBlockStateWrapper getBlockState(DhBlockPos pos)
 	{
-		return BlockStateWrapper.fromBlockState(level.getBlockState(McObjectConverter.Convert(pos)), this);
+		return BlockStateWrapper.fromBlockState(this.level.getBlockState(McObjectConverter.Convert(pos)), this);
 	}
 	
 	@Override
 	public IBiomeWrapper getBiome(DhBlockPos pos)
 	{
-		return BiomeWrapper.getBiomeWrapper(level.getBiome(McObjectConverter.Convert(pos)), this);
+		return BiomeWrapper.getBiomeWrapper(this.level.getBiome(McObjectConverter.Convert(pos)), this);
 	}
 	
 	@Override
@@ -189,6 +197,6 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	//================//
 	
 	@Override
-	public String toString() { return "Wrapped{" + this.level.toString() + "@" + this.getDimensionType().getDimensionName() + "}"; }
+	public String toString() { return "Wrapped{" + this.level.toString() + "@" + this.getDimensionName() + "}"; }
 	
-}
+}
@@ -147,7 +147,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				if (index == -1) continue;
 				times.get(index).add(e.timeNs);
 			}
-			times.getFirst().add(event.getTotalTimeNs());
+			times.get(0).add(event.getTotalTimeNs());
 		}
 		
 		public String toString()
@@ -224,8 +224,8 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	// constructors //
 	//==============//
 	
-	public static ImmutableMap<EDhApiWorldGenerationStep, Integer> BorderNeeded;
-	public static int MaxBorderNeeded;
+	public static final ImmutableMap<EDhApiWorldGenerationStep, Integer> WORLD_GEN_CHUNK_BORDER_NEEDED_BY_GEN_STEP;
+	public static final int MAX_WORLD_GEN_CHUNK_BORDER_NEEDED;
 	
 	static
 	{
@@ -253,8 +253,13 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		builder.put(EDhApiWorldGenerationStep.LIQUID_CARVERS, 0);
 		builder.put(EDhApiWorldGenerationStep.FEATURES, 0);
 		builder.put(EDhApiWorldGenerationStep.LIGHT, 0);
-		BorderNeeded = builder.build();
-		MaxBorderNeeded = BorderNeeded.values().stream().mapToInt(Integer::intValue).max().getAsInt();
+		WORLD_GEN_CHUNK_BORDER_NEEDED_BY_GEN_STEP = builder.build();
+		
+		// TODO this is a test to see if the additional boarder is actually necessary or not.
+		//  If world generators end up having infinite loops or other unexplained issues,
+		//  this should be set back to the commented out logic below
+		MAX_WORLD_GEN_CHUNK_BORDER_NEEDED = 0;
+		//MAX_WORLD_GEN_CHUNK_BORDER_NEEDED = WORLD_GEN_CHUNK_BORDER_NEEDED_BY_GEN_STEP.values().stream().mapToInt(Integer::intValue).max().getAsInt();
 	}
 	
 	public BatchGenerationEnvironment(IDhServerLevel serverlevel)
@@ -383,171 +388,177 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	{
 		EVENT_LOGGER.debug("Lod Generate Event: " + genEvent.minPos);
 		
-		ArrayGridList<ChunkWrapper> chunkWrapperList;
-		DhLitWorldGenRegion region;
-		DummyLightEngine dummyLightEngine;
-		LightGetterAdaptor adaptor;
+		// Minecraft's generation events expect odd chunk width areas (3x3, 7x7, or 11x11),
+		// but DH submits square generation events (4x4).
+		// We handle this later, although that handling would need to change if the gen size ever changed.
+		LodUtil.assertTrue(genEvent.size % 2 == 0, "Generation events are expected to be an evan number of chunks wide.");
 		
-		int borderSize = MaxBorderNeeded;
-		int refSize = genEvent.size + borderSize * 2;
-		int refPosX = genEvent.minPos.x - borderSize;
-		int refPosZ = genEvent.minPos.z - borderSize;
 		
-		try
+		
+		int borderSize = MAX_WORLD_GEN_CHUNK_BORDER_NEEDED;
+		// genEvent.size - 1 converts the even width size to an odd number for MC compatability
+		int refSize = (genEvent.size - 1) + (borderSize * 2);
+		int refPosX = genEvent.minPos.getX() - borderSize;
+		int refPosZ = genEvent.minPos.getZ() - borderSize;
+		
+		LightGetterAdaptor lightGetterAdaptor = new LightGetterAdaptor(this.params.level);
+		DummyLightEngine dummyLightEngine = new DummyLightEngine(lightGetterAdaptor);
+		
+		
+		
+		//====================================//
+		// offset and generate odd width area //
+		//====================================//
+		
+		// reused data between each offset
+		HashMap<DhChunkPos, ChunkLightStorage> chunkSkyLightingByDhPos = new HashMap<>();
+		HashMap<DhChunkPos, ChunkLightStorage> chunkBlockLightingByDhPos = new HashMap<>();
+		HashMap<DhChunkPos, ChunkAccess> generatedChunkByDhPos = new HashMap<>();
+		HashMap<DhChunkPos, ChunkWrapper> chunkWrappersByDhPos = new HashMap<>();
+		
+		// offset 1 chunk in both X and Z direction so we can generate an even number of chunks wide
+		// while still submitting odd numbers to MC's internal generators
+		for (int xOffset = 0; xOffset < 2; xOffset++)
 		{
-			ArrayGridList<ChunkAccess> totalChunks;
-			
-			adaptor = new LightGetterAdaptor(this.params.level);
-			dummyLightEngine = new DummyLightEngine(adaptor);
-			
-			
-			
-			//=============================//
-			// try getting existing chunks //
-			//=============================//
-			
-			HashMap<DhChunkPos, ChunkLightStorage> chunkSkyLightingByDhPos = new HashMap<>();
-			HashMap<DhChunkPos, ChunkLightStorage> chunkBlockLightingByDhPos = new HashMap<>();
-			IEmptyChunkGeneratorFunc emptyChunkGeneratorFunc = (int x, int z) ->
+			// final is so the offset can be used in lambdas
+			final int xOffsetFinal = xOffset;
+			for (int zOffset = 0; zOffset < 2; zOffset++)
 			{
-				ChunkPos chunkPos = new ChunkPos(x, z);
-				DhChunkPos dhChunkPos = new DhChunkPos(x, z);
-				ChunkAccess newChunk = null;
-				try
+				final int zOffsetFinal = zOffset;
+				
+				
+				
+				//================//
+				// variable setup //
+				//================//
+				
+				int radius = refSize / 2; 
+				int centerX = refPosX + radius + xOffset;
+				int centerZ = refPosZ + radius + zOffset;
+				
+				// get/create the list of chunks we're going to generate
+				ArrayGridList<ChunkAccess> regionChunks = new ArrayGridList<>(
+						refSize, 
+						(x, z) -> this.generateEmptyChunk(
+								x + refPosX + xOffsetFinal, 
+								z + refPosZ + zOffsetFinal, 
+								chunkSkyLightingByDhPos, chunkBlockLightingByDhPos, generatedChunkByDhPos));
+				ChunkAccess centerChunk = regionChunks.stream().filter(chunk -> chunk.getPos().x == centerX && chunk.getPos().z == centerZ).findFirst().get();
+				
+				genEvent.refreshTimeout();
+				DhLitWorldGenRegion region = new DhLitWorldGenRegion(
+						centerX, centerZ,
+						centerChunk,
+						this.params.level, dummyLightEngine, regionChunks,
+						ChunkStatus.STRUCTURE_STARTS, radius,
+						// this method shouldn't be necessary since we're passing in a pre-populated
+						// list of chunks, but just in case
+						(x, z) -> this.generateEmptyChunk(x, z, chunkSkyLightingByDhPos, chunkBlockLightingByDhPos, generatedChunkByDhPos)
+				);
+				lightGetterAdaptor.setRegion(region);
+				genEvent.threadedParam.makeStructFeat(region, this.params);
+				
+				
+				
+				//=========================//
+				// create chunk wrappers   //
+				// and get existing chunks //
+				//=========================//
+				
+				ArrayGridList<ChunkWrapper> chunkWrapperList = new ArrayGridList<>(regionChunks.gridSize);
+				regionChunks.forEachPos((relX, relZ) ->
 				{
-					// get the chunk
-					CompoundTag chunkData = this.getChunkNbtData(chunkPos);
-					newChunk = this.loadOrMakeChunk(chunkPos, chunkData);
+					// ArrayGridList's use relative positions and don't have a center position
+					// so we need to use the offsetFinal to select the correct position
+					DhChunkPos chunkPos = new DhChunkPos(relX + xOffsetFinal, relZ + zOffsetFinal);
+					ChunkAccess chunk = regionChunks.get(relX, relZ);
 					
-					if (Config.Client.Advanced.LodBuilding.pullLightingForPregeneratedChunks.get())
+					if (chunkWrappersByDhPos.containsKey(chunkPos))
 					{
-						// attempt to get chunk lighting
-						ChunkLoader.CombinedChunkLightStorage combinedLights = ChunkLoader.readLight(newChunk, chunkData);
-						if (combinedLights != null)
+						chunkWrapperList.set(relX, relZ, chunkWrappersByDhPos.get(chunkPos));
+					}
+					else if (chunk != null)
+					{
+						// wrap the chunk
+						ChunkWrapper chunkWrapper = new ChunkWrapper(chunk, region, this.serverlevel.getLevelWrapper());
+						chunkWrapperList.set(relX, relZ, chunkWrapper);
+						
+						// try setting the wrapper's lighting
+						if (chunkBlockLightingByDhPos.containsKey(chunkWrapper.getChunkPos()))
 						{
-							chunkSkyLightingByDhPos.put(dhChunkPos, combinedLights.skyLightStorage);
-							chunkBlockLightingByDhPos.put(dhChunkPos, combinedLights.blockLightStorage);
+							chunkWrapper.setBlockLightStorage(chunkBlockLightingByDhPos.get(chunkWrapper.getChunkPos()));
+							chunkWrapper.setSkyLightStorage(chunkSkyLightingByDhPos.get(chunkWrapper.getChunkPos()));
+							chunkWrapper.setUseDhLighting(true);
+							chunkWrapper.setIsDhLightCorrect(true);
 						}
+						
+						chunkWrappersByDhPos.put(chunkPos, chunkWrapper);
 					}
-				}
-				catch (RuntimeException loadChunkError)
-				{
-					// Continue...
-				}
-				
-				if (newChunk == null)
-				{
-					newChunk = new ProtoChunk(chunkPos, UpgradeData.EMPTY
-							#if MC_VER >= MC_1_17_1 , this.params.level #endif
-							#if MC_VER >= MC_1_18_2 , this.params.biomes, null #endif
-					);
-				}
-				return newChunk;
-			};
-			totalChunks = new ArrayGridList<>(refSize, (x, z) -> emptyChunkGeneratorFunc.generate(x + refPosX, z + refPosZ));
-			
-			int radius = refSize / 2;
-			int centerX = refPosX + radius;
-			int centerZ = refPosZ + radius;
-			
-			ChunkAccess centerChunk = totalChunks.stream().filter(chunk -> chunk.getPos().x == centerX && chunk.getPos().z == centerZ).findFirst().get();
-			
-			genEvent.refreshTimeout();
-			region = new DhLitWorldGenRegion(
-					centerX, centerZ,
-					centerChunk,
-					this.params.level, dummyLightEngine, totalChunks,
-					ChunkStatus.STRUCTURE_STARTS, radius, emptyChunkGeneratorFunc);
-			adaptor.setRegion(region);
-			genEvent.threadedParam.makeStructFeat(region, this.params);
-			
-			
-			
-			//=======================//
-			// create chunk wrappers //
-			//=======================//
-			
-			chunkWrapperList = new ArrayGridList<>(totalChunks.gridSize);
-			totalChunks.forEachPos((x, z) ->
-			{
-				ChunkAccess chunk = totalChunks.get(x, z);
-				if (chunk != null)
-				{
-					// wrap the chunk
-					ChunkWrapper chunkWrapper = new ChunkWrapper(chunk, region, this.serverlevel.getLevelWrapper());
-					chunkWrapperList.set(x, z, chunkWrapper);
-					
-					// try setting the wrapper's lighting
-					if (chunkBlockLightingByDhPos.containsKey(chunkWrapper.getChunkPos()))
+					else //if (chunk == null)
 					{
-						chunkWrapper.setBlockLightStorage(chunkBlockLightingByDhPos.get(chunkWrapper.getChunkPos()));
-						chunkWrapper.setSkyLightStorage(chunkSkyLightingByDhPos.get(chunkWrapper.getChunkPos()));
-						chunkWrapper.setUseDhLighting(true);
-						chunkWrapper.setIsDhLightCorrect(true);
+						LodUtil.assertNotReach("Programmer Error: No chunk found in grid list, position offset is likely wrong.");
 					}
-				}
-			});
-			
-			
-			
-			//=================//
-			// generate chunks //
-			//=================//
-			
-			this.generateDirect(genEvent, chunkWrapperList, borderSize, genEvent.targetGenerationStep, region);
-			genEvent.timer.nextEvent("cleanup");
-		}
-		catch (StepStructureStart.StructStartCorruptedException f)
-		{
-			genEvent.threadedParam.markAsInvalid();
-			throw (RuntimeException) f.getCause();
+				});
+				
+				
+				
+				//=================//
+				// generate chunks //
+				//=================//
+				
+				this.generateDirect(genEvent, chunkWrapperList, borderSize, genEvent.targetGenerationStep, region);
+				
+				genEvent.timer.nextEvent("cleanup");
+			}	
 		}
 		
-		ArrayGridList<ChunkWrapper> finalGenChunks = GetCutoutFrom(chunkWrapperList, borderSize);
-		for (int offsetY = 0; offsetY < finalGenChunks.gridSize; offsetY++)
+		
+		
+		//=========================//
+		// submit generated chunks //
+		//=========================//
+		
+		for (DhChunkPos dhChunkPos : chunkWrappersByDhPos.keySet())
 		{
-			for (int offsetX = 0; offsetX < finalGenChunks.gridSize; offsetX++)
+			ChunkWrapper wrappedChunk = chunkWrappersByDhPos.get(dhChunkPos);
+			ChunkAccess target = wrappedChunk.getChunk();
+			if (target instanceof LevelChunk)
 			{
-				ChunkWrapper wrappedChunk = finalGenChunks.get(offsetX, offsetY);
-				ChunkAccess target = wrappedChunk.getChunk();
-				if (target instanceof LevelChunk)
-				{
-					#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
-					((LevelChunk) target).setLoaded(true);
-					#else
-					((LevelChunk) target).loaded = true;
-					#endif
-				}
-				
-				if (!wrappedChunk.isLightCorrect())
-				{
-					throw new RuntimeException("The generated chunk somehow has isLightCorrect() returning false");
-				}
-				
-				boolean isFull = ChunkWrapper.getStatus(target) == ChunkStatus.FULL || target instanceof LevelChunk;
-				#if MC_VER >= MC_1_18_2
-				boolean isPartial = target.isOldNoiseGeneration();
+				#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
+				((LevelChunk) target).setLoaded(true);
+				#else
+				((LevelChunk) target).loaded = true;
 				#endif
-				if (isFull)
-				{
-					LOAD_LOGGER.info("Detected full existing chunk at {}", target.getPos());
-					genEvent.resultConsumer.accept(wrappedChunk);
-				}
-				#if MC_VER >= MC_1_18_2
-				else if (isPartial)
-				{
-					LOAD_LOGGER.info("Detected old existing chunk at {}", target.getPos());
-					genEvent.resultConsumer.accept(wrappedChunk);
-				}
-				#endif
-				else if (ChunkWrapper.getStatus(target) == ChunkStatus.EMPTY)
-				{
-					genEvent.resultConsumer.accept(wrappedChunk);
-				}
-				else
-				{
-					genEvent.resultConsumer.accept(wrappedChunk);
-				}
+			}
+			
+			if (!wrappedChunk.isLightCorrect())
+			{
+				throw new RuntimeException("The generated chunk somehow has isLightCorrect() returning false");
+			}
+			
+			boolean isFull = ChunkWrapper.getStatus(target) == ChunkStatus.FULL || target instanceof LevelChunk;
+			#if MC_VER >= MC_1_18_2
+			boolean isPartial = target.isOldNoiseGeneration();
+			#endif
+			if (isFull)
+			{
+				LOAD_LOGGER.debug("Detected full existing chunk at {}", target.getPos());
+				genEvent.resultConsumer.accept(wrappedChunk);
+			}
+			#if MC_VER >= MC_1_18_2
+			else if (isPartial)
+			{
+				LOAD_LOGGER.debug("Detected old existing chunk at {}", target.getPos());
+				genEvent.resultConsumer.accept(wrappedChunk);
+			}
+			#endif
+			else if (ChunkWrapper.getStatus(target) == ChunkStatus.EMPTY)
+			{
+				genEvent.resultConsumer.accept(wrappedChunk);
+			}
+			else
+			{
+				genEvent.resultConsumer.accept(wrappedChunk);
 			}
 		}
 		
@@ -556,9 +567,58 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		if (PREF_LOGGER.canMaybeLog())
 		{
 			genEvent.threadedParam.perf.recordEvent(genEvent.timer);
-			PREF_LOGGER.infoInc("{}", genEvent.timer);
+			PREF_LOGGER.debugInc("{}", genEvent.timer);
 		}
 	}
+	private ChunkAccess generateEmptyChunk(
+			int x, int z,
+			HashMap<DhChunkPos, ChunkLightStorage> chunkSkyLightingByDhPos,
+			HashMap<DhChunkPos, ChunkLightStorage> chunkBlockLightingByDhPos,
+			HashMap<DhChunkPos, ChunkAccess> generatedChunkByDhPos)
+	{
+		ChunkPos chunkPos = new ChunkPos(x, z);
+		DhChunkPos dhChunkPos = new DhChunkPos(x, z);
+		
+		if (generatedChunkByDhPos.containsKey(dhChunkPos))
+		{
+			return generatedChunkByDhPos.get(dhChunkPos);
+		}
+		
+		
+		ChunkAccess newChunk = null;
+		try
+		{
+			// get the chunk
+			CompoundTag chunkData = this.getChunkNbtData(chunkPos);
+			newChunk = this.loadOrMakeChunk(chunkPos, chunkData);
+			
+			if (Config.Client.Advanced.LodBuilding.pullLightingForPregeneratedChunks.get())
+			{
+				// attempt to get chunk lighting
+				ChunkLoader.CombinedChunkLightStorage combinedLights = ChunkLoader.readLight(newChunk, chunkData);
+				if (combinedLights != null)
+				{
+					chunkSkyLightingByDhPos.put(dhChunkPos, combinedLights.skyLightStorage);
+					chunkBlockLightingByDhPos.put(dhChunkPos, combinedLights.blockLightStorage);
+				}
+			}
+		}
+		catch (RuntimeException loadChunkError)
+		{
+			// Continue...
+		}
+		
+		if (newChunk == null)
+		{
+			newChunk = new ProtoChunk(chunkPos, UpgradeData.EMPTY
+							#if MC_VER >= MC_1_17_1 , this.params.level #endif
+							#if MC_VER >= MC_1_18_2 , this.params.biomes, null #endif
+			);
+		}
+		
+		generatedChunkByDhPos.put(dhChunkPos, newChunk);
+		return newChunk;
+	}
 	private CompoundTag getChunkNbtData(ChunkPos chunkPos)
 	{
 		ServerLevel level = this.params.level;
@@ -609,7 +669,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		{
 			try
 			{
-				LOAD_LOGGER.info("DistantHorizons: Loading chunk [" + chunkPos + "] from disk.");
+				LOAD_LOGGER.debug("DistantHorizons: Loading chunk [" + chunkPos + "] from disk.");
 				return ChunkLoader.read(level, chunkPos, chunkData);
 			}
 			catch (Exception e)
@@ -639,6 +699,9 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		);
 	}
 	
+	
+	
+	
 	public void generateDirect(
 			GenerationEvent genEvent, ArrayGridList<ChunkWrapper> chunksToGenerate, int border,
 			EDhApiWorldGenerationStep step, DhLitWorldGenRegion region) throws InterruptedException
@@ -653,8 +716,9 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			chunksToGenerate.forEach((chunkWrapper) ->
 			{
 				ChunkAccess chunk = chunkWrapper.getChunk();
-				if (chunk instanceof ProtoChunk protoChunk)
+				if (chunk instanceof ProtoChunk)
 				{
+					ProtoChunk protoChunk = ((ProtoChunk) chunk);
 					
 					protoChunk.setLightEngine(region.getLightEngine());
 				}
@@ -769,7 +833,8 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		}
 	}
 	private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, int border) { return new ArrayGridList<>(total, border, total.gridSize - border); }
-	private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, EDhApiWorldGenerationStep step) { return GetCutoutFrom(total, MaxBorderNeeded - BorderNeeded.get(step)); }
+	//private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, EDhApiWorldGenerationStep step) { return GetCutoutFrom(total, MaxBorderNeeded - WORLD_GEN_CHUNK_BORDER_NEEDED_BY_GEN_STEP.get(step)); }
+	private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, EDhApiWorldGenerationStep step) { return GetCutoutFrom(total, 0); }
 	
 	
 	@Override
@@ -43,6 +43,7 @@ public final class GenerationEvent
 	public final int id;
 	public final ThreadedParameters threadedParam;
 	public final DhChunkPos minPos;
+	/** the number of chunks wide this event is */
 	public final int size;
 	public final EDhApiWorldGenerationStep targetGenerationStep;
 	public EventTimer timer = null;
@@ -73,10 +74,10 @@ public final class GenerationEvent
 			EDhApiWorldGenerationStep target, Consumer<IChunkWrapper> resultConsumer,
 			ExecutorService worldGeneratorThreadPool)
 	{
-		if (size % 2 == 0)
-		{
-			size += 1; // size must be odd for vanilla world gen regions to work
-		}
+		//if (size % 2 == 0)
+		//{
+		//	size += 1; // size must be odd for vanilla world gen regions to work
+		//}
 		
 		
 		GenerationEvent generationEvent = new GenerationEvent(minPos, size, genEnvironment, target, resultConsumer);
@@ -93,9 +94,7 @@ public final class GenerationEvent
 				//LOGGER.info("generating [{}]", event.minPos);
 				genEnvironment.generateLodFromList(generationEvent);
 			}
-			catch (InterruptedException ignored)
-			{
-			}
+			catch (InterruptedException ignored) { }
 			finally
 			{
 				BatchGenerationEnvironment.isDistantGeneratorThread.remove();
@@ -126,21 +125,6 @@ public final class GenerationEvent
 		return this.future.isCancelled();
 	}
 	
-	public boolean tooClose(int minX, int minZ, int width)
-	{
-		int aMinX = this.minPos.x;
-		int aMinZ = this.minPos.z;
-		int aSize = this.size;
-		// Account for required empty chunks in the border
-		aSize += 1;
-		width += 1;
-		// Do a AABB to AABB intersection test
-		return (aMinX + aSize >= minX &&
-				aMinX <= minX + width &&
-				aMinZ + aSize >= minZ &&
-				aMinZ <= minZ + width);
-	}
-	
 	public void refreshTimeout()
 	{
 		this.timeoutTime = System.nanoTime();
@@ -85,7 +85,7 @@ import net.minecraft.world.level.material.Fluids;
 #if MC_VER == MC_1_20_6
 import net.minecraft.world.level.chunk.status.ChunkStatus;
 import net.minecraft.world.level.chunk.status.ChunkType;
-#elif MC_VER == MC_1_21
+#elif MC_VER >= MC_1_21_1
 import net.minecraft.world.level.chunk.status.ChunkStatus;
 import net.minecraft.world.level.chunk.status.ChunkType;
 #endif
@@ -128,7 +128,7 @@ public class ChunkLoader
 		ChunkPos actualPos = new ChunkPos(tagLevel.getInt("xPos"), tagLevel.getInt("zPos"));
 		if (!Objects.equals(chunkPos, actualPos))
 		{
-			#if MC_VER > MC_1_17_1
+			#if MC_VER >= MC_1_18_2
 			if (actualPos.equals(ChunkPos.ZERO))
 			#else
 			if (actualPos.equals(ChunkPos.INVALID_CHUNK_POS))
@@ -294,7 +294,7 @@ public class ChunkLoader
 						#else
 						.getOrThrow((message) -> (RuntimeException) LOGGER.errorAndThrow(message, null)) 
 						#endif
-						: new PalettedContainer<>(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState(), PalettedContainer.Strategy.SECTION_STATES);
+						: new PalettedContainer<BlockState>(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState(), PalettedContainer.Strategy.SECTION_STATES);

 				#if MC_VER < MC_1_18_2
 				biomeContainer = tagSection.contains("biomes", 10)
@@ -309,7 +309,7 @@ public class ChunkLoader
 						#else
 						.getOrThrow((message) -> (RuntimeException) LOGGER.errorAndThrow(message, null))
 						#endif
-						: new PalettedContainer<>(biomes.asHolderIdMap(), biomes.getHolderOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
+						: new PalettedContainer<Holder<Biome>>(biomes.asHolderIdMap(), biomes.getHolderOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
 				#endif
 				
 				#if MC_VER < MC_1_20_1
@@ -325,7 +325,7 @@ public class ChunkLoader
 	}
 	private static 
 		#if MC_VER < MC_1_20_6 ChunkStatus.ChunkType
-		#elif MC_VER < MC_1_21 ChunkType
+		#elif MC_VER < MC_1_21_1 ChunkType
 		#else ChunkType #endif 
 	readChunkType(CompoundTag tagLevel)
 	{
@@ -434,7 +434,7 @@ public class ChunkLoader
 		for (int sectionIndex = 0; sectionIndex < chunkSectionListTag.size(); sectionIndex++)
 		{
 			Tag chunkSectionTag = chunkSectionListTag.get(sectionIndex);
-			if (!(chunkSectionTag instanceof CompoundTag chunkSectionCompoundTag))
+			if (!(chunkSectionTag instanceof CompoundTag))
 			{
 				if (!lightingSectionErrorLogged)
 				{
@@ -443,9 +443,10 @@ public class ChunkLoader
 				}
 				return null;
 			}
-
-
-            // if null all lights = 0
+			CompoundTag chunkSectionCompoundTag = (CompoundTag) chunkSectionTag;
+			
+			
+			// if null all lights = 0
 			byte[] blockLightNibbleArray = chunkSectionCompoundTag.getByteArray("BlockLight");
 			byte[] skyLightNibbleArray = chunkSectionCompoundTag.getByteArray("SkyLight");
 			
@@ -1,6 +1,6 @@
 package com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject;

-#if MC_VER >= MC_1_21
+#if MC_VER >= MC_1_21_1

 import net.minecraft.server.level.GenerationChunkHolder;
 import net.minecraft.world.level.ChunkPos;
@@ -20,7 +20,6 @@
 package com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject;

 import java.lang.invoke.MethodHandles;
-import java.util.EnumSet;
 import java.util.List;
 import java.util.concurrent.locks.ReentrantLock;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
@@ -63,7 +62,7 @@ import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.status.*;
 #endif

-#if MC_VER == MC_1_21
+#if MC_VER >= MC_1_21_1
 import net.minecraft.util.StaticCache2D;
 import com.google.common.collect.ImmutableList;
 import net.minecraft.server.level.GenerationChunkHolder;
@@ -84,7 +83,7 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 	
 	private final ChunkPos firstPos;
 	private final List<ChunkAccess> cache;
-	private final Long2ObjectOpenHashMap<ChunkAccess> chunkMap = new Long2ObjectOpenHashMap<>();
+	private final Long2ObjectOpenHashMap<ChunkAccess> chunkMap = new Long2ObjectOpenHashMap<ChunkAccess>();
 	
 	/** 
 	 * Present to reduce the chance that we accidentally break underlying MC code that isn't thread safe, 
@@ -127,7 +126,7 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 	{
 		#if MC_VER == MC_1_16_5
 		super(serverLevel, chunkList);
-		#elif MC_VER < MC_1_21
+		#elif MC_VER < MC_1_21_1
 		super(serverLevel, chunkList, chunkStatus, writeRadius);
 		#else
 		super(serverLevel, 
@@ -142,7 +141,7 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 				centerChunk);
 		
 		#endif
-		this.firstPos = chunkList.getFirst().getPos();
+		this.firstPos = chunkList.get(0).getPos();
 		this.generator = generator;
 		this.lightEngine = lightEngine;
 		this.writeRadius = writeRadius;
@@ -235,6 +234,22 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 		#endif
 	}
 	
+	/**
+	 * This needs to be manually overridden to make sure Lithium 0.11.2 and lower
+	 * don't try to get null chunks. <br><br>
+	 *
+	 * Problematic Lithium code was removed in 0.13.0 (MC 1.21.1) and higher: <br>
+	 * https://github.com/CaffeineMC/lithium-fabric/commit/b7cfd53a1ed0197e1d13dea2799b898eb52ecab3
+	 */
+	@NotNull
+	@Override
+	public BlockState getBlockState(BlockPos blockPos)
+	{
+		int chunkX = SectionPos.blockToSectionCoord(blockPos.getX());
+		int chunkZ = SectionPos.blockToSectionCoord(blockPos.getZ());
+		return this.getChunk(chunkX, chunkZ).getBlockState(blockPos);
+	}
+	
 	/** Skip BlockEntity stuff. They aren't needed for our use case. */
 	@Override
 	public boolean addFreshEntity(@NotNull Entity entity) { return true; }
@@ -231,9 +231,11 @@ public class WorldGenStructFeatManager extends #if MC_VER < MC_1_19_2 StructureF
 		Map<Structure, LongSet> map = chunk.getAllReferences();
 		
 		ImmutableList.Builder<StructureStart> builder = ImmutableList.builder();
+		Iterator<Map.Entry<Structure, LongSet>> var5 = map.entrySet().iterator();
 		
-		for (Map.Entry<Structure, LongSet> entry : map.entrySet())
+		while (var5.hasNext())
 		{
+			Map.Entry<Structure, LongSet> entry = var5.next();
 			Structure configuredStructureFeature = entry.getKey();
 			if (predicate.test(configuredStructureFeature))
 			{
@@ -68,7 +68,7 @@ public final class StepBiomes
 			}
 			else if (chunk instanceof ProtoChunk)
 			{
-				#if MC_VER < MC_1_21
+				#if MC_VER < MC_1_21_1
 				((ProtoChunk) chunk).setStatus(STATUS);
 				#else
 				((ProtoChunk) chunk).setPersistedStatus(STATUS);
@@ -89,7 +89,7 @@ public final class StepBiomes
 			#elif MC_VER < MC_1_19_4
 			chunk = this.environment.joinSync(this.environment.params.generator.createBiomes(this.environment.params.biomes, Runnable::run, this.environment.params.randomState, Blender.of(worldGenRegion),
 					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
-			#elif MC_VER < MC_1_21
+			#elif MC_VER < MC_1_21_1
 			chunk = this.environment.joinSync(this.environment.params.generator.createBiomes(Runnable::run, this.environment.params.randomState, Blender.of(worldGenRegion),
 					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
 			#else
@@ -66,7 +66,7 @@ public final class StepFeatures
 			}
 			else if (chunk instanceof ProtoChunk)
 			{
-				#if MC_VER < MC_1_21
+				#if MC_VER < MC_1_21_1
 				((ProtoChunk) chunk).setStatus(STATUS);
 				#else
 				((ProtoChunk) chunk).setPersistedStatus(STATUS);
@@ -80,7 +80,7 @@ public final class StepFeatures
 				worldGenRegion.setOverrideCenter(chunk.getPos());
 				environment.params.generator.applyBiomeDecoration(worldGenRegion, tParams.structFeat);
 				#else
-				if (worldGenRegion.hasChunk(chunkWrapper.getChunkPos().x, chunkWrapper.getChunkPos().z))
+				if (worldGenRegion.hasChunk(chunkWrapper.getChunkPos().getX(), chunkWrapper.getChunkPos().getZ()))
 				{
 					this.environment.params.generator.applyBiomeDecoration(worldGenRegion, chunk, tParams.structFeat.forWorldGenRegion(worldGenRegion));
 				}
@@ -68,7 +68,7 @@ public final class StepNoise
 				continue;
 			}
 			
-			#if MC_VER < MC_1_21
+			#if MC_VER < MC_1_21_1
 			((ProtoChunk) chunk).setStatus(STATUS);
 			#else
 			((ProtoChunk) chunk).setPersistedStatus(STATUS);
@@ -87,7 +87,7 @@ public final class StepNoise
 			#elif MC_VER < MC_1_19_2
 			chunk = this.environment.joinSync(this.environment.params.generator.fillFromNoise(Runnable::run, Blender.of(worldGenRegion),
 					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
-			#elif MC_VER < MC_1_21
+			#elif MC_VER < MC_1_21_1
 			chunk = this.environment.joinSync(this.environment.params.generator.fillFromNoise(Runnable::run, Blender.of(worldGenRegion), this.environment.params.randomState,
 					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
 			#else
@@ -54,7 +54,7 @@ public final class StepStructureReference
 			List<ChunkWrapper> chunkWrappers)
 	{
 		
-		ArrayList<ChunkAccess> chunksToDo = new ArrayList<>();
+		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
 		
 		for (ChunkWrapper chunkWrapper : chunkWrappers)
 		{
@@ -66,7 +66,7 @@ public final class StepStructureReference
 			}
 			else if (chunk instanceof ProtoChunk)
 			{
-				#if MC_VER < MC_1_21
+				#if MC_VER < MC_1_21_1
 				((ProtoChunk) chunk).setStatus(STATUS);
 				#else
 				((ProtoChunk) chunk).setPersistedStatus(STATUS);
@@ -83,7 +83,7 @@ public final class StepStructureStart
 			}
 			else if (chunk instanceof ProtoChunk)
 			{
-				#if MC_VER < MC_1_21
+				#if MC_VER < MC_1_21_1
 				((ProtoChunk) chunk).setStatus(STATUS);
 				#else
 				((ProtoChunk) chunk).setPersistedStatus(STATUS);
@@ -65,7 +65,7 @@ public final class StepSurface
 			}
 			else if (chunk instanceof ProtoChunk)
 			{
-				#if MC_VER < MC_1_21
+				#if MC_VER < MC_1_21_1
 				((ProtoChunk) chunk).setStatus(STATUS);
 				#else
 				((ProtoChunk) chunk).setPersistedStatus(STATUS);
@@ -47,4 +47,7 @@ accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite frames
 accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite framesY [I
 accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite mainImage [Lcom/mojang/blaze3d/platform/NativeImage;

+# DimensionTypeWrapper workaround
+accessible field net/minecraft/world/level/dimension/DimensionType effectsLocation Lnet/minecraft/resources/ResourceLocation;
+
 extendable class com/mojang/math/Matrix4f
@@ -5,26 +5,32 @@ plugins {
 loom {
    accessWidenerPath = project(":common").file("src/main/resources/${accessWidenerVersion}.distanthorizons.accesswidener")
    
+    // Custom logging
+    log4jConfigs.from(file("log4j-dev.xml"))
+    
    // "runs" isn't required, but when we do need it then it can be useful
    runs {
        client {
            client()
            setConfigName("Fabric Client")
            ideConfigGenerated(true)
-            runDir("../run")
+            runDir("../run/client")
+            vmArgs("-Dio.netty.leakDetection.level=advanced")
+            programArgs("--username", "Dev")
        }
        server {
            server()
            setConfigName("Fabric Server")
            ideConfigGenerated(true)
-            runDir("../run")
+            runDir("../run/server")
+            vmArgs("-Dio.netty.leakDetection.level=advanced")
        }
    }
 }

 remapJar {
-    inputFile = shadeDowngradedApi.archiveFile
-    dependsOn shadeDowngradedApi
+    inputFile = shadowJar.archiveFile
+    dependsOn shadowJar
 }


@@ -69,6 +75,11 @@ dependencies {
    addModJar(fabricApi.module("fabric-events-interaction-v0", rootProject.fabric_api_version))
    addModJar(fabricApi.module("fabric-rendering-v1", rootProject.fabric_api_version)) // TODO: Remove this as it is only needed in 1 line (FabricClientProxy)
    addModJar(fabricApi.module("fabric-networking-api-v1", rootProject.fabric_api_version))
+    addModJar(fabricApi.module("fabric-entity-events-v1", rootProject.fabric_api_version))
+    if (minecraft_version >= "1.19.2")
+        addModJar(fabricApi.module("fabric-command-api-v2", rootProject.fabric_api_version))
+    else // < 1.19.2
+        addModJar(fabricApi.module("fabric-command-api-v1", rootProject.fabric_api_version))
    
    // used by mod menu in MC 1.20.6+
    addModJar(fabricApi.module("fabric-screen-api-v1", rootProject.fabric_api_version))
@@ -149,4 +160,4 @@ sourcesJar {
    def commonSources = project(":common").sourcesJar
    dependsOn commonSources
    from commonSources.archiveFile.map { zipTree(it) }
-}
+}
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration name="Dev" monitorInterval="10">
+    <Loggers>
+        <Logger name="com.seibel.distanthorizons.core.network" level="trace" additivity="false">
+            <AppenderRef ref="DebugFile" level="${sys:fabric.log.debug.level:-debug}" />
+            <AppenderRef ref="SysOut" />
+            <AppenderRef ref="LatestFile" level="${sys:fabric.log.level:-info}" />
+            <AppenderRef ref="ServerGuiConsole" />
+        </Logger>
+    </Loggers>
+</Configuration>
@@ -19,9 +19,8 @@

 package com.seibel.distanthorizons.fabric;

-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
 import com.seibel.distanthorizons.common.AbstractModInitializer;
+import com.seibel.distanthorizons.common.AbstractPluginPacketSender;
 import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
@@ -38,17 +37,24 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAcce
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.util.math.Mat4f;
 import com.seibel.distanthorizons.fabric.wrappers.modAccessor.SodiumAccessor;
-//import io.netty.buffer.ByteBuf;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientChunkEvents;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
 import net.fabricmc.fabric.api.event.player.AttackBlockCallback;
 import net.fabricmc.fabric.api.event.player.UseBlockCallback;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.TitleScreen;

+#if MC_VER >= MC_1_20_6
+import com.seibel.distanthorizons.common.CommonPacketPayload;
+import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
+#else
+import com.seibel.distanthorizons.core.network.messages.NetworkMessage;
+#endif
+
 #if MC_VER < MC_1_19_4
 import java.nio.FloatBuffer;
 #endif
@@ -60,7 +66,6 @@ import net.minecraft.world.InteractionResult;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.phys.HitResult;
 import org.apache.logging.log4j.Logger;
-import org.joml.Matrix4f;
 import org.lwjgl.glfw.GLFW;

 /**
@@ -89,6 +94,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 	 * Registers Fabric Events
 	 * @author Ran
 	 */
+	@Override
 	public void registerEvents()
 	{
 		LOGGER.info("Registering Fabric Client Events");
@@ -106,7 +112,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		// tick events //
 		//=============//
 		
-		ClientTickEvents.START_CLIENT_TICK.register((client) -> ClientApi.INSTANCE.clientTickEvent());
+		ClientTickEvents.START_CLIENT_TICK.register((client) -> { ClientApi.INSTANCE.clientTickEvent(); });
 		
 		
 		
@@ -117,8 +123,11 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		// ClientChunkLoadEvent
 		ClientChunkEvents.CHUNK_LOAD.register((level, chunk) ->
 		{
-			IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper(level);
-			SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, level, wrappedLevel), wrappedLevel);
+			if (MC.clientConnectedToDedicatedServer())
+			{
+				IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper(level);
+				SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, level, wrappedLevel), wrappedLevel);
+			}
 		});
 		
 		// (kinda) block break event
@@ -200,14 +209,6 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		});
 		
 		
-		// Client Chunk Save
-		ClientChunkEvents.CHUNK_UNLOAD.register((level, chunk) ->
-		{
-			IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper(level);
-			SharedApi.INSTANCE.chunkUnloadEvent(new ChunkWrapper(chunk, level, wrappedLevel), wrappedLevel);
-		});
-		
-		
 		
 		//==============//
 		// render event //
@@ -227,14 +228,14 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 			this.clientApi.renderLods(ClientLevelWrapper.getWrapper(renderContext.world()),
 					modelViewMatrix,
 					projectionMatrix,
-					#if MC_VER < MC_1_21
+					#if MC_VER < MC_1_21_1
 					renderContext.tickDelta()
 					#else
 					renderContext.tickCounter().getGameTimeDeltaTicks()
 					#endif
 					);
 		});
-
+		
 		// Debug keyboard event
 		// FIXME: Use better hooks so it doesn't trigger key press events in text boxes
 		ClientTickEvents.END_CLIENT_TICK.register(client -> 
@@ -251,17 +252,29 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		// networking event //
 		//==================//
 		
-//		ClientPlayNetworking.registerGlobalReceiver(new ResourceLocation(ModInfo.NETWORKING_RESOURCE_NAMESPACE, ModInfo.MULTIVERSE_PLUGIN_NAMESPACE),
-//			(Minecraft client, ClientPacketListener handler, FriendlyByteBuf friendlyByteBuf, PacketSender responseSender) ->
-//			{
-//				// converting to a ByteBuf is necessary otherwise Fabric will complain when the game boots
-//				ByteBuf nettyByteBuf = friendlyByteBuf.asByteBuf();
-//				
-//				// remove the Bukkit/Forge packet ID byte
-//				nettyByteBuf.readByte();
-//				
-//				ClientApi.INSTANCE.serverMessageReceived(nettyByteBuf);
-//			});
+		#if MC_VER >= MC_1_20_6
+		PayloadTypeRegistry.playC2S().register(CommonPacketPayload.TYPE, new CommonPacketPayload.Codec());
+		PayloadTypeRegistry.playS2C().register(CommonPacketPayload.TYPE, new CommonPacketPayload.Codec());
+		ClientPlayNetworking.registerGlobalReceiver(CommonPacketPayload.TYPE, (payload, context) ->
+		{
+			if (payload.message() == null)
+			{
+				return;
+			}
+			ClientApi.INSTANCE.pluginMessageReceived(payload.message());
+		});
+		#else
+		ClientPlayNetworking.registerGlobalReceiver(AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE, (client, handler, buffer, packetSender) ->
+		{
+			// Forge packet ID
+			buffer.readByte();
+			NetworkMessage message = AbstractPluginPacketSender.decodeMessage(buffer);
+			if (message != null)
+			{
+				ClientApi.INSTANCE.pluginMessageReceived(message);
+			}
+		});
+		#endif
 	}
 	
 	public void onKeyInput()
@@ -290,14 +303,14 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		// Diff and trigger events
 		for (int keyCode : currentKeyDown)
 		{
-			if (!previouslyPressKeyCodes.contains(keyCode))
+			if (!this.previouslyPressKeyCodes.contains(keyCode))
 			{
 				ClientApi.INSTANCE.keyPressedEvent(keyCode);
 			}
 		}
 		
 		// Update the set
-		previouslyPressKeyCodes = currentKeyDown;
+		this.previouslyPressKeyCodes = currentKeyDown;
 	}
 	
-}
+}
@@ -27,6 +27,7 @@ import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.*;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.fabric.wrappers.modAccessor.*;
@@ -40,6 +41,12 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
 import org.apache.logging.log4j.Logger;

+#if MC_VER >= MC_1_19_2
+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
+#else // < 1.19.2
+import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
+#endif
+
 import javax.swing.*;
 import java.awt.*;
 import java.util.function.Consumer;
@@ -51,14 +58,22 @@ import java.util.function.Consumer;
 */
 public class FabricMain extends AbstractModInitializer implements ClientModInitializer, DedicatedServerModInitializer
 {
-	private static final ResourceLocation INITIAL_PHASE = ResourceLocation.tryParse("distanthorizons:dedicated_server_initial");
+	#if MC_VER >= MC_1_21_1
+	private static final ResourceLocation INITIAL_PHASE = ResourceLocation.fromNamespaceAndPath(ModInfo.RESOURCE_NAMESPACE, ModInfo.DEDICATED_SERVER_INITIAL_PATH);
+	#else
+	private static final ResourceLocation INITIAL_PHASE = new ResourceLocation(ModInfo.RESOURCE_NAMESPACE, ModInfo.DEDICATED_SERVER_INITIAL_PATH);
+	#endif
 	
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	
 	
 	@Override
-	protected void createInitialBindings() { SingletonInjector.INSTANCE.bind(IModChecker.class, ModChecker.INSTANCE); }
+	protected void createInitialBindings()
+	{
+		SingletonInjector.INSTANCE.bind(IModChecker.class, ModChecker.INSTANCE);
+		SingletonInjector.INSTANCE.bind(IPluginPacketSender.class, new FabricPluginPacketSender());
+	}
 	
 	@Override
 	protected IEventProxy createClientProxy() { return new FabricClientProxy(); }
@@ -102,7 +117,12 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti
 	}
 	
 	@Override
-	protected void subscribeRegisterCommandsEvent(Consumer<CommandDispatcher<CommandSourceStack>> eventHandler) { }
+	protected void subscribeRegisterCommandsEvent(Consumer<CommandDispatcher<CommandSourceStack>> eventHandler)
+	{
+		CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess #if MC_VER >= MC_1_19_2 , environment #endif ) -> {
+			eventHandler.accept(dispatcher);
+		});
+	}
 	
 	@Override
 	protected void subscribeClientStartedEvent(Runnable eventHandler) { ClientLifecycleEvents.CLIENT_STARTED.register((mc) -> eventHandler.run()); }
@@ -120,15 +140,21 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti
 		SingletonInjector.INSTANCE.runDelayedSetup();
 		
 		if (Config.Client.Advanced.Graphics.Fog.disableVanillaFog.get() && SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("bclib"))
+		{
 			ModAccessorInjector.INSTANCE.get(IBCLibAccessor.class).setRenderCustomFog(false); // Remove BCLib's fog
+		}
 		
 		#if MC_VER >= MC_1_20_1
 		if (SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("sodium"))
-			ModAccessorInjector.INSTANCE.get(ISodiumAccessor.class).setFogOcclusion(false); // FIXME: This is a tmp fix for sodium 0.5.0, and 0.5.1. This is fixed in sodium 0.5.2
+		{
+			ModAccessorInjector.INSTANCE.get(ISodiumAccessor.class).setFogOcclusion(false);
+		}
 		#endif
 		
 		if (ConfigBase.INSTANCE == null)
+		{
 			throw new IllegalStateException("Config was not initialized. Make sure to call LodCommonMain.initConfig() before calling this method.");
+		}
 	}
 	
-}
+}
@@ -0,0 +1,46 @@
+package com.seibel.distanthorizons.fabric;
+
+import com.seibel.distanthorizons.common.AbstractPluginPacketSender;
+import com.seibel.distanthorizons.core.network.messages.NetworkMessage;
+import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.minecraft.server.level.ServerPlayer;
+
+#if MC_VER >= MC_1_20_6
+import com.seibel.distanthorizons.common.CommonPacketPayload;
+#else // < 1.20.6
+import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
+import net.minecraft.network.FriendlyByteBuf;
+#endif
+
+public class FabricPluginPacketSender extends AbstractPluginPacketSender
+{
+	@Override
+	public void sendPluginPacketClient(NetworkMessage message)
+	{
+		#if MC_VER >= MC_1_20_6
+		ClientPlayNetworking.send(new CommonPacketPayload(message));
+		#else // < 1.20.6
+		FriendlyByteBuf buffer = PacketByteBufs.create();
+		// Forge packet ID
+		buffer.writeByte(0);
+		AbstractPluginPacketSender.encodeMessage(buffer, message);
+		ClientPlayNetworking.send(WRAPPER_PACKET_RESOURCE, buffer);
+		#endif
+	}
+	
+	@Override
+	public void sendPluginPacketServer(ServerPlayer serverPlayer, NetworkMessage message)
+	{
+		#if MC_VER >= MC_1_20_6
+		ServerPlayNetworking.send(serverPlayer, new CommonPacketPayload(message));
+		#else // < 1.20.6
+		FriendlyByteBuf buffer = PacketByteBufs.create();
+		// Forge packet ID
+		buffer.writeByte(0);
+		AbstractPluginPacketSender.encodeMessage(buffer, message);
+		ServerPlayNetworking.send(serverPlayer, WRAPPER_PACKET_RESOURCE, buffer);
+		#endif
+	}
+	
+}
@@ -1,5 +1,7 @@
 package com.seibel.distanthorizons.fabric;

+import com.seibel.distanthorizons.api.methods.events.DhApiEventRegister;
+import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiLevelLoadEvent;
 import com.seibel.distanthorizons.common.AbstractModInitializer;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.misc.ServerPlayerWrapper;
@@ -10,11 +12,14 @@ import com.seibel.distanthorizons.core.api.internal.ServerApi;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
+import com.seibel.distanthorizons.fabric.testing.TestWorldGenBindingEvent;
+import net.fabricmc.fabric.api.entity.event.v1.ServerEntityWorldChangeEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
+import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.TitleScreen;
 import net.minecraft.client.multiplayer.ClientLevel;
@@ -22,6 +27,14 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import org.apache.logging.log4j.Logger;

+#if MC_VER >= MC_1_20_6
+import com.seibel.distanthorizons.common.CommonPacketPayload;
+import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
+#else
+import com.seibel.distanthorizons.core.network.messages.NetworkMessage;
+import com.seibel.distanthorizons.common.AbstractPluginPacketSender;
+#endif
+
 import java.util.function.Supplier;

 /**
@@ -51,7 +64,7 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy
 	
 	private boolean isValidTime()
 	{
-		if (isDedicated)
+		if (this.isDedicated)
 		{
 			return true;
 		}
@@ -65,6 +78,7 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy
 	private ServerPlayerWrapper getServerPlayerWrapper(ServerPlayer player) { return ServerPlayerWrapper.getWrapper(player); }
 	
 	/** Registers Fabric Events */
+	@Override
 	public void registerEvents()
 	{
 		LOGGER.info("Registering Fabric Server Events");
@@ -75,19 +89,27 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy
 		// ServerTickEvent
 		ServerTickEvents.END_SERVER_TICK.register((server) -> SERVER_API.serverTickEvent());
 		
+		
+		// can be enabled to test world gen overrides without having to build a separate API project 
+		if (false)
+		{
+			DhApiEventRegister.on(DhApiLevelLoadEvent.class, new TestWorldGenBindingEvent());
+		}
+		
+		
 		// ServerWorldLoadEvent
 		//TODO: Check if both of these use the correct timed events. (i.e. is it 'ed' or 'ing' one?)
 		ServerLifecycleEvents.SERVER_STARTING.register((server) ->
 		{
-			if (isValidTime())
+			if (this.isValidTime())
 			{
-				ServerApi.INSTANCE.serverLoadEvent(isDedicated);
+				ServerApi.INSTANCE.serverLoadEvent(this.isDedicated);
 			}
 		});
 		// ServerWorldUnloadEvent
 		ServerLifecycleEvents.SERVER_STOPPED.register((server) ->
 		{
-			if (isValidTime())
+			if (this.isValidTime())
 			{
 				ServerApi.INSTANCE.serverUnloadEvent();
 			}
@@ -96,25 +118,25 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy
 		// ServerLevelLoadEvent
 		ServerWorldEvents.LOAD.register((server, level) ->
 		{
-			if (isValidTime())
+			if (this.isValidTime())
 			{
-				ServerApi.INSTANCE.serverLevelLoadEvent(getServerLevelWrapper(level));
+				ServerApi.INSTANCE.serverLevelLoadEvent(this.getServerLevelWrapper(level));
 			}
 		});
 		// ServerLevelUnloadEvent
 		ServerWorldEvents.UNLOAD.register((server, level) ->
 		{
-			if (isValidTime())
+			if (this.isValidTime())
 			{
-				ServerApi.INSTANCE.serverLevelUnloadEvent(getServerLevelWrapper(level));
+				ServerApi.INSTANCE.serverLevelUnloadEvent(this.getServerLevelWrapper(level));
 			}
 		});
 		
 		// ServerChunkLoadEvent
 		ServerChunkEvents.CHUNK_LOAD.register((server, chunk) ->
 		{
-			ILevelWrapper level = getServerLevelWrapper((ServerLevel) chunk.getLevel());
-			if (isValidTime())
+			ILevelWrapper level = this.getServerLevelWrapper((ServerLevel) chunk.getLevel());
+			if (this.isValidTime())
 			{
 				ServerApi.INSTANCE.serverChunkLoadEvent(
 						new ChunkWrapper(chunk, chunk.getLevel(), level),
@@ -125,18 +147,56 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy
 		
 		ServerPlayConnectionEvents.JOIN.register((handler, sender, server) ->
 		{
-			if (isValidTime())
+			if (this.isValidTime())
 			{
-				ServerApi.INSTANCE.serverPlayerJoinEvent(getServerPlayerWrapper(handler.player));
+				ServerApi.INSTANCE.serverPlayerJoinEvent(this.getServerPlayerWrapper(handler.player));
 			}
 		});
 		ServerPlayConnectionEvents.DISCONNECT.register((handler, server) ->
 		{
-			if (isValidTime())
+			if (this.isValidTime())
 			{
-				ServerApi.INSTANCE.serverPlayerDisconnectEvent(getServerPlayerWrapper(handler.player));
+				ServerApi.INSTANCE.serverPlayerDisconnectEvent(this.getServerPlayerWrapper(handler.player));
 			}
 		});
+		ServerEntityWorldChangeEvents.AFTER_PLAYER_CHANGE_WORLD.register((player, origin, dest) ->
+		{
+			if (this.isValidTime())
+			{
+				ServerApi.INSTANCE.serverPlayerLevelChangeEvent(
+						this.getServerPlayerWrapper(player),
+						this.getServerLevelWrapper(origin),
+						this.getServerLevelWrapper(dest)
+				);
+			}
+		});
+		
+		if (this.isDedicated)
+		{
+			#if MC_VER >= MC_1_20_6
+			PayloadTypeRegistry.playC2S().register(CommonPacketPayload.TYPE, new CommonPacketPayload.Codec());
+			PayloadTypeRegistry.playS2C().register(CommonPacketPayload.TYPE, new CommonPacketPayload.Codec());
+			ServerPlayNetworking.registerGlobalReceiver(CommonPacketPayload.TYPE, (payload, context) ->
+			{
+				if (payload.message() == null)
+				{
+					return;
+				}
+				ServerApi.INSTANCE.pluginMessageReceived(ServerPlayerWrapper.getWrapper(context.player()), payload.message());
+			});
+			#else
+			ServerPlayNetworking.registerGlobalReceiver(AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE, (server, serverPlayer, handler, buffer, packetSender) ->
+			{
+				// Forge packet ID
+				buffer.readByte();
+				NetworkMessage message = AbstractPluginPacketSender.decodeMessage(buffer);
+				if (message != null)
+				{
+					ServerApi.INSTANCE.pluginMessageReceived(ServerPlayerWrapper.getWrapper(serverPlayer), message);
+				}
+			});
+			#endif
+		}
 	}
 	
-}
+}
@@ -65,4 +65,4 @@ public class MixinClientLevel
 	}
 	#endif
 	
-}
+}
@@ -21,33 +21,9 @@ import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
@Mixin(ClientPacketListener.class)
 public class MixinClientPacketListener
 {
-	@Shadow
-	private ClientLevel level;
-	
-	@Unique
-	private ClientLevel previousLevel;
-	
-	
 	@Inject(method = "handleLogin", at = @At("RETURN"))
 	void onHandleLoginEnd(CallbackInfo ci) { ClientApi.INSTANCE.onClientOnlyConnected(); }
 	
-	@Inject(method = "handleRespawn", at = @At("HEAD"))
-	void onHandleRespawnStart(CallbackInfo ci) { this.previousLevel = this.level; }
-	@Inject(method = "handleRespawn", at = @At("RETURN"))
-	void onHandleRespawnEnd(CallbackInfo ci) 
-	{
-		// If the player changes dimensions the "this.level" will be changed halfway through the respawn method.
-		// By checking if the object references are the same, we can see if the previous level should be unloaded
-		// or if the player just respawned in the same level. 
-		if (this.previousLevel != this.level)
-		{
-			ClientApi.INSTANCE.clientLevelUnloadEvent(ClientLevelWrapper.getWrapper(this.previousLevel));
-			ClientApi.INSTANCE.clientLevelLoadEvent(ClientLevelWrapper.getWrapper(this.level));
-		}
-		
-		this.previousLevel = null;
-	}
-	
 	#if MC_VER < MC_1_19_4
 	@Inject(method = "cleanup", at = @At("HEAD"))
 	#else
@@ -55,10 +31,6 @@ public class MixinClientPacketListener
 	#endif
 	void onCleanupStart(CallbackInfo ci)
 	{
-		if (this.level != null)
-		{
-			ClientApi.INSTANCE.clientLevelUnloadEvent(ClientLevelWrapper.getWrapper(this.level));
-		}
 		ClientApi.INSTANCE.onClientOnlyDisconnected();
 	}
 	
@@ -72,4 +44,4 @@ public class MixinClientPacketListener

 	#endif
 	
-}
+}
@@ -116,7 +116,7 @@ public class MixinLevelRenderer
 		    ClientApi.INSTANCE.renderDeferredLods(ClientLevelWrapper.getWrapper(this.level),
 				    mcModelViewMatrix,
 				    mcProjectionMatrix,
-					#if MC_VER < MC_1_21
+					#if MC_VER < MC_1_21_1
 					Minecraft.getInstance().getFrameTime()
 					#else
 				    Minecraft.getInstance().getTimer().getRealtimeDeltaTicks()
@@ -2,6 +2,8 @@ package com.seibel.distanthorizons.fabric.mixins.client;

 import com.seibel.distanthorizons.api.enums.config.EDhApiUpdateBranch;
 import com.seibel.distanthorizons.common.wrappers.gui.updater.UpdateModScreen;
+import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
+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.jar.installer.GitlabGetter;
@@ -12,7 +14,9 @@ import com.seibel.distanthorizons.coreapi.ModInfo;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.TitleScreen;
+import net.minecraft.client.multiplayer.ClientLevel;
 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;
@@ -25,8 +29,14 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 * @author coolGi
 */
@Mixin(Minecraft.class)
-public class MixinMinecraft
+public abstract class MixinMinecraft
 {
+	@Shadow
+	public abstract boolean isLocalServer();
+	
+	@Unique
+	private ClientLevel lastLevel;
+	
 	/** 
 	 * Can be enabled for testing the auto updater UI. <br/>
 	 * will always show the auto updater if set to true. 
@@ -98,7 +108,7 @@ public class MixinMinecraft
 				}
 				else
 				{
-					versionId = GitlabGetter.INSTANCE.projectPipelines.getFirst().get("sha");
+					versionId = GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha");
 				}
 				
 				Minecraft.getInstance().setScreen(new UpdateModScreen(
@@ -113,7 +123,21 @@ public class MixinMinecraft
 	}
 	#endif
 	
+	@Inject(at = @At("HEAD"), method = "updateLevelInEngines")
+	public void updateLevelInEngines(ClientLevel level, CallbackInfo ci)
+	{
+		if (this.lastLevel != null && level != this.lastLevel)
+		{
+			ClientApi.INSTANCE.clientLevelUnloadEvent(ClientLevelWrapper.getWrapper(this.lastLevel));
+		}
+		if (level != null)
+		{
+			ClientApi.INSTANCE.clientLevelLoadEvent(ClientLevelWrapper.getWrapper(level, true));
+		}
+		this.lastLevel = level;
+	}
+	
 	@Inject(at = @At("HEAD"), method = "close()V")
 	public void close(CallbackInfo ci) { SelfUpdater.onClose(); }
 	
-}
+}
@@ -45,7 +45,7 @@ import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Shadow;
 #endif

-#if MC_VER < MC_1_21
+#if MC_VER < MC_1_21_1
 import net.minecraft.client.gui.screens.OptionsScreen;
 #else
 import net.minecraft.client.gui.screens.options.OptionsScreen;
@@ -64,7 +64,7 @@ public class MixinOptionsScreen extends Screen
 	/** Texture used for the config opening button */
 	@Unique
 	private static final ResourceLocation ICON_TEXTURE =
-		#if MC_VER < MC_1_21
+		#if MC_VER < MC_1_21_1
 		new ResourceLocation(ModInfo.ID, "textures/gui/button.png");
 		#else
 		ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "textures/gui/button.png");
@@ -104,14 +104,14 @@ public class MixinOptionsScreen extends Screen
 			
 			// add the button to the correct location in the UI
 			// TODO is there a better way to do this instead of using access transformers to inject into the exact UI elements?
-			LinearLayout layout = (LinearLayout) this.layout.headerFrame.children.getFirst().child;
+			LinearLayout layout = (LinearLayout) this.layout.headerFrame.children.get(0).child;
 			
 			// determine how wide the other option buttons are so we can put our botton to the left of them all
 			AtomicInteger width = new AtomicInteger(0);
-			layout.visitChildren(x -> width.addAndGet(x.getWidth()));
+			layout.visitChildren(x -> { width.addAndGet(x.getWidth()); });
 			width.addAndGet(-10); // padding between the DH button and the FOV slider
 			
-			layout.wrapped.addChild(this.getOptionsButton(), 1, 2, (settings) -> settings.paddingLeft(width.get() * -1));
+			layout.wrapped.addChild(this.getOptionsButton(), 1, 2, (settings) -> { settings.paddingLeft(width.get() * -1); });
 			layout.arrangeElements();
 			
 		    #endif
@@ -1,8 +1,6 @@
 package com.seibel.distanthorizons.fabric.mixins.server;

-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.common.commonMixins.MixinChunkMapCommon;
 import net.minecraft.server.level.ChunkMap;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.chunk.ChunkAccess;
@@ -32,62 +30,6 @@ public class MixinChunkMap
 	// don't need the chunk(s) before MC has finished saving them
 	@Inject(method = "save", at = @At(value = "RETURN", target = CHUNK_SERIALIZER_WRITE))
 	private void onChunkSave(ChunkAccess chunk, CallbackInfoReturnable<Boolean> ci)
-	{
-		// true means a chunk was saved to disk
-		if (ci.getReturnValue())
-		{
-			// TODO is this validation necessary since we are checking above if 
-			//  the callback return value should state if the chunk was actually saved or not?
-			//  Do we trust it to always be correct?
-			
-			//=====================================//
-			// corrupt/incomplete chunk validation //
-			//=====================================//
-			
-			// 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 (chunk.isUnsaved() || chunk.getUpgradeData() != null || !chunk.isLightCorrect())
-			{
-				return;
-			}
-			#else
-			if (chunk.isUnsaved() || chunk.isUpgrading() || !chunk.isLightCorrect())
-			{
-				return;
-			}
-			#endif
-			
-			
-			//==================//
-			// 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 (chunk.getBiomes() == null)
-			{
-				return;
-			}
-			#else
-			try
-			{
-				// this will throw an exception if the biomes aren't set up
-				chunk.getNoiseBiome(0,0,0);
-			}
-			catch (Exception e)
-			{
-				return;
-			}
-			#endif
-			
-			
-			
-			ServerApi.INSTANCE.serverChunkSaveEvent(
-					new ChunkWrapper(chunk, this.level, ServerLevelWrapper.getWrapper(this.level)),
-					ServerLevelWrapper.getWrapper(this.level)
-			);
-		}
-	}
+	{ MixinChunkMapCommon.onChunkSave(this.level, chunk, ci); }
 	
 }
@@ -0,0 +1,77 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020-2023 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.fabric.mixins.server;
+
+import com.seibel.distanthorizons.common.wrappers.misc.IMixinServerPlayer;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.Entity;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+#if MC_VER >= MC_1_21_1
+import net.minecraft.world.level.portal.DimensionTransition;
+#endif
+
+
+@Mixin(ServerPlayer.class)
+public class MixinServerPlayer implements IMixinServerPlayer
+{
+	@Unique
+	@Nullable
+	private ServerLevel dimensionChangeDestination;
+	
+	@Override
+	@Nullable
+	public ServerLevel distantHorizons$getDimensionChangeDestination()
+	{
+		return this.dimensionChangeDestination;
+	}
+	
+	@Inject(at = @At("HEAD"), method = "changeDimension")
+	#if MC_VER >= MC_1_21_1
+	public void changeDimension(DimensionTransition dimensionTransition, CallbackInfoReturnable<Entity> cir)
+	{
+		this.dimensionChangeDestination = dimensionTransition.newLevel();
+	}
+	#else
+	public void changeDimension(ServerLevel destination, CallbackInfoReturnable<Entity> cir)
+	{
+		this.dimensionChangeDestination = destination;
+	}
+	#endif
+	
+	#if MC_VER >= MC_1_20_1
+	@Inject(at = @At("RETURN"), method = "setServerLevel")
+	public void setServerLevel(ServerLevel level, CallbackInfo ci)
+	#else
+	@Inject(at = @At("RETURN"), method = "setLevel")
+	public void setLevel(ServerLevel level, CallbackInfo ci)
+	#endif
+	{
+		this.dimensionChangeDestination = null;
+	}
+	
+}
@@ -0,0 +1,28 @@
+package com.seibel.distanthorizons.fabric.testing;
+
+import com.seibel.distanthorizons.api.DhApi;
+import com.seibel.distanthorizons.api.interfaces.override.worldGenerator.IDhApiWorldGenerator;
+import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiLevelLoadEvent;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import net.minecraft.server.level.ServerLevel;
+import org.apache.logging.log4j.Logger;
+
+public class TestWorldGenBindingEvent extends DhApiLevelLoadEvent
+{
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	
+	@Override
+	public void onLevelLoad(DhApiEventParam<DhApiLevelLoadEvent.EventParam> event)
+	{
+		LOGGER.info("DH Level: ["+event.value.levelWrapper.getDimensionType()+"] loaded.");
+		
+		// Note: whenever you use a wrapper method on a new Minecraft version it is recommended that you
+		// call wrapper.getClass() to determine which object the API will return before you try casting it.
+		ServerLevel level = (ServerLevel) event.value.levelWrapper.getWrappedMcObject();
+		
+		// override the core DH world generator for this level
+		IDhApiWorldGenerator exampleWorldGen = new TestWorldGenerator(level);
+		DhApi.worldGenOverrides.registerWorldGeneratorOverride(event.value.levelWrapper, exampleWorldGen);
+	}
+}
@@ -0,0 +1,114 @@
+package com.seibel.distanthorizons.fabric.testing;
+
+import com.seibel.distanthorizons.api.DhApi;
+import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorMode;
+import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGeneratorReturnType;
+import com.seibel.distanthorizons.api.interfaces.block.IDhApiBiomeWrapper;
+import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper;
+import com.seibel.distanthorizons.api.interfaces.override.worldGenerator.AbstractDhApiChunkWorldGenerator;
+import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper;
+import com.seibel.distanthorizons.api.objects.data.DhApiChunk;
+import com.seibel.distanthorizons.api.objects.data.DhApiTerrainDataPoint;
+import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
+import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
+import com.seibel.distanthorizons.core.config.Config;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.chunk.ChunkAccess;
+
+import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class TestWorldGenerator extends AbstractDhApiChunkWorldGenerator
+{
+	private final ServerLevel level;
+	private final IDhApiLevelWrapper levelWrapper;
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	
+	public TestWorldGenerator(ServerLevel level)
+	{
+		this.level = level;
+		this.levelWrapper = ServerLevelWrapper.getWrapper(level);
+	}
+	
+	
+	
+	//============//
+	// properties //
+	//============//
+	
+	@Override
+	public EDhApiWorldGeneratorReturnType getReturnType() { return EDhApiWorldGeneratorReturnType.API_CHUNKS; }
+	
+	@Override 
+	public boolean runApiChunkValidation() { return true; }
+	
+	
+	
+	//==================//
+	// chunk generation //
+	//==================//
+	
+	@Override
+	public Object[] generateChunk(int chunkX, int chunkZ, EDhApiDistantGeneratorMode eDhApiDistantGeneratorMode)
+	{
+		ChunkAccess chunk = this.level.getChunk(chunkX, chunkZ);
+		return new Object[] { chunk, this.level };
+	}
+	
+	@Override
+	public DhApiChunk generateApiChunk(int chunkPosX, int chunkPosZ, EDhApiDistantGeneratorMode generatorMode)
+	{
+		// this test is only validated for 1.18.2 and up 
+		// (and it is only needed when testing world gen overrides/API chunks, so it isn't normally needed)
+		#if MC_VER >= MC_1_18_2
+		ChunkAccess chunk = this.level.getChunk(chunkPosX, chunkPosZ);
+		
+		
+		int minBuildHeight = this.level.getMinBuildHeight();
+		int maxBuildHeight = this.level.getMaxBuildHeight();
+		
+		DhApiChunk apiChunk = DhApiChunk.create(chunkPosX, chunkPosZ, minBuildHeight, maxBuildHeight);
+		for (int x = 0; x < 16; x++)
+		{
+			for (int z = 0; z < 16; z++)
+			{
+				ArrayList<DhApiTerrainDataPoint> dataPoints = new ArrayList<>();
+				
+				IDhApiBlockStateWrapper block = null;
+				IDhApiBiomeWrapper biome = null;
+				
+				for (int y = minBuildHeight; y < maxBuildHeight; y++)
+				{
+					block = DhApi.Delayed.wrapperFactory.getBlockStateWrapper(new Object[]{chunk.getBlockState(new BlockPos(x, y, z))}, this.levelWrapper);
+					biome = DhApi.Delayed.wrapperFactory.getBiomeWrapper(new Object[]{chunk.getNoiseBiome(x, y, z)}, this.levelWrapper);
+					dataPoints.add(DhApiTerrainDataPoint.create((byte) 0, 0, 15, y, y + 1, block, biome));
+				}
+				
+				apiChunk.setDataPoints(x, z, dataPoints);
+			}
+		}
+		return apiChunk;
+		#else
+		return null;
+		#endif
+	}
+	
+	@Override
+	public void preGeneratorTaskStart() { /* do nothing */ }
+	
+	
+	
+	//=========//
+	// cleanup //
+	//=========//
+	
+	@Override
+	public void close() { /* do nothing */ }
+	
+}
@@ -32,7 +32,7 @@ public class ModMenuIntegration implements ModMenuApi
 	@Override
 	public ConfigScreenFactory<?> getModConfigScreenFactory()
 	{
-		return GetConfigScreen::getScreen;
+		return parent -> GetConfigScreen.getScreen(parent);
 	}
 	
 }
@@ -5,7 +5,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IBCLibAcces
 #elif MC_VER == MC_1_18_2
 import ru.bclib.config.ClientConfig;
 import ru.bclib.config.Configs;
-#elif MC_VER < MC_1_21
+#elif MC_VER < MC_1_21_1
 import org.betterx.bclib.config.ClientConfig;
 import org.betterx.bclib.config.Configs;
 #endif
@@ -37,7 +37,7 @@ public class ModChecker implements IModChecker
 	@Override
 	public File modLocation(String modid)
 	{
-		return new File(FabricLoader.getInstance().getModContainer(modid).get().getOrigin().getPaths().getFirst().toUri());
+		return new File(FabricLoader.getInstance().getModContainer(modid).get().getOrigin().getPaths().get(0).toUri());
 	}
 	
 }
@@ -19,20 +19,18 @@

 package com.seibel.distanthorizons.fabric.wrappers.modAccessor;

-import java.util.HashSet;
-import java.util.stream.Collectors;
+import java.lang.invoke.MethodHandle;
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;

-import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.util.math.Mat4f;
-import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAccessor;


-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
+#if MC_VER < MC_1_20_1
 import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer;
-import net.minecraft.client.Minecraft;
+#endif
 #if MC_VER < MC_1_17_1
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.protocol.Packet;
@@ -40,101 +38,100 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.phys.AABB;
-#else
-import net.minecraft.world.level.LevelHeightAccessor;
+#else 
 #endif

 public class SodiumAccessor implements ISodiumAccessor
 {
-	private final IWrapperFactory factory = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
-	private final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
-
-	public IClientLevelWrapper levelWrapper;
-	public Mat4f mcModelViewMatrix;
-	public Mat4f mcProjectionMatrix;
-	public float partialTicks;
-
-	@Override
-	public String getModName()
-	{
-		return "Sodium-Fabric";
-	}
-
-	#if MC_VER >= MC_1_17_1
-	@Override
-	public HashSet<DhChunkPos> getNormalRenderedChunks()
-	{
-		SodiumWorldRenderer renderer = SodiumWorldRenderer.instance();
-		LevelHeightAccessor height = Minecraft.getInstance().level;
-
-		#if MC_VER >= MC_1_20_1
-		// TODO: This is just a tmp solution, use a proper solution later
-		return MC_RENDER.getMaximumRenderedChunks().stream().filter((DhChunkPos chunk) -> (renderer.isBoxVisible(
-				chunk.getMinBlockX() + 1, height.getMinBuildHeight() + 1, chunk.getMinBlockZ() + 1,
-				chunk.getMinBlockX() + 15, height.getMaxBuildHeight() - 1, chunk.getMinBlockZ() + 15))).collect(Collectors.toCollection(HashSet::new));
-		#elif MC_VER >= MC_1_18_2
-		// 0b11 = Lighted chunk & loaded chunk
-		return renderer.getChunkTracker().getChunks(0b00).filter(
-				(long l) -> {
-					return true;
-				}).mapToObj(DhChunkPos::new).collect(Collectors.toCollection(HashSet::new));
-		#else
-		// TODO: Maybe use a mixin to make this more efficient, and maybe ignore changes behind the camera
-		return MC_RENDER.getMaximumRenderedChunks().stream().filter((DhChunkPos chunk) -> {
-			return (renderer.isBoxVisible(
-					chunk.getMinBlockX() + 1, height.getMinBuildHeight() + 1, chunk.getMinBlockZ() + 1,
-					chunk.getMinBlockX() + 15, height.getMaxBuildHeight() - 1, chunk.getMinBlockZ() + 15));
-		}).collect(Collectors.toCollection(HashSet::new));
-		#endif
-	}
-	#else
-	@Override
-	public HashSet<DhChunkPos> getNormalRenderedChunks() {
-		SodiumWorldRenderer renderer = SodiumWorldRenderer.getInstance();
-		LevelAccessor height = Minecraft.getInstance().level;
-		// TODO: Maybe use a mixin to make this more efficient
-		return MC_RENDER.getMaximumRenderedChunks().stream().filter((DhChunkPos chunk) -> {
-			FakeChunkEntity AABB = new FakeChunkEntity(chunk.x, chunk.z, height.getMaxBuildHeight());
-			return (renderer.isEntityVisible(AABB));
-		}).collect(Collectors.toCollection(HashSet::new));
-	}
-
-	private static class FakeChunkEntity extends Entity {
-		public int cx;
-		public int cz;
-		public int my;
-		public FakeChunkEntity(int chunkX, int chunkZ, int maxHeight) {
-			super(EntityType.AREA_EFFECT_CLOUD, null);
-			cx = chunkX;
-			cz = chunkZ;
-			my = maxHeight;
-		}
-		@Override
-		public AABB getBoundingBoxForCulling() {
-			return new AABB(cx*16+1, 1, cz*16+1,
-					cx*16+15, my-1, cz*16+15);
-		}
-		@Override
-		protected void defineSynchedData() {}
-		@Override
-		protected void readAdditionalSaveData(CompoundTag paramCompoundTag) {}
-		@Override
-		protected void addAdditionalSaveData(CompoundTag paramCompoundTag) {}
-		@Override
-		public Packet<?> getAddEntityPacket() {
-			throw new UnsupportedOperationException("This is a FAKE CHUNK ENTITY... For tricking the Sodium to check a AABB.");
-		}
-	}
+	#if MC_VER >= MC_1_20_1
+	private static MethodHandle setFogOcclusionMethod;
+	private static Object sodiumPerformanceOptions;
 	#endif
-
-	/** A temporary overwrite for a config in sodium 0.5 to fix their terrain from showing, will be removed once a proper fix is added */
-	// FIXME
+	
+	
+	
+	//======================//
+	// mod accessor methods //
+	//======================//
+	
 	@Override
-	public void setFogOcclusion(boolean b)
+	public String getModName() { return "Sodium-Fabric"; }
+	
+	
+	
+	//================//
+	// sodium methods //
+	//================//
+	
+	/** An overwrite for a config in sodium 0.5 to fix their terrain from showing */
+	@Override
+	public void setFogOcclusion(boolean occlusionEnabled)
 	{
 		#if MC_VER >= MC_1_20_1
-		me.jellysquid.mods.sodium.client.SodiumClientMod.options().performance.useFogOcclusion = b;
+		try
+		{
+			if (sodiumPerformanceOptions == null)
+			{
+				boolean sodiumV6 = classPresent("net.caffeinemc.mods.sodium.client.render.SodiumWorldRenderer");
+				if (!sodiumV6)
+				{
+					// sodium 0.5
+					
+					Class<?> optionsClass = Class.forName("me.jellysquid.mods.sodium.client.gui.SodiumGameOptions");
+					Object basicOptions = MethodHandles.lookup().findStatic(
+							Class.forName("me.jellysquid.mods.sodium.client.SodiumClientMod"), 
+							"options", MethodType.methodType(optionsClass)).invoke();
+					sodiumPerformanceOptions = optionsClass.getDeclaredField("performance").get(basicOptions);
+					setFogOcclusionMethod = MethodHandles.lookup()
+							.findSetter(Class.forName(
+									"me.jellysquid.mods.sodium.client.gui.SodiumGameOptions$PerformanceSettings"), 
+									"useFogOcclusion", boolean.class);
+					
+					// alternate option if referencing Sodium 0.5 directly
+					//me.jellysquid.mods.sodium.client.SodiumClientMod.options().performance.useFogOcclusion = b;
+				} 
+				else
+				{
+					// sodium 0.6
+					
+					Class<?> optionsClass = Class.forName("net.caffeinemc.mods.sodium.client.gui.SodiumGameOptions");
+					Object basicOptions = MethodHandles.lookup().findStatic(
+							Class.forName("net.caffeinemc.mods.sodium.client.SodiumClientMod"),
+							"options", MethodType.methodType(optionsClass)).invoke();
+					sodiumPerformanceOptions = optionsClass.getDeclaredField("performance").get(basicOptions);
+					setFogOcclusionMethod = MethodHandles.lookup()
+							.findSetter(Class.forName(
+									"net.caffeinemc.mods.sodium.client.gui.SodiumGameOptions$PerformanceSettings"), 
+									"useFogOcclusion", boolean.class);
+				}
+			}
+			
+			setFogOcclusionMethod.invoke(sodiumPerformanceOptions, occlusionEnabled);
+		}
+		catch (Throwable e)
+		{
+			throw new RuntimeException(e);
+		}
 		#endif
 	}

+	
+	
+	//================//
+	// helper methods //
+	//================//
+	
+	private static boolean classPresent(String className)
+	{
+		try
+		{
+			Class.forName(className);
+			return true;
+		}
+		catch (ClassNotFoundException e)
+		{
+			return false;
+		}
+	}
+	
 }
@@ -5,7 +5,8 @@
    "mixins": [
        "server.MixinChunkGenerator",
        "server.MixinChunkMap",
-        "server.MixinUtilBackgroundThread"
+      "server.MixinUtilBackgroundThread",
+      "server.MixinServerPlayer"
    ],
    "client": [
        "client.MixinClientLevel",
@@ -24,4 +25,4 @@
        "defaultRequire": 1
    },
    "plugin": "com.seibel.distanthorizons.fabric.mixins.FabricMixinPlugin"
-}
+}
@@ -37,22 +37,24 @@ loom {
        client {
            client()
            setConfigName("Forge Client")
-            ideConfigGenerated(true)
-            runDir("../run")
-//            vmArgs("-XX:-OmitStackTraceInFastThrow", minecraftMemoryJavaArg)
+            ideConfigGenerated(false)
+            runDir("../run/client")
+            vmArgs("-Dio.netty.leakDetection.level=advanced")
+            programArgs("--username", "Dev")
        }
        server {
            server()
            setConfigName("Forge Server")
-            ideConfigGenerated(true)
-            runDir("../run")
+            ideConfigGenerated(false)
+            runDir("../run/server")
+            vmArgs("-Dio.netty.leakDetection.level=advanced")
        }
    }
 }

 remapJar {
-    inputFile = shadeDowngradedApi.archiveFile
-    dependsOn shadeDowngradedApi
+    inputFile = shadowJar.archiveFile
+    dependsOn shadowJar
 }

 def addMod(path, enabled) {
@@ -33,8 +33,6 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import com.seibel.distanthorizons.coreapi.ModInfo;
-//import io.netty.buffer.ByteBuf;
 import net.minecraft.world.level.LevelAccessor;

 import net.minecraft.client.multiplayer.ClientLevel;
@@ -53,8 +51,6 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraft.world.level.chunk.ChunkAccess;

 import net.minecraftforge.common.MinecraftForge;
-//import net.minecraftforge.network.NetworkRegistry;
-//import net.minecraftforge.network.simple.SimpleChannel;
 import org.apache.logging.log4j.Logger;
 import org.lwjgl.glfw.GLFW;

@@ -79,8 +75,6 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 {
 	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
-
-//	private static SimpleChannel multiversePluginChannel;
 	
 	
 	#if MC_VER < MC_1_19_2
@@ -95,7 +89,7 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 	public void registerEvents()
 	{
 		MinecraftForge.EVENT_BUS.register(this);
-		this.setupNetworkingListeners();
+		ForgePluginPacketSender.setPacketHandler(ClientApi.INSTANCE::pluginMessageReceived);
 	}
 	
 	
@@ -127,7 +121,7 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 	#endif
 	{
 		LOGGER.info("level load");
-		
+
 		#if MC_VER < MC_1_19_2
 		LevelAccessor level = event.getWorld();
 		#else
@@ -139,7 +133,7 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 		}
 		
 		ClientLevel clientLevel = (ClientLevel) level;
-		IClientLevelWrapper clientLevelWrapper = ClientLevelWrapper.getWrapper(clientLevel);
+		IClientLevelWrapper clientLevelWrapper = ClientLevelWrapper.getWrapper(clientLevel, true);
 		// TODO this causes a crash due to level being set to null somewhere
 		ClientApi.INSTANCE.clientLevelLoadEvent(clientLevelWrapper);
 	}
@@ -151,7 +145,7 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 	#endif
 	{
 		LOGGER.info("level unload");
-		
+
 		#if MC_VER < MC_1_19_2
 		LevelAccessor level = event.getWorld();
 		#else
@@ -176,53 +170,59 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 	@SubscribeEvent
 	public void rightClickBlockEvent(PlayerInteractEvent.RightClickBlock event)
 	{
-		if (SharedApi.isChunkAtBlockPosAlreadyUpdating(event.getPos().getX(), event.getPos().getZ()))
+		if (MC.clientConnectedToDedicatedServer())
 		{
-			return;
-		}
-		
-		//LOGGER.trace("interact or block place event at blockPos: " + event.getPos());
-		
-		#if MC_VER < MC_1_19_2
-		LevelAccessor level = event.getWorld();
-		#else
-		LevelAccessor level = event.getLevel();
-		#endif
-		
-		ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor();
-		if (executor != null)
-		{
-			executor.execute(() ->
+			if (SharedApi.isChunkAtBlockPosAlreadyUpdating(event.getPos().getX(), event.getPos().getZ()))
 			{
-				ChunkAccess chunk = level.getChunk(event.getPos());
-				this.onBlockChangeEvent(level, chunk);
-			});
+				return;
+			}
+			
+			//LOGGER.trace("interact or block place event at blockPos: " + event.getPos());
+			
+			#if MC_VER < MC_1_19_2
+			LevelAccessor level = event.getWorld();
+			#else
+			LevelAccessor level = event.getLevel();
+			#endif
+			
+			ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor();
+			if (executor != null)
+			{
+				executor.execute(() ->
+				{
+					ChunkAccess chunk = level.getChunk(event.getPos());
+					this.onBlockChangeEvent(level, chunk);
+				});
+			}
 		}
 	}
 	@SubscribeEvent
 	public void leftClickBlockEvent(PlayerInteractEvent.LeftClickBlock event)
 	{
-		if (SharedApi.isChunkAtBlockPosAlreadyUpdating(event.getPos().getX(), event.getPos().getZ()))
+		if (MC.clientConnectedToDedicatedServer())
 		{
-			return;
-		}
-		
-		//LOGGER.trace("break or block attack at blockPos: " + event.getPos());
-		
-		#if MC_VER < MC_1_19_2
-		LevelAccessor level = event.getWorld();
-		#else
-		LevelAccessor level = event.getLevel();
-		#endif
-		
-		ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor();
-		if (executor != null)
-		{
-			executor.execute(() ->
+			if (SharedApi.isChunkAtBlockPosAlreadyUpdating(event.getPos().getX(), event.getPos().getZ()))
 			{
-				ChunkAccess chunk = level.getChunk(event.getPos());
-				this.onBlockChangeEvent(level, chunk);
-			});
+				return;
+			}
+			
+			//LOGGER.trace("break or block attack at blockPos: " + event.getPos());
+			
+			#if MC_VER < MC_1_19_2
+			LevelAccessor level = event.getWorld();
+			#else
+			LevelAccessor level = event.getLevel();
+			#endif
+			
+			ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor();
+			if (executor != null)
+			{
+				executor.execute(() ->
+				{
+					ChunkAccess chunk = level.getChunk(event.getPos());
+					this.onBlockChangeEvent(level, chunk);
+				});
+			}
 		}
 	}
 	private void onBlockChangeEvent(LevelAccessor level, ChunkAccess chunk)
@@ -230,21 +230,16 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 		ILevelWrapper wrappedLevel = ProxyUtil.getLevelWrapper(level);
 		SharedApi.INSTANCE.chunkBlockChangedEvent(new ChunkWrapper(chunk, level, wrappedLevel), wrappedLevel);
 	}
-	
-	
+
 	@SubscribeEvent
 	public void clientChunkLoadEvent(ChunkEvent.Load event)
 	{
-		ILevelWrapper wrappedLevel = ProxyUtil.getLevelWrapper(GetEventLevel(event));
-		IChunkWrapper chunk = new ChunkWrapper(event.getChunk(), GetEventLevel(event), wrappedLevel);
-		SharedApi.INSTANCE.chunkLoadEvent(chunk, wrappedLevel);
-	}
-	@SubscribeEvent
-	public void clientChunkUnloadEvent(ChunkEvent.Unload event)
-	{
-		ILevelWrapper wrappedLevel = ProxyUtil.getLevelWrapper(GetEventLevel(event));
-		IChunkWrapper chunk = new ChunkWrapper(event.getChunk(), GetEventLevel(event), wrappedLevel);
-		SharedApi.INSTANCE.chunkUnloadEvent(chunk, wrappedLevel);
+		if (MC.clientConnectedToDedicatedServer())
+		{
+			ILevelWrapper wrappedLevel = ProxyUtil.getLevelWrapper(GetEventLevel(event));
+			IChunkWrapper chunk = new ChunkWrapper(event.getChunk(), GetEventLevel(event), wrappedLevel);
+			SharedApi.INSTANCE.chunkLoadEvent(chunk, wrappedLevel);
+		}
 	}
 	
 	
@@ -269,66 +264,6 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 	}
 	
 	
-	
-	//============//
-	// networking //
-	//============//
-	
-	public void setupNetworkingListeners()
-	{
-//		multiversePluginChannel = NetworkRegistry.newSimpleChannel(
-//				new ResourceLocation(ModInfo.NETWORKING_RESOURCE_NAMESPACE, ModInfo.MULTIVERSE_PLUGIN_NAMESPACE),
-//				// network protocol version
-//				() -> ModInfo.MULTIVERSE_PLUGIN_PROTOCOL_VERSION +"",
-//				// client accepted versions
-//				ForgeClientProxy::isReceivedProtocolVersionAcceptable,
-//				// server accepted versions
-//				ForgeClientProxy::isReceivedProtocolVersionAcceptable
-//		);
-//		
-//		multiversePluginChannel.registerMessage(0/*should be incremented for each simple channel we listen to*/, ByteBuf.class,
-//				// encoder
-//				(pack, friendlyByteBuf) -> { },
-//				// decoder
-//				(friendlyByteBuf) -> friendlyByteBuf.asByteBuf(),
-//				// message consumer
-//				(nettyByteBuf, contextRef) ->
-//				{
-//					ClientApi.INSTANCE.serverMessageReceived(nettyByteBuf);
-//					contextRef.get().setPacketHandled(true);
-//				}
-//		);
-	}
-	
-	public static boolean isReceivedProtocolVersionAcceptable(String versionString)
-	{
-		if (versionString.toLowerCase().contains("allowvanilla"))
-		{
-			// allow using networking on vanilla servers
-			return true;
-		}
-		else if (versionString.toLowerCase().contains("absent"))
-		{
-			// allow using networking even if DH isn't installed on the server
-			return true;
-		}
-		else
-		{
-			// DH is installed on the server, check if the version is valid to use
-			try
-			{
-				int version = Integer.parseInt(versionString);
-				return ModInfo.MULTIVERSE_PLUGIN_PROTOCOL_VERSION == version;
-			}
-			catch (NumberFormatException ignored)
-			{
-				return false;
-			}
-		}
-	}
-	
-	
-	
 	//===========//
 	// rendering //
 	//===========//
@@ -362,5 +297,4 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 		}
 	}
 	
-	
-}
+}
@@ -22,7 +22,11 @@ package com.seibel.distanthorizons.forge;
 import com.mojang.brigadier.CommandDispatcher;
 import com.seibel.distanthorizons.common.AbstractModInitializer;
 import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen;
+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.common.wrappers.gui.GetConfigScreen;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
@@ -34,15 +38,16 @@ import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.server.MinecraftServer;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.RegisterCommandsEvent;
+import net.minecraftforge.eventbus.api.EventPriority;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.*;
 #if MC_VER == MC_1_16_5
-import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
+import net.minecraftforge.fml.event.server.FMLServerAboutToStartEvent;
 #elif MC_VER == MC_1_17_1
-import net.minecraftforge.fmlserverevents.FMLServerStartingEvent;
+import net.minecraftforge.fmlserverevents.FMLServerAboutToStartEvent;
 #else
-import net.minecraftforge.event.server.ServerStartingEvent;
+import net.minecraftforge.event.server.ServerAboutToStartEvent;
 #endif
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 #if MC_VER < MC_1_17_1
@@ -81,7 +86,11 @@ public class ForgeMain extends AbstractModInitializer
 	}
 	
 	@Override
-	protected void createInitialBindings() { SingletonInjector.INSTANCE.bind(IModChecker.class, ModChecker.INSTANCE); }
+	protected void createInitialBindings()
+	{
+		SingletonInjector.INSTANCE.bind(IModChecker.class, ModChecker.INSTANCE);
+		SingletonInjector.INSTANCE.bind(IPluginPacketSender.class, new ForgePluginPacketSender());
+	}
 	
 	@Override
 	protected IEventProxy createClientProxy() { return new ForgeClientProxy(); }
@@ -104,6 +113,20 @@ public class ForgeMain extends AbstractModInitializer
 		ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class,
 				() -> new ConfigScreenHandler.ConfigScreenFactory((client, parent) -> GetConfigScreen.getScreen(parent)));
 		#endif
+		
+		
+		if (Config.Client.Advanced.Logging.showModCompatibilityWarningsOnStartup.get())
+		{
+			IModChecker modChecker = SingletonInjector.INSTANCE.get(IModChecker.class);
+			if (modChecker.isModLoaded("alexscaves"))
+			{
+				String message =
+						// orange text
+						"\u00A76" + "Distant Horizons: Alex's Cave detected." + "\u00A7r\n" +
+						"You may have to change Alex's config for DH to render. ";
+				ClientApi.INSTANCE.showChatMessageNextFrame(message);
+			}
+		}
 	}
 	
 	@Override
@@ -121,7 +144,7 @@ public class ForgeMain extends AbstractModInitializer
 	@Override
 	protected void subscribeServerStartingEvent(Consumer<MinecraftServer> eventHandler)
 	{
-		MinecraftForge.EVENT_BUS.addListener((#if MC_VER >= MC_1_18_2 ServerStartingEvent #else FMLServerStartingEvent #endif e) ->
+		MinecraftForge.EVENT_BUS.addListener(EventPriority.HIGH, (#if MC_VER >= MC_1_18_2 ServerAboutToStartEvent #else FMLServerAboutToStartEvent #endif e) ->
 		{
 			eventHandler.accept(e.getServer());
 		});
@@ -130,4 +153,4 @@ public class ForgeMain extends AbstractModInitializer
 	@Override
 	protected void runDelayedSetup() { SingletonInjector.INSTANCE.runDelayedSetup(); }
 	
-}
+}
@@ -0,0 +1,130 @@
+package com.seibel.distanthorizons.forge;
+
+import com.seibel.distanthorizons.common.AbstractPluginPacketSender;
+import com.seibel.distanthorizons.common.wrappers.misc.ServerPlayerWrapper;
+import com.seibel.distanthorizons.core.network.messages.NetworkMessage;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
+import net.minecraft.server.level.ServerPlayer;
+
+#if MC_VER >= MC_1_20_2
+import net.minecraftforge.network.PacketDistributor;
+import net.minecraftforge.network.ChannelBuilder;
+import net.minecraftforge.network.SimpleChannel;
+#elif MC_VER >= MC_1_18_2
+import net.minecraftforge.network.PacketDistributor;
+import net.minecraftforge.network.NetworkRegistry;
+import net.minecraftforge.network.simple.SimpleChannel;
+#elif MC_VER >= MC_1_17_1
+import net.minecraftforge.fmllegacy.network.NetworkRegistry;
+import net.minecraftforge.fmllegacy.network.PacketDistributor;
+import net.minecraftforge.fmllegacy.network.simple.SimpleChannel;
+#else // < 1.17.1
+import net.minecraftforge.fml.network.NetworkRegistry;
+import net.minecraftforge.fml.network.simple.SimpleChannel;
+import net.minecraftforge.fml.network.PacketDistributor;
+#endif
+
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+
+public class ForgePluginPacketSender extends AbstractPluginPacketSender
+{
+	public static final SimpleChannel PLUGIN_CHANNEL =
+			#if MC_VER >= MC_1_20_2
+			ChannelBuilder.named(AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE)
+					.networkProtocolVersion(1)
+					.serverAcceptedVersions((status, version) -> true)
+					.clientAcceptedVersions((status, version) -> true)
+					.simpleChannel();
+			#else // < 1.20.2
+			NetworkRegistry.newSimpleChannel(
+					AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE,
+					() -> "1",
+					ignored -> true,
+					ignored -> true
+			);
+			#endif
+	
+	public static void setPacketHandler(Consumer<NetworkMessage> consumer)
+	{
+		setPacketHandler((player, message) -> consumer.accept(message));
+	}
+	public static void setPacketHandler(BiConsumer<IServerPlayerWrapper, NetworkMessage> consumer)
+	{
+		#if MC_VER >= MC_1_20_2
+		PLUGIN_CHANNEL.messageBuilder(MessageWrapper.class, 0)
+				.encoder((wrapper, out) -> AbstractPluginPacketSender.encodeMessage(out, wrapper.message))
+				.decoder(in -> new MessageWrapper(AbstractPluginPacketSender.decodeMessage(in)))
+				.consumerNetworkThread((wrapper, context) ->
+				{
+					if (wrapper.message != null)
+					{
+						if (context.getSender() != null)
+						{
+							consumer.accept(ServerPlayerWrapper.getWrapper(context.getSender()), wrapper.message);
+						}
+						else
+						{
+							consumer.accept(null, wrapper.message);
+						}
+					}
+					context.setPacketHandled(true);
+				})
+				.add();
+		#else // < 1.20.2
+		PLUGIN_CHANNEL.registerMessage(0, MessageWrapper.class,
+				(wrapper, out) -> AbstractPluginPacketSender.encodeMessage(out, wrapper.message),
+				in -> new MessageWrapper(AbstractPluginPacketSender.decodeMessage(in)),
+				(wrapper, context) ->
+				{
+					if (wrapper.message != null)
+					{
+						if (context.get().getSender() != null)
+						{
+							consumer.accept(ServerPlayerWrapper.getWrapper(context.get().getSender()), wrapper.message);
+						}
+						else
+						{
+							consumer.accept(null, wrapper.message);
+						}
+					}
+					context.get().setPacketHandled(true);
+				}
+		);
+		#endif
+	}
+	
+	@Override
+	public void sendPluginPacketClient(NetworkMessage message)
+	{
+		#if MC_VER >= MC_1_20_2
+		PLUGIN_CHANNEL.send(new MessageWrapper(message), PacketDistributor.SERVER.noArg());
+		#else // < 1.20.2
+		PLUGIN_CHANNEL.send(PacketDistributor.SERVER.noArg(), new MessageWrapper(message));
+		#endif
+	}
+	
+	@Override
+	public void sendPluginPacketServer(ServerPlayer serverPlayer, NetworkMessage message)
+	{
+		#if MC_VER >= MC_1_20_2
+		PLUGIN_CHANNEL.send(new MessageWrapper(message), PacketDistributor.PLAYER.with(serverPlayer));
+		#else // < 1.20.2
+		PLUGIN_CHANNEL.send(PacketDistributor.PLAYER.with(() -> serverPlayer), new MessageWrapper(message));
+		#endif
+	}
+	
+	// Forge doesn't support using abstract classes
+	@SuppressWarnings({"ClassCanBeRecord", "RedundantSuppression"})
+	public static class MessageWrapper
+	{
+		public final NetworkMessage message;
+		
+		public MessageWrapper(NetworkMessage message)
+		{
+			this.message = message;
+		}
+		
+	}
+	
+}
@@ -3,16 +3,20 @@ package com.seibel.distanthorizons.forge;
 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.misc.ServerPlayerWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.core.api.internal.ServerApi;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.TickEvent;
+import net.minecraftforge.event.entity.player.PlayerEvent;
 #if MC_VER < MC_1_19_2
 import net.minecraftforge.event.world.ChunkEvent;
 import net.minecraftforge.event.world.WorldEvent;
@@ -22,6 +26,13 @@ import net.minecraftforge.event.level.LevelEvent;
 #endif
 import net.minecraftforge.eventbus.api.SubscribeEvent;

+#if MC_VER >= MC_1_19_4
+import net.minecraft.core.registries.Registries;
+#else // < 1.19.4
+import net.minecraft.core.Registry;
+import net.minecraft.core.RegistryAccess;
+#endif
+
 #if MC_VER == MC_1_16_5
 import net.minecraftforge.fml.event.server.FMLServerAboutToStartEvent;
 import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
@@ -47,7 +58,6 @@ public class ForgeServerProxy implements AbstractModInitializer.IEventProxy
    #endif
 	
 	private final ServerApi serverApi = ServerApi.INSTANCE;
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	private final boolean isDedicated;
 	public static Supplier<Boolean> isGenerationThreadChecker = null;
 	
@@ -57,6 +67,10 @@ public class ForgeServerProxy implements AbstractModInitializer.IEventProxy
 	public void registerEvents()
 	{
 		MinecraftForge.EVENT_BUS.register(this);
+		if (this.isDedicated)
+		{
+			ForgePluginPacketSender.setPacketHandler(ServerApi.INSTANCE::pluginMessageReceived);
+		}
 	}
 	
 	
@@ -111,7 +125,7 @@ public class ForgeServerProxy implements AbstractModInitializer.IEventProxy
 	{
 		if (GetEventLevel(event) instanceof ServerLevel)
 		{
-			this.serverApi.serverLevelLoadEvent(this.getServerLevelWrapper((ServerLevel) GetEventLevel(event)));
+			this.serverApi.serverLevelLoadEvent(getServerLevelWrapper((ServerLevel) GetEventLevel(event)));
 		}
 	}
 	
@@ -125,7 +139,7 @@ public class ForgeServerProxy implements AbstractModInitializer.IEventProxy
 	{
 		if (GetEventLevel(event) instanceof ServerLevel)
 		{
-			this.serverApi.serverLevelUnloadEvent(this.getServerLevelWrapper((ServerLevel) GetEventLevel(event)));
+			this.serverApi.serverLevelUnloadEvent(getServerLevelWrapper((ServerLevel) GetEventLevel(event)));
 		}
 	}
 	
@@ -137,13 +151,25 @@ public class ForgeServerProxy implements AbstractModInitializer.IEventProxy
 		IChunkWrapper chunk = new ChunkWrapper(event.getChunk(), GetEventLevel(event), levelWrapper);
 		this.serverApi.serverChunkLoadEvent(chunk, levelWrapper);
 	}
+	
 	@SubscribeEvent
-	public void serverChunkSaveEvent(ChunkEvent.Unload event)
+	public void playerLoggedInEvent(PlayerEvent.PlayerLoggedInEvent event)
 	{
-		ILevelWrapper levelWrapper = ProxyUtil.getLevelWrapper(GetEventLevel(event));
-		
-		IChunkWrapper chunk = new ChunkWrapper(event.getChunk(), GetEventLevel(event), levelWrapper);
-		this.serverApi.serverChunkSaveEvent(chunk, levelWrapper);
+		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.getFrom(), event),
+				getServerLevelWrapper(event.getTo(), event)
+		);
 	}
 	
 	
@@ -155,4 +181,20 @@ public class ForgeServerProxy implements AbstractModInitializer.IEventProxy
 	private static ServerLevelWrapper getServerLevelWrapper(ServerLevel level) { return ServerLevelWrapper.getWrapper(level); }
 	
 	
+	private static ServerLevelWrapper getServerLevelWrapper(ResourceKey<Level> resourceKey, PlayerEvent event)
+	{
+		//noinspection DataFlowIssue (possible NPE after getServer())
+		return getServerLevelWrapper(event.getEntity().getServer().getLevel(resourceKey));
+	}
+	
+	private static ServerPlayerWrapper getServerPlayerWrapper(PlayerEvent event) {
+		return ServerPlayerWrapper.getWrapper(
+				#if MC_VER >= MC_1_19_2
+				(ServerPlayer) event.getEntity()
+				#else
+				(ServerPlayer) event.getPlayer()
+				#endif
+		);
+	}
+	
 }
@@ -26,4 +26,4 @@ public class MixinClientPacketListener
 		ClientApi.INSTANCE.onClientOnlyDisconnected();
 	}
 	
-}
+}
@@ -2,6 +2,8 @@ package com.seibel.distanthorizons.forge.mixins.client;

 import com.seibel.distanthorizons.api.enums.config.EDhApiUpdateBranch;
 import com.seibel.distanthorizons.common.wrappers.gui.updater.UpdateModScreen;
+import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
+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.jar.installer.GitlabGetter;
@@ -11,7 +13,9 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.TitleScreen;
+import net.minecraft.client.multiplayer.ClientLevel;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
@@ -104,4 +108,4 @@ public class MixinMinecraft
 		SelfUpdater.onClose();
 	}
 	
-}
+}
@@ -0,0 +1,35 @@
+package com.seibel.distanthorizons.forge.mixins.server;
+
+import com.seibel.distanthorizons.common.commonMixins.MixinChunkMapCommon;
+import net.minecraft.server.level.ChunkMap;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.chunk.ChunkAccess;
+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.CallbackInfoReturnable;
+
+@Mixin(ChunkMap.class)
+public class MixinChunkMap
+{
+	
+	@Unique
+	private static final String CHUNK_SERIALIZER_WRITE
+			= "Lnet/minecraft/world/level/chunk/storage/ChunkSerializer;write(" +
+			"Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/chunk/ChunkAccess;)" +
+			"Lnet/minecraft/nbt/CompoundTag;";
+	
+	@Shadow
+	@Final
+	ServerLevel level;
+	
+	// firing at INVOKE causes issues with C2ME and is probably unnecessary since we
+	// don't need the chunk(s) before MC has finished saving them
+	@Inject(method = "save", at = @At(value = "RETURN", target = CHUNK_SERIALIZER_WRITE))
+	private void onChunkSave(ChunkAccess chunk, CallbackInfoReturnable<Boolean> ci)
+	{ MixinChunkMapCommon.onChunkSave(this.level, chunk, ci); }
+	
+}
@@ -0,0 +1,67 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020-2023 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.forge.mixins.server;
+
+import com.seibel.distanthorizons.common.wrappers.misc.IMixinServerPlayer;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.Entity;
+import net.minecraftforge.common.util.ITeleporter;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+
+@Mixin(ServerPlayer.class)
+public class MixinServerPlayer implements IMixinServerPlayer
+{
+	@Unique
+	@Nullable
+	private volatile ServerLevel distantHorizons$dimensionChangeDestination;
+	
+	@Override
+	@Nullable
+	public ServerLevel distantHorizons$getDimensionChangeDestination()
+	{
+		return this.distantHorizons$dimensionChangeDestination;
+	}
+	
+	@Inject(at = @At("HEAD"), method = "changeDimension", remap = false)
+	public void changeDimension(ServerLevel destination, ITeleporter teleporter, CallbackInfoReturnable<Entity> cir)
+	{
+		this.distantHorizons$dimensionChangeDestination = destination;
+	}
+	
+	#if MC_VER >= MC_1_20_1
+	@Inject(at = @At("RETURN"), method = "setServerLevel")
+	public void setServerLevel(ServerLevel level, CallbackInfo ci)
+	#else
+	@Inject(at = @At("RETURN"), method = "setLevel")
+	public void setLevel(ServerLevel level, CallbackInfo ci)
+	#endif
+	{
+		this.distantHorizons$dimensionChangeDestination = null;
+	}
+	
+}
@@ -5,7 +5,9 @@
    "mixins": [
        "server.MixinUtilBackgroundThread",
        "server.MixinChunkGenerator",
-        "server.MixinTFChunkGenerator"
+        "server.MixinTFChunkGenerator",
+      "server.MixinChunkMap",
+      "server.MixinServerPlayer"
    ],
    "client": [
        "client.MixinClientPacketListener",
@@ -5,7 +5,7 @@ org.gradle.caching=true

 # Mod Info
 mod_name=DistantHorizons
-mod_version=2.1.3-a-dev
+mod_version=2.2.2-a-dev
 api_version=3.0.0
 maven_group=com.seibel.distanthorizons
 mod_readable_name=Distant Horizons
@@ -31,7 +31,6 @@ fastutil_version=8.2.1

 # Minecraft related libraries (included in MC's jar)
 log4j_version=2.23.1
-netty_version=4.1.94.Final
 lwjgl_version=3.3.1
 joml_version=1.10.2

@@ -49,7 +48,7 @@ versionStr=

 # This defines what MC version Intellij will use for the preprocessor
 # and what version is used automatically by build and run commands
-mcVer=1.21
+mcVer=1.21.1

 # Defines the maximum amount of memory Minecraft is allowed when run in a development environment
-#minecraftMemoryJavaArg="-Xmx4G"
+#minecraftMemoryJavaArg="-Xmx4G"
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
@@ -23,32 +23,28 @@ loom {
    mixin {
        // Mixins are defined in the `mods.toml`
    }
-
+    
    // "runs" isn't required, but when we do need it then it can be useful
    runs {
        client {
            client()
            setConfigName("NeoForge Client")
-            ideConfigGenerated(true)
-            runDir("../run")
-//            vmArgs("-XX:-OmitStackTraceInFastThrow", minecraftMemoryJavaArg)
+            ideConfigGenerated(false)
+            runDir("../run/client")
+            vmArgs("-Dio.netty.leakDetection.level=advanced")
+            programArgs("--username", "Dev")
        }
        server {
            server()
            setConfigName("NeoForge Server")
-            ideConfigGenerated(true)
-            runDir("../run")
+            ideConfigGenerated(false)
+            runDir("../run/server")
+            vmArgs("-Dio.netty.leakDetection.level=advanced")
        }
    }
 }

-remapJar {
-    inputFile = apiDowngrade.archiveFile
-    dependsOn apiDowngrade
-//    classifier null

-    atAccessWideners.add("distanthorizons.accesswidener")
-}

 def addMod(path, enabled) {
    if (enabled == "2")
@@ -56,21 +52,24 @@ def addMod(path, enabled) {
    else if (enabled == "1")
        dependencies { modCompileOnly(path) }
 }
-
 dependencies {
    minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-    mappings loom.layered() {
+    mappings loom.layered() 
+    {
        // Mojmap mappings
        officialMojangMappings()
        // Parchment mappings (it adds parameter mappings & javadoc)
        parchment("org.parchmentmc.data:parchment-${rootProject.parchment_version}@zip")
    }
-
+    
+    
    // Neoforge
    neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}"
    addMod("curse.maven:TerraFirmaCraft-302973:4616004", rootProject.enable_terrafirmacraft)
 }

+
+
 task deleteResources(type: Delete) {
    delete file("build/resources/main")
 }
@@ -89,8 +88,15 @@ tasks.named('runClient') {
    finalizedBy(deleteResources)
 }

+remapJar {
+    inputFile = shadowJar.archiveFile
+    dependsOn shadowJar
+
+    atAccessWideners.add("distanthorizons.accesswidener")
+}
+
 sourcesJar {
    def commonSources = project(":common").sourcesJar
    dependsOn commonSources
    from commonSources.archiveFile.map { zipTree(it) }
-}
+}
@@ -35,7 +35,6 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import com.seibel.distanthorizons.coreapi.ModInfo;
 import net.minecraft.world.level.LevelAccessor;

 import net.minecraft.client.multiplayer.ClientLevel;
@@ -47,8 +46,6 @@ import net.neoforged.neoforge.event.level.LevelEvent;
 import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent;
 import net.minecraft.world.level.chunk.ChunkAccess;

-//import net.neoforged.network.NetworkRegistry;
-//import net.neoforged.network.simple.SimpleChannel;
 import org.apache.logging.log4j.Logger;
 import org.lwjgl.glfw.GLFW;

@@ -63,6 +60,8 @@ import org.lwjgl.opengl.GL32;
 import net.neoforged.neoforge.event.TickEvent;
 #else
 import net.neoforged.neoforge.client.event.ClientTickEvent;
+
+import java.util.concurrent.ThreadPoolExecutor;
 #endif


@@ -91,7 +90,6 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 	public void registerEvents()
 	{
 		NeoForge.EVENT_BUS.register(this);
-		setupNetworkingListeners();
 	}
 	
 	
@@ -129,12 +127,13 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 		LOGGER.info("level load");
 		
 		LevelAccessor level = event.getLevel();
-		if (!(level instanceof ClientLevel clientLevel))
+		if (!(level instanceof ClientLevel))
 		{
 			return;
 		}
 		
-		IClientLevelWrapper clientLevelWrapper = ClientLevelWrapper.getWrapper(clientLevel);
+		ClientLevel clientLevel = (ClientLevel) level;
+		IClientLevelWrapper clientLevelWrapper = ClientLevelWrapper.getWrapper(clientLevel, true);
 		// TODO this causes a crash due to level being set to null somewhere
 		ClientApi.INSTANCE.clientLevelLoadEvent(clientLevelWrapper);
 	}
@@ -144,11 +143,12 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 		LOGGER.info("level unload");
 		
 		LevelAccessor level = event.getLevel();
-		if (!(level instanceof ClientLevel clientLevel))
+		if (!(level instanceof ClientLevel))
 		{
 			return;
 		}
 		
+		ClientLevel clientLevel = (ClientLevel) level;
 		IClientLevelWrapper clientLevelWrapper = ClientLevelWrapper.getWrapper(clientLevel);
 		ClientApi.INSTANCE.clientLevelUnloadEvent(clientLevelWrapper);
 	}
@@ -162,49 +162,55 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 	@SubscribeEvent
 	public void rightClickBlockEvent(PlayerInteractEvent.RightClickBlock event)
 	{
-		if (SharedApi.isChunkAtBlockPosAlreadyUpdating(event.getPos().getX(), event.getPos().getZ()))
+		if (MC.clientConnectedToDedicatedServer())
 		{
-			return;
-		}
-		
-		// executor to prevent locking up the render/event thread
-		// if the getChunk() takes longer than expected 
-		// (which can be caused by certain mods) 
-		var executor = ThreadPoolUtil.getFileHandlerExecutor();
-		if (executor != null)
-		{
-			executor.execute(() ->
+			if (SharedApi.isChunkAtBlockPosAlreadyUpdating(event.getPos().getX(), event.getPos().getZ()))
 			{
-				//LOGGER.trace("interact or block place event at blockPos: " + event.getPos());
-				
-				LevelAccessor level = event.getLevel();
-				ChunkAccess chunk = level.getChunk(event.getPos());
-				this.onBlockChangeEvent(level, chunk);
-			});
+				return;
+			}
+			
+			// executor to prevent locking up the render/event thread
+			// if the getChunk() takes longer than expected 
+			// (which can be caused by certain mods) 
+			ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor();
+			if (executor != null)
+			{
+				executor.execute(() ->
+				{
+					//LOGGER.trace("interact or block place event at blockPos: " + event.getPos());
+					
+					LevelAccessor level = event.getLevel();
+					ChunkAccess chunk = level.getChunk(event.getPos());
+					this.onBlockChangeEvent(level, chunk);
+				});
+			}
 		}
 	}
 	@SubscribeEvent
 	public void leftClickBlockEvent(PlayerInteractEvent.LeftClickBlock event)
 	{
-		if (SharedApi.isChunkAtBlockPosAlreadyUpdating(event.getPos().getX(), event.getPos().getZ()))
+		if (MC.clientConnectedToDedicatedServer())
 		{
-			return;
-		}
-		
-		// executor to prevent locking up the render/event thread
-		// if the getChunk() takes longer than expected 
-		// (which can be caused by certain mods) 
-		var executor = ThreadPoolUtil.getFileHandlerExecutor();
-		if (executor != null)
-		{
-			executor.execute(() ->
+			if (SharedApi.isChunkAtBlockPosAlreadyUpdating(event.getPos().getX(), event.getPos().getZ()))
 			{
-				//LOGGER.trace("break or block attack at blockPos: " + event.getPos());
-				
-				LevelAccessor level = event.getLevel();
-				ChunkAccess chunk = level.getChunk(event.getPos());
-				this.onBlockChangeEvent(level, chunk);
-			});
+				return;
+			}
+			
+			// executor to prevent locking up the render/event thread
+			// if the getChunk() takes longer than expected 
+			// (which can be caused by certain mods) 
+			ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor();
+			if (executor != null)
+			{
+				executor.execute(() ->
+				{
+					//LOGGER.trace("break or block attack at blockPos: " + event.getPos());
+					
+					LevelAccessor level = event.getLevel();
+					ChunkAccess chunk = level.getChunk(event.getPos());
+					this.onBlockChangeEvent(level, chunk);
+				});
+			}
 		}
 	}
 	private void onBlockChangeEvent(LevelAccessor level, ChunkAccess chunk)
@@ -214,22 +220,6 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 	}
 	
 	
-	@SubscribeEvent
-	public void clientChunkLoadEvent(ChunkEvent.Load event)
-	{
-		ILevelWrapper wrappedLevel = ProxyUtil.getLevelWrapper(GetEventLevel(event));
-		IChunkWrapper chunk = new ChunkWrapper(event.getChunk(), GetEventLevel(event), wrappedLevel);
-		SharedApi.INSTANCE.chunkLoadEvent(chunk, wrappedLevel);
-	}
-	@SubscribeEvent
-	public void clientChunkUnloadEvent(ChunkEvent.Unload event)
-	{
-		ILevelWrapper wrappedLevel = ProxyUtil.getLevelWrapper(GetEventLevel(event));
-		IChunkWrapper chunk = new ChunkWrapper(event.getChunk(), GetEventLevel(event), wrappedLevel);
-		SharedApi.INSTANCE.chunkUnloadEvent(chunk, wrappedLevel);
-	}
-	
-	
 	
 	//==============//
 	// key bindings //
@@ -252,65 +242,6 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 	
 	
 	
-	//============//
-	// networking //
-	//============//
-	
-	public static void setupNetworkingListeners()
-	{
-//		multiversePluginChannel = NetworkRegistry.newSimpleChannel(
-//				new ResourceLocation(ModInfo.NETWORKING_RESOURCE_NAMESPACE, ModInfo.MULTIVERSE_PLUGIN_NAMESPACE),
-//				// network protocol version
-//				() -> ModInfo.MULTIVERSE_PLUGIN_PROTOCOL_VERSION +"",
-//				// client accepted versions
-//				ForgeClientProxy::isReceivedProtocolVersionAcceptable,
-//				// server accepted versions
-//				ForgeClientProxy::isReceivedProtocolVersionAcceptable
-//		);
-//		
-//		multiversePluginChannel.registerMessage(0/*should be incremented for each simple channel we listen to*/, ByteBuf.class,
-//				// encoder
-//				(pack, friendlyByteBuf) -> { },
-//				// decoder
-//				(friendlyByteBuf) -> friendlyByteBuf.asByteBuf(),
-//				// message consumer
-//				(nettyByteBuf, contextRef) ->
-//				{
-//					ClientApi.INSTANCE.serverMessageReceived(nettyByteBuf);
-//					contextRef.get().setPacketHandled(true);
-//				}
-//		);
-	}
-	
-	public static boolean isReceivedProtocolVersionAcceptable(String versionString)
-	{
-		if (versionString.toLowerCase().contains("allowvanilla"))
-		{
-			// allow using networking on vanilla servers
-			return true;
-		}
-		else if (versionString.toLowerCase().contains("absent"))
-		{
-			// allow using networking even if DH isn't installed on the server
-			return true;
-		}
-		else
-		{
-			// DH is installed on the server, check if the version is valid to use
-			try
-			{
-				int version = Integer.parseInt(versionString);
-				return ModInfo.MULTIVERSE_PLUGIN_PROTOCOL_VERSION == version;
-			}
-			catch (NumberFormatException ignored)
-			{
-				return false;
-			}
-		}
-	}
-	
-	
-	
 	//===========//
 	// rendering //
 	//===========//
@@ -353,4 +284,4 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 	private static LevelAccessor GetEventLevel(LevelEvent e) { return e.getLevel(); }
 	
 	
-}
+}
@@ -22,7 +22,11 @@ package com.seibel.distanthorizons.neoforge;
 import com.mojang.brigadier.CommandDispatcher;
 import com.seibel.distanthorizons.common.AbstractModInitializer;
 import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen;
+import com.seibel.distanthorizons.core.api.internal.ClientApi;
+import com.seibel.distanthorizons.core.config.Config;
+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.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 import com.seibel.distanthorizons.coreapi.ModInfo;
@@ -30,6 +34,7 @@ import com.seibel.distanthorizons.neoforge.wrappers.modAccessor.ModChecker;
 import com.seibel.distanthorizons.neoforge.wrappers.modAccessor.OptifineAccessor;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.server.MinecraftServer;
+import net.neoforged.bus.api.EventPriority;
 import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.ModLoadingContext;
 import net.neoforged.fml.common.Mod;
@@ -38,13 +43,14 @@ import net.neoforged.fml.event.lifecycle.FMLDedicatedServerSetupEvent;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.RegisterCommandsEvent;
 import net.neoforged.neoforge.event.server.ServerStartingEvent;
+import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;

 import java.util.function.Consumer;

 #if MC_VER < MC_1_20_6
 import net.neoforged.neoforge.client.ConfigScreenHandler;
 #else
-import net.neoforged.neoforge.client.gui.IConfigScreenFactory;	
+import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
 #endif

 /**
@@ -53,19 +59,46 @@ import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
 * check out the ClientProxy.
 */
@Mod(ModInfo.ID)
+@SuppressWarnings("unused")
 public class NeoforgeMain extends AbstractModInitializer
 {
 	public NeoforgeMain(IEventBus eventBus)
 	{
-		eventBus.addListener((FMLClientSetupEvent e) -> this.onInitializeClient());
-		eventBus.addListener((FMLDedicatedServerSetupEvent e) -> this.onInitializeServer());
+		eventBus.addListener((FMLClientSetupEvent e) -> {
+			this.onInitializeClient();
+			eventBus.addListener(this::registerNetworkingClient);
+		});
+		eventBus.addListener((FMLDedicatedServerSetupEvent e) -> {
+			this.onInitializeServer();
+			eventBus.addListener(this::registerNetworkingServer);
+		});
 	}
 	
+	
+	
+	//============//
+	// networking //
+	//============//
+	public void registerNetworkingClient(RegisterPayloadHandlersEvent event)
+	{
+		NeoforgePluginPacketSender.setPacketHandler(event, ClientApi.INSTANCE::pluginMessageReceived);
+	}
+	public void registerNetworkingServer(RegisterPayloadHandlersEvent event)
+	{
+		NeoforgePluginPacketSender.setPacketHandler(event, ServerApi.INSTANCE::pluginMessageReceived);
+	}
+	
+	
+	
 	@Override
 	protected IEventProxy createServerProxy(boolean isDedicated) { return new NeoforgeServerProxy(isDedicated); }
 	
 	@Override
-	protected void createInitialBindings() { SingletonInjector.INSTANCE.bind(IModChecker.class, ModChecker.INSTANCE); }
+	protected void createInitialBindings()
+	{
+		SingletonInjector.INSTANCE.bind(IModChecker.class, ModChecker.INSTANCE);
+		SingletonInjector.INSTANCE.bind(IPluginPacketSender.class, new NeoforgePluginPacketSender());
+	}
 	
 	@Override
 	protected IEventProxy createClientProxy() { return new NeoforgeClientProxy(); }
@@ -83,12 +116,26 @@ public class NeoforgeMain extends AbstractModInitializer
 				// TODO fix potential null pointer
 				() -> (client, parent) -> GetConfigScreen.getScreen(parent));
 		#endif
+		
+		
+		if (Config.Client.Advanced.Logging.showModCompatibilityWarningsOnStartup.get())
+		{
+			IModChecker modChecker = SingletonInjector.INSTANCE.get(IModChecker.class);
+			if (modChecker.isModLoaded("alexscaves"))
+			{
+				String message =
+						// orange text
+						"\u00A76" + "Distant Horizons: Alex's Cave detected." + "\u00A7r\n" +
+						"You may have to change Alex's config for DH to render. ";
+				ClientApi.INSTANCE.showChatMessageNextFrame(message);
+			}
+		}
 	}
 	
 	@Override
 	protected void subscribeRegisterCommandsEvent(Consumer<CommandDispatcher<CommandSourceStack>> eventHandler)
 	{
-		NeoForge.EVENT_BUS.addListener((RegisterCommandsEvent e) -> eventHandler.accept(e.getDispatcher()));
+		NeoForge.EVENT_BUS.addListener((RegisterCommandsEvent e) ->  { eventHandler.accept(e.getDispatcher()); });
 	}
 	
 	@Override
@@ -100,10 +147,10 @@ public class NeoforgeMain extends AbstractModInitializer
 	@Override
 	protected void subscribeServerStartingEvent(Consumer<MinecraftServer> eventHandler)
 	{
-		NeoForge.EVENT_BUS.addListener((ServerStartingEvent e) -> eventHandler.accept(e.getServer()));
+		NeoForge.EVENT_BUS.addListener(EventPriority.HIGH, (ServerStartingEvent e) -> { eventHandler.accept(e.getServer()); });
 	}
 	
 	@Override
 	protected void runDelayedSetup() { SingletonInjector.INSTANCE.runDelayedSetup(); }
 	
-}
+}
@@ -0,0 +1,56 @@
+package com.seibel.distanthorizons.neoforge;
+
+import com.seibel.distanthorizons.common.CommonPacketPayload;
+import com.seibel.distanthorizons.common.wrappers.misc.ServerPlayerWrapper;
+import com.seibel.distanthorizons.common.AbstractPluginPacketSender;
+import com.seibel.distanthorizons.core.network.messages.NetworkMessage;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
+import net.minecraft.server.level.ServerPlayer;
+import net.neoforged.neoforge.network.PacketDistributor;
+import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
+import net.neoforged.neoforge.network.registration.PayloadRegistrar;
+
+import java.util.Optional;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
+
+public class NeoforgePluginPacketSender extends AbstractPluginPacketSender
+{
+	private static BiConsumer<IServerPlayerWrapper, NetworkMessage> packetConsumer;
+	
+	public static void setPacketHandler(RegisterPayloadHandlersEvent event, Consumer<NetworkMessage> consumer)
+	{
+		setPacketHandler(event, (player, buffer) -> consumer.accept(buffer));
+	}
+	public static void setPacketHandler(RegisterPayloadHandlersEvent event, BiConsumer<IServerPlayerWrapper, NetworkMessage> consumer)
+	{
+		packetConsumer = consumer;
+		
+		PayloadRegistrar registrar = event.registrar("1").optional();
+		registrar.playBidirectional(CommonPacketPayload.TYPE, new CommonPacketPayload.Codec(), (payload, context) ->
+		{
+			ServerPlayerWrapper serverPlayer = Optional.of(context.player())
+					.map(player -> player instanceof ServerPlayer ? (ServerPlayer) player : null)
+					.map(ServerPlayerWrapper::getWrapper)
+					.orElse(null);
+			
+			if (payload.message() != null)
+			{
+				packetConsumer.accept(serverPlayer, payload.message());
+			}
+		});
+	}
+	
+	@Override
+	public void sendPluginPacketClient(NetworkMessage message)
+	{
+		PacketDistributor.sendToServer(new CommonPacketPayload(message));
+	}
+	
+	@Override
+	public void sendPluginPacketServer(ServerPlayer serverPlayer, NetworkMessage message)
+	{
+		PacketDistributor.sendToPlayer(serverPlayer, new CommonPacketPayload(message));
+	}
+	
+}
@@ -3,15 +3,20 @@ package com.seibel.distanthorizons.neoforge;
 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.misc.ServerPlayerWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.core.api.internal.ServerApi;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
 import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.event.entity.player.PlayerEvent;
 import net.neoforged.neoforge.event.level.ChunkEvent;
 import net.neoforged.neoforge.event.level.LevelEvent;
 import net.neoforged.bus.api.SubscribeEvent;
@@ -122,13 +127,25 @@ public class NeoforgeServerProxy implements AbstractModInitializer.IEventProxy
 		IChunkWrapper chunk = new ChunkWrapper(event.getChunk(), GetEventLevel(event), levelWrapper);
 		this.serverApi.serverChunkLoadEvent(chunk, levelWrapper);
 	}
+	
 	@SubscribeEvent
-	public void serverChunkSaveEvent(ChunkEvent.Unload event)
+	public void playerLoggedInEvent(PlayerEvent.PlayerLoggedInEvent event)
 	{
-		ILevelWrapper levelWrapper = ProxyUtil.getLevelWrapper(GetEventLevel(event));
-		
-		IChunkWrapper chunk = new ChunkWrapper(event.getChunk(), GetEventLevel(event), levelWrapper);
-		this.serverApi.serverChunkSaveEvent(chunk, levelWrapper);
+		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.getFrom(), event),
+				getServerLevelWrapper(event.getTo(), event)
+		);
 	}
 	
 	
@@ -138,6 +155,15 @@ public class NeoforgeServerProxy implements AbstractModInitializer.IEventProxy
 	//================//
 	
 	private static ServerLevelWrapper getServerLevelWrapper(ServerLevel level) { return ServerLevelWrapper.getWrapper(level); }
+	private static ServerLevelWrapper getServerLevelWrapper(ResourceKey<Level> resourceKey, PlayerEvent event)
+	{
+		//noinspection DataFlowIssue (possible NPE after getServer())
+		return getServerLevelWrapper(event.getEntity().getServer().getLevel(resourceKey));
+	}
 	
+	private static ServerPlayerWrapper getServerPlayerWrapper(PlayerEvent event)
+	{
+		return ServerPlayerWrapper.getWrapper((ServerPlayer) event.getEntity());
+	}
 	
-}
+}
@@ -1,8 +1,11 @@
 package com.seibel.distanthorizons.neoforge.mixins.client;

+import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -10,10 +13,16 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(ClientPacketListener.class)
 public class MixinClientPacketListener
 {
+	@Shadow
+	private ClientLevel level;
 	// TODO update fabric version as well
 	
 	@Inject(method = "handleLogin", at = @At("RETURN"))
-	void onHandleLoginEnd(CallbackInfo ci) { ClientApi.INSTANCE.onClientOnlyConnected(); }
+	void onHandleLoginEnd(CallbackInfo ci)
+	{
+		ClientApi.INSTANCE.onClientOnlyConnected();
+		ClientApi.INSTANCE.clientLevelLoadEvent(ClientLevelWrapper.getWrapper(this.level, true));
+	}
 	
 	#if MC_VER < MC_1_19_4
 	@Inject(method = "cleanup", at = @At("HEAD"))
@@ -120,7 +120,7 @@ public class MixinLevelRenderer
 		
 		
 		float frameTime;
-		#if MC_VER < MC_1_21
+		#if MC_VER < MC_1_21_1
 		frameTime = Minecraft.getInstance().getFrameTime();
 		#else
 		frameTime = Minecraft.getInstance().getTimer().getRealtimeDeltaTicks();
@@ -86,7 +86,7 @@ public class MixinMinecraft
 				}
 				else
 				{
-					versionId = GitlabGetter.INSTANCE.projectPipelines.getFirst().get("sha");
+					versionId = GitlabGetter.INSTANCE.projectPipelines.get(0).get("sha");
 				}
 				
 				Minecraft.getInstance().setScreen(new UpdateModScreen(
@@ -45,7 +45,7 @@ import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Shadow;
 #endif

-#if MC_VER < MC_1_21
+#if MC_VER < MC_1_21_1
 import net.minecraft.client.gui.screens.OptionsScreen;
 #else
 import net.minecraft.client.gui.screens.options.OptionsScreen;
@@ -64,7 +64,7 @@ public class MixinOptionsScreen extends Screen
 	/** Texture used for the config opening button */
 	@Unique
 	private static final ResourceLocation ICON_TEXTURE =
-		#if MC_VER < MC_1_21
+		#if MC_VER < MC_1_21_1
 		new ResourceLocation(ModInfo.ID, "textures/gui/button.png");
 		#else
 			ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "textures/gui/button.png");
@@ -104,14 +104,14 @@ public class MixinOptionsScreen extends Screen
 			
 			// add the button to the correct location in the UI
 			// TODO is there a better way to do this instead of using access transformers to inject into the exact UI elements?
-			LinearLayout layout = (LinearLayout) this.layout.headerFrame.children.getFirst().child;
+			LinearLayout layout = (LinearLayout) this.layout.headerFrame.children.get(0).child;
 			
 			// determine how wide the other option buttons are so we can put our botton to the left of them all
 			AtomicInteger width = new AtomicInteger(0);
-			layout.visitChildren(x -> width.addAndGet(x.getWidth()));
+			layout.visitChildren(x -> { width.addAndGet(x.getWidth()); });
 			width.addAndGet(-10); // padding between the DH button and the FOV slider
 			
-			layout.wrapped.addChild(this.getOptionsButton(), 1, 2, (settings) -> settings.paddingLeft(width.get() * -1));
+			layout.wrapped.addChild(this.getOptionsButton(), 1, 2, (settings) -> { settings.paddingLeft(width.get() * -1); });
 			layout.arrangeElements();
 			
 		    #endif
@@ -0,0 +1,35 @@
+package com.seibel.distanthorizons.neoforge.mixins.server;
+
+import com.seibel.distanthorizons.common.commonMixins.MixinChunkMapCommon;
+import net.minecraft.server.level.ChunkMap;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.chunk.ChunkAccess;
+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.CallbackInfoReturnable;
+
+@Mixin(ChunkMap.class)
+public class MixinChunkMap
+{
+	
+	@Unique
+	private static final String CHUNK_SERIALIZER_WRITE
+			= "Lnet/minecraft/world/level/chunk/storage/ChunkSerializer;write(" +
+			"Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/level/chunk/ChunkAccess;)" +
+			"Lnet/minecraft/nbt/CompoundTag;";
+	
+	@Shadow
+	@Final
+	ServerLevel level;
+	
+	// firing at INVOKE causes issues with C2ME and is probably unnecessary since we
+	// don't need the chunk(s) before MC has finished saving them
+	@Inject(method = "save", at = @At(value = "RETURN", target = CHUNK_SERIALIZER_WRITE))
+	private void onChunkSave(ChunkAccess chunk, CallbackInfoReturnable<Boolean> ci)
+	{ MixinChunkMapCommon.onChunkSave(this.level, chunk, ci); }
+	
+}
@@ -0,0 +1,77 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020-2023 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.neoforge.mixins.server;
+
+import com.seibel.distanthorizons.common.wrappers.misc.IMixinServerPlayer;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.entity.Entity;
+import org.jetbrains.annotations.Nullable;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+#if MC_VER >= MC_1_21_1
+import net.minecraft.world.level.portal.DimensionTransition;
+#endif
+
+
+@Mixin(ServerPlayer.class)
+public class MixinServerPlayer implements IMixinServerPlayer
+{
+	@Unique
+	@Nullable
+	private ServerLevel distantHorizons$dimensionChangeDestination;
+	
+	@Override
+	@Nullable
+	public ServerLevel distantHorizons$getDimensionChangeDestination()
+	{
+		return this.distantHorizons$dimensionChangeDestination;
+	}
+	
+	@Inject(at = @At("HEAD"), method = "changeDimension")
+	#if MC_VER >= MC_1_21_1
+	public void changeDimension(DimensionTransition dimensionTransition, CallbackInfoReturnable<Entity> cir)
+	{
+		this.distantHorizons$dimensionChangeDestination = dimensionTransition.newLevel();
+	}
+	#else
+	public void changeDimension(ServerLevel destination, CallbackInfoReturnable<Entity> cir)
+	{
+		this.distantHorizons$dimensionChangeDestination = destination;
+	}
+	#endif
+	
+	#if MC_VER >= MC_1_20_1
+	@Inject(at = @At("RETURN"), method = "setServerLevel")
+	public void setServerLevel(ServerLevel level, CallbackInfo ci)
+	#else
+	@Inject(at = @At("RETURN"), method = "setLevel")
+	public void setLevel(ServerLevel level, CallbackInfo ci)
+	#endif
+	{
+		this.distantHorizons$dimensionChangeDestination = null;
+	}
+	
+}
@@ -5,7 +5,9 @@
    "mixins": [
        "server.MixinUtilBackgroundThread",
        "server.MixinChunkGenerator",
-        "server.MixinTFChunkGenerator"
+        "server.MixinTFChunkGenerator",
+      "server.MixinChunkMap",
+      "server.MixinServerPlayer"
    ],
    "client": [
        "client.MixinClientPacketListener",
--- a/Show More
+++ b/Show More