0.1.0-beta.8

.github/workflows/build.yml

@@ -31,6 +31,8 @@ jobs:
           key: ${{ runner.os }}-project-local-gradle-caches-${{ hashFiles('**/libs.versions.toml', '**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-project-local-gradle-caches-
+      - name: "setup concurrentutil"
+        run: ./installConcurrentUtil.sh
       - name: "execute gradle build"
         run: ./gradlew build
       - name: Determine Snapshot Status

.gitignore

@@ -116,6 +116,3 @@ run/
 
 # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
-
-ConcurrentUtil/
-YamlConfig/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "ConcurrentUtil"]
+	path = ConcurrentUtil
+	url = https://github.com/Spottedleaf/ConcurrentUtil.git

README.md

@@ -12,19 +12,19 @@ Fabric/NeoForge mod for optimising performance of the integrated (singleplayer/L
 Moonrise aims to optimise the game *without changing Vanilla behavior*. If you find that there are changes to Vanilla behavior,
 please open an issue.
 
-Moonrise is an official port of several important [Paper](https://github.com/PaperMC/Paper/)
+Moonrise ports several important [Paper](https://github.com/PaperMC/Paper/)
 patches. Listed below are notable patches:
- - [Starlight](https://github.com/PaperMC/Starlight/)
  - Chunk system rewrite
  - Collision optimisations
  - Entity tracker optimisations
  - Random ticking optimisations
+ - [Starlight](https://github.com/PaperMC/Starlight/)
 
 ## Known Compatibility Issues
 | Mod         | Status                                                                                                                                                                                                                                                                                                   |
 |-------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Lithium     | <details><summary>✅ compatible</summary>Lithium optimises many of the same parts of the game as Moonrise, for example the chunk system. Moonrise will automatically disable conflicting parts of Lithium. This mechanism needs to be manually validated for each Moonrise and Lithium release.</details> |
-| FerriteCore | <details><summary>✅ compatible</summary>FerriteCore optimises some of the same parts of the game as Moonrise. Moonrise will automatically disable conflicting parts of FerriteCore. This mechanism needs to be manually validated for each Moonrise and FerriteCore release.</details>                   |
+| FerriteCore | <details><summary>📝 requires config changes</summary>In `config/ferritecore-mixin.toml`:<br/>Set `replaceNeighborLookup` and `replacePropertyMap` to `false`</details>                                                                                                                                  |
 | C2ME        | <details><summary>❌ incompatible</summary>C2ME is based around modifications to the chunk system, which Moonrise replaces wholesale. This makes them fundamentally incompatible.</details>                                                                                                               |
 
 ## Configuration

build.gradle

@@ -1,53 +1,40 @@
 import me.modmuss50.mpp.ReleaseType
 
 plugins {
-    id("java-library")
-    id("net.neoforged.moddev")
-    id("me.modmuss50.mod-publish-plugin") version "0.8.4" apply false
+    id("xyz.jpenilla.quiet-architectury-loom")
+    id("me.modmuss50.mod-publish-plugin") version "0.7.2" apply false
 }
 
-extensions.create("runConfigCommon", RunConfigCommon.class)
-
-def getGitCommit = providers.exec {
-    commandLine 'git', 'rev-parse', '--short', 'HEAD'
-}.standardOutput.getAsText().map { it.trim() }
-
-def aw2at = Aw2AtTask.configureDefault(
-    getProject(),
-    layout.projectDirectory.file("src/main/resources/moonrise.accesswidener").getAsFile(),
-    sourceSets.main
-)
-
-neoForge {
-    neoFormVersion = neoform_version
-    validateAccessTransformers = true
-    accessTransformers.files.setFrom(aw2at.flatMap { t -> t.getOutputFile() })
+/*
+ * Gets the version name from the latest Git tag
+ */
+// https://stackoverflow.com/questions/28498688/gradle-script-to-autoversion-and-include-the-commit-hash-in-android
+def getGitCommit = { ->
+    def stdout = new ByteArrayOutputStream()
+    exec {
+        commandLine 'git', 'rev-parse', '--short', 'HEAD'
+        standardOutput = stdout
+    }
+    return stdout.toString().trim()
 }
 
-runConfigCommon {
-    systemProperties.put "mixin.debug", "true"
-    systemProperties.put "Moonrise.MaxViewDistance", "128"
-}
 
 dependencies {
-    compileOnly "net.fabricmc:sponge-mixin:0.15.4+mixin.0.8.7"
-    compileOnly "io.github.llamalad7:mixinextras-common:0.4.1"
-    // work around minecraft (MDG) forcing ASM 9.3 which is incompatible with the above deps...
-    components.withModule("net.neoforged:minecraft-dependencies", RemoveAsmConstraint.class)
+    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-    api("ca.spottedleaf:concurrentutil:${rootProject.concurrentutil_version}") { setTransitive(false) }
-    api("ca.spottedleaf:yamlconfig:${rootProject.yamlconfig_version}") { setTransitive(false) }
+    api("ca.spottedleaf:concurrentutil:${rootProject.concurrentutil_version}")
     api("org.yaml:snakeyaml:${rootProject.snakeyaml_version}")
 
-    // todo: does cloth publish a platform-agnostic jar in mojang mappings?
-    compileOnly "me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_version}"
+    modImplementation "me.shedaniel.cloth:cloth-config:${rootProject.cloth_version}"
 }
 
+File awFile = file("src/main/resources/moonrise.accesswidener")
+
 allprojects {
     group = rootProject.maven_group
-    version = rootProject.mod_version + "+" + getGitCommit.get()
+    version = rootProject.mod_version + "+" + getGitCommit()
 
-    plugins.apply("java-library")
+    plugins.apply("xyz.jpenilla.quiet-architectury-loom")
 
     java {
         withSourcesJar()
@@ -57,30 +44,25 @@ allprojects {
         }
     }
 
-    dependencies {
-        testImplementation "org.junit.jupiter:junit-jupiter:${rootProject.junit_version}"
-        testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
-    }
-
-    tasks.test {
-        useJUnitPlatform()
-    }
-
     repositories {
-        maven {
-            url = "https://repo.papermc.io/repository/maven-public/"
+        mavenLocal {
             mavenContent {
-                includeGroup("ca.spottedleaf")
+                includeModule("ca.spottedleaf", "concurrentutil")
             }
         }
         maven {
-            url = "https://api.modrinth.com/maven"
+            url "https://api.modrinth.com/maven"
             mavenContent {
                 includeGroup("maven.modrinth")
             }
         }
-        maven { url = "https://maven.shedaniel.me/" }
-        maven { url = "https://maven.terraformersmc.com/releases/" }
+        maven { url "https://maven.shedaniel.me/" }
+        maven { url "https://maven.terraformersmc.com/releases/" }
+    }
+
+    dependencies {
+        minecraft "com.mojang:minecraft:${project.minecraft_version}"
+        mappings loom.officialMojangMappings()
     }
 
     // make build reproducible
@@ -98,22 +80,31 @@ allprojects {
             rename { "${it}_${rootProject.base.archivesName.get()}"}
         }
     }
+
+    loom {
+        accessWidenerPath = awFile
+        mixin {
+            useLegacyMixinAp = false
+        }
+    }
 }
 
 subprojects {
-    plugins.apply("me.modmuss50.mod-publish-plugin")
-    plugins.apply 'java-library'
-    plugins.apply 'com.gradleup.shadow'
+    loom.mods {
+        main {
+            sourceSet("main")
+            sourceSet("main", project.rootProject)
+        }
+    }
+    loom.runs.all {
+        ideConfigGenerated true
+        // property "mixin.debug", "true"
+    }
 
-    configurations.create("libs")
-    configurations.shadow {
-        extendsFrom(configurations.libs)
-    }
-    configurations.implementation {
-        extendsFrom(configurations.libs)
-    }
+    plugins.apply("me.modmuss50.mod-publish-plugin")
 
     publishMods {
+        file = remapJar.archiveFile
         if (project.version.contains("-beta.")) {
             type = ReleaseType.BETA
         } else {
@@ -137,7 +128,20 @@ subprojects {
     }
 
     // Setup a run with lithium for compatibility testing
+    sourceSets.create("lithium")
     configurations.create("lithium")
+    loom {
+        createRemapConfigurations(sourceSets.lithium)
+        runs {
+            register("lithiumClient") {
+                client()
+                property "mixin.debug", "true"
+            }
+        }
+    }
+    tasks.named("runLithiumClient", net.fabricmc.loom.task.RunGameTask.class) {
+        getClasspath().from(configurations.modRuntimeClasspathLithiumMapped)
+    }
     dependencies {
         String coordinates =  "maven.modrinth:lithium:"
         if (getProject().name == "Moonrise-NeoForge") {
@@ -145,6 +149,10 @@ subprojects {
         } else {
             coordinates += rootProject.fabric_lithium_version
         }
-        lithium coordinates
+        modLithiumRuntimeOnly coordinates
     }
 }
+
+loom.runs.all {
+    ideConfigGenerated false
+}

buildSrc/build.gradle.kts

@@ -1,11 +0,0 @@
-repositories {
-  gradlePluginPortal()
-  mavenCentral()
-  maven("https://maven.fabricmc.net/")
-  maven("https://maven.architectury.dev/")
-}
-
-dependencies {
-  implementation("net.fabricmc:access-widener:2.1.0")
-  implementation("dev.architectury:at:1.0.1")
-}

buildSrc/src/main/java/Aw2AtTask.java

@@ -1,152 +0,0 @@
-import dev.architectury.at.AccessChange;
-import dev.architectury.at.AccessTransform;
-import dev.architectury.at.AccessTransformSet;
-import dev.architectury.at.ModifierChange;
-import dev.architectury.at.io.AccessTransformFormat;
-import dev.architectury.at.io.AccessTransformFormats;
-import java.io.BufferedReader;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.List;
-import javax.inject.Inject;
-import net.fabricmc.accesswidener.AccessWidenerReader;
-import net.fabricmc.accesswidener.AccessWidenerVisitor;
-import org.cadixdev.bombe.type.signature.MethodSignature;
-import org.gradle.api.DefaultTask;
-import org.gradle.api.Project;
-import org.gradle.api.file.ProjectLayout;
-import org.gradle.api.file.RegularFileProperty;
-import org.gradle.api.tasks.CacheableTask;
-import org.gradle.api.tasks.InputFile;
-import org.gradle.api.tasks.OutputFile;
-import org.gradle.api.tasks.PathSensitive;
-import org.gradle.api.tasks.PathSensitivity;
-import org.gradle.api.tasks.SourceSet;
-import org.gradle.api.tasks.TaskAction;
-import org.gradle.api.tasks.TaskProvider;
-
-@CacheableTask
-public abstract class Aw2AtTask extends DefaultTask {
-
-    @InputFile
-    @PathSensitive(PathSensitivity.NONE)
-    public abstract RegularFileProperty getInputFile();
-
-    @OutputFile
-    public abstract RegularFileProperty getOutputFile();
-
-    @Inject
-    public abstract ProjectLayout getLayout();
-
-    public static TaskProvider<Aw2AtTask> configureDefault(
-        final Project project,
-        final File awFile,
-        final SourceSet sourceSet
-    ) {
-        final TaskProvider<Aw2AtTask> aw2at = project.getTasks().register("aw2at", Aw2AtTask.class, task -> {
-            task.getOutputFile().set(project.getLayout().getBuildDirectory().file("aw2at/files/accesstransformer.cfg"));
-            task.getInputFile().set(awFile);
-        });
-
-        final TaskProvider<CopyTask> copyTask = project.getTasks().register("copyAt", CopyTask.class, copy -> {
-            copy.getInputFile().set(aw2at.flatMap(Aw2AtTask::getOutputFile));
-            copy.getOutputDirectory().set(project.getLayout().getBuildDirectory().dir("aw2at/dir"));
-            copy.getDestination().set("META-INF/accesstransformer.cfg");
-        });
-
-        sourceSet.resources(resources -> {
-            resources.srcDir(copyTask.flatMap(CopyTask::getOutputDirectory));
-        });
-
-        return aw2at;
-    }
-
-    @TaskAction
-    public void run() {
-        try (final BufferedReader reader = Files.newBufferedReader(this.getInputFile().get().getAsFile().toPath())) {
-            final AccessTransformSet accessTransformSet = toAccessTransformSet(reader);
-            Files.deleteIfExists(this.getOutputFile().get().getAsFile().toPath());
-            Files.createDirectories(this.getOutputFile().get().getAsFile().toPath().getParent());
-            writeLF(AccessTransformFormats.FML, this.getOutputFile().get().getAsFile().toPath(), accessTransformSet);
-        } catch (final IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static void writeLF(final AccessTransformFormat format, final Path path, final AccessTransformSet at) throws IOException {
-        final StringWriter stringWriter = new StringWriter();
-        final BufferedWriter writer = new BufferedWriter(stringWriter);
-        format.write(writer, at);
-        writer.close();
-        final List<String> lines = Arrays.stream(stringWriter.toString()
-                // unify line endings
-                .replace("\r\n", "\n")
-                .split("\n"))
-            // skip blank lines
-            .filter(it -> !it.isBlank())
-            // sort
-            .sorted()
-            .toList();
-        Files.writeString(path, String.join("\n", lines));
-    }
-
-    // Below methods are heavily based on architectury-loom Aw2At class (MIT licensed)
-    /*
-    MIT License
-
-    Copyright (c) 2016 FabricMC
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-    of this software and associated documentation files (the "Software"), to deal
-    in the Software without restriction, including without limitation the rights
-    to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-    copies of the Software, and to permit persons to whom the Software is
-    furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all
-    copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-    IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-    AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-    LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-    OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-    SOFTWARE.
-     */
-
-    public static AccessTransformSet toAccessTransformSet(final BufferedReader reader) throws IOException {
-        AccessTransformSet atSet = AccessTransformSet.create();
-
-        new AccessWidenerReader(new AccessWidenerVisitor() {
-            @Override
-            public void visitClass(final String name, final AccessWidenerReader.AccessType access, final boolean transitive) {
-                atSet.getOrCreateClass(name).merge(toAt(access));
-            }
-
-            @Override
-            public void visitMethod(final String owner, final String name, final String descriptor, final AccessWidenerReader.AccessType access, final boolean transitive) {
-                atSet.getOrCreateClass(owner).mergeMethod(MethodSignature.of(name, descriptor), toAt(access));
-            }
-
-            @Override
-            public void visitField(final String owner, final String name, final String descriptor, final AccessWidenerReader.AccessType access, final boolean transitive) {
-                atSet.getOrCreateClass(owner).mergeField(name, toAt(access));
-            }
-        }).read(reader);
-
-        return atSet;
-    }
-
-    public static AccessTransform toAt(final AccessWidenerReader.AccessType access) {
-        return switch (access) {
-            case ACCESSIBLE -> AccessTransform.of(AccessChange.PUBLIC);
-            case EXTENDABLE, MUTABLE -> AccessTransform.of(AccessChange.PUBLIC, ModifierChange.REMOVE);
-        };
-    }
-}

buildSrc/src/main/java/CopyTask.java

@@ -1,44 +0,0 @@
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.Comparator;
-import java.util.stream.Stream;
-import org.gradle.api.DefaultTask;
-import org.gradle.api.file.DirectoryProperty;
-import org.gradle.api.file.RegularFileProperty;
-import org.gradle.api.provider.Property;
-import org.gradle.api.tasks.Input;
-import org.gradle.api.tasks.InputFile;
-import org.gradle.api.tasks.OutputDirectory;
-import org.gradle.api.tasks.TaskAction;
-
-public abstract class CopyTask extends DefaultTask {
-
-    @InputFile
-    public abstract RegularFileProperty getInputFile();
-
-    @Input
-    public abstract Property<String> getDestination();
-
-    @OutputDirectory
-    public abstract DirectoryProperty getOutputDirectory();
-
-    @TaskAction
-    public void run() {
-        final Path outputDirPath = this.getOutputDirectory().get().getAsFile().toPath();
-        try {
-            try (final Stream<Path> walk = Files.walk(outputDirPath)) {
-                for (final Path path : walk.sorted(Comparator.reverseOrder()).toList()) {
-                    Files.delete(path);
-                }
-            }
-
-            final Path destFile = outputDirPath.resolve(this.getDestination().get());
-            Files.createDirectories(destFile.getParent());
-
-            Files.copy(this.getInputFile().get().getAsFile().toPath(), destFile);
-        } catch (final IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-}

buildSrc/src/main/java/RemoveAsmConstraint.java

@@ -1,24 +0,0 @@
-import java.util.Objects;
-import org.gradle.api.artifacts.CacheableRule;
-import org.gradle.api.artifacts.ComponentMetadataContext;
-import org.gradle.api.artifacts.ComponentMetadataRule;
-
-@CacheableRule
-public abstract class RemoveAsmConstraint implements ComponentMetadataRule {
-    @Override
-    public void execute(final ComponentMetadataContext ctx) {
-        ctx.getDetails().allVariants(variants -> {
-            variants.withDependencies(deps -> {
-                deps.forEach(dep -> {
-                    if (Objects.equals(dep.getGroup(), "org.ow2.asm")) {
-                        if (dep.getVersionConstraint().getStrictVersion() != null) {
-                            dep.version(v -> {
-                                v.require(v.getStrictVersion());
-                            });
-                        }
-                    }
-                });
-            });
-        });
-    }
-}

buildSrc/src/main/java/RunConfigCommon.java

@@ -1,5 +0,0 @@
-import org.gradle.api.provider.MapProperty;
-
-public abstract class RunConfigCommon {
-    public abstract MapProperty<String, String> getSystemProperties();
-}

fabric/build.gradle

@@ -1,60 +1,52 @@
-import java.util.stream.Collectors
-import net.fabricmc.loom.util.gradle.SourceSetHelper
-
 plugins {
-    id("quiet-fabric-loom")
+    id("xyz.jpenilla.quiet-architectury-loom")
     id 'maven-publish'
+    id 'com.gradleup.shadow'
+}
+
+configurations.create("libs")
+configurations.shadow {
+    extendsFrom(configurations.libs)
+}
+configurations.implementation {
+    extendsFrom(configurations.libs)
 }
 
 dependencies {
-    minecraft "com.mojang:minecraft:${project.minecraft_version}"
-    mappings loom.officialMojangMappings()
-    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
-    testImplementation "net.fabricmc:fabric-loader-junit:${project.loader_version}"
-
+    add('shadow', project([path: ":", configuration: "namedElements"]))
     runtimeOnly(project(":").sourceSets.main.output)
-    shadow(project(":"))
-    compileOnly(project(":"))
+    modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
-    libs("ca.spottedleaf:concurrentutil:${rootProject.concurrentutil_version}") { setTransitive(false) }
-    libs("ca.spottedleaf:yamlconfig:${rootProject.yamlconfig_version}") { setTransitive(false) }
+    libs("ca.spottedleaf:concurrentutil:${rootProject.concurrentutil_version}")
     libs("org.yaml:snakeyaml:${rootProject.snakeyaml_version}")
 
     modImplementation "me.shedaniel.cloth:cloth-config-fabric:${rootProject.cloth_version}"
     include "me.shedaniel.cloth:cloth-config-fabric:${rootProject.cloth_version}"
-    modImplementation "com.terraformersmc:modmenu:${rootProject.modmenu_version}"
+    modImplementation "com.terraformersmc:modmenu:11.0.1"
 
-    modImplementation platform(fabricApiLibs.bom)
     modImplementation fabricApiLibs.command.api.v2
     modImplementation fabricApiLibs.lifecycle.events.v1
     include fabricApiLibs.command.api.v2
     include fabricApiLibs.base
 }
 
-tasks.processResources {
-    def properties = [
-        "version": project.version,
-        "minecraft_version": minecraft_version,
-        "loader_version": loader_version,
-        "mod_version": mod_version
-    ]
-    inputs.properties(properties)
+processResources {
+    inputs.property "version", project.version
+
     filesMatching("fabric.mod.json") {
-        expand properties
+        expand "version": project.version, "minecraft_version": minecraft_version, "loader_version": loader_version, "mod_version": mod_version
     }
 }
 
-tasks.shadowJar {
+shadowJar {
     archiveClassifier = "dev-all"
     destinationDirectory = layout.buildDirectory.dir("libs")
     configurations = [project.configurations.shadow]
     relocate 'ca.spottedleaf.concurrentutil', 'ca.spottedleaf.moonrise.libs.ca.spottedleaf.concurrentutil'
-    relocate 'ca.spottedleaf.yamlconfig', 'ca.spottedleaf.moonrise.libs.ca.spottedleaf.yamlconfig'
     relocate 'org.yaml.snakeyaml', 'ca.spottedleaf.moonrise.libs.org.yaml.snakeyaml'
 }
 
 publishMods {
-    file = remapJar.archiveFile
     modLoaders = ["fabric"]
 
     modrinth {
@@ -68,56 +60,7 @@ publishMods {
         incompatible(
             "not-enough-crashes",
             "starlight",
-            "c2me"
+            "c2me-fabric"
         )
     }
 }
-
-loom {
-    accessWidenerPath.set(getRootProject().file("src/main/resources/moonrise.accesswidener"))
-    mixin {
-        useLegacyMixinAp = false
-    }
-    runs.configureEach {
-        ideConfigGenerated true
-    }
-    mods {
-        main {
-            sourceSet("main")
-            sourceSet("main", project.rootProject)
-        }
-    }
-}
-
-tasks.test {
-    def classPathGroups = SourceSetHelper.getClasspath(loom.mods.main, getProject()).stream()
-        .map(File.&getAbsolutePath)
-        .collect(Collectors.joining(File.pathSeparator))
-
-    systemProperty("fabric.classPathGroups", classPathGroups)
-}
-
-afterEvaluate {
-    loom.runs.configureEach { cfg ->
-        runConfigCommon.systemProperties.get().each {
-            cfg.property it.key, it.value
-        }
-    }
-}
-
-// Setup a run with lithium for compatibility testing
-sourceSets.create("lithium")
-loom {
-    createRemapConfigurations(sourceSets.lithium)
-    runs {
-        register("lithiumClient") {
-            client()
-        }
-    }
-}
-configurations.modLithiumRuntimeOnly {
-    extendsFrom configurations.lithium
-}
-tasks.named("runLithiumClient", net.fabricmc.loom.task.RunGameTask.class) {
-    getClasspath().from(configurations.modRuntimeClasspathLithiumMapped)
-}

fabric/src/main/java/ca/spottedleaf/moonrise/fabric/FabricHooks.java

@@ -1,42 +1,50 @@
 package ca.spottedleaf.moonrise.fabric;
 
-import ca.spottedleaf.moonrise.common.util.BaseChunkSystemHooks;
 import ca.spottedleaf.moonrise.common.PlatformHooks;
 import ca.spottedleaf.moonrise.common.util.ConfigHolder;
-import com.mojang.datafixers.DSL;
-import com.mojang.datafixers.DataFixer;
-import com.mojang.serialization.Dynamic;
+import ca.spottedleaf.moonrise.patches.chunk_system.scheduling.NewChunkHolder;
+import net.fabricmc.fabric.api.event.Event;
+import net.fabricmc.fabric.api.event.EventFactory;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtOps;
-import net.minecraft.server.level.ChunkHolder;
 import net.minecraft.server.level.GenerationChunkHolder;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.boss.EnderDragonPart;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ImposterProtoChunk;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.ProtoChunk;
-import net.minecraft.world.level.chunk.status.ChunkStatusTasks;
-import net.minecraft.world.level.chunk.storage.SerializableChunkData;
 import net.minecraft.world.level.entity.EntityTypeTest;
 import net.minecraft.world.phys.AABB;
-import java.util.Collection;
+import net.minecraft.world.phys.Vec3;
 import java.util.List;
 import java.util.function.Predicate;
 
-public final class FabricHooks extends BaseChunkSystemHooks implements PlatformHooks {
+public final class FabricHooks implements PlatformHooks {
 
     private static final boolean HAS_FABRIC_LIFECYCLE_EVENTS = FabricLoader.getInstance().isModLoaded("fabric-lifecycle-events-v1");
 
+    public interface OnExplosionDetonate {
+        void onExplosion(final Level world, final Explosion explosion, final List<Entity> possiblyAffecting, final double diameter);
+    }
+
+    public static final Event<OnExplosionDetonate> ON_EXPLOSION_DETONATE = EventFactory.createArrayBacked(
+        OnExplosionDetonate.class,
+        listeners -> (final Level world, final Explosion explosion, final List<Entity> possiblyAffecting, final double diameter) -> {
+            for (int i = 0; i < listeners.length; i++) {
+                listeners[i].onExplosion(world, explosion, possiblyAffecting, diameter);
+            }
+        }
+    );
+
     @Override
     public String getBrand() {
         return "Moonrise";
@@ -54,6 +62,16 @@ public final class FabricHooks extends BaseChunkSystemHooks implements PlatformH
         };
     }
 
+    @Override
+    public void onExplosion(final Level world, final Explosion explosion, final List<Entity> possiblyAffecting, final double diameter) {
+        ON_EXPLOSION_DETONATE.invoker().onExplosion(world, explosion, possiblyAffecting, diameter);
+    }
+
+    @Override
+    public Vec3 modifyExplosionKnockback(final Level world, final Explosion explosion, final Entity entity, final Vec3 original) {
+        return original;
+    }
+
     @Override
     public boolean hasCurrentlyLoadingChunk() {
         return false;
@@ -72,7 +90,7 @@ public final class FabricHooks extends BaseChunkSystemHooks implements PlatformH
     @Override
     public void chunkFullStatusComplete(final LevelChunk newChunk, final ProtoChunk original) {
         if (HAS_FABRIC_LIFECYCLE_EVENTS) {
-            ServerChunkEvents.CHUNK_LOAD.invoker().onChunkLoad((ServerLevel)newChunk.getLevel(), newChunk);
+            ServerChunkEvents.CHUNK_LOAD.invoker().onChunkLoad((ServerLevel) newChunk.getLevel(), newChunk);
             if (!(original instanceof ImposterProtoChunk)) {
                 ServerChunkEvents.CHUNK_GENERATE.invoker().onChunkGenerate((ServerLevel)newChunk.getLevel(), newChunk);
             }
@@ -85,19 +103,19 @@ public final class FabricHooks extends BaseChunkSystemHooks implements PlatformH
     }
 
     @Override
-    public void onChunkHolderTicketChange(final ServerLevel world, final ChunkHolder holder, final int oldLevel, final int newLevel) {
+    public void onChunkHolderTicketChange(final ServerLevel world, final NewChunkHolder holder, final int oldLevel, final int newLevel) {
 
     }
 
     @Override
     public void chunkUnloadFromWorld(final LevelChunk chunk) {
         if (HAS_FABRIC_LIFECYCLE_EVENTS) {
-            ServerChunkEvents.CHUNK_UNLOAD.invoker().onChunkUnload((ServerLevel)chunk.getLevel(), chunk);
+            ServerChunkEvents.CHUNK_UNLOAD.invoker().onChunkUnload((ServerLevel) chunk.getLevel(), chunk);
         }
     }
 
     @Override
-    public void chunkSyncSave(final ServerLevel world, final ChunkAccess chunk, final SerializableChunkData data) {
+    public void chunkSyncSave(final ServerLevel world, final ChunkAccess chunk, final CompoundTag data) {
 
     }
 
@@ -114,43 +132,13 @@ public final class FabricHooks extends BaseChunkSystemHooks implements PlatformH
     @Override
     public void addToGetEntities(final Level world, final Entity entity, final AABB boundingBox, final Predicate<? super Entity> predicate,
                                  final List<Entity> into) {
-        final Collection<EnderDragonPart> parts = world.dragonParts();
-        if (parts.isEmpty()) {
-            return;
-        }
 
-        for (final EnderDragonPart part : parts) {
-            if (part != entity && part.getBoundingBox().intersects(boundingBox) && (predicate == null || predicate.test(part))) {
-                into.add(part);
-            }
-        }
     }
 
     @Override
     public <T extends Entity> void addToGetEntities(final Level world, final EntityTypeTest<Entity, T> entityTypeTest, final AABB boundingBox,
                                                     final Predicate<? super T> predicate, final List<? super T> into, final int maxCount) {
-        if (into.size() >= maxCount) {
-            // fix neoforge issue: do not add if list is already full
-            return;
-        }
 
-        final Collection<EnderDragonPart> parts = world.dragonParts();
-        if (parts.isEmpty()) {
-            return;
-        }
-
-        for (final EnderDragonPart part : parts) {
-            if (!part.getBoundingBox().intersects(boundingBox)) {
-                continue;
-            }
-            final T casted = (T)entityTypeTest.tryCast(part);
-            if (casted != null && (predicate == null || predicate.test(casted))) {
-                into.add(casted);
-                if (into.size() >= maxCount) {
-                    break;
-                }
-            }
-        }
     }
 
     @Override
@@ -199,12 +187,12 @@ public final class FabricHooks extends BaseChunkSystemHooks implements PlatformH
     }
 
     @Override
-    public long configAutoSaveInterval(final ServerLevel world) {
+    public long configAutoSaveInterval() {
         return ConfigHolder.getConfig().chunkSaving.autoSaveInterval.getTimeTicks();
     }
 
     @Override
-    public int configMaxAutoSavePerTick(final ServerLevel world) {
+    public int configMaxAutoSavePerTick() {
         return ConfigHolder.getConfig().chunkSaving.maxAutoSaveChunksPerTick;
     }
 
@@ -212,47 +200,4 @@ public final class FabricHooks extends BaseChunkSystemHooks implements PlatformH
     public boolean configFixMC159283() {
         return ConfigHolder.getConfig().bugFixes.fixMC159283;
     }
-
-    @Override
-    public boolean forceNoSave(final ChunkAccess chunk) {
-        return false;
-    }
-
-    @Override
-    public CompoundTag convertNBT(final DSL.TypeReference type, final DataFixer dataFixer, final CompoundTag nbt,
-                                  final int fromVersion, final int toVersion) {
-        return (CompoundTag)dataFixer.update(
-            type, new Dynamic<>(NbtOps.INSTANCE, nbt), fromVersion, toVersion
-        ).getValue();
-    }
-
-    @Override
-    public boolean hasMainChunkLoadHook() {
-        return false;
-    }
-
-    @Override
-    public void mainChunkLoad(final ChunkAccess chunk, final SerializableChunkData chunkData) {
-
-    }
-
-    @Override
-    public List<Entity> modifySavedEntities(final ServerLevel world, final int chunkX, final int chunkZ, final List<Entity> entities) {
-        return entities;
-    }
-
-    @Override
-    public void unloadEntity(final Entity entity) {
-        entity.setRemoved(Entity.RemovalReason.UNLOADED_TO_CHUNK);
-    }
-
-    @Override
-    public void postLoadProtoChunk(final ServerLevel world, final ProtoChunk chunk) {
-        ChunkStatusTasks.postLoadProtoChunk(world, chunk.getEntities());
-    }
-
-    @Override
-    public int modifyEntityTrackingRange(final Entity entity, final int currentRange) {
-        return currentRange;
-    }
 }

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

@@ -36,12 +36,13 @@
     "accessWidener": "moonrise.accesswidener",
     "depends": {
         "fabricloader": ">=${loader_version}",
-        "minecraft": ">1.21.3 <1.21.5",
+        "minecraft": ">=1.21 <=1.21.1",
         "fabric-command-api-v2": "*"
     },
     "custom": {
         "lithium:options": {
             "mixin.ai.poi": false,
+            "mixin.alloc.chunk_ticking": false,
             "mixin.alloc.deep_passengers": false,
             "mixin.alloc.entity_tracker": false,
             "mixin.block.flatten_states": false,
@@ -65,12 +66,9 @@
             "mixin.world.block_entity_ticking": false,
             "mixin.world.chunk_access": false,
             "mixin.world.explosions.block_raycast": false,
+            "mixin.world.explosions.cache_exposure": false,
             "mixin.world.temperature_cache": false,
             "mixin.world.tick_scheduler": false
-        },
-        "ferritecore:disabled_options": [
-            "replaceNeighborLookup",
-            "replacePropertyMap"
-        ]
+        }
     }
 }

fabric/src/test/java/ca/spottedleaf/moonrise/fabric/MixinAuditTest.java

@@ -1,20 +0,0 @@
-package ca.spottedleaf.moonrise.fabric;
-
-import net.minecraft.SharedConstants;
-import net.minecraft.server.Bootstrap;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.spongepowered.asm.mixin.MixinEnvironment;
-
-class MixinAuditTest {
-    @BeforeAll
-    static void beforeAll() {
-        SharedConstants.tryDetectVersion();
-        Bootstrap.bootStrap();
-    }
-
-    @Test
-    void auditMixins() {
-        MixinEnvironment.getCurrentEnvironment().audit();
-    }
-}

gradle.properties

@@ -1,26 +1,19 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx2G
-org.gradle.parallel=true
-org.gradle.caching=true
-org.gradle.configuration-cache=true
+org.gradle.daemon=false
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.21.4
-loader_version=0.16.9
-supported_minecraft_versions=1.21.4
-neoforge_version=21.4.33-beta
-neoform_version=1.21.4-20241203.161809
-fabric_api_version=0.110.5+1.21.4
-snakeyaml_version=2.3
-concurrentutil_version=0.0.3
-yamlconfig_version=1.0.2
-cloth_version=17.0.144
-modmenu_version=13.0.0-beta.1
-junit_version=5.11.3
+minecraft_version=1.21.1
+supported_minecraft_versions=1.21,1.21.1
+loader_version=0.16.5
+neoforge_version=21.1.62
+snakeyaml_version=2.2
+concurrentutil_version=0.0.2-SNAPSHOT
+cloth_version=15.0.128
 # version ids from modrinth
-fabric_lithium_version=t1FlWYl9
-neo_lithium_version=iDqQi66g
+fabric_lithium_version=mc1.21.1-0.14.0-beta.1
+neo_lithium_version=BrMIoIMv
 # Mod Properties
-mod_version=0.2.0-beta.8
+mod_version=0.1.0-beta.8
 maven_group=ca.spottedleaf.moonrise
 archives_base_name=moonrise

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -86,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

installConcurrentUtil.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -eou pipefail
+
+git submodule update --init --recursive
+cd ConcurrentUtil
+mvn install

neoforge/build.gradle

@@ -1,10 +1,9 @@
-import java.nio.file.Files
-import java.nio.file.StandardCopyOption
-import net.neoforged.moddevgradle.internal.RunGameTask
+import net.fabricmc.loom.util.aw2at.Aw2At
 
 plugins {
-    id("net.neoforged.moddev")
+    id("xyz.jpenilla.quiet-architectury-loom")
     id 'maven-publish'
+    id 'com.gradleup.shadow'
 }
 
 repositories {
@@ -14,88 +13,41 @@ repositories {
     }
 }
 
-def aw2at = Aw2AtTask.configureDefault(
-    getProject(),
-    rootProject.layout.projectDirectory.file("src/main/resources/moonrise.accesswidener").getAsFile(),
-    sourceSets.main
-)
-
-neoForge {
-    version = rootProject.neoforge_version
-    validateAccessTransformers = true
-    accessTransformers.files.setFrom(aw2at.flatMap { t -> t.getOutputFile() })
-    mods {
-        moonrise {
-            sourceSet sourceSets.main
-            sourceSet rootProject.sourceSets.main
-        }
-    }
-    runs {
-        client {
-            client()
-        }
-        server {
-            server()
-        }
-    }
-    unitTest {
-        enable()
-        testedMod = mods.moonrise
-    }
+configurations.implementation {
+    extendsFrom(configurations.shadow)
 }
 
 dependencies {
-    runtimeOnly(project(":").sourceSets.main.output)
-    shadow(project(":"))
-    compileOnly(project(":"))
+    add('shadow', project([path: ":", configuration: "namedElements"]))
+    neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}"
 
-    libs("ca.spottedleaf:concurrentutil:${rootProject.concurrentutil_version}") { setTransitive(false) }
-    libs("ca.spottedleaf:yamlconfig:${rootProject.yamlconfig_version}") { setTransitive(false) }
-    additionalRuntimeClasspath libs("org.yaml:snakeyaml:${rootProject.snakeyaml_version}")
+    shadow("ca.spottedleaf:concurrentutil:${rootProject.concurrentutil_version}")
+    shadow("org.yaml:snakeyaml:${rootProject.snakeyaml_version}")
+    forgeExtra("org.yaml:snakeyaml:${rootProject.snakeyaml_version}")
 
-    implementation "me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_version}"
-    jarJar "me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_version}"
+    modImplementation "me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_version}"
+    include "me.shedaniel.cloth:cloth-config-neoforge:${rootProject.cloth_version}"
 }
 
-tasks.processResources {
-    def properties = [
-        "version": project.version,
-        "minecraft_version": minecraft_version,
-        "mod_version": mod_version
-    ]
-    inputs.properties(properties)
+processResources {
+    inputs.property "version", project.version
+
     filesMatching("META-INF/neoforge.mods.toml") {
-        expand properties
+        expand "version": project.version, "minecraft_version": minecraft_version, "loader_version": loader_version, "mod_version": mod_version
     }
 }
 
-tasks.jar {
-    archiveClassifier = "dev"
-}
-
-tasks.shadowJar {
+shadowJar {
     archiveClassifier = "dev-all"
     destinationDirectory = layout.buildDirectory.dir("libs")
     configurations = [project.configurations.shadow]
     relocate 'ca.spottedleaf.concurrentutil', 'ca.spottedleaf.moonrise.libs.ca.spottedleaf.concurrentutil'
-    relocate 'ca.spottedleaf.yamlconfig', 'ca.spottedleaf.moonrise.libs.ca.spottedleaf.yamlconfig'
     relocate 'org.yaml.snakeyaml', 'ca.spottedleaf.moonrise.libs.org.yaml.snakeyaml'
 }
 
-tasks.register("productionJar", Zip.class) {
-    archiveClassifier = ""
-    archiveExtension = "jar"
-    destinationDirectory = layout.buildDirectory.dir("libs")
-    from(tasks.jarJar)
-    from(zipTree(tasks.shadowJar.archiveFile))
-}
-
-tasks.assemble {
-    dependsOn tasks.productionJar
-}
+Aw2At.setup(getProject(), tasks.remapJar)
 
 publishMods {
-    file = productionJar.archiveFile
     modLoaders = ["neoforge"]
 
     modrinth {
@@ -113,42 +65,3 @@ publishMods {
         )
     }
 }
-
-afterEvaluate {
-    neoForge.runs.configureEach { cfg ->
-        runConfigCommon.systemProperties.get().each {
-            cfg.systemProperties.put it.key, it.value
-        }
-    }
-}
-
-// Setup a run with lithium for compatibility testing
-neoForge {
-    runs {
-        lithiumClient {
-            client()
-            disableIdeRun()
-        }
-    }
-}
-tasks.withType(RunGameTask).configureEach {
-    if (name == "runLithiumClient") {
-        return
-    }
-    def out = gameDirectory.get().getAsFile().toPath().resolve("mods/lithium-tmp.jar")
-    doFirst {
-        Files.deleteIfExists(out)
-    }
-}
-def lithium = configurations.lithium
-tasks.runLithiumClient {
-    def out = gameDirectory.get().getAsFile().toPath().resolve("mods/lithium-tmp.jar")
-    doFirst {
-        for (File file in lithium) {
-            Files.copy(file.toPath(), out, StandardCopyOption.REPLACE_EXISTING)
-        }
-    }
-    doLast {
-        Files.deleteIfExists(out)
-    }
-}

neoforge/gradle.properties

@@ -0,0 +1 @@
+loom.platform=neoforge

neoforge/src/main/java/ca/spottedleaf/moonrise/neoforge/NeoForgeHooks.java

@@ -1,16 +1,11 @@
 package ca.spottedleaf.moonrise.neoforge;
 
-import ca.spottedleaf.moonrise.common.util.BaseChunkSystemHooks;
 import ca.spottedleaf.moonrise.common.PlatformHooks;
 import ca.spottedleaf.moonrise.common.util.ConfigHolder;
 import ca.spottedleaf.moonrise.common.util.CoordinateUtils;
-import com.mojang.datafixers.DSL;
-import com.mojang.datafixers.DataFixer;
-import com.mojang.serialization.Dynamic;
+import ca.spottedleaf.moonrise.patches.chunk_system.scheduling.NewChunkHolder;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtOps;
-import net.minecraft.server.level.ChunkHolder;
 import net.minecraft.server.level.GenerationChunkHolder;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -18,16 +13,16 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.EmptyBlockGetter;
+import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ImposterProtoChunk;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.ProtoChunk;
-import net.minecraft.world.level.chunk.status.ChunkStatusTasks;
-import net.minecraft.world.level.chunk.storage.SerializableChunkData;
 import net.minecraft.world.level.entity.EntityTypeTest;
 import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.Vec3;
 import net.neoforged.neoforge.common.CommonHooks;
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.entity.PartEntity;
@@ -35,11 +30,10 @@ import net.neoforged.neoforge.event.EventHooks;
 import net.neoforged.neoforge.event.entity.EntityJoinLevelEvent;
 import net.neoforged.neoforge.event.level.ChunkDataEvent;
 import net.neoforged.neoforge.event.level.ChunkEvent;
-import java.util.Collection;
 import java.util.List;
 import java.util.function.Predicate;
 
-public final class NeoForgeHooks extends BaseChunkSystemHooks implements PlatformHooks {
+public final class NeoForgeHooks implements PlatformHooks {
 
     @Override
     public String getBrand() {
@@ -58,6 +52,16 @@ public final class NeoForgeHooks extends BaseChunkSystemHooks implements Platfor
         };
     }
 
+    @Override
+    public void onExplosion(final Level world, final Explosion explosion, final List<Entity> possiblyAffecting, final double diameter) {
+        EventHooks.onExplosionDetonate(world, explosion, possiblyAffecting, diameter);
+    }
+
+    @Override
+    public Vec3 modifyExplosionKnockback(final Level world, final Explosion explosion, final Entity entity, final Vec3 original) {
+        return EventHooks.getExplosionKnockback(world, explosion, entity, original);
+    }
+
     @Override
     public boolean hasCurrentlyLoadingChunk() {
         return true;
@@ -84,12 +88,10 @@ public final class NeoForgeHooks extends BaseChunkSystemHooks implements Platfor
     }
 
     @Override
-    public void onChunkHolderTicketChange(final ServerLevel world, final ChunkHolder holder, final int oldLevel, final int newLevel) {
-        final ChunkPos pos = holder.getPos();
-
+    public void onChunkHolderTicketChange(final ServerLevel world, final NewChunkHolder holder, final int oldLevel, final int newLevel) {
         EventHooks.fireChunkTicketLevelUpdated(
-            world, CoordinateUtils.getChunkKey(pos.x, pos.z),
-            oldLevel, newLevel, holder
+            world, CoordinateUtils.getChunkKey(holder.chunkX, holder.chunkZ),
+            oldLevel, newLevel, holder.vanillaChunkHolder
         );
     }
 
@@ -99,7 +101,7 @@ public final class NeoForgeHooks extends BaseChunkSystemHooks implements Platfor
     }
 
     @Override
-    public void chunkSyncSave(final ServerLevel world, final ChunkAccess chunk, final SerializableChunkData data) {
+    public void chunkSyncSave(final ServerLevel world, final ChunkAccess chunk, final CompoundTag data) {
         NeoForge.EVENT_BUS.post(new ChunkDataEvent.Save(chunk, world, data));
     }
 
@@ -116,12 +118,7 @@ public final class NeoForgeHooks extends BaseChunkSystemHooks implements Platfor
     @Override
     public void addToGetEntities(final Level world, final Entity entity, final AABB boundingBox, final Predicate<? super Entity> predicate,
                                  final List<Entity> into) {
-        final Collection<PartEntity<?>> parts = world.dragonParts();
-        if (parts.isEmpty()) {
-            return;
-        }
-
-        for (final PartEntity<?> part : parts) {
+        for (final PartEntity<?> part : world.getPartEntities()) {
             if (part != entity && part.getBoundingBox().intersects(boundingBox) && (predicate == null || predicate.test(part))) {
                 into.add(part);
             }
@@ -136,18 +133,9 @@ public final class NeoForgeHooks extends BaseChunkSystemHooks implements Platfor
             return;
         }
 
-        final Collection<PartEntity<?>> parts = world.dragonParts();
-        if (parts.isEmpty()) {
-            return;
-        }
-
-        for (final PartEntity<?> part : parts) {
-            if (!part.getBoundingBox().intersects(boundingBox)) {
-                continue;
-            }
-
+        for (final PartEntity<?> part : world.getPartEntities()) {
             final T casted = (T)entityTypeTest.tryCast(part);
-            if (casted != null && (predicate == null || predicate.test(casted))) {
+            if (casted != null && casted.getBoundingBox().intersects(boundingBox) && (predicate == null || predicate.test(casted))) {
                 into.add(casted);
                 if (into.size() >= maxCount) {
                     break;
@@ -205,12 +193,12 @@ public final class NeoForgeHooks extends BaseChunkSystemHooks implements Platfor
     }
 
     @Override
-    public long configAutoSaveInterval(final ServerLevel world) {
+    public long configAutoSaveInterval() {
         return ConfigHolder.getConfig().chunkSaving.autoSaveInterval.getTimeTicks();
     }
 
     @Override
-    public int configMaxAutoSavePerTick(final ServerLevel world) {
+    public int configMaxAutoSavePerTick() {
         return ConfigHolder.getConfig().chunkSaving.maxAutoSaveChunksPerTick;
     }
 
@@ -218,47 +206,4 @@ public final class NeoForgeHooks extends BaseChunkSystemHooks implements Platfor
     public boolean configFixMC159283() {
         return ConfigHolder.getConfig().bugFixes.fixMC159283;
     }
-
-    @Override
-    public boolean forceNoSave(final ChunkAccess chunk) {
-        return false;
-    }
-
-    @Override
-    public CompoundTag convertNBT(final DSL.TypeReference type, final DataFixer dataFixer, final CompoundTag nbt,
-                                  final int fromVersion, final int toVersion) {
-        return (CompoundTag)dataFixer.update(
-            type, new Dynamic<>(NbtOps.INSTANCE, nbt), fromVersion, toVersion
-        ).getValue();
-    }
-
-    @Override
-    public boolean hasMainChunkLoadHook() {
-        return true;
-    }
-
-    @Override
-    public void mainChunkLoad(final ChunkAccess chunk, final SerializableChunkData chunkData) {
-        NeoForge.EVENT_BUS.post(new ChunkDataEvent.Load(chunk, chunkData));
-    }
-
-    @Override
-    public List<Entity> modifySavedEntities(final ServerLevel world, final int chunkX, final int chunkZ, final List<Entity> entities) {
-        return entities;
-    }
-
-    @Override
-    public void unloadEntity(final Entity entity) {
-        entity.setRemoved(Entity.RemovalReason.UNLOADED_TO_CHUNK);
-    }
-
-    @Override
-    public void postLoadProtoChunk(final ServerLevel world, final ProtoChunk chunk) {
-        ChunkStatusTasks.postLoadProtoChunk(world, chunk.getEntities());
-    }
-
-    @Override
-    public int modifyEntityTrackingRange(final Entity entity, final int currentRange) {
-        return currentRange;
-    }
 }

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

@@ -13,10 +13,6 @@ displayURL = "https://github.com/Tuinity/Moonrise"
 authors = "Spottedleaf"
 description = "Optimisation mod for the dedicated and integrated server."
 displayTest = "IGNORE_ALL_VERSION"
-"ferritecore:disabled_options" = [
-    "replaceNeighborLookup",
-    "replacePropertyMap"
-]
 
 [[dependencies.moonrise]]
 modId = "neoforge"
@@ -28,7 +24,7 @@ side = "BOTH"
 [[dependencies.moonrise]]
 modId = "minecraft"
 type = "required"
-versionRange = "(1.21.3,1.21.5)"
+versionRange = "[1.21,1.21.2)"
 ordering = "NONE"
 side = "BOTH"
 
@@ -55,8 +51,9 @@ config = "moonrise.mixins.json"
 [[mixins]]
 config = "moonrise-neoforge.mixins.json"
 
-["lithium:options"]
+[mods."lithium:options"]
 "mixin.ai.poi" = false
+"mixin.alloc.chunk_ticking" = false
 "mixin.alloc.deep_passengers" = false
 "mixin.alloc.entity_tracker" = false
 "mixin.block.flatten_states" = false
@@ -80,5 +77,6 @@ config = "moonrise-neoforge.mixins.json"
 "mixin.world.block_entity_ticking" = false
 "mixin.world.chunk_access" = false
 "mixin.world.explosions.block_raycast" = false
+"mixin.world.explosions.cache_exposure" = false
 "mixin.world.temperature_cache" = false
 "mixin.world.tick_scheduler" = false

neoforge/src/test/java/ca/spottedleaf/moonrise/neoforge/MixinAuditTest.java

@@ -1,17 +0,0 @@
-package ca.spottedleaf.moonrise.neoforge;
-
-import org.junit.jupiter.api.Test;
-import org.spongepowered.asm.mixin.MixinEnvironment;
-
-class MixinAuditTest {
-    @Test
-    void auditMixins() {
-        final ClassLoader old = Thread.currentThread().getContextClassLoader();
-        try {
-            Thread.currentThread().setContextClassLoader(MixinAuditTest.class.getClassLoader());
-            MixinEnvironment.getCurrentEnvironment().audit();
-        } finally {
-            Thread.currentThread().setContextClassLoader(old);
-        }
-    }
-}

settings.gradle

@@ -13,6 +13,7 @@ pluginManagement {
         maven {
             name = 'jmp'
             url = 'https://repo.jpenilla.xyz/snapshots'
+            mavenContent { snapshotsOnly() }
         }
         maven {
             name = 'architectury'
@@ -22,10 +23,9 @@ pluginManagement {
 }
 
 plugins {
-    id("org.gradle.toolchains.foojay-resolver-convention") version "0.9.0"
-    id("quiet-fabric-loom") version "1.9.312" apply false
-    id("net.neoforged.moddev") version "2.0.61-beta" apply false
-    id 'com.gradleup.shadow' version '8.3.5' apply false
+    id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
+    id("xyz.jpenilla.quiet-architectury-loom") version "1.7.295" apply false
+    id 'com.gradleup.shadow' version '8.3.0' apply false
 }
 
 dependencyResolutionManagement {
@@ -37,7 +37,7 @@ dependencyResolutionManagement {
     }
     versionCatalogs {
         create("fabricApiLibs") {
-            from("net.fabricmc.fabric-api:fabric-api-catalog:${fabric_api_version}")
+            from("net.fabricmc.fabric-api:fabric-api-catalog:0.107.0+1.21.1")
         }
     }
 }
@@ -48,6 +48,3 @@ include("fabric")
 findProject(":fabric").name = "Moonrise-Fabric"
 include("neoforge")
 findProject(":neoforge").name = "Moonrise-NeoForge"
-
-// includeBuild("../YamlConfig") // Uncomment to use local YamlConfig
-// includeBuild("../ConcurrentUtil") // Uncomment to use local ConcurrentUtil

src/main/java/ca/spottedleaf/moonrise/common/PlatformHooks.java

@@ -1,30 +1,28 @@
 package ca.spottedleaf.moonrise.common;
 
-import ca.spottedleaf.moonrise.common.util.ChunkSystemHooks;
-import com.mojang.datafixers.DSL;
-import com.mojang.datafixers.DataFixer;
+import ca.spottedleaf.moonrise.patches.chunk_system.scheduling.NewChunkHolder;
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.server.level.ChunkHolder;
 import net.minecraft.server.level.GenerationChunkHolder;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.ProtoChunk;
-import net.minecraft.world.level.chunk.storage.SerializableChunkData;
 import net.minecraft.world.level.entity.EntityTypeTest;
 import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.Vec3;
 import java.util.List;
 import java.util.ServiceLoader;
 import java.util.function.Predicate;
 
-public interface PlatformHooks extends ChunkSystemHooks {
+public interface PlatformHooks {
     public static PlatformHooks get() {
         return Holder.INSTANCE;
     }
@@ -35,6 +33,10 @@ public interface PlatformHooks extends ChunkSystemHooks {
 
     public Predicate<BlockState> maybeHasLightEmission();
 
+    public void onExplosion(final Level world, final Explosion explosion, final List<Entity> possiblyAffecting, final double diameter);
+
+    public Vec3 modifyExplosionKnockback(final Level world, final Explosion explosion, final Entity entity, final Vec3 original);
+
     public boolean hasCurrentlyLoadingChunk();
 
     public LevelChunk getCurrentlyLoadingChunk(final GenerationChunkHolder holder);
@@ -45,11 +47,11 @@ public interface PlatformHooks extends ChunkSystemHooks {
 
     public boolean allowAsyncTicketUpdates();
 
-    public void onChunkHolderTicketChange(final ServerLevel world, final ChunkHolder holder, final int oldLevel, final int newLevel);
+    public void onChunkHolderTicketChange(final ServerLevel world, final NewChunkHolder holder, final int oldLevel, final int newLevel);
 
     public void chunkUnloadFromWorld(final LevelChunk chunk);
 
-    public void chunkSyncSave(final ServerLevel world, final ChunkAccess chunk, final SerializableChunkData data);
+    public void chunkSyncSave(final ServerLevel world, final ChunkAccess chunk, final CompoundTag data);
 
     public void onChunkWatch(final ServerLevel world, final LevelChunk chunk, final ServerPlayer player);
 
@@ -64,6 +66,8 @@ public interface PlatformHooks extends ChunkSystemHooks {
 
     public void entityMove(final Entity entity, final long oldSection, final long newSection);
 
+    public boolean screenEntity(final ServerLevel world, final Entity entity, final boolean fromDisk, final boolean event);
+
     public boolean configFixMC224294();
 
     public boolean configAutoConfigSendDistance();
@@ -78,30 +82,12 @@ public interface PlatformHooks extends ChunkSystemHooks {
 
     public int configPlayerMaxConcurrentGens();
 
-    public long configAutoSaveInterval(final ServerLevel world);
+    public long configAutoSaveInterval();
 
-    public int configMaxAutoSavePerTick(final ServerLevel world);
+    public int configMaxAutoSavePerTick();
 
     public boolean configFixMC159283();
 
-    // support for CB chunk mustNotSave
-    public boolean forceNoSave(final ChunkAccess chunk);
-
-    public CompoundTag convertNBT(final DSL.TypeReference type, final DataFixer dataFixer, final CompoundTag nbt,
-                                  final int fromVersion, final int toVersion);
-
-    public boolean hasMainChunkLoadHook();
-
-    public void mainChunkLoad(final ChunkAccess chunk, final SerializableChunkData chunkData);
-
-    public List<Entity> modifySavedEntities(final ServerLevel world, final int chunkX, final int chunkZ, final List<Entity> entities);
-
-    public void unloadEntity(final Entity entity);
-
-    public void postLoadProtoChunk(final ServerLevel world, final ProtoChunk chunk);
-
-    public int modifyEntityTrackingRange(final Entity entity, final int currentRange);
-
     public static final class Holder {
         private Holder() {
         }

src/main/java/ca/spottedleaf/moonrise/common/config/InitialiseHook.java

@@ -0,0 +1,7 @@
+package ca.spottedleaf.moonrise.common.config;
+
+public interface InitialiseHook {
+
+    public void initialise();
+
+}

src/main/java/ca/spottedleaf/moonrise/common/config/adapter/TypeAdapter.java

@@ -0,0 +1,11 @@
+package ca.spottedleaf.moonrise.common.config.adapter;
+
+import java.lang.reflect.Type;
+
+public abstract class TypeAdapter<T, S> {
+
+    public abstract T deserialize(final TypeAdapterRegistry registry, final Object input, final Type type);
+
+    public abstract S serialize(final TypeAdapterRegistry registry, final T value, final Type type);
+
+}

src/main/java/ca/spottedleaf/moonrise/common/config/adapter/TypeAdapterRegistry.java

@@ -0,0 +1,307 @@
+package ca.spottedleaf.moonrise.common.config.adapter;
+
+import ca.spottedleaf.moonrise.common.config.InitialiseHook;
+import ca.spottedleaf.moonrise.common.config.adapter.collection.CollectionTypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.collection.ListTypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.collection.SortedMapTypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.primitive.BooleanTypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.primitive.ByteTypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.primitive.DoubleTypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.primitive.FloatTypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.primitive.IntegerTypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.primitive.LongTypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.primitive.ShortTypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.primitive.StringTypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.type.BigDecimalTypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.type.BigIntegerTypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.type.DurationTypeAdapter;
+import ca.spottedleaf.moonrise.common.config.annotation.Adaptable;
+import ca.spottedleaf.moonrise.common.config.annotation.Serializable;
+import ca.spottedleaf.moonrise.common.config.type.Duration;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+public final class TypeAdapterRegistry {
+
+    private final Map<Class<?>, TypeAdapter<?, ?>> adapters = new HashMap<>();
+    {
+        this.adapters.put(boolean.class, BooleanTypeAdapter.INSTANCE);
+        this.adapters.put(byte.class, ByteTypeAdapter.INSTANCE);
+        this.adapters.put(short.class, ShortTypeAdapter.INSTANCE);
+        this.adapters.put(int.class, IntegerTypeAdapter.INSTANCE);
+        this.adapters.put(long.class, LongTypeAdapter.INSTANCE);
+        this.adapters.put(float.class, FloatTypeAdapter.INSTANCE);
+        this.adapters.put(double.class, DoubleTypeAdapter.INSTANCE);
+
+        this.adapters.put(Boolean.class, BooleanTypeAdapter.INSTANCE);
+        this.adapters.put(Byte.class, ByteTypeAdapter.INSTANCE);
+        this.adapters.put(Short.class, ShortTypeAdapter.INSTANCE);
+        this.adapters.put(Integer.class, IntegerTypeAdapter.INSTANCE);
+        this.adapters.put(Long.class, LongTypeAdapter.INSTANCE);
+        this.adapters.put(Float.class, FloatTypeAdapter.INSTANCE);
+        this.adapters.put(Double.class, DoubleTypeAdapter.INSTANCE);
+
+        this.adapters.put(String.class, StringTypeAdapter.INSTANCE);
+
+        this.adapters.put(Collection.class, CollectionTypeAdapter.INSTANCE);
+        this.adapters.put(List.class, ListTypeAdapter.INSTANCE);
+        this.adapters.put(Map.class, SortedMapTypeAdapter.SORTED_CASE_INSENSITIVE);
+        this.adapters.put(LinkedHashMap.class, SortedMapTypeAdapter.SORTED_CASE_INSENSITIVE);
+
+        this.adapters.put(BigInteger.class, BigIntegerTypeAdapter.INSTANCE);
+        this.adapters.put(BigDecimal.class, BigDecimalTypeAdapter.INSTANCE);
+        this.adapters.put(Duration.class, DurationTypeAdapter.INSTANCE);
+    }
+
+    public TypeAdapter<?, ?> putAdapter(final Class<?> clazz, final TypeAdapter<?, ?> adapter) {
+        return this.adapters.put(clazz, adapter);
+    }
+
+    public TypeAdapter<?, ?> getAdapter(final Class<?> clazz) {
+        return this.adapters.get(clazz);
+    }
+
+    public Object deserialize(final Object input, final Type type) {
+        TypeAdapter<?, ?> adapter = null;
+        if (type instanceof Class<?> clazz) {
+            adapter = this.adapters.get(clazz);
+        }
+        if (adapter == null && (type instanceof ParameterizedType parameterizedType)) {
+            adapter = this.adapters.get((Class<?>)parameterizedType.getRawType());
+        }
+
+        if (adapter == null) {
+            throw new IllegalArgumentException("No adapter for " + input.getClass() + " with type " + type);
+        }
+
+        return ((TypeAdapter)adapter).deserialize(this, input, type);
+    }
+
+    public Object serialize(final Object input, final Type type) {
+        TypeAdapter<?, ?> adapter = null;
+        if (type instanceof Class<?> clazz) {
+            adapter = this.adapters.get(clazz);
+        }
+        if (adapter == null && (type instanceof ParameterizedType parameterizedType)) {
+            adapter = this.adapters.get((Class<?>)parameterizedType.getRawType());
+        }
+        if (adapter == null) {
+            adapter = this.adapters.get(input.getClass());
+        }
+
+        if (adapter == null) {
+            throw new IllegalArgumentException("No adapter for " + input.getClass() + " with type " + type);
+        }
+
+        return ((TypeAdapter)adapter).serialize(this, input, type);
+    }
+
+    public <T> TypeAdapter<T, Map<Object, Object>> makeAdapter(final Class<? extends T> clazz) throws Exception {
+        final TypeAdapter<T, Map<Object, Object>> ret = new AutoTypeAdapter<>(this, clazz);
+
+        this.putAdapter(clazz, ret);
+
+        return ret;
+    }
+
+    public <T> void callInitialisers(final T object) {
+        if (object == null) {
+            return;
+        }
+
+        final TypeAdapter<?, ?> adapter = this.getAdapter(object.getClass());
+
+        if (!(adapter instanceof AutoTypeAdapter<?> autoTypeAdapter)) {
+            return;
+        }
+
+        ((AutoTypeAdapter<T>)autoTypeAdapter).callInitialisers(object);
+    }
+
+    private static final class AutoTypeAdapter<T> extends TypeAdapter<T, Map<Object, Object>> {
+
+        private final TypeAdapterRegistry registry;
+        private final Constructor<? extends T> constructor;
+        private final SerializableField[] fields;
+
+        public AutoTypeAdapter(final TypeAdapterRegistry registry, final Class<? extends T> clazz) throws Exception {
+            this.registry = registry;
+            this.constructor = clazz.getConstructor();
+            this.fields = findSerializableFields(registry, clazz);
+        }
+
+        private static TypeAdapter<?, ?> findOrMakeAdapter(final TypeAdapterRegistry registry, final Class<?> clazz) throws Exception {
+            final TypeAdapter<?, ?> ret = registry.getAdapter(clazz);
+            if (ret != null) {
+                return ret;
+            }
+
+            for (final Annotation annotation : clazz.getAnnotations()) {
+                if (annotation instanceof Adaptable adaptable) {
+                    return registry.makeAdapter(clazz);
+                }
+            }
+
+            throw new IllegalArgumentException("No type adapter for " + clazz + " (Forgot @Adaptable?)");
+        }
+
+        private static String makeSerializedKey(final String input) {
+            final StringBuilder ret = new StringBuilder();
+
+            for (final char c : input.toCharArray()) {
+                if (!Character.isUpperCase(c)) {
+                    ret.append(c);
+                    continue;
+                }
+                ret.append('-');
+                ret.append(Character.toLowerCase(c));
+            }
+
+            return ret.toString();
+        }
+
+        private static record SerializableField(
+                Field field,
+                boolean required,
+                String comment,
+                TypeAdapter<?, ?> adapter,
+                boolean serialize,
+                String serializedKey
+        ) {}
+
+        private static SerializableField[] findSerializableFields(final TypeAdapterRegistry registry, Class<?> clazz) throws Exception {
+            final List<SerializableField> ret = new ArrayList<>();
+            do {
+                for (final Field field : clazz.getDeclaredFields()) {
+                    field.setAccessible(true);
+
+                    for (final Annotation annotation : field.getAnnotations()) {
+                        if (!(annotation instanceof Serializable serializable)) {
+                            continue;
+                        }
+
+                        final TypeAdapter<?, ?> adapter;
+
+                        if (serializable.adapter() != TypeAdapter.class) {
+                            adapter = serializable.adapter().getConstructor().newInstance();
+                        } else {
+                            adapter = findOrMakeAdapter(registry, field.getType());
+                        }
+
+                        String serializedKey = serializable.serializedKey();
+                        if (serializedKey.isEmpty()) {
+                            serializedKey = makeSerializedKey(field.getName());
+                        }
+
+                        ret.add(new SerializableField(
+                                field, serializable.required(), serializable.comment(), adapter,
+                                serializable.serialize(), serializedKey
+                        ));
+                    }
+                }
+            } while ((clazz = clazz.getSuperclass()) != Object.class);
+
+            ret.sort((final SerializableField c1, final SerializableField c2) -> {
+                return c1.serializedKey.compareTo(c2.serializedKey);
+            });
+
+            return ret.toArray(new SerializableField[0]);
+        }
+
+        @Override
+        public T deserialize(final TypeAdapterRegistry registry, final Object input, final Type type) {
+            if (!(input instanceof Map<?,?> inputMap)) {
+                throw new IllegalArgumentException("Not a map type: " + input.getClass());
+            }
+
+            try {
+                final T ret = this.constructor.newInstance();
+
+                for (final SerializableField field : this.fields) {
+                    final Object fieldValue = inputMap.get(field.serializedKey);
+
+                    if (fieldValue == null) {
+                        if (field.required) {
+                            throw new IllegalArgumentException("Missing required field '" + field.serializedKey + "' in " + this.constructor.getDeclaringClass());
+                        }
+                        continue;
+                    }
+
+                    field.field.set(ret, field.adapter.deserialize(registry, fieldValue, field.field.getGenericType()));
+                }
+
+                return ret;
+            } catch (final Exception ex) {
+                throw new RuntimeException(ex);
+            }
+        }
+
+        @Override
+        public Map<Object, Object> serialize(final TypeAdapterRegistry registry, final T value, final Type type) {
+            final LinkedHashMap<Object, Object> ret = new LinkedHashMap<>();
+
+            for (final SerializableField field : this.fields) {
+                if (!field.serialize) {
+                    continue;
+                }
+
+                final Object fieldValue;
+                try {
+                    fieldValue = field.field.get(value);
+                } catch (final Exception ex) {
+                    throw new RuntimeException(ex);
+                }
+
+                if (fieldValue != null) {
+                    ret.put(
+                            field.comment.isBlank() ? field.serializedKey : new CommentedData(field.comment, field.serializedKey),
+                            ((TypeAdapter)field.adapter).serialize(
+                                    registry, fieldValue, field.field.getGenericType()
+                            )
+                    );
+                }
+            }
+
+            return ret;
+        }
+
+        public void callInitialisers(final T value) {
+            for (final SerializableField field : this.fields) {
+                final Object fieldValue;
+                try {
+                    fieldValue = field.field.get(value);
+                } catch (final Exception ex) {
+                    throw new RuntimeException(ex);
+                }
+
+                if (fieldValue instanceof InitialiseHook initialiseHook) {
+                    initialiseHook.initialise();
+                }
+
+                this.registry.callInitialisers(fieldValue);
+            }
+        }
+    }
+
+    public static final class CommentedData {
+
+        public final String comment;
+        public final Object data;
+
+        public CommentedData(final String comment, final Object data) {
+            this.comment = comment;
+            this.data = data;
+        }
+    }
+}

src/main/java/ca/spottedleaf/moonrise/common/config/adapter/collection/CollectionTypeAdapter.java

@@ -0,0 +1,46 @@
+package ca.spottedleaf.moonrise.common.config.adapter.collection;
+
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapterRegistry;
+import ca.spottedleaf.moonrise.common.config.adapter.primitive.StringTypeAdapter;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+public final class CollectionTypeAdapter extends TypeAdapter<Collection<Object>, List<Object>> {
+
+    public static final CollectionTypeAdapter INSTANCE = new CollectionTypeAdapter();
+
+    @Override
+    public Collection<Object> deserialize(final TypeAdapterRegistry registry, final Object input, final Type type) {
+        if (!(type instanceof ParameterizedType parameterizedType)) {
+            throw new IllegalArgumentException("Collection field must specify generic type");
+        }
+        final Type elementType = parameterizedType.getActualTypeArguments()[0];
+        if (input instanceof Collection<?> collection) {
+            final List<Object> ret = new ArrayList<>(collection.size());
+
+            for (final Object v : collection) {
+                ret.add(registry.deserialize(v, elementType));
+            }
+
+            return ret;
+        }
+        throw new IllegalArgumentException("Not a collection type: " + input.getClass());
+    }
+
+    @Override
+    public List<Object> serialize(final TypeAdapterRegistry registry, final Collection<Object> value, final Type type) {
+        final List<Object> ret = new ArrayList<>(value.size());
+
+        final Type elementType = type instanceof ParameterizedType parameterizedType ? parameterizedType.getActualTypeArguments()[0] : null;
+
+        for (final Object v : value) {
+            ret.add(registry.serialize(v, elementType == null ? v.getClass() : elementType));
+        }
+
+        return ret;
+    }
+}

src/main/java/ca/spottedleaf/moonrise/common/config/adapter/collection/ListTypeAdapter.java

@@ -0,0 +1,45 @@
+package ca.spottedleaf.moonrise.common.config.adapter.collection;
+
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapterRegistry;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+public final class ListTypeAdapter extends TypeAdapter<List<Object>, List<Object>> {
+
+    public static final ListTypeAdapter INSTANCE = new ListTypeAdapter();
+
+    @Override
+    public List<Object> deserialize(final TypeAdapterRegistry registry, final Object input, final Type type) {
+        if (!(type instanceof ParameterizedType parameterizedType)) {
+            throw new IllegalArgumentException("Collection field must specify generic type");
+        }
+        final Type elementType = parameterizedType.getActualTypeArguments()[0];
+        if (input instanceof Collection<?> collection) {
+            final List<Object> ret = new ArrayList<>(collection.size());
+
+            for (final Object v : collection) {
+                ret.add(registry.deserialize(v, elementType));
+            }
+
+            return ret;
+        }
+        throw new IllegalArgumentException("Not a collection type: " + input.getClass());
+    }
+
+    @Override
+    public List<Object> serialize(final TypeAdapterRegistry registry, final List<Object> value, final Type type) {
+        final List<Object> ret = new ArrayList<>(value.size());
+
+        final Type elementType = type instanceof ParameterizedType parameterizedType ? parameterizedType.getActualTypeArguments()[0] : null;
+
+        for (final Object v : value) {
+            ret.add(registry.serialize(v, elementType));
+        }
+
+        return ret;
+    }
+}

src/main/java/ca/spottedleaf/moonrise/common/config/adapter/collection/SortedMapTypeAdapter.java

@@ -0,0 +1,59 @@
+package ca.spottedleaf.moonrise.common.config.adapter.collection;
+
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapterRegistry;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.TreeMap;
+
+public final class SortedMapTypeAdapter extends TypeAdapter<Map<String, Object>, Map<String, Object>> {
+
+    public static final SortedMapTypeAdapter SORTED_CASE_INSENSITIVE = new SortedMapTypeAdapter(String.CASE_INSENSITIVE_ORDER);
+    public static final SortedMapTypeAdapter SORTED_CASE_SENSITIVE = new SortedMapTypeAdapter(null);
+
+    private final Comparator<String> keyComparator;
+
+    public SortedMapTypeAdapter(final Comparator<String> keyComparator) {
+        this.keyComparator = keyComparator;
+    }
+
+    @Override
+    public Map<String, Object> deserialize(final TypeAdapterRegistry registry, final Object input, final Type type) {
+        if (!(type instanceof ParameterizedType parameterizedType)) {
+            throw new IllegalArgumentException("Collection field must specify generic type");
+        }
+        final Type valueType = parameterizedType.getActualTypeArguments()[1];
+        if (input instanceof Map<?,?> inputMap) {
+            final Map<String, Object> castedInput = (Map<String, Object>)inputMap;
+
+            final TreeMap<String, Object> ret = new TreeMap<>(this.keyComparator);
+
+            for (final Map.Entry<String, Object> entry : castedInput.entrySet()) {
+                ret.put(entry.getKey(), registry.deserialize(entry.getValue(), valueType));
+            }
+
+            // transform to linked so that get() is O(1)
+            return new LinkedHashMap<>(ret);
+        }
+
+        throw new IllegalArgumentException("Not a map type: " + input.getClass());
+    }
+
+    @Override
+    public Map<String, Object> serialize(final TypeAdapterRegistry registry, final Map<String, Object> value, final Type type) {
+        final TreeMap<String, Object> ret = new TreeMap<>(this.keyComparator);
+
+        final Type valueType = type instanceof ParameterizedType parameterizedType ? parameterizedType.getActualTypeArguments()[1] : null;
+
+        for (final Map.Entry<String, Object> entry : value.entrySet()) {
+            ret.put(entry.getKey(), registry.serialize(entry.getValue(), valueType));
+        }
+
+        // transform to linked so that get() is O(1)
+        return new LinkedHashMap<>(ret);
+    }
+
+}

src/main/java/ca/spottedleaf/moonrise/common/config/adapter/collection/UnsortedMapTypeAdapter.java

@@ -0,0 +1,47 @@
+package ca.spottedleaf.moonrise.common.config.adapter.collection;
+
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapterRegistry;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public final class UnsortedMapTypeAdapter extends TypeAdapter<Map<String, Object>, Map<String, Object>> {
+
+    public static final UnsortedMapTypeAdapter INSTANCE = new UnsortedMapTypeAdapter();
+
+    @Override
+    public Map<String, Object> deserialize(final TypeAdapterRegistry registry, final Object input, final Type type) {
+        if (!(type instanceof ParameterizedType parameterizedType)) {
+            throw new IllegalArgumentException("Collection field must specify generic type");
+        }
+        final Type valueType = parameterizedType.getActualTypeArguments()[1];
+        if (input instanceof Map<?,?> inputMap) {
+            final Map<String, Object> castedInput = (Map<String, Object>)inputMap;
+
+            final LinkedHashMap<String, Object> ret = new LinkedHashMap<>();
+
+            for (final Map.Entry<String, Object> entry : castedInput.entrySet()) {
+                ret.put(entry.getKey(), registry.deserialize(entry.getValue(), valueType));
+            }
+
+            return ret;
+        }
+
+        throw new IllegalArgumentException("Not a map type: " + input.getClass());
+    }
+
+    @Override
+    public Map<String, Object> serialize(final TypeAdapterRegistry registry, final Map<String, Object> value, final Type type) {
+        final LinkedHashMap<String, Object> ret = new LinkedHashMap<>();
+
+        final Type valueType = type instanceof ParameterizedType parameterizedType ? parameterizedType.getActualTypeArguments()[1] : null;
+
+        for (final Map.Entry<String, Object> entry : value.entrySet()) {
+            ret.put(entry.getKey(), registry.serialize(entry.getValue(), valueType));
+        }
+
+        return ret;
+    }
+}

src/main/java/ca/spottedleaf/moonrise/common/config/adapter/primitive/BooleanTypeAdapter.java

@@ -0,0 +1,33 @@
+package ca.spottedleaf.moonrise.common.config.adapter.primitive;
+
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapterRegistry;
+import java.lang.reflect.Type;
+
+public final class BooleanTypeAdapter extends TypeAdapter<Boolean, Boolean> {
+
+    public static final BooleanTypeAdapter INSTANCE = new BooleanTypeAdapter();
+
+    @Override
+    public Boolean deserialize(final TypeAdapterRegistry registry, final Object input, final Type type) {
+        if (input instanceof Boolean ret) {
+            return ret;
+        }
+        if (input instanceof String str) {
+            if (str.equalsIgnoreCase("false")) {
+                return Boolean.FALSE;
+            }
+            if (str.equalsIgnoreCase("true")) {
+                return Boolean.TRUE;
+            }
+            throw new IllegalArgumentException("Not a boolean: " + str);
+        }
+
+        throw new IllegalArgumentException("Not a boolean type: " + input.getClass());
+    }
+
+    @Override
+    public Boolean serialize(final TypeAdapterRegistry registry, final Boolean value, final Type type) {
+        return value;
+    }
+}

src/main/java/ca/spottedleaf/moonrise/common/config/adapter/primitive/ByteTypeAdapter.java

@@ -0,0 +1,36 @@
+package ca.spottedleaf.moonrise.common.config.adapter.primitive;
+
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapterRegistry;
+import java.lang.reflect.Type;
+import java.math.BigInteger;
+
+public final class ByteTypeAdapter extends TypeAdapter<Byte, Byte> {
+
+    public static final ByteTypeAdapter INSTANCE = new ByteTypeAdapter();
+
+    private static Byte cast(final Object original, final long value) {
+        if (value < (long)Byte.MIN_VALUE || value > (long)Byte.MAX_VALUE) {
+            throw new IllegalArgumentException("Byte value is out of range: " + original.toString());
+        }
+        return Byte.valueOf((byte)value);
+    }
+
+    @Override
+    public Byte deserialize(final TypeAdapterRegistry registry, final Object input, final Type type) {
+        if (input instanceof Number number) {
+            // note: silently discard floating point significand
+            return cast(input, number instanceof BigInteger bigInteger ? bigInteger.longValueExact() : number.longValue());
+        }
+        if (input instanceof String string) {
+            return cast(input, (long)Double.parseDouble(string));
+        }
+
+        throw new IllegalArgumentException("Not a byte type: " + input.getClass());
+    }
+
+    @Override
+    public Byte serialize(final TypeAdapterRegistry registry, final Byte value, final Type type) {
+        return value;
+    }
+}

src/main/java/ca/spottedleaf/moonrise/common/config/adapter/primitive/DoubleTypeAdapter.java

@@ -0,0 +1,27 @@
+package ca.spottedleaf.moonrise.common.config.adapter.primitive;
+
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapterRegistry;
+import java.lang.reflect.Type;
+
+public final class DoubleTypeAdapter extends TypeAdapter<Double, Double> {
+
+    public static final DoubleTypeAdapter INSTANCE = new DoubleTypeAdapter();
+
+    @Override
+    public Double deserialize(final TypeAdapterRegistry registry, final Object input, final Type type) {
+        if (input instanceof Number number) {
+            return Double.valueOf(number.doubleValue());
+        }
+        if (input instanceof String string) {
+            return Double.valueOf(Double.parseDouble(string));
+        }
+
+        throw new IllegalArgumentException("Not a byte type: " + input.getClass());
+    }
+
+    @Override
+    public Double serialize(final TypeAdapterRegistry registry, final Double value, final Type type) {
+        return value;
+    }
+}

src/main/java/ca/spottedleaf/moonrise/common/config/adapter/primitive/FloatTypeAdapter.java

@@ -0,0 +1,35 @@
+package ca.spottedleaf.moonrise.common.config.adapter.primitive;
+
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapterRegistry;
+import java.lang.reflect.Type;
+
+public final class FloatTypeAdapter extends TypeAdapter<Float, Float> {
+
+    public static final FloatTypeAdapter INSTANCE = new FloatTypeAdapter();
+
+    private static Float cast(final Object original, final double value) {
+        if (value < -(double)Float.MAX_VALUE || value > (double)Float.MAX_VALUE) {
+            throw new IllegalArgumentException("Byte value is out of range: " + original.toString());
+        }
+        // note: silently ignore precision loss
+        return Float.valueOf((float)value);
+    }
+
+    @Override
+    public Float deserialize(final TypeAdapterRegistry registry, final Object input, final Type type) {
+        if (input instanceof Number number) {
+            return cast(input, number.doubleValue());
+        }
+        if (input instanceof String string) {
+            return cast(input, Double.parseDouble(string));
+        }
+
+        throw new IllegalArgumentException("Not a byte type: " + input.getClass());
+    }
+
+    @Override
+    public Float serialize(final TypeAdapterRegistry registry, final Float value, final Type type) {
+        return value;
+    }
+}

src/main/java/ca/spottedleaf/moonrise/common/config/adapter/primitive/IntegerTypeAdapter.java

@@ -0,0 +1,36 @@
+package ca.spottedleaf.moonrise.common.config.adapter.primitive;
+
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapterRegistry;
+import java.lang.reflect.Type;
+import java.math.BigInteger;
+
+public final class IntegerTypeAdapter extends TypeAdapter<Integer, Integer> {
+
+    public static final IntegerTypeAdapter INSTANCE = new IntegerTypeAdapter();
+
+    private static Integer cast(final Object original, final long value) {
+        if (value < (long)Integer.MIN_VALUE || value > (long)Integer.MAX_VALUE) {
+            throw new IllegalArgumentException("Integer value is out of range: " + original.toString());
+        }
+        return Integer.valueOf((int)value);
+    }
+
+    @Override
+    public Integer deserialize(final TypeAdapterRegistry registry, final Object input, final Type type) {
+        if (input instanceof Number number) {
+            // note: silently discard floating point significand
+            return cast(input, number instanceof BigInteger bigInteger ? bigInteger.longValueExact() : number.longValue());
+        }
+        if (input instanceof String string) {
+            return cast(input, (long)Double.parseDouble(string));
+        }
+
+        throw new IllegalArgumentException("Not an integer type: " + input.getClass());
+    }
+
+    @Override
+    public Integer serialize(final TypeAdapterRegistry registry, final Integer value, final Type type) {
+        return value;
+    }
+}

src/main/java/ca/spottedleaf/moonrise/common/config/adapter/primitive/LongTypeAdapter.java

@@ -0,0 +1,33 @@
+package ca.spottedleaf.moonrise.common.config.adapter.primitive;
+
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapterRegistry;
+import java.lang.reflect.Type;
+import java.math.BigInteger;
+
+public final class LongTypeAdapter extends TypeAdapter<Long, Long> {
+
+    public static final LongTypeAdapter INSTANCE = new LongTypeAdapter();
+
+    @Override
+    public Long deserialize(final TypeAdapterRegistry registry, final Object input, final Type type) {
+        if (input instanceof Number number) {
+            // note: silently discard floating point significand
+            return number instanceof BigInteger bigInteger ? bigInteger.longValueExact() : number.longValue();
+        }
+        if (input instanceof String string) {
+            try {
+                return Long.valueOf(Long.parseLong(string));
+            } catch (final NumberFormatException ex) {
+                return Long.valueOf((long)Double.parseDouble(string));
+            }
+        }
+
+        throw new IllegalArgumentException("Not a long type: " + input.getClass());
+    }
+
+    @Override
+    public Long serialize(final TypeAdapterRegistry registry, final Long value, final Type type) {
+        return value;
+    }
+}

src/main/java/ca/spottedleaf/moonrise/common/config/adapter/primitive/ShortTypeAdapter.java

@@ -0,0 +1,36 @@
+package ca.spottedleaf.moonrise.common.config.adapter.primitive;
+
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapterRegistry;
+import java.lang.reflect.Type;
+import java.math.BigInteger;
+
+public final class ShortTypeAdapter extends TypeAdapter<Short, Short> {
+
+    public static final ShortTypeAdapter INSTANCE = new ShortTypeAdapter();
+
+    private static Short cast(final Object original, final long value) {
+        if (value < (long)Short.MIN_VALUE || value > (long)Short.MAX_VALUE) {
+            throw new IllegalArgumentException("Short value is out of range: " + original.toString());
+        }
+        return Short.valueOf((short)value);
+    }
+
+    @Override
+    public Short deserialize(final TypeAdapterRegistry registry, final Object input, final Type type) {
+        if (input instanceof Number number) {
+            // note: silently discard floating point significand
+            return cast(input, number instanceof BigInteger bigInteger ? bigInteger.longValueExact() : number.longValue());
+        }
+        if (input instanceof String string) {
+            return cast(input, (long)Double.parseDouble(string));
+        }
+
+        throw new IllegalArgumentException("Not a short type: " + input.getClass());
+    }
+
+    @Override
+    public Short serialize(final TypeAdapterRegistry registry, final Short value, final Type type) {
+        return value;
+    }
+}

src/main/java/ca/spottedleaf/moonrise/common/config/adapter/primitive/StringTypeAdapter.java

@@ -0,0 +1,29 @@
+package ca.spottedleaf.moonrise.common.config.adapter.primitive;
+
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapterRegistry;
+import java.lang.reflect.Type;
+
+public final class StringTypeAdapter extends TypeAdapter<String, String> {
+
+    public static final StringTypeAdapter INSTANCE = new StringTypeAdapter();
+
+    @Override
+    public String deserialize(final TypeAdapterRegistry registry, final Object input, final Type type) {
+        if (input instanceof Boolean bool) {
+            return String.valueOf(bool.booleanValue());
+        }
+        if (input instanceof Number number) {
+            return number.toString();
+        }
+        if (input instanceof String string) {
+            return string;
+        }
+        throw new IllegalArgumentException("Not a string type: " + input.getClass());
+    }
+
+    @Override
+    public String serialize(final TypeAdapterRegistry registry, final String value, final Type type) {
+        return value;
+    }
+}

src/main/java/ca/spottedleaf/moonrise/common/config/adapter/type/BigDecimalTypeAdapter.java

@@ -0,0 +1,30 @@
+package ca.spottedleaf.moonrise.common.config.adapter.type;
+
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapterRegistry;
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+public final class BigDecimalTypeAdapter extends TypeAdapter<BigDecimal, String> {
+
+    public static final BigDecimalTypeAdapter INSTANCE = new BigDecimalTypeAdapter();
+
+    @Override
+    public BigDecimal deserialize(final TypeAdapterRegistry registry, final Object input, final Type type) {
+        if (input instanceof Number number) {
+            // safest to catch all number impls is to use toString
+            return new BigDecimal(number.toString());
+        }
+        if (input instanceof String string) {
+            return new BigDecimal(string);
+        }
+
+        throw new IllegalArgumentException("Not an BigDecimal type: " + input.getClass());
+    }
+
+    @Override
+    public String serialize(final TypeAdapterRegistry registry, final BigDecimal value, final Type type) {
+        return value.toString();
+    }
+}

src/main/java/ca/spottedleaf/moonrise/common/config/adapter/type/BigIntegerTypeAdapter.java

@@ -0,0 +1,37 @@
+package ca.spottedleaf.moonrise.common.config.adapter.type;
+
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapterRegistry;
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+public final class BigIntegerTypeAdapter extends TypeAdapter<BigInteger, String> {
+
+    public static final BigIntegerTypeAdapter INSTANCE = new BigIntegerTypeAdapter();
+
+    @Override
+    public BigInteger deserialize(final TypeAdapterRegistry registry, final Object input, final Type type) {
+        if (input instanceof Number number) {
+            if (number instanceof BigInteger bigInteger) {
+                return bigInteger;
+            }
+            // note: silently discard floating point significand
+            if (number instanceof BigDecimal bigDecimal) {
+                return bigDecimal.toBigInteger();
+            }
+
+            return BigInteger.valueOf(number.longValue());
+        }
+        if (input instanceof String string) {
+            return new BigDecimal(string).toBigInteger();
+        }
+
+        throw new IllegalArgumentException("Not an BigInteger type: " + input.getClass());
+    }
+
+    @Override
+    public String serialize(final TypeAdapterRegistry registry, final BigInteger value, final Type type) {
+        return value.toString();
+    }
+}

src/main/java/ca/spottedleaf/moonrise/common/config/adapter/type/DurationTypeAdapter.java

@@ -0,0 +1,24 @@
+package ca.spottedleaf.moonrise.common.config.adapter.type;
+
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapterRegistry;
+import ca.spottedleaf.moonrise.common.config.type.Duration;
+import java.lang.reflect.Type;
+
+public final class DurationTypeAdapter extends TypeAdapter<Duration, String> {
+
+    public static final DurationTypeAdapter INSTANCE = new DurationTypeAdapter();
+
+    @Override
+    public Duration deserialize(final TypeAdapterRegistry registry, final Object input, final Type type) {
+        if (!(input instanceof String string)) {
+            throw new IllegalArgumentException("Not a string: " + input.getClass());
+        }
+        return Duration.parse(string);
+    }
+
+    @Override
+    public String serialize(final TypeAdapterRegistry registry, final Duration value, final Type type) {
+        return value.toString();
+    }
+}

src/main/java/ca/spottedleaf/moonrise/common/config/annotation/Adaptable.java

@@ -0,0 +1,15 @@
+package ca.spottedleaf.moonrise.common.config.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation used on a class to indicate that its type adapter may automatically be generated. The class must have
+ * a public no-args constructor.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface Adaptable {
+}

src/main/java/ca/spottedleaf/moonrise/common/config/annotation/Serializable.java

@@ -0,0 +1,45 @@
+package ca.spottedleaf.moonrise.common.config.annotation;
+
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapter;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.util.function.Function;
+
+/**
+ * Annotation indicating that a field should be deserialized or serialized from the config.
+ * By default, this annotation is not assumed.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface Serializable {
+
+    /**
+     * Indicates whether this field is required to be present in the config. If the field is not present,
+     * and {@code required = true}, then an exception will be thrown during deserialization. If {@code required = false}
+     * and the field is not present, then the field value will remain unmodified.
+     */
+    public boolean required() default false;
+
+    /**
+     * The comment to apply before the element when serializing.
+     */
+    public String comment() default "";
+
+    /**
+     * Adapter override class. The class must have a public no-args constructor.
+     */
+    public Class<? extends TypeAdapter> adapter() default TypeAdapter.class;
+
+    /**
+     * Whether to serialize the value to the config.
+     */
+    public boolean serialize() default true;
+
+    /**
+     * When not empty, this value overrides the auto generated serialized key in the config.
+     */
+    public String serializedKey() default "";
+
+}

src/main/java/ca/spottedleaf/moonrise/common/config/config/YamlConfig.java

@@ -0,0 +1,178 @@
+package ca.spottedleaf.moonrise.common.config.config;
+
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapterRegistry;
+import org.yaml.snakeyaml.DumperOptions;
+import org.yaml.snakeyaml.LoaderOptions;
+import org.yaml.snakeyaml.Yaml;
+import org.yaml.snakeyaml.comments.CommentLine;
+import org.yaml.snakeyaml.comments.CommentType;
+import org.yaml.snakeyaml.constructor.Constructor;
+import org.yaml.snakeyaml.nodes.Node;
+import org.yaml.snakeyaml.representer.Represent;
+import org.yaml.snakeyaml.representer.Representer;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.AtomicMoveNotSupportedException;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+public final class YamlConfig<T> {
+
+    public final TypeAdapterRegistry typeAdapters;
+
+    private final Class<? extends T> clazz;
+
+    public volatile T config;
+
+    private final Yaml yaml;
+    private final LoaderOptions loaderOptions;
+    private final DumperOptions dumperOptions;
+
+    public YamlConfig(final Class<? extends T> clazz, final T dfl) throws Exception {
+        this(clazz, dfl, new TypeAdapterRegistry());
+    }
+
+    public YamlConfig(final Class<? extends T> clazz, final T dfl, final TypeAdapterRegistry registry) throws Exception {
+        this.clazz = clazz;
+        this.config = dfl;
+        this.typeAdapters = registry;
+        this.typeAdapters.makeAdapter(clazz);
+
+        final LoaderOptions loaderOptions = new LoaderOptions();
+        loaderOptions.setProcessComments(true);
+
+        final DumperOptions dumperOptions = new DumperOptions();
+        dumperOptions.setProcessComments(true);
+        dumperOptions.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK);
+
+        this.loaderOptions = loaderOptions;
+        this.dumperOptions = dumperOptions;
+        this.yaml = new Yaml(new YamlConstructor(loaderOptions), new YamlRepresenter(dumperOptions), dumperOptions, loaderOptions);
+    }
+
+    public void load(final File file) throws IOException {
+        try (final InputStream is = new BufferedInputStream(new FileInputStream(file))) {
+            this.load(is);
+        }
+    }
+
+    public void load(final InputStream is) throws IOException {
+        final Object serialized = this.yaml.load(new InputStreamReader(is, StandardCharsets.UTF_8));
+
+        this.config = (T)this.typeAdapters.deserialize(serialized, this.clazz);
+    }
+
+    public void save(final File file) throws IOException {
+        this.save(file, "");
+    }
+
+    public void save(final File file, final String header) throws IOException {
+        if (file.isDirectory()) {
+            throw new IOException("File is a directory");
+        }
+
+        final File parent = file.getParentFile();
+        if (parent != null) {
+            parent.mkdirs();
+        }
+
+        final File tmp = new File(parent, file.getName() + ".tmp");
+        tmp.delete();
+        tmp.createNewFile();
+        try {
+            try (final OutputStream os = new BufferedOutputStream(new FileOutputStream(tmp))) {
+                this.save(os, header);
+            }
+
+            try {
+                Files.move(tmp.toPath(), file.toPath(), StandardCopyOption.REPLACE_EXISTING, StandardCopyOption.ATOMIC_MOVE);
+            } catch (final AtomicMoveNotSupportedException ex) {
+                Files.move(tmp.toPath(), file.toPath(), StandardCopyOption.REPLACE_EXISTING);
+            }
+        } finally {
+            tmp.delete();
+        }
+    }
+
+    public void save(final OutputStream os) throws IOException {
+        os.write(this.saveToString().getBytes(StandardCharsets.UTF_8));
+    }
+
+    public void save(final OutputStream os, final String header) throws IOException {
+        os.write(this.saveToString(header).getBytes(StandardCharsets.UTF_8));
+    }
+
+    public String saveToString() {
+        return this.yaml.dump(this.typeAdapters.serialize(this.config, this.clazz));
+    }
+
+    public String saveToString(final String header) {
+        if (header.isBlank()) {
+            return this.saveToString();
+        }
+
+        final StringBuilder ret = new StringBuilder();
+        final String lineBreak = this.dumperOptions.getLineBreak().getString();
+
+        for (final String line : header.split("\n")) {
+            ret.append("# ").append(line.trim()).append(lineBreak);
+        }
+
+        ret.append(lineBreak);
+
+        return ret.append(this.saveToString()).toString();
+    }
+
+    public void callInitialisers() {
+        this.typeAdapters.callInitialisers(this.config);
+    }
+
+    private static final class YamlConstructor extends Constructor {
+
+        public YamlConstructor(final LoaderOptions loadingConfig) {
+            super(loadingConfig);
+        }
+    }
+
+    private static final class YamlRepresenter extends Representer {
+
+        public YamlRepresenter(final DumperOptions options) {
+            super(options);
+
+            this.representers.put(TypeAdapterRegistry.CommentedData.class, new CommentedDataRepresenter());
+        }
+
+        private final class CommentedDataRepresenter implements Represent {
+
+            @Override
+            public Node representData(final Object data0) {
+                final TypeAdapterRegistry.CommentedData commentedData = (TypeAdapterRegistry.CommentedData)data0;
+
+                final Node node = YamlRepresenter.this.representData(commentedData.data);
+
+                final List<CommentLine> comments = new ArrayList<>();
+
+                for (final String line : commentedData.comment.split("\n")) {
+                    comments.add(new CommentLine(null, null, " ".concat(line.trim()), CommentType.BLOCK));
+                }
+
+                node.setBlockComments(comments);
+
+                return node;
+            }
+        }
+    }
+}

src/main/java/ca/spottedleaf/moonrise/common/config/moonrise/MoonriseConfig.java

@@ -1,12 +1,12 @@
 package ca.spottedleaf.moonrise.common.config.moonrise;
 
+import ca.spottedleaf.moonrise.common.config.InitialiseHook;
+import ca.spottedleaf.moonrise.common.config.annotation.Adaptable;
 import ca.spottedleaf.moonrise.common.config.ui.ClothConfig;
+import ca.spottedleaf.moonrise.common.config.annotation.Serializable;
+import ca.spottedleaf.moonrise.common.config.type.Duration;
 import ca.spottedleaf.moonrise.common.util.MoonriseCommon;
 import ca.spottedleaf.moonrise.patches.chunk_system.scheduling.ChunkTaskScheduler;
-import ca.spottedleaf.yamlconfig.InitialiseHook;
-import ca.spottedleaf.yamlconfig.annotation.Adaptable;
-import ca.spottedleaf.yamlconfig.annotation.Serializable;
-import ca.spottedleaf.yamlconfig.type.Duration;
 
 @Adaptable
 public final class MoonriseConfig {
@@ -251,21 +251,4 @@ public final class MoonriseConfig {
         )
         public boolean fixMC159283 = false;
     }
-
-    @Serializable
-    public Misc misc = new Misc();
-
-    @Adaptable
-    public static final class Misc {
-
-        @Serializable(
-            serializedKey = "immediately-close-loading-screen",
-            comment = """
-                        Whether the loading screen should be closed immediately when joining servers/SP worlds.
-                        This will let you in game faster, but may result in getting in game before enough chunks are
-                        loaded for rendering.
-                        """
-        )
-        public boolean immediatelyCloseLoadingScreen = false;
-    }
 }

src/main/java/ca/spottedleaf/moonrise/common/config/moonrise/adapter/DefaultedTypeAdapter.java

@@ -0,0 +1,38 @@
+package ca.spottedleaf.moonrise.common.config.moonrise.adapter;
+
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapter;
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapterRegistry;
+import ca.spottedleaf.moonrise.common.config.moonrise.type.DefaultedValue;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+public final class DefaultedTypeAdapter extends TypeAdapter<DefaultedValue<?>, Object> {
+
+    private static final String DEFAULT_STRING = "default";
+
+    @Override
+    public DefaultedValue<?> deserialize(final TypeAdapterRegistry registry, final Object input, final Type type) {
+        if (input instanceof String string && string.equalsIgnoreCase(DEFAULT_STRING)) {
+            return new DefaultedValue<>();
+        }
+
+        if (!(type instanceof ParameterizedType parameterizedType)) {
+            throw new IllegalArgumentException("DefaultedValue field must specify generic type");
+        }
+        final Type valueType = parameterizedType.getActualTypeArguments()[0];
+
+        return new DefaultedValue<>(registry.deserialize(input, valueType));
+    }
+
+    @Override
+    public Object serialize(final TypeAdapterRegistry registry, final DefaultedValue<?> value, final Type type) {
+        final Object raw = value.getValueRaw();
+        if (raw == null) {
+            return DEFAULT_STRING;
+        }
+
+        final Type valueType = type instanceof ParameterizedType parameterizedType ? parameterizedType.getActualTypeArguments()[0] : null;
+
+        return registry.serialize(raw, valueType);
+    }
+}

src/main/java/ca/spottedleaf/moonrise/common/config/moonrise/type/DefaultedValue.java

@@ -0,0 +1,22 @@
+package ca.spottedleaf.moonrise.common.config.moonrise.type;
+
+public final class DefaultedValue<T> {
+
+    private final T value;
+
+    public DefaultedValue() {
+        this(null);
+    }
+
+    public DefaultedValue(final T value) {
+        this.value = value;
+    }
+
+    public T getValueRaw() {
+        return value;
+    }
+
+    public T getOrDefault(final T dfl) {
+        return this.value != null ? this.value : dfl;
+    }
+}

src/main/java/ca/spottedleaf/moonrise/common/config/type/Duration.java

@@ -0,0 +1,76 @@
+package ca.spottedleaf.moonrise.common.config.type;
+
+import java.math.BigDecimal;
+
+public final class Duration {
+
+    private final String string;
+    private final long timeNS;
+
+    private Duration(final String string, final long timeNS) {
+        this.string = string;
+        this.timeNS = timeNS;
+    }
+
+    public static Duration parse(final String value) {
+        if (value.length() < 2) {
+            throw new IllegalArgumentException("Invalid duration: " + value);
+        }
+
+        final char last = value.charAt(value.length() - 1);
+
+        final long multiplier;
+
+        switch (last) {
+            case 's': {
+                multiplier = (1000L * 1000L * 1000L) * 1L;
+                break;
+            }
+            case 't': {
+                multiplier = (1000L * 1000L * 1000L) / 20L;
+                break;
+            }
+            case 'm': {
+                multiplier = (1000L * 1000L * 1000L) * 60L;
+                break;
+            }
+            case 'h': {
+                multiplier = (1000L * 1000L * 1000L) * 60L * 60L;
+                break;
+            }
+            case 'd': {
+                multiplier = (1000L * 1000L * 1000L) * 24L * 60L * 60L;
+                break;
+            }
+            default: {
+                throw new IllegalArgumentException("Duration must end with one of: [s, t, m, h, d]");
+            }
+        }
+
+        final BigDecimal parsed = new BigDecimal(value.substring(0, value.length() - 1))
+                .multiply(new BigDecimal(multiplier));
+
+        return new Duration(value, parsed.toBigInteger().longValueExact());
+    }
+
+    public long getTimeNS() {
+        return this.timeNS;
+    }
+
+    public long getTimeMS() {
+        return this.timeNS / (1000L * 1000L);
+    }
+
+    public long getTimeS() {
+        return this.timeNS / (1000L * 1000L * 1000L);
+    }
+
+    public long getTimeTicks() {
+        return this.timeNS / ((1000L * 1000L * 1000L) / (20L));
+    }
+
+    @Override
+    public String toString() {
+        return this.string;
+    }
+}

src/main/java/ca/spottedleaf/moonrise/common/misc/NearbyPlayers.java

@@ -1,9 +1,9 @@
 package ca.spottedleaf.moonrise.common.misc;
 
-import ca.spottedleaf.moonrise.common.PlatformHooks;
 import ca.spottedleaf.moonrise.common.list.ReferenceList;
 import ca.spottedleaf.moonrise.common.util.CoordinateUtils;
 import ca.spottedleaf.moonrise.common.util.MoonriseConstants;
+import ca.spottedleaf.moonrise.common.util.ChunkSystem;
 import ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemLevel;
 import ca.spottedleaf.moonrise.patches.chunk_system.level.chunk.ChunkData;
 import ca.spottedleaf.moonrise.patches.chunk_tick_iteration.ChunkTickConstants;
@@ -121,8 +121,8 @@ public final class NearbyPlayers {
         players[NearbyMapType.GENERAL.ordinal()].update(chunk.x, chunk.z, GENERAL_AREA_VIEW_DISTANCE);
         players[NearbyMapType.GENERAL_SMALL.ordinal()].update(chunk.x, chunk.z, GENERAL_SMALL_VIEW_DISTANCE);
         players[NearbyMapType.GENERAL_REALLY_SMALL.ordinal()].update(chunk.x, chunk.z, GENERAL_REALLY_SMALL_VIEW_DISTANCE);
-        players[NearbyMapType.TICK_VIEW_DISTANCE.ordinal()].update(chunk.x, chunk.z, PlatformHooks.get().getTickViewDistance(player));
-        players[NearbyMapType.VIEW_DISTANCE.ordinal()].update(chunk.x, chunk.z, PlatformHooks.get().getViewDistance(player));
+        players[NearbyMapType.TICK_VIEW_DISTANCE.ordinal()].update(chunk.x, chunk.z, ChunkSystem.getTickViewDistance(player));
+        players[NearbyMapType.VIEW_DISTANCE.ordinal()].update(chunk.x, chunk.z, ChunkSystem.getLoadViewDistance(player));
         players[NearbyMapType.SPAWN_RANGE.ordinal()].update(chunk.x, chunk.z, ChunkTickConstants.PLAYER_SPAWN_TRACK_RANGE); // Moonrise - chunk tick iteration
     }
 

src/main/java/ca/spottedleaf/moonrise/common/misc/PositionCountingAreaMap.java

@@ -2,7 +2,6 @@ package ca.spottedleaf.moonrise.common.misc;
 
 import ca.spottedleaf.concurrentutil.util.IntPairUtil;
 import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
-import it.unimi.dsi.fastutil.longs.LongSet;
 import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ReferenceSet;
 
@@ -15,10 +14,6 @@ public final class PositionCountingAreaMap<T> {
         return this.counters.keySet();
     }
 
-    public LongSet getPositions() {
-        return this.positions.keySet();
-    }
-
     public int getTotalPositions() {
         return this.positions.size();
     }

src/main/java/ca/spottedleaf/moonrise/common/util/ChunkSystem.java

@@ -1,188 +1,176 @@
 package ca.spottedleaf.moonrise.common.util;
 
 import ca.spottedleaf.concurrentutil.util.Priority;
+import ca.spottedleaf.moonrise.common.PlatformHooks;
 import ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel;
 import ca.spottedleaf.moonrise.patches.chunk_system.level.chunk.ChunkSystemLevelChunk;
 import ca.spottedleaf.moonrise.patches.chunk_system.player.RegionizedPlayerChunkLoader;
 import ca.spottedleaf.moonrise.patches.chunk_system.world.ChunkSystemServerChunkCache;
 import ca.spottedleaf.moonrise.patches.chunk_tick_iteration.ChunkTickServerLevel;
+import com.mojang.logging.LogUtils;
 import net.minecraft.server.level.ChunkHolder;
 import net.minecraft.server.level.FullChunkStatus;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.level.progress.ChunkProgressListener;
+import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.status.ChunkStatus;
+import org.slf4j.Logger;
 import java.util.List;
 import java.util.function.Consumer;
 
-public abstract class BaseChunkSystemHooks implements ChunkSystemHooks {
+public final class ChunkSystem {
 
-    @Override
-    public void scheduleChunkTask(final ServerLevel level, final int chunkX, final int chunkZ, final Runnable run) {
+    private static final Logger LOGGER = LogUtils.getLogger();
+
+    public static void scheduleChunkTask(final ServerLevel level, final int chunkX, final int chunkZ, final Runnable run) {
         scheduleChunkTask(level, chunkX, chunkZ, run, Priority.NORMAL);
     }
 
-    @Override
-    public void scheduleChunkTask(final ServerLevel level, final int chunkX, final int chunkZ, final Runnable run, final Priority priority) {
+    public static void scheduleChunkTask(final ServerLevel level, final int chunkX, final int chunkZ, final Runnable run, final Priority priority) {
         ((ChunkSystemServerLevel)level).moonrise$getChunkTaskScheduler().scheduleChunkTask(chunkX, chunkZ, run, priority);
     }
 
-    @Override
-    public void scheduleChunkLoad(final ServerLevel level, final int chunkX, final int chunkZ, final boolean gen,
-                                  final ChunkStatus toStatus, final boolean addTicket, final Priority priority,
-                                  final Consumer<ChunkAccess> onComplete) {
+    public static void scheduleChunkLoad(final ServerLevel level, final int chunkX, final int chunkZ, final boolean gen,
+                                         final ChunkStatus toStatus, final boolean addTicket, final Priority priority,
+                                         final Consumer<ChunkAccess> onComplete) {
         ((ChunkSystemServerLevel)level).moonrise$getChunkTaskScheduler().scheduleChunkLoad(chunkX, chunkZ, gen, toStatus, addTicket, priority, onComplete);
     }
 
-    @Override
-    public void scheduleChunkLoad(final ServerLevel level, final int chunkX, final int chunkZ, final ChunkStatus toStatus,
-                                  final boolean addTicket, final Priority priority, final Consumer<ChunkAccess> onComplete) {
+    public static void scheduleChunkLoad(final ServerLevel level, final int chunkX, final int chunkZ, final ChunkStatus toStatus,
+                                         final boolean addTicket, final Priority priority, final Consumer<ChunkAccess> onComplete) {
         ((ChunkSystemServerLevel)level).moonrise$getChunkTaskScheduler().scheduleChunkLoad(chunkX, chunkZ, toStatus, addTicket, priority, onComplete);
     }
 
-    @Override
-    public void scheduleTickingState(final ServerLevel level, final int chunkX, final int chunkZ,
-                                     final FullChunkStatus toStatus, final boolean addTicket,
-                                     final Priority priority, final Consumer<LevelChunk> onComplete) {
+    public static void scheduleTickingState(final ServerLevel level, final int chunkX, final int chunkZ,
+                                            final FullChunkStatus toStatus, final boolean addTicket,
+                                            final Priority priority, final Consumer<LevelChunk> onComplete) {
         ((ChunkSystemServerLevel)level).moonrise$getChunkTaskScheduler().scheduleTickingState(chunkX, chunkZ, toStatus, addTicket, priority, onComplete);
     }
 
-    @Override
-    public List<ChunkHolder> getVisibleChunkHolders(final ServerLevel level) {
+    public static List<ChunkHolder> getVisibleChunkHolders(final ServerLevel level) {
         return ((ChunkSystemServerLevel)level).moonrise$getChunkTaskScheduler().chunkHolderManager.getOldChunkHolders();
     }
 
-    @Override
-    public List<ChunkHolder> getUpdatingChunkHolders(final ServerLevel level) {
+    public static List<ChunkHolder> getUpdatingChunkHolders(final ServerLevel level) {
         return ((ChunkSystemServerLevel)level).moonrise$getChunkTaskScheduler().chunkHolderManager.getOldChunkHolders();
     }
 
-    @Override
-    public int getVisibleChunkHolderCount(final ServerLevel level) {
+    public static int getVisibleChunkHolderCount(final ServerLevel level) {
         return ((ChunkSystemServerLevel)level).moonrise$getChunkTaskScheduler().chunkHolderManager.size();
     }
 
-    @Override
-    public int getUpdatingChunkHolderCount(final ServerLevel level) {
+    public static int getUpdatingChunkHolderCount(final ServerLevel level) {
         return ((ChunkSystemServerLevel)level).moonrise$getChunkTaskScheduler().chunkHolderManager.size();
     }
 
-    @Override
-    public boolean hasAnyChunkHolders(final ServerLevel level) {
+    public static boolean hasAnyChunkHolders(final ServerLevel level) {
         return getUpdatingChunkHolderCount(level) != 0;
     }
 
-    @Override
-    public void onChunkHolderCreate(final ServerLevel level, final ChunkHolder holder) {
+    public static boolean screenEntity(final ServerLevel level, final Entity entity, final boolean fromDisk, final boolean event) {
+        if (!PlatformHooks.get().screenEntity(level, entity, fromDisk, event)) {
+            return false;
+        }
+        return true;
+    }
+
+    public static void onChunkHolderCreate(final ServerLevel level, final ChunkHolder holder) {
 
     }
 
-    @Override
-    public void onChunkHolderDelete(final ServerLevel level, final ChunkHolder holder) {
+    public static void onChunkHolderDelete(final ServerLevel level, final ChunkHolder holder) {
         // Update progress listener for LevelLoadingScreen
         final ChunkProgressListener progressListener = level.getChunkSource().chunkMap.progressListener;
         if (progressListener != null) {
-            this.scheduleChunkTask(level, holder.getPos().x, holder.getPos().z, () -> {
+            ChunkSystem.scheduleChunkTask(level, holder.getPos().x, holder.getPos().z, () -> {
                 progressListener.onStatusChange(holder.getPos(), null);
             });
         }
     }
 
-    @Override
-    public void onChunkPreBorder(final LevelChunk chunk, final ChunkHolder holder) {
+    public static void onChunkPreBorder(final LevelChunk chunk, final ChunkHolder holder) {
         ((ChunkSystemServerChunkCache)((ServerLevel)chunk.getLevel()).getChunkSource())
-            .moonrise$setFullChunk(chunk.getPos().x, chunk.getPos().z, chunk);
+                .moonrise$setFullChunk(chunk.getPos().x, chunk.getPos().z, chunk);
     }
 
-    @Override
-    public void onChunkBorder(final LevelChunk chunk, final ChunkHolder holder) {
+    public static void onChunkBorder(final LevelChunk chunk, final ChunkHolder holder) {
         ((ChunkSystemServerLevel)((ServerLevel)chunk.getLevel())).moonrise$getLoadedChunks().add(
-            ((ChunkSystemLevelChunk)chunk).moonrise$getChunkAndHolder()
+                ((ChunkSystemLevelChunk)chunk).moonrise$getChunkAndHolder()
         );
     }
 
-    @Override
-    public void onChunkNotBorder(final LevelChunk chunk, final ChunkHolder holder) {
+    public static void onChunkNotBorder(final LevelChunk chunk, final ChunkHolder holder) {
         ((ChunkSystemServerLevel)((ServerLevel)chunk.getLevel())).moonrise$getLoadedChunks().remove(
-            ((ChunkSystemLevelChunk)chunk).moonrise$getChunkAndHolder()
+                ((ChunkSystemLevelChunk)chunk).moonrise$getChunkAndHolder()
         );
     }
 
-    @Override
-    public void onChunkPostNotBorder(final LevelChunk chunk, final ChunkHolder holder) {
+    public static void onChunkPostNotBorder(final LevelChunk chunk, final ChunkHolder holder) {
         ((ChunkSystemServerChunkCache)((ServerLevel)chunk.getLevel()).getChunkSource())
-            .moonrise$setFullChunk(chunk.getPos().x, chunk.getPos().z, null);
+                .moonrise$setFullChunk(chunk.getPos().x, chunk.getPos().z, null);
     }
 
-    @Override
-    public void onChunkTicking(final LevelChunk chunk, final ChunkHolder holder) {
+    public static void onChunkTicking(final LevelChunk chunk, final ChunkHolder holder) {
         ((ChunkSystemServerLevel)((ServerLevel)chunk.getLevel())).moonrise$getTickingChunks().add(
-            ((ChunkSystemLevelChunk)chunk).moonrise$getChunkAndHolder()
+                ((ChunkSystemLevelChunk)chunk).moonrise$getChunkAndHolder()
         );
         if (!((ChunkSystemLevelChunk)chunk).moonrise$isPostProcessingDone()) {
-            chunk.postProcessGeneration((ServerLevel)chunk.getLevel());
+            chunk.postProcessGeneration();
         }
         ((ServerLevel)chunk.getLevel()).startTickingChunk(chunk);
         ((ServerLevel)chunk.getLevel()).getChunkSource().chunkMap.tickingGenerated.incrementAndGet();
         ((ChunkTickServerLevel)(ServerLevel)chunk.getLevel()).moonrise$markChunkForPlayerTicking(chunk); // Moonrise - chunk tick iteration
     }
 
-    @Override
-    public void onChunkNotTicking(final LevelChunk chunk, final ChunkHolder holder) {
+    public static void onChunkNotTicking(final LevelChunk chunk, final ChunkHolder holder) {
         ((ChunkSystemServerLevel)((ServerLevel)chunk.getLevel())).moonrise$getTickingChunks().remove(
-            ((ChunkSystemLevelChunk)chunk).moonrise$getChunkAndHolder()
+                ((ChunkSystemLevelChunk)chunk).moonrise$getChunkAndHolder()
         );
         ((ChunkTickServerLevel)(ServerLevel)chunk.getLevel()).moonrise$removeChunkForPlayerTicking(chunk); // Moonrise - chunk tick iteration
     }
 
-    @Override
-    public void onChunkEntityTicking(final LevelChunk chunk, final ChunkHolder holder) {
+    public static void onChunkEntityTicking(final LevelChunk chunk, final ChunkHolder holder) {
         ((ChunkSystemServerLevel)((ServerLevel)chunk.getLevel())).moonrise$getEntityTickingChunks().add(
-            ((ChunkSystemLevelChunk)chunk).moonrise$getChunkAndHolder()
+                ((ChunkSystemLevelChunk)chunk).moonrise$getChunkAndHolder()
         );
     }
 
-    @Override
-    public void onChunkNotEntityTicking(final LevelChunk chunk, final ChunkHolder holder) {
+    public static void onChunkNotEntityTicking(final LevelChunk chunk, final ChunkHolder holder) {
         ((ChunkSystemServerLevel)((ServerLevel)chunk.getLevel())).moonrise$getEntityTickingChunks().remove(
-            ((ChunkSystemLevelChunk)chunk).moonrise$getChunkAndHolder()
+                ((ChunkSystemLevelChunk)chunk).moonrise$getChunkAndHolder()
         );
     }
 
-    @Override
-    public ChunkHolder getUnloadingChunkHolder(final ServerLevel level, final int chunkX, final int chunkZ) {
+    public static ChunkHolder getUnloadingChunkHolder(final ServerLevel level, final int chunkX, final int chunkZ) {
         return null;
     }
 
-    @Override
-    public int getSendViewDistance(final ServerPlayer player) {
+    public static int getSendViewDistance(final ServerPlayer player) {
         return RegionizedPlayerChunkLoader.getAPISendViewDistance(player);
     }
 
-    @Override
-    public int getViewDistance(final ServerPlayer player) {
-        return RegionizedPlayerChunkLoader.getAPIViewDistance(player);
+    public static int getLoadViewDistance(final ServerPlayer player) {
+        return RegionizedPlayerChunkLoader.getLoadViewDistance(player);
     }
 
-    @Override
-    public int getTickViewDistance(final ServerPlayer player) {
+    public static int getTickViewDistance(final ServerPlayer player) {
         return RegionizedPlayerChunkLoader.getAPITickViewDistance(player);
     }
 
-    @Override
-    public void addPlayerToDistanceMaps(final ServerLevel world, final ServerPlayer player) {
+    public static void addPlayerToDistanceMaps(final ServerLevel world, final ServerPlayer player) {
         ((ChunkSystemServerLevel)world).moonrise$getPlayerChunkLoader().addPlayer(player);
     }
 
-    @Override
-    public void removePlayerFromDistanceMaps(final ServerLevel world, final ServerPlayer player) {
+    public static void removePlayerFromDistanceMaps(final ServerLevel world, final ServerPlayer player) {
         ((ChunkSystemServerLevel)world).moonrise$getPlayerChunkLoader().removePlayer(player);
     }
 
-    @Override
-    public void updateMaps(final ServerLevel world, final ServerPlayer player) {
+    public static void updateMaps(final ServerLevel world, final ServerPlayer player) {
         ((ChunkSystemServerLevel)world).moonrise$getPlayerChunkLoader().updatePlayer(player);
     }
+
+    private ChunkSystem() {}
 }

src/main/java/ca/spottedleaf/moonrise/common/util/ChunkSystemHooks.java

@@ -1,77 +0,0 @@
-package ca.spottedleaf.moonrise.common.util;
-
-import ca.spottedleaf.concurrentutil.util.Priority;
-import net.minecraft.server.level.ChunkHolder;
-import net.minecraft.server.level.FullChunkStatus;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.chunk.status.ChunkStatus;
-import java.util.List;
-import java.util.function.Consumer;
-
-public interface ChunkSystemHooks {
-
-    public void scheduleChunkTask(final ServerLevel level, final int chunkX, final int chunkZ, final Runnable run);
-
-    public void scheduleChunkTask(final ServerLevel level, final int chunkX, final int chunkZ, final Runnable run, final Priority priority);
-
-    public void scheduleChunkLoad(final ServerLevel level, final int chunkX, final int chunkZ, final boolean gen,
-                                  final ChunkStatus toStatus, final boolean addTicket, final Priority priority,
-                                  final Consumer<ChunkAccess> onComplete);
-
-    public void scheduleChunkLoad(final ServerLevel level, final int chunkX, final int chunkZ, final ChunkStatus toStatus,
-                                  final boolean addTicket, final Priority priority, final Consumer<ChunkAccess> onComplete);
-
-    public void scheduleTickingState(final ServerLevel level, final int chunkX, final int chunkZ,
-                                     final FullChunkStatus toStatus, final boolean addTicket,
-                                     final Priority priority, final Consumer<LevelChunk> onComplete);
-
-    public List<ChunkHolder> getVisibleChunkHolders(final ServerLevel level);
-
-    public List<ChunkHolder> getUpdatingChunkHolders(final ServerLevel level);
-
-    public int getVisibleChunkHolderCount(final ServerLevel level);
-
-    public int getUpdatingChunkHolderCount(final ServerLevel level);
-
-    public boolean hasAnyChunkHolders(final ServerLevel level);
-
-    public boolean screenEntity(final ServerLevel level, final Entity entity, final boolean fromDisk, final boolean event);
-
-    public void onChunkHolderCreate(final ServerLevel level, final ChunkHolder holder);
-
-    public void onChunkHolderDelete(final ServerLevel level, final ChunkHolder holder);
-
-    public void onChunkPreBorder(final LevelChunk chunk, final ChunkHolder holder);
-
-    public void onChunkBorder(final LevelChunk chunk, final ChunkHolder holder);
-
-    public void onChunkNotBorder(final LevelChunk chunk, final ChunkHolder holder);
-
-    public void onChunkPostNotBorder(final LevelChunk chunk, final ChunkHolder holder);
-
-    public void onChunkTicking(final LevelChunk chunk, final ChunkHolder holder);
-
-    public void onChunkNotTicking(final LevelChunk chunk, final ChunkHolder holder);
-
-    public void onChunkEntityTicking(final LevelChunk chunk, final ChunkHolder holder);
-
-    public void onChunkNotEntityTicking(final LevelChunk chunk, final ChunkHolder holder);
-
-    public ChunkHolder getUnloadingChunkHolder(final ServerLevel level, final int chunkX, final int chunkZ);
-
-    public int getSendViewDistance(final ServerPlayer player);
-
-    public int getViewDistance(final ServerPlayer player);
-
-    public int getTickViewDistance(final ServerPlayer player);
-
-    public void addPlayerToDistanceMaps(final ServerLevel world, final ServerPlayer player);
-
-    public void removePlayerFromDistanceMaps(final ServerLevel world, final ServerPlayer player);
-
-    public void updateMaps(final ServerLevel world, final ServerPlayer player);
-}

src/main/java/ca/spottedleaf/moonrise/common/util/ConfigHolder.java

@@ -1,9 +1,10 @@
 package ca.spottedleaf.moonrise.common.util;
 
-import ca.spottedleaf.moonrise.common.PlatformHooks;
+import ca.spottedleaf.moonrise.common.config.adapter.TypeAdapterRegistry;
+import ca.spottedleaf.moonrise.common.config.config.YamlConfig;
 import ca.spottedleaf.moonrise.common.config.moonrise.MoonriseConfig;
-import ca.spottedleaf.yamlconfig.adapter.TypeAdapterRegistry;
-import ca.spottedleaf.yamlconfig.config.YamlConfig;
+import ca.spottedleaf.moonrise.common.config.moonrise.adapter.DefaultedTypeAdapter;
+import ca.spottedleaf.moonrise.common.config.moonrise.type.DefaultedValue;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import java.io.File;
@@ -12,17 +13,19 @@ public final class ConfigHolder {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ConfigHolder.class);
 
-    private static final File CONFIG_FILE = new File(System.getProperty(PlatformHooks.get().getBrand() + ".ConfigFile", "config/moonrise.yml"));
+    private static final File CONFIG_FILE = new File(System.getProperty("Moonrise.ConfigFile", "config/moonrise.yml"));
     private static final TypeAdapterRegistry CONFIG_ADAPTERS = new TypeAdapterRegistry();
     private static final YamlConfig<MoonriseConfig> CONFIG;
     static {
+        CONFIG_ADAPTERS.putAdapter(DefaultedValue.class, new DefaultedTypeAdapter());
+
         try {
             CONFIG = new YamlConfig<>(MoonriseConfig.class, new MoonriseConfig(), CONFIG_ADAPTERS);
         } catch (final Exception ex) {
             throw new RuntimeException(ex);
         }
     }
-    private static final String CONFIG_HEADER = String.format("""
+    private static final String CONFIG_HEADER = """
             This is the configuration file for Moonrise.
             
             Each configuration option is prefixed with a comment to explain what it does. Additional changes to this file
@@ -30,10 +33,10 @@ public final class ConfigHolder {
             
             Below are the Moonrise startup flags. Note that startup flags must be placed in the JVM arguments, not
             program arguments.
-            -D%1$s.ConfigFile=<file> - Override the config file location. Might be useful for multiple game versions.
-            -D%1$s.WorkerThreadCount=<number> - Override the auto configured worker thread counts (worker-threads).
-            -D%1$s.MaxViewDistance=<number> - Overrides the maximum view distance, should only use for debugging purposes.
-            """, PlatformHooks.get().getBrand());
+            -DMoonrise.ConfigFile=<file> - Override the config file location. Might be useful for multiple game versions.
+            -DMoonrise.WorkerThreadCount=<number> - Override the auto configured worker thread counts (worker-threads).
+            -DMoonrise.MaxViewDistance=<number> - Overrides the maximum view distance, should only use for debugging purposes.
+            """;
 
     static {
         reloadConfig();
@@ -48,6 +51,14 @@ public final class ConfigHolder {
     }
 
     public static boolean reloadConfig() {
+        final boolean ret = reloadConfig0();
+
+        CONFIG.callInitialisers();
+
+        return ret;
+    }
+
+    private static boolean reloadConfig0() {
         synchronized (CONFIG) {
             if (CONFIG_FILE.exists()) {
                 try {
@@ -58,8 +69,6 @@ public final class ConfigHolder {
                 }
             }
 
-            CONFIG.callInitialisers();
-
             // write back any changes, or create if needed
             return saveConfig();
         }

src/main/java/ca/spottedleaf/moonrise/common/util/JsonUtil.java

@@ -1,7 +1,6 @@
 package ca.spottedleaf.moonrise.common.util;
 
 import com.google.gson.JsonElement;
-import com.google.gson.Strictness;
 import com.google.gson.internal.Streams;
 import com.google.gson.stream.JsonWriter;
 import java.io.File;
@@ -17,7 +16,7 @@ public final class JsonUtil {
         final StringWriter stringWriter = new StringWriter();
         final JsonWriter jsonWriter = new JsonWriter(stringWriter);
         jsonWriter.setIndent(" ");
-        jsonWriter.setStrictness(Strictness.LENIENT);
+        jsonWriter.setLenient(false);
         Streams.write(element, jsonWriter);
 
         final String jsonString = stringWriter.toString();

src/main/java/ca/spottedleaf/moonrise/common/util/MixinWorkarounds.java

@@ -3,12 +3,8 @@ package ca.spottedleaf.moonrise.common.util;
 public final class MixinWorkarounds {
 
     // mixins tries to find the owner of the clone() method, which doesn't exist and NPEs
-    // https://github.com/FabricMC/Mixin/pull/147
     public static long[] clone(final long[] values) {
         return values.clone();
     }
 
-    public static byte[] clone(final byte[] values) {
-        return values.clone();
-    }
 }

src/main/java/ca/spottedleaf/moonrise/common/util/MoonriseCommon.java

@@ -19,7 +19,7 @@ public final class MoonriseCommon {
                 @Override
                 public void accept(Thread thread) {
                     thread.setDaemon(true);
-                    thread.setName(PlatformHooks.get().getBrand() + " Common Worker #" + this.idGenerator.getAndIncrement());
+                    thread.setName("Moonrise Common Worker #" + this.idGenerator.getAndIncrement());
                     thread.setUncaughtExceptionHandler(new Thread.UncaughtExceptionHandler() {
                         @Override
                         public void uncaughtException(final Thread thread, final Throwable throwable) {
@@ -44,7 +44,7 @@ public final class MoonriseCommon {
         } else {
             defaultWorkerThreads = defaultWorkerThreads / 2;
         }
-        defaultWorkerThreads = Integer.getInteger(PlatformHooks.get().getBrand() + ".WorkerThreadCount", Integer.valueOf(defaultWorkerThreads));
+        defaultWorkerThreads = Integer.getInteger("Moonrise.WorkerThreadCount", Integer.valueOf(defaultWorkerThreads));
 
         int workerThreads = configWorkerThreads;
 

src/main/java/ca/spottedleaf/moonrise/common/util/MoonriseConstants.java

@@ -1,10 +1,8 @@
 package ca.spottedleaf.moonrise.common.util;
 
-import ca.spottedleaf.moonrise.common.PlatformHooks;
-
 public final class MoonriseConstants {
 
-    public static final int MAX_VIEW_DISTANCE = Integer.getInteger(PlatformHooks.get().getBrand() + ".MaxViewDistance", 32);
+    public static final int MAX_VIEW_DISTANCE = Integer.getInteger("Moonrise.MaxViewDistance", 32);
 
     private MoonriseConstants() {}
 

src/main/java/ca/spottedleaf/moonrise/common/util/SimpleRandom.java

@@ -0,0 +1,53 @@
+package ca.spottedleaf.moonrise.common.util;
+
+import net.minecraft.world.level.levelgen.LegacyRandomSource;
+
+/**
+ * Avoid costly CAS of superclass
+ */
+public final class SimpleRandom extends LegacyRandomSource {
+
+    private static final long MULTIPLIER = 25214903917L;
+    private static final long ADDEND = 11L;
+    private static final int BITS = 48;
+    private static final long MASK = (1L << BITS) - 1;
+
+    private long value;
+
+    public SimpleRandom(final long seed) {
+        super(0L);
+        this.value = seed;
+    }
+
+    @Override
+    public void setSeed(final long seed) {
+        this.value = (seed ^ MULTIPLIER) & MASK;
+    }
+
+    private long advanceSeed() {
+        return this.value = ((this.value * MULTIPLIER) + ADDEND) & MASK;
+    }
+
+    @Override
+    public int next(final int bits) {
+        return (int)(this.advanceSeed() >>> (BITS - bits));
+    }
+
+    @Override
+    public int nextInt() {
+        final long seed = this.advanceSeed();
+        return (int)(seed >>> (BITS - Integer.SIZE));
+    }
+
+
+    @Override
+    public int nextInt(final int bound) {
+        if (bound <= 0) {
+            throw new IllegalArgumentException();
+        }
+
+        // https://lemire.me/blog/2016/06/27/a-fast-alternative-to-the-modulo-reduction/
+        final long value = this.advanceSeed() >>> (BITS - Integer.SIZE);
+        return (int)((value * (long)bound) >>> Integer.SIZE);
+    }
+}

src/main/java/ca/spottedleaf/moonrise/common/util/SimpleThreadUnsafeRandom.java

@@ -1,105 +0,0 @@
-package ca.spottedleaf.moonrise.common.util;
-
-import net.minecraft.util.Mth;
-import net.minecraft.util.RandomSource;
-import net.minecraft.world.level.levelgen.BitRandomSource;
-import net.minecraft.world.level.levelgen.MarsagliaPolarGaussian;
-import net.minecraft.world.level.levelgen.PositionalRandomFactory;
-
-/**
- * Avoid costly CAS of superclass + division in nextInt
- */
-public final class SimpleThreadUnsafeRandom implements BitRandomSource {
-
-    private static final long MULTIPLIER = 25214903917L;
-    private static final long ADDEND = 11L;
-    private static final int BITS = 48;
-    private static final long MASK = (1L << BITS) - 1L;
-
-    private long value;
-    private final MarsagliaPolarGaussian gaussianSource = new MarsagliaPolarGaussian(this);
-
-    public SimpleThreadUnsafeRandom(final long seed) {
-        this.setSeed(seed);
-    }
-
-    @Override
-    public void setSeed(final long seed) {
-        this.value = (seed ^ MULTIPLIER) & MASK;
-        this.gaussianSource.reset();
-    }
-
-    private long advanceSeed() {
-        return this.value = ((this.value * MULTIPLIER) + ADDEND) & MASK;
-    }
-
-    @Override
-    public int next(final int bits) {
-        return (int)(this.advanceSeed() >>> (BITS - bits));
-    }
-
-    @Override
-    public int nextInt() {
-        final long seed = this.advanceSeed();
-        return (int)(seed >>> (BITS - Integer.SIZE));
-    }
-
-    @Override
-    public int nextInt(final int bound) {
-        if (bound <= 0) {
-            throw new IllegalArgumentException();
-        }
-
-        // https://lemire.me/blog/2016/06/27/a-fast-alternative-to-the-modulo-reduction/
-        final long value = this.advanceSeed() >>> (BITS - Integer.SIZE);
-        return (int)((value * (long)bound) >>> Integer.SIZE);
-    }
-
-    @Override
-    public double nextGaussian() {
-        return this.gaussianSource.nextGaussian();
-    }
-
-    @Override
-    public RandomSource fork() {
-        return new SimpleThreadUnsafeRandom(this.nextLong());
-    }
-
-    @Override
-    public PositionalRandomFactory forkPositional() {
-        return new SimpleRandomPositionalFactory(this.nextLong());
-    }
-
-    public static final class SimpleRandomPositionalFactory implements PositionalRandomFactory {
-
-        private final long seed;
-
-        public SimpleRandomPositionalFactory(final long seed) {
-            this.seed = seed;
-        }
-
-        public long getSeed() {
-            return this.seed;
-        }
-
-        @Override
-        public RandomSource fromHashOf(final String string) {
-            return new SimpleThreadUnsafeRandom((long)string.hashCode() ^ this.seed);
-        }
-
-        @Override
-        public RandomSource fromSeed(final long seed) {
-            return new SimpleThreadUnsafeRandom(seed);
-        }
-
-        @Override
-        public RandomSource at(final int x, final int y, final int z) {
-            return new SimpleThreadUnsafeRandom(Mth.getSeed(x, y, z) ^ this.seed);
-        }
-
-        @Override
-        public void parityConfigString(final StringBuilder stringBuilder) {
-            stringBuilder.append("SimpleRandomPositionalFactory{").append(this.seed).append('}');
-        }
-    }
-}

src/main/java/ca/spottedleaf/moonrise/common/util/ThreadUnsafeRandom.java

@@ -1,94 +0,0 @@
-package ca.spottedleaf.moonrise.common.util;
-
-import net.minecraft.util.Mth;
-import net.minecraft.util.RandomSource;
-import net.minecraft.world.level.levelgen.BitRandomSource;
-import net.minecraft.world.level.levelgen.MarsagliaPolarGaussian;
-import net.minecraft.world.level.levelgen.PositionalRandomFactory;
-
-/**
- * Avoid costly CAS of superclass
- */
-public final class ThreadUnsafeRandom implements BitRandomSource {
-
-    private static final long MULTIPLIER = 25214903917L;
-    private static final long ADDEND = 11L;
-    private static final int BITS = 48;
-    private static final long MASK = (1L << BITS) - 1L;
-
-    private long value;
-    private final MarsagliaPolarGaussian gaussianSource = new MarsagliaPolarGaussian(this);
-
-    public ThreadUnsafeRandom(final long seed) {
-        this.setSeed(seed);
-    }
-
-    @Override
-    public void setSeed(final long seed) {
-        this.value = (seed ^ MULTIPLIER) & MASK;
-        this.gaussianSource.reset();
-    }
-
-    private long advanceSeed() {
-        return this.value = ((this.value * MULTIPLIER) + ADDEND) & MASK;
-    }
-
-    @Override
-    public int next(final int bits) {
-        return (int)(this.advanceSeed() >>> (BITS - bits));
-    }
-
-    @Override
-    public int nextInt() {
-        final long seed = this.advanceSeed();
-        return (int)(seed >>> (BITS - Integer.SIZE));
-    }
-
-    @Override
-    public double nextGaussian() {
-        return this.gaussianSource.nextGaussian();
-    }
-
-    @Override
-    public RandomSource fork() {
-        return new ThreadUnsafeRandom(this.nextLong());
-    }
-
-    @Override
-    public PositionalRandomFactory forkPositional() {
-        return new ThreadUnsafeRandomPositionalFactory(this.nextLong());
-    }
-
-    public static final class ThreadUnsafeRandomPositionalFactory implements PositionalRandomFactory {
-
-        private final long seed;
-
-        public ThreadUnsafeRandomPositionalFactory(final long seed) {
-            this.seed = seed;
-        }
-
-        public long getSeed() {
-            return this.seed;
-        }
-
-        @Override
-        public RandomSource fromHashOf(final String string) {
-            return new ThreadUnsafeRandom((long)string.hashCode() ^ this.seed);
-        }
-
-        @Override
-        public RandomSource fromSeed(final long seed) {
-            return new ThreadUnsafeRandom(seed);
-        }
-
-        @Override
-        public RandomSource at(final int x, final int y, final int z) {
-            return new ThreadUnsafeRandom(Mth.getSeed(x, y, z) ^ this.seed);
-        }
-
-        @Override
-        public void parityConfigString(final StringBuilder stringBuilder) {
-            stringBuilder.append("ThreadUnsafeRandomPositionalFactory{").append(this.seed).append('}');
-        }
-    }
-}

src/main/java/ca/spottedleaf/moonrise/common/util/TickThread.java

@@ -28,64 +28,43 @@ public class TickThread extends Thread {
 
     public static void ensureTickThread(final Level world, final BlockPos pos, final String reason) {
         if (!isTickThreadFor(world, pos)) {
-            final String ex = "Thread " + Thread.currentThread().getName() + " failed main thread check: " +
-                               reason + ", world=" + WorldUtil.getWorldName(world) + ", block_pos=" + pos;
-            LOGGER.error(ex, new Throwable());
-            throw new IllegalStateException(ex);
-        }
-    }
-
-    public static void ensureTickThread(final Level world, final BlockPos pos, final int blockRadius, final String reason) {
-        if (!isTickThreadFor(world, pos, blockRadius)) {
-            final String ex = "Thread " + Thread.currentThread().getName() + " failed main thread check: " +
-                reason + ", world=" + WorldUtil.getWorldName(world) + ", block_pos=" + pos + ", block_radius=" + blockRadius;
-            LOGGER.error(ex, new Throwable());
-            throw new IllegalStateException(ex);
+            LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable());
+            throw new IllegalStateException(reason);
         }
     }
 
     public static void ensureTickThread(final Level world, final ChunkPos pos, final String reason) {
         if (!isTickThreadFor(world, pos)) {
-            final String ex = "Thread " + Thread.currentThread().getName() + " failed main thread check: " +
-                reason + ", world=" + WorldUtil.getWorldName(world) + ", chunk_pos=" + pos;
-            LOGGER.error(ex, new Throwable());
-            throw new IllegalStateException(ex);
+            LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable());
+            throw new IllegalStateException(reason);
         }
     }
 
     public static void ensureTickThread(final Level world, final int chunkX, final int chunkZ, final String reason) {
         if (!isTickThreadFor(world, chunkX, chunkZ)) {
-            final String ex = "Thread " + Thread.currentThread().getName() + " failed main thread check: " +
-                reason + ", world=" + WorldUtil.getWorldName(world) + ", chunk_pos=" + new ChunkPos(chunkX, chunkZ);
-            LOGGER.error(ex, new Throwable());
-            throw new IllegalStateException(ex);
+            LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable());
+            throw new IllegalStateException(reason);
         }
     }
 
     public static void ensureTickThread(final Entity entity, final String reason) {
         if (!isTickThreadFor(entity)) {
-            final String ex = "Thread " + Thread.currentThread().getName() + " failed main thread check: " +
-                reason + ", entity=" + entity;
-            LOGGER.error(ex, new Throwable());
-            throw new IllegalStateException(ex);
+            LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable());
+            throw new IllegalStateException(reason);
         }
     }
 
     public static void ensureTickThread(final Level world, final AABB aabb, final String reason) {
         if (!isTickThreadFor(world, aabb)) {
-            final String ex = "Thread " + Thread.currentThread().getName() + " failed main thread check: " +
-                reason + ", world=" + WorldUtil.getWorldName(world) + ", aabb=" + aabb;
-            LOGGER.error(ex, new Throwable());
-            throw new IllegalStateException(ex);
+            LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable());
+            throw new IllegalStateException(reason);
         }
     }
 
     public static void ensureTickThread(final Level world, final double blockX, final double blockZ, final String reason) {
         if (!isTickThreadFor(world, blockX, blockZ)) {
-            final String ex = "Thread " + Thread.currentThread().getName() + " failed main thread check: " +
-                reason + ", world=" + WorldUtil.getWorldName(world) + ", block_pos=" + new Vec3(blockX, 0.0, blockZ);
-            LOGGER.error(ex, new Throwable());
-            throw new IllegalStateException(ex);
+            LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable());
+            throw new IllegalStateException(reason);
         }
     }
 
@@ -126,10 +105,6 @@ public class TickThread extends Thread {
         return isTickThread();
     }
 
-    public static boolean isTickThreadFor(final Level world, final BlockPos pos, final int blockRadius) {
-        return isTickThread();
-    }
-
     public static boolean isTickThreadFor(final Level world, final ChunkPos pos) {
         return isTickThread();
     }

src/main/java/ca/spottedleaf/moonrise/common/util/WorldUtil.java

@@ -8,19 +8,19 @@ public final class WorldUtil {
     // min, max are inclusive
 
     public static int getMaxSection(final LevelHeightAccessor world) {
-        return world.getMaxSectionY();
+        return world.getMaxSection() - 1; // getMaxSection() is exclusive
     }
 
     public static int getMaxSection(final Level world) {
-        return world.getMaxSectionY();
+        return world.getMaxSection() - 1; // getMaxSection() is exclusive
     }
 
     public static int getMinSection(final LevelHeightAccessor world) {
-        return world.getMinSectionY();
+        return world.getMinSection();
     }
 
     public static int getMinSection(final Level world) {
-        return world.getMinSectionY();
+        return world.getMinSection();
     }
 
     public static int getMaxLightSection(final LevelHeightAccessor world) {

src/main/java/ca/spottedleaf/moonrise/mixin/block_counting/LevelChunkSectionMixin.java

@@ -154,9 +154,9 @@ abstract class LevelChunkSectionMixin implements BlockCountingChunkSection {
 
         if (this.maybeHas((final BlockState state) -> !state.isAir())) {
             final PalettedContainer.Data<BlockState> data = this.states.data;
-            final Palette<BlockState> palette = data.palette();
+            final Palette<BlockState> palette = data.palette;
             final int paletteSize = palette.getSize();
-            final BitStorage storage = data.storage();
+            final BitStorage storage = data.storage;
 
             final Int2ObjectOpenHashMap<ShortArrayList> counts;
             if (paletteSize == 1) {

src/main/java/ca/spottedleaf/moonrise/mixin/blockstate_propertyaccess/BooleanPropertyMixin.java

@@ -6,7 +6,6 @@ import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
 import net.minecraft.world.level.block.state.properties.Property;
 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.Constant;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -18,9 +17,6 @@ abstract class BooleanPropertyMixin extends Property<Boolean> implements Propert
         super(string, class_);
     }
 
-    @Unique
-    private static final Boolean[] BY_ID = new Boolean[]{ Boolean.FALSE, Boolean.TRUE };
-
     @Override
     public final int moonrise$getIdFor(final Boolean value) {
         return value.booleanValue() ? 1 : 0;
@@ -37,6 +33,23 @@ abstract class BooleanPropertyMixin extends Property<Boolean> implements Propert
         )
     )
     private void init(final CallbackInfo ci) {
-        this.moonrise$setById(BY_ID);
+        this.moonrise$setById(new Boolean[]{ Boolean.FALSE, Boolean.TRUE });
+    }
+
+    /**
+     * This skips all ops after the identity comparison in the original code.
+     *
+     * @reason Properties are identity comparable
+     * @author Spottedleaf
+     */
+    @WrapOperation(
+        method = "equals",
+        constant = @Constant(
+            classValue = BooleanProperty.class,
+            ordinal = 0
+        )
+    )
+    private boolean skipFurtherComparison(final Object obj, final Operation<Boolean> orig) {
+        return false;
     }
 }

src/main/java/ca/spottedleaf/moonrise/mixin/blockstate_propertyaccess/EnumPropertyMixin.java

@@ -18,6 +18,9 @@ import java.util.Collection;
 @Mixin(EnumProperty.class)
 abstract class EnumPropertyMixin<T extends Enum<T> & StringRepresentable> extends Property<T> implements PropertyAccess<T> {
 
+    @Shadow
+    public abstract Collection<T> getPossibleValues();
+
     @Unique
     private int[] idLookupTable;
 

src/main/java/ca/spottedleaf/moonrise/mixin/blockstate_propertyaccess/StateHolderMixin.java

@@ -83,6 +83,7 @@ abstract class StateHolderMixin<O, S> implements PropertyAccessStateHolder {
         }
 
         // remove values arrays
+        this.values = null;
         for (final Map.Entry<Map<Property<?>, Comparable<?>>, S> entry : map.entrySet()) {
             final S value = entry.getValue();
             ((StateHolderMixin<O, S>)(Object)(StateHolder<O, S>)value).values = null;
@@ -125,8 +126,8 @@ abstract class StateHolderMixin<O, S> implements PropertyAccessStateHolder {
      * @author Spottedleaf
      */
     @Overwrite
-    public <T extends Comparable<T>> T getNullableValue(Property<T> property) {
-        return property == null ? null : this.optimisedTable.get(this.tableIndex, property);
+    public <T extends Comparable<T>> Optional<T> getOptionalValue(final Property<T> property) {
+        return property == null ? Optional.empty() : Optional.ofNullable(this.optimisedTable.get(this.tableIndex, property));
     }
 
     /**

src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/ChunkHolderMixin.java

@@ -66,6 +66,9 @@ abstract class ChunkHolderMixin extends GenerationChunkHolder implements ChunkSy
     @Unique
     private final ReferenceList<ServerPlayer> playersSentChunkTo = new ReferenceList<>(EMPTY_PLAYER_ARRAY);
 
+    @Unique
+    private boolean isMarkedDirtyForPlayers;
+
     @Unique
     private ChunkMap getChunkMap() {
         return (ChunkMap)this.playerProvider;
@@ -120,6 +123,16 @@ abstract class ChunkHolderMixin extends GenerationChunkHolder implements ChunkSy
         return ret;
     }
 
+    @Override
+    public final boolean moonrise$isMarkedDirtyForPlayers() {
+        return this.isMarkedDirtyForPlayers;
+    }
+
+    @Override
+    public final void moonrise$markDirtyForPlayers(final boolean value) {
+        this.isMarkedDirtyForPlayers = value;
+    }
+
     @Unique
     private static final ServerPlayer[] EMPTY_PLAYER_ARRAY = new ServerPlayer[0];
 
@@ -287,7 +300,14 @@ abstract class ChunkHolderMixin extends GenerationChunkHolder implements ChunkSy
             // no players to sent to, so don't need to update anything
             return null;
         }
-        return this.getChunkToSend();
+        final LevelChunk ret = this.getChunkToSend();
+
+        if (ret != null) {
+            ((ChunkSystemServerLevel)this.getChunkMap().level).moonrise$addUnsyncedChunk((ChunkHolder)(Object)this);
+            return ret;
+        }
+
+        return ret;
     }
 
     /**
@@ -306,7 +326,14 @@ abstract class ChunkHolderMixin extends GenerationChunkHolder implements ChunkSy
             // no players to sent to, so don't need to update anything
             return null;
         }
-        return this.getChunkToSend();
+        final LevelChunk ret = this.getChunkToSend();
+
+        if (ret != null) {
+            ((ChunkSystemServerLevel)this.getChunkMap().level).moonrise$addUnsyncedChunk((ChunkHolder)(Object)this);
+            return ret;
+        }
+
+        return ret;
     }
 
     /**

src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/ChunkMapMixin.java

@@ -1,7 +1,7 @@
 package ca.spottedleaf.moonrise.mixin.chunk_system;
 
-import ca.spottedleaf.moonrise.common.PlatformHooks;
 import ca.spottedleaf.moonrise.common.util.MoonriseConstants;
+import ca.spottedleaf.moonrise.common.util.ChunkSystem;
 import ca.spottedleaf.moonrise.patches.chunk_system.io.MoonriseRegionFileIO;
 import ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemChunkMap;
 import ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel;
@@ -11,17 +11,14 @@ import ca.spottedleaf.moonrise.patches.chunk_system.scheduling.NewChunkHolder;
 import com.mojang.datafixers.DataFixer;
 import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap;
 import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.IntConsumer;
 import java.util.function.Supplier;
-import it.unimi.dsi.fastutil.longs.LongSet;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.StreamTagVisitor;
 import net.minecraft.server.level.ChunkGenerationTask;
 import net.minecraft.server.level.ChunkHolder;
 import net.minecraft.server.level.ChunkMap;
 import net.minecraft.server.level.ChunkResult;
-import net.minecraft.server.level.ChunkTaskDispatcher;
+import net.minecraft.server.level.ChunkTaskPriorityQueueSorter;
 import net.minecraft.server.level.ChunkTrackingView;
 import net.minecraft.server.level.GeneratingChunkMap;
 import net.minecraft.server.level.GenerationChunkHolder;
@@ -31,6 +28,7 @@ import net.minecraft.server.level.progress.ChunkProgressListener;
 import net.minecraft.util.Mth;
 import net.minecraft.util.StaticCache2D;
 import net.minecraft.util.thread.BlockableEventLoop;
+import net.minecraft.util.thread.ProcessorHandle;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkGenerator;
@@ -80,10 +78,13 @@ abstract class ChunkMapMixin extends ChunkStorage implements ChunkSystemChunkMap
     private volatile Long2ObjectLinkedOpenHashMap<ChunkHolder> visibleChunkMap;
 
     @Shadow
-    private ChunkTaskDispatcher worldgenTaskDispatcher;
+    private ChunkTaskPriorityQueueSorter queueSorter;
 
     @Shadow
-    private ChunkTaskDispatcher lightTaskDispatcher;
+    private ProcessorHandle<ChunkTaskPriorityQueueSorter.Message<Runnable>> worldgenMailbox;
+
+    @Shadow
+    private ProcessorHandle<ChunkTaskPriorityQueueSorter.Message<Runnable>> mainThreadMailbox;
 
     @Shadow
     private int serverViewDistance;
@@ -97,12 +98,6 @@ abstract class ChunkMapMixin extends ChunkStorage implements ChunkSystemChunkMap
     @Shadow
     private Queue<Runnable> unloadQueue;
 
-    @Shadow
-    private LongSet chunksToEagerlySave;
-
-    @Shadow
-    private AtomicInteger activeChunkWrites;
-
     public ChunkMapMixin(RegionStorageInfo regionStorageInfo, Path path, DataFixer dataFixer, boolean bl) {
         super(regionStorageInfo, path, dataFixer, bl);
     }
@@ -133,12 +128,11 @@ abstract class ChunkMapMixin extends ChunkStorage implements ChunkSystemChunkMap
         this.updatingChunkMap = null;
         this.visibleChunkMap = null;
         this.pendingUnloads = null;
-        this.worldgenTaskDispatcher = null;
-        this.lightTaskDispatcher = null;
+        this.queueSorter = null;
+        this.worldgenMailbox = null;
+        this.mainThreadMailbox = null;
         this.pendingGenerationTasks = null;
         this.unloadQueue = null;
-        this.chunksToEagerlySave = null;
-        this.activeChunkWrites = null;
 
         // Dummy impl for mods that try to loadAsync directly
         this.worker = new IOWorker(
@@ -158,7 +152,7 @@ abstract class ChunkMapMixin extends ChunkStorage implements ChunkSystemChunkMap
             @Override
             public CompletableFuture<Optional<CompoundTag>> loadAsync(final ChunkPos chunkPos) {
                 final CompletableFuture<Optional<CompoundTag>> future = new CompletableFuture<>();
-                MoonriseRegionFileIO.loadDataAsync(ChunkMapMixin.this.level, chunkPos.x, chunkPos.z, MoonriseRegionFileIO.RegionFileType.CHUNK_DATA, (final CompoundTag tag, final Throwable throwable) -> {
+                MoonriseRegionFileIO.loadDataAsync(ChunkMapMixin.this.level, chunkPos.x, chunkPos.z, MoonriseRegionFileIO.RegionFileType.CHUNK_DATA, (tag, throwable) -> {
                     if (throwable != null) {
                         future.completeExceptionally(throwable);
                     } else {
@@ -190,15 +184,6 @@ abstract class ChunkMapMixin extends ChunkStorage implements ChunkSystemChunkMap
         };
     }
 
-    /**
-     * @reason This map is not needed, we maintain our own ordered set of chunks to autosave.
-     * @author Spottedleaf
-     */
-    @Overwrite
-    public void setChunkUnsaved(final ChunkPos pos) {
-
-    }
-
     /**
      * @reason Route to new chunk system hooks
      * @author Spottedleaf
@@ -276,15 +261,6 @@ abstract class ChunkMapMixin extends ChunkStorage implements ChunkSystemChunkMap
         throw new UnsupportedOperationException();
     }
 
-    /**
-     * @reason Destroy old chunk system hooks
-     * @author Spottedleaf
-     */
-    @Overwrite
-    public void onLevelChange(final ChunkPos chunkPos, final IntSupplier intSupplier, final int i, final IntConsumer intConsumer) {
-        throw new UnsupportedOperationException();
-    }
-
     /**
      * @reason Destroy old chunk system hooks
      * @author Spottedleaf
@@ -333,15 +309,6 @@ abstract class ChunkMapMixin extends ChunkStorage implements ChunkSystemChunkMap
         ((ChunkSystemServerLevel)this.level).moonrise$getChunkTaskScheduler().chunkHolderManager.autoSave();
     }
 
-    /**
-     * @reason Destroy old chunk system hooks
-     * @author Spottedleaf
-     */
-    @Overwrite
-    public void saveChunksEagerly(final BooleanSupplier hasTime) {
-        throw new UnsupportedOperationException();
-    }
-
     /**
      * @reason Destroy old chunk system hooks
      * @author Spottedleaf
@@ -436,7 +403,7 @@ abstract class ChunkMapMixin extends ChunkStorage implements ChunkSystemChunkMap
      * @author Spottedleaf
      */
     @Overwrite
-    public void onChunkReadyToSend(final ChunkHolder holder, final LevelChunk chunk) {
+    public void onChunkReadyToSend(final LevelChunk chunk) {
         throw new UnsupportedOperationException();
     }
 
@@ -455,7 +422,7 @@ abstract class ChunkMapMixin extends ChunkStorage implements ChunkSystemChunkMap
      * @see NewChunkHolder#save(boolean)
      */
     @Overwrite
-    public boolean saveChunkIfNeeded(final ChunkHolder chunkHolder, final long time) {
+    public boolean saveChunkIfNeeded(final ChunkHolder chunkHolder) {
         throw new UnsupportedOperationException();
     }
 
@@ -499,7 +466,7 @@ abstract class ChunkMapMixin extends ChunkStorage implements ChunkSystemChunkMap
      */
     @Overwrite
     public int getPlayerViewDistance(final ServerPlayer player) {
-        return PlatformHooks.get().getSendViewDistance(player);
+        return ChunkSystem.getSendViewDistance(player);
     }
 
     /**
@@ -538,21 +505,6 @@ abstract class ChunkMapMixin extends ChunkStorage implements ChunkSystemChunkMap
         throw new UnsupportedOperationException();
     }
 
-    /**
-     * @reason Route to new chunk system
-     * @author Spottedleaf
-     */
-    @Redirect(
-        method = "forEachSpawnCandidateChunk",
-        at = @At(
-            value = "INVOKE",
-            target = "Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;get(J)Ljava/lang/Object;"
-        )
-    )
-    private <V> V redirectChunkHolderGet(final Long2ObjectLinkedOpenHashMap<V> instance, final long key) {
-        return (V)this.getVisibleChunkIfPresent(key);
-    }
-
     @Override
     public CompletableFuture<Optional<CompoundTag>> read(final ChunkPos pos) {
         final CompletableFuture<Optional<CompoundTag>> ret = new CompletableFuture<>();
@@ -572,11 +524,10 @@ abstract class ChunkMapMixin extends ChunkStorage implements ChunkSystemChunkMap
     }
 
     @Override
-    public CompletableFuture<Void> write(final ChunkPos pos, final Supplier<CompoundTag> tag) {
+    public CompletableFuture<Void> write(final ChunkPos pos, final CompoundTag tag) {
         MoonriseRegionFileIO.scheduleSave(
-                this.level, pos.x, pos.z, tag.get(),
-                MoonriseRegionFileIO.RegionFileType.CHUNK_DATA
-        );
+                this.level, pos.x, pos.z, tag,
+                MoonriseRegionFileIO.RegionFileType.CHUNK_DATA);
         return null;
     }
 
@@ -597,7 +548,7 @@ abstract class ChunkMapMixin extends ChunkStorage implements ChunkSystemChunkMap
             )
     )
     private void avoidUpdateChunkTrackingInUpdate(final ChunkMap instance, final ServerPlayer serverPlayer) {
-        PlatformHooks.get().addPlayerToDistanceMaps(this.level, serverPlayer);
+        ChunkSystem.addPlayerToDistanceMaps(this.level, serverPlayer);
     }
 
     /**
@@ -627,7 +578,7 @@ abstract class ChunkMapMixin extends ChunkStorage implements ChunkSystemChunkMap
     )
     private void avoidApplyChunkTrackingViewInUpdate(final ChunkMap instance, final ServerPlayer serverPlayer,
                                                      final ChunkTrackingView chunkTrackingView) {
-        PlatformHooks.get().removePlayerFromDistanceMaps(this.level, serverPlayer);
+        ChunkSystem.removePlayerFromDistanceMaps(this.level, serverPlayer);
     }
 
     /**
@@ -641,7 +592,7 @@ abstract class ChunkMapMixin extends ChunkStorage implements ChunkSystemChunkMap
         )
     )
     private void updateMapsHook(final ServerPlayer player, final CallbackInfo ci) {
-        PlatformHooks.get().updateMaps(this.level, player);
+        ChunkSystem.updateMaps(this.level, player);
     }
 
     /**

src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/ChunkSerializerMixin.java

@@ -3,13 +3,13 @@ package ca.spottedleaf.moonrise.mixin.chunk_system;
 import net.minecraft.core.SectionPos;
 import net.minecraft.world.entity.ai.village.poi.PoiManager;
 import net.minecraft.world.level.chunk.LevelChunkSection;
-import net.minecraft.world.level.chunk.storage.SerializableChunkData;
+import net.minecraft.world.level.chunk.storage.ChunkSerializer;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-@Mixin(SerializableChunkData.class)
-abstract class SerializableChunkDataMixin {
+@Mixin(ChunkSerializer.class)
+abstract class ChunkSerializerMixin {
 
     /**
      * @reason Chunk system handles this during full transition
@@ -17,12 +17,12 @@ abstract class SerializableChunkDataMixin {
      * @see ca.spottedleaf.moonrise.patches.chunk_system.scheduling.task.ChunkFullTask
      */
     @Redirect(
-        method = "read",
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/world/entity/ai/village/poi/PoiManager;checkConsistencyWithBlocks(Lnet/minecraft/core/SectionPos;Lnet/minecraft/world/level/chunk/LevelChunkSection;)V"
-        )
+            method = "read",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/world/entity/ai/village/poi/PoiManager;checkConsistencyWithBlocks(Lnet/minecraft/core/SectionPos;Lnet/minecraft/world/level/chunk/LevelChunkSection;)V"
+            )
     )
-    private void skipConsistencyCheck(final PoiManager instance, final SectionPos sectionPos, final LevelChunkSection levelChunkSection) {}
+    private static void skipConsistencyCheck(PoiManager instance, SectionPos sectionPos, LevelChunkSection levelChunkSection) {}
 
 }

src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/ChunkStorageMixin.java

@@ -22,13 +22,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import java.io.IOException;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
-import java.util.function.Supplier;
 
 @Mixin(ChunkStorage.class)
 abstract class ChunkStorageMixin implements ChunkSystemChunkStorage, AutoCloseable {
 
     @Shadow
-    public IOWorker worker;
+    private IOWorker worker;
 
     @Unique
     private static final Logger LOGGER = LogUtils.getLogger();
@@ -119,13 +118,13 @@ abstract class ChunkStorageMixin implements ChunkSystemChunkStorage, AutoCloseab
             method = "write",
             at = @At(
                     value = "INVOKE",
-                    target = "Lnet/minecraft/world/level/chunk/storage/IOWorker;store(Lnet/minecraft/world/level/ChunkPos;Ljava/util/function/Supplier;)Ljava/util/concurrent/CompletableFuture;"
+                    target = "Lnet/minecraft/world/level/chunk/storage/IOWorker;store(Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/nbt/CompoundTag;)Ljava/util/concurrent/CompletableFuture;"
             )
     )
     private CompletableFuture<Void> redirectWrite(final IOWorker instance, final ChunkPos chunkPos,
-                                                  final Supplier<CompoundTag> compoundTag) {
+                                                  final CompoundTag compoundTag) {
         try {
-            this.storage.write(chunkPos, compoundTag.get());
+            this.storage.write(chunkPos, compoundTag);
             return CompletableFuture.completedFuture(null);
         } catch (final Throwable throwable) {
             return CompletableFuture.failedFuture(throwable);

src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/ClientLevelMixin.java

@@ -41,8 +41,8 @@ abstract class ClientLevelMixin extends Level implements ChunkSystemLevel {
     @Final
     private ClientChunkCache chunkSource;
 
-    protected ClientLevelMixin(final WritableLevelData writableLevelData, final ResourceKey<Level> resourceKey, final RegistryAccess registryAccess, final Holder<DimensionType> holder, final boolean bl, final boolean bl2, final long l, final int i) {
-        super(writableLevelData, resourceKey, registryAccess, holder, bl, bl2, l, i);
+    protected ClientLevelMixin(WritableLevelData writableLevelData, ResourceKey<Level> resourceKey, RegistryAccess registryAccess, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean bl, boolean bl2, long l, int i) {
+        super(writableLevelData, resourceKey, registryAccess, holder, supplier, bl, bl2, l, i);
     }
 
     /**
@@ -55,8 +55,9 @@ abstract class ClientLevelMixin extends Level implements ChunkSystemLevel {
                     value = "RETURN"
             )
     )
-    private void init(ClientPacketListener clientPacketListener, ClientLevel.ClientLevelData clientLevelData, ResourceKey<Level> resourceKey,
-                      Holder<DimensionType> holder, int i, int j, LevelRenderer levelRenderer, boolean bl, long l, int k, CallbackInfo ci) {
+    private void init(ClientPacketListener clientPacketListener, ClientLevel.ClientLevelData clientLevelData,
+                      ResourceKey<Level> resourceKey, Holder<DimensionType> holder, int i, int j, Supplier<ProfilerFiller> supplier,
+                      LevelRenderer levelRenderer, boolean bl, long l, CallbackInfo ci) {
         this.entityStorage = null;
 
         this.moonrise$setEntityLookup(new ClientEntityLookup(this, ((ClientLevel)(Object)this).new EntityCallbacks()));

src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/DistanceManagerMixin.java

@@ -1,6 +1,5 @@
 package ca.spottedleaf.moonrise.mixin.chunk_system;
 
-import ca.spottedleaf.moonrise.common.util.MoonriseConstants;
 import ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemServerLevel;
 import ca.spottedleaf.moonrise.patches.chunk_system.level.chunk.ChunkSystemDistanceManager;
 import ca.spottedleaf.moonrise.patches.chunk_system.scheduling.ChunkHolderManager;
@@ -9,13 +8,13 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.longs.LongSet;
 import net.minecraft.server.level.ChunkHolder;
 import net.minecraft.server.level.ChunkMap;
+import net.minecraft.server.level.ChunkTaskPriorityQueueSorter;
 import net.minecraft.server.level.DistanceManager;
-import net.minecraft.server.level.ThrottlingChunkTaskDispatcher;
 import net.minecraft.server.level.Ticket;
 import net.minecraft.server.level.TicketType;
 import net.minecraft.server.level.TickingTracker;
-import net.minecraft.util.Mth;
 import net.minecraft.util.SortedArraySet;
+import net.minecraft.util.thread.ProcessorHandle;
 import net.minecraft.world.level.ChunkPos;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
@@ -46,7 +45,13 @@ abstract class DistanceManagerMixin implements ChunkSystemDistanceManager {
     Set<ChunkHolder> chunksToUpdateFutures;
 
     @Shadow
-    ThrottlingChunkTaskDispatcher ticketDispatcher;
+    ChunkTaskPriorityQueueSorter ticketThrottler;
+
+    @Shadow
+    ProcessorHandle<ChunkTaskPriorityQueueSorter.Message<Runnable>> ticketThrottlerInput;
+
+    @Shadow
+    ProcessorHandle<ChunkTaskPriorityQueueSorter.Release> ticketThrottlerReleaser;
 
     @Shadow
     LongSet ticketsToRelease;
@@ -55,8 +60,10 @@ abstract class DistanceManagerMixin implements ChunkSystemDistanceManager {
     Executor mainThreadExecutor;
 
     @Shadow
-    private int simulationDistance;
+    private DistanceManager.FixedPlayerDistanceChunkTracker naturalSpawnChunkCounter;
 
+    @Shadow
+    private int simulationDistance;
 
     @Override
     public ChunkMap moonrise$getChunkMap() {
@@ -79,14 +86,16 @@ abstract class DistanceManagerMixin implements ChunkSystemDistanceManager {
         this.tickingTicketsTracker = null;
         this.playerTicketManager = null;
         this.chunksToUpdateFutures = null;
-        this.ticketDispatcher = null;
+        this.ticketThrottler = null;
+        this.ticketThrottlerInput = null;
+        this.ticketThrottlerReleaser = null;
         this.ticketsToRelease = null;
         this.mainThreadExecutor = null;
         this.simulationDistance = -1;
     }
 
     @Override
-    public final ChunkHolderManager moonrise$getChunkHolderManager() {
+    public ChunkHolderManager moonrise$getChunkHolderManager() {
         return ((ChunkSystemServerLevel)this.moonrise$getChunkMap().level).moonrise$getChunkTaskScheduler().chunkHolderManager;
     }
 
@@ -287,10 +296,7 @@ abstract class DistanceManagerMixin implements ChunkSystemDistanceManager {
      */
     @Overwrite
     public void updateSimulationDistance(final int simulationDistance) {
-        // note: vanilla does not clamp to 0, but we do simply because we need a min of 0
-        final int clamped = Mth.clamp(simulationDistance, 0, MoonriseConstants.MAX_VIEW_DISTANCE);
-
-        ((ChunkSystemServerLevel)this.moonrise$getChunkMap().level).moonrise$getPlayerChunkLoader().setTickDistance(clamped);
+        ((ChunkSystemServerLevel)this.moonrise$getChunkMap().level).moonrise$getPlayerChunkLoader().setTickDistance(simulationDistance);
     }
 
     /**
@@ -320,15 +326,6 @@ abstract class DistanceManagerMixin implements ChunkSystemDistanceManager {
         throw new UnsupportedOperationException();
     }
 
-    /**
-     * @reason Remove old chunk system hooks
-     * @author Spottedleaf
-     */
-    @Overwrite
-    public LongSet getTickingChunks() {
-        throw new UnsupportedOperationException();
-    }
-
     /**
      * @reason This hack is not required anymore, see {@link MinecraftServerMixin}
      * @author Spottedleaf

src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/GenerationChunkHolderMixin.java

@@ -195,6 +195,15 @@ abstract class GenerationChunkHolderMixin {
         throw new UnsupportedOperationException();
     }
 
+    /**
+     * @reason Chunk system is not built on futures anymore
+     * @author Spottedleaf
+     */
+    @Overwrite
+    public int getGenerationRefCount() {
+        throw new UnsupportedOperationException();
+    }
+
     /**
      * @reason Route to new chunk holder
      * @author Spottedleaf

src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/LevelChunkMixin.java

@@ -93,15 +93,11 @@ abstract class LevelChunkMixin extends ChunkAccess implements ChunkSystemLevelCh
     }
 
     @Override
-    public boolean tryMarkSaved() {
-        if (!this.isUnsaved()) {
-            return false;
+    public void setUnsaved(final boolean needsSaving) {
+        if (!needsSaving) {
+            ((ChunkSystemLevelChunkTicks)this.blockTicks).moonrise$clearDirty();
+            ((ChunkSystemLevelChunkTicks)this.fluidTicks).moonrise$clearDirty();
         }
-        ((ChunkSystemLevelChunkTicks)this.blockTicks).moonrise$clearDirty();
-        ((ChunkSystemLevelChunkTicks)this.fluidTicks).moonrise$clearDirty();
-
-        super.tryMarkSaved();
-
-        return true;
+        super.setUnsaved(needsSaving);
     }
 }

src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/LevelMixin.java

@@ -10,7 +10,6 @@ import ca.spottedleaf.moonrise.patches.chunk_system.level.entity.dfl.DefaultEnti
 import ca.spottedleaf.moonrise.patches.chunk_system.world.ChunkSystemEntityGetter;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.FullChunkStatus;
-import net.minecraft.util.profiling.Profiler;
 import net.minecraft.util.profiling.ProfilerFiller;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
@@ -38,6 +37,9 @@ import java.util.function.Predicate;
 @Mixin(Level.class)
 abstract class LevelMixin implements ChunkSystemLevel, ChunkSystemEntityGetter, LevelAccessor, AutoCloseable {
 
+    @Shadow
+    public abstract ProfilerFiller getProfiler();
+
     @Shadow
     public abstract LevelChunk getChunk(int i, int j);
 
@@ -57,7 +59,7 @@ abstract class LevelMixin implements ChunkSystemLevel, ChunkSystemEntityGetter,
     }
 
     @Override
-    public final void moonrise$setEntityLookup(final EntityLookup entityLookup) {
+    public void moonrise$setEntityLookup(final EntityLookup entityLookup) {
         if (this.entityLookup != null && !(this.entityLookup instanceof DefaultEntityLookup)) {
             throw new IllegalStateException("Entity lookup already initialised");
         }
@@ -85,7 +87,7 @@ abstract class LevelMixin implements ChunkSystemLevel, ChunkSystemEntityGetter,
     @Overwrite
     @Override
     public List<Entity> getEntities(final Entity entity, final AABB boundingBox, final Predicate<? super Entity> predicate) {
-        Profiler.get().incrementCounter("getEntities");
+        this.getProfiler().incrementCounter("getEntities");
         final List<Entity> ret = new ArrayList<>();
 
         ((ChunkSystemLevel)this).moonrise$getEntityLookup().getEntities(entity, boundingBox, ret, predicate);
@@ -103,7 +105,7 @@ abstract class LevelMixin implements ChunkSystemLevel, ChunkSystemEntityGetter,
     public <T extends Entity> void getEntities(final EntityTypeTest<Entity, T> entityTypeTest,
                                                final AABB boundingBox, final Predicate<? super T> predicate,
                                                final List<? super T> into, final int maxCount) {
-        Profiler.get().incrementCounter("getEntities");
+        this.getProfiler().incrementCounter("getEntities");
 
         if (entityTypeTest instanceof EntityType<T> byType) {
             if (maxCount != Integer.MAX_VALUE) {
@@ -176,7 +178,7 @@ abstract class LevelMixin implements ChunkSystemLevel, ChunkSystemEntityGetter,
      */
     @Override
     public final <T extends Entity> List<T> getEntitiesOfClass(final Class<T> entityClass, final AABB boundingBox, final Predicate<? super T> predicate) {
-        Profiler.get().incrementCounter("getEntities");
+        this.getProfiler().incrementCounter("getEntities");
         final List<T> ret = new ArrayList<>();
 
         ((ChunkSystemLevel)this).moonrise$getEntityLookup().getEntities(entityClass, null, boundingBox, ret, predicate);
@@ -194,7 +196,7 @@ abstract class LevelMixin implements ChunkSystemLevel, ChunkSystemEntityGetter,
      */
     @Override
     public final List<Entity> moonrise$getHardCollidingEntities(final Entity entity, final AABB box, final Predicate<? super Entity> predicate) {
-        Profiler.get().incrementCounter("getEntities");
+        this.getProfiler().incrementCounter("getEntities");
         final List<Entity> ret = new ArrayList<>();
 
         ((ChunkSystemLevel)this).moonrise$getEntityLookup().getHardCollidingEntities(entity, box, ret, predicate);

src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/MinecraftServerMixin.java

@@ -240,7 +240,6 @@ abstract class MinecraftServerMixin extends ReentrantBlockableEventLoop<TickTask
     private void closeIOThreads(final CallbackInfo ci) {
         LOGGER.info("Waiting for I/O tasks to complete...");
         MoonriseRegionFileIO.flush((MinecraftServer)(Object)this);
-        LOGGER.info("All I/O tasks to complete");
         if ((Object)this instanceof DedicatedServer) {
             MoonriseCommon.haltExecutors();
         }

src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/PlayerListMixin.java

@@ -43,17 +43,4 @@ abstract class PlayerListMixin {
     )
     private void doNotAdjustVD(final PlayerList instance, final Packet<?> packet) {}
 
-
-    /**
-     * @reason The RegionizedPlayerChunkLoader will handle the SD packet
-     * @author Spottedleaf
-     */
-    @Redirect(
-        method = "setSimulationDistance",
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/server/players/PlayerList;broadcastAll(Lnet/minecraft/network/protocol/Packet;)V"
-        )
-    )
-    private void doNotAdjustSD(final PlayerList instance, final Packet<?> packet) {}
 }

src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/PoiManagerMixin.java

@@ -36,7 +36,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Optional;
-import java.util.function.BiFunction;
 import java.util.function.BooleanSupplier;
 import java.util.function.Function;
 import java.util.function.Predicate;
@@ -45,14 +44,7 @@ import java.util.stream.Stream;
 @Mixin(PoiManager.class)
 // Declare the generic type as Object so that our Overrides match the method signature of the superclass
 // Specifically, getOrCreate must return Object so that existing invokes do not route to the superclass
-public abstract class PoiManagerMixin extends SectionStorage<Object, Object> implements ChunkSystemPoiManager {
-
-    public PoiManagerMixin(final SimpleRegionStorage simpleRegionStorage, final Codec<Object> codec, final Function<Object, Object> function,
-                           final BiFunction<Object, Runnable, Object> biFunction, final Function<Runnable, Object> function2,
-                           final RegistryAccess registryAccess, final ChunkIOErrorReporter chunkIOErrorReporter,
-                           final LevelHeightAccessor levelHeightAccessor) {
-        super(simpleRegionStorage, codec, function, biFunction, function2, registryAccess, chunkIOErrorReporter, levelHeightAccessor);
-    }
+public abstract class PoiManagerMixin extends SectionStorage<Object> implements ChunkSystemPoiManager {
 
     @Shadow
     abstract boolean isVillageCenter(long l);
@@ -60,6 +52,10 @@ public abstract class PoiManagerMixin extends SectionStorage<Object, Object> imp
     @Shadow
     public abstract void checkConsistencyWithBlocks(SectionPos sectionPos, LevelChunkSection levelChunkSection);
 
+    public PoiManagerMixin(SimpleRegionStorage simpleRegionStorage, Function<Runnable, Codec<Object>> function, Function<Runnable, Object> function2, RegistryAccess registryAccess, ChunkIOErrorReporter chunkIOErrorReporter, LevelHeightAccessor levelHeightAccessor) {
+        super(simpleRegionStorage, function, function2, registryAccess, chunkIOErrorReporter, levelHeightAccessor);
+    }
+
     @Unique
     private ServerLevel world;
 
@@ -155,8 +151,8 @@ public abstract class PoiManagerMixin extends SectionStorage<Object, Object> imp
 
         TickThread.ensureTickThread(this.world, chunkX, chunkZ, "Accessing poi chunk off-main");
 
-        final PoiChunk ret = ((ChunkSystemServerLevel)this.world).moonrise$getChunkTaskScheduler().chunkHolderManager
-            .getPoiChunkIfLoaded(chunkX, chunkZ, true);
+        final ChunkHolderManager manager = ((ChunkSystemServerLevel)this.world).moonrise$getChunkTaskScheduler().chunkHolderManager;
+        final PoiChunk ret = manager.getPoiChunkIfLoaded(chunkX, chunkZ, true);
 
         return ret == null ? Optional.empty() : (Optional)ret.getSectionForVanilla(chunkY);
     }
@@ -210,13 +206,9 @@ public abstract class PoiManagerMixin extends SectionStorage<Object, Object> imp
     public final void moonrise$onUnload(final long coordinate) { // Paper - rewrite chunk system
         final int chunkX = CoordinateUtils.getChunkX(coordinate);
         final int chunkZ = CoordinateUtils.getChunkZ(coordinate);
-
-        final int minY = WorldUtil.getMinSection(this.world);
-        final int maxY = WorldUtil.getMaxSection(this.world);
-
         TickThread.ensureTickThread(this.world, chunkX, chunkZ, "Unloading poi chunk off-main");
-        for (int sectionY = minY; sectionY <= maxY; ++sectionY) {
-            final long sectionPos = SectionPos.asLong(chunkX, sectionY, chunkZ);
+        for (int section = this.levelHeightAccessor.getMinSection(); section < this.levelHeightAccessor.getMaxSection(); ++section) {
+            final long sectionPos = SectionPos.asLong(chunkX, section, chunkZ);
             this.updateDistanceTracking(sectionPos);
         }
     }
@@ -225,12 +217,8 @@ public abstract class PoiManagerMixin extends SectionStorage<Object, Object> imp
     public final void moonrise$loadInPoiChunk(final PoiChunk poiChunk) {
         final int chunkX = poiChunk.chunkX;
         final int chunkZ = poiChunk.chunkZ;
-
-        final int minY = WorldUtil.getMinSection(this.world);
-        final int maxY = WorldUtil.getMaxSection(this.world);
-
         TickThread.ensureTickThread(this.world, chunkX, chunkZ, "Loading poi chunk off-main");
-        for (int sectionY = minY; sectionY <= maxY; ++sectionY) {
+        for (int sectionY = this.levelHeightAccessor.getMinSection(); sectionY < this.levelHeightAccessor.getMaxSection(); ++sectionY) {
             final PoiSection section = poiChunk.getSection(sectionY);
             if (section != null && !((ChunkSystemPoiSection)section).moonrise$isEmpty()) {
                 this.onSectionLoad(SectionPos.asLong(chunkX, sectionY, chunkZ));
@@ -266,4 +254,20 @@ public abstract class PoiManagerMixin extends SectionStorage<Object, Object> imp
     private <T> Stream<T> skipLoadedSet(final Stream<T> instance, final Predicate<? super T> predicate) {
         return instance;
     }
+
+    @Override
+    public final void moonrise$close() throws IOException {}
+
+    @Override
+    public final CompoundTag moonrise$read(final int chunkX, final int chunkZ) throws IOException {
+        return MoonriseRegionFileIO.loadData(
+                this.world, chunkX, chunkZ, MoonriseRegionFileIO.RegionFileType.POI_DATA,
+                MoonriseRegionFileIO.getIOBlockingPriorityForCurrentThread()
+        );
+    }
+
+    @Override
+    public final void moonrise$write(final int chunkX, final int chunkZ, final CompoundTag data) throws IOException {
+        MoonriseRegionFileIO.scheduleSave(this.world, chunkX, chunkZ, data, MoonriseRegionFileIO.RegionFileType.POI_DATA);
+    }
 }

src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/PoiSectionMixin.java

@@ -30,7 +30,7 @@ abstract class PoiSectionMixin implements ChunkSystemPoiSection {
 
 
     @Unique
-    private final Optional<PoiSection> noAllocOptional = Optional.of((PoiSection)(Object)this);
+    private final Optional<PoiSection> noAllocOptional = Optional.of((PoiSection)(Object)this);;
 
     @Override
     public final boolean moonrise$isEmpty() {

src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/SectionStorageMixin.java

@@ -2,6 +2,8 @@ package ca.spottedleaf.moonrise.mixin.chunk_system;
 
 import ca.spottedleaf.moonrise.patches.chunk_system.level.storage.ChunkSystemSectionStorage;
 import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
+import net.minecraft.resources.RegistryOps;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFileStorage;
 import net.minecraft.world.level.chunk.storage.SectionStorage;
@@ -21,11 +23,15 @@ import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
 @Mixin(SectionStorage.class)
-abstract class SectionStorageMixin<R, P> implements ChunkSystemSectionStorage, AutoCloseable {
+abstract class SectionStorageMixin implements ChunkSystemSectionStorage, AutoCloseable {
 
     @Shadow
     private SimpleRegionStorage simpleRegionStorage;
 
+    @Shadow
+    @Final
+    private static Logger LOGGER;
+
 
     @Unique
     private RegionFileStorage storage;
@@ -35,9 +41,6 @@ abstract class SectionStorageMixin<R, P> implements ChunkSystemSectionStorage, A
         return this.storage;
     }
 
-    @Override
-    public void moonrise$close() throws IOException {}
-
     /**
      * @reason Retrieve storage from IOWorker, and then nuke it
      * @author Spottedleaf
@@ -58,8 +61,12 @@ abstract class SectionStorageMixin<R, P> implements ChunkSystemSectionStorage, A
      * @author Spottedleaf
      */
     @Overwrite
-    public final CompletableFuture<Optional<SectionStorage.PackedChunk<P>>> tryRead(final ChunkPos pos) {
-        throw new IllegalStateException("Only chunk system can write state, offending class:" + this.getClass().getName());
+    public final CompletableFuture<Optional<CompoundTag>> tryRead(final ChunkPos pos) {
+        try {
+            return CompletableFuture.completedFuture(Optional.ofNullable(this.moonrise$read(pos.x, pos.z)));
+        } catch (final Throwable thr) {
+            return CompletableFuture.failedFuture(thr);
+        }
     }
 
     /**
@@ -67,17 +74,29 @@ abstract class SectionStorageMixin<R, P> implements ChunkSystemSectionStorage, A
      * @author Spottedleaf
      */
     @Overwrite
-    public void unpackChunk(final ChunkPos chunkPos, final SectionStorage.PackedChunk<P> packedChunk) {
+    public void readColumn(final ChunkPos pos, final RegistryOps<Tag> ops, final CompoundTag data) {
         throw new IllegalStateException("Only chunk system can load in state, offending class:" + this.getClass().getName());
     }
 
     /**
-     * @reason Destroy old chunk system hook
+     * @reason Route to new chunk system hook
      * @author Spottedleaf
      */
-    @Overwrite
-    private void writeChunk(final ChunkPos chunkPos) {
-        throw new IllegalStateException("Only chunk system can write state, offending class:" + this.getClass().getName());
+    @Redirect(
+            method = "writeColumn(Lnet/minecraft/world/level/ChunkPos;)V",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/world/level/chunk/storage/SimpleRegionStorage;write(Lnet/minecraft/world/level/ChunkPos;Lnet/minecraft/nbt/CompoundTag;)Ljava/util/concurrent/CompletableFuture;"
+            )
+    )
+    private CompletableFuture<Void> redirectWrite(final SimpleRegionStorage instance, final ChunkPos pos,
+                                                  final CompoundTag tag) {
+        try {
+            this.moonrise$write(pos.x, pos.z, tag);
+        } catch (final IOException ex) {
+            LOGGER.error("Error writing poi chunk data to disk for chunk " + pos, ex);
+        }
+        return null;
     }
 
     /**
@@ -94,4 +113,4 @@ abstract class SectionStorageMixin<R, P> implements ChunkSystemSectionStorage, A
     private void redirectClose(final SimpleRegionStorage instance) throws IOException {
         this.moonrise$close();
     }
-}
+}

src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/ServerChunkCacheMixin.java

@@ -24,7 +24,6 @@ import net.minecraft.world.level.chunk.ChunkSource;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.LightChunk;
 import net.minecraft.world.level.chunk.status.ChunkStatus;
-import net.minecraft.world.level.storage.DimensionDataStorage;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
@@ -52,10 +51,6 @@ abstract class ServerChunkCacheMixin extends ChunkSource implements ChunkSystemS
     @Final
     public ServerLevel level;
 
-    @Shadow
-    @Final
-    private DimensionDataStorage dataStorage;
-
     @Unique
     private final ConcurrentLong2ReferenceChainedHashTable<LevelChunk> fullChunks = new ConcurrentLong2ReferenceChainedHashTable<>();
 
@@ -86,13 +81,6 @@ abstract class ServerChunkCacheMixin extends ChunkSource implements ChunkSystemS
                 completable::complete
         );
 
-        if (!completable.isDone() && chunkTaskScheduler.hasShutdown()) {
-            throw new IllegalStateException(
-                "Chunk system has shut down, cannot process chunk requests in world '" + ca.spottedleaf.moonrise.common.util.WorldUtil.getWorldName(this.level) + "' at "
-                    + "(" + chunkX + "," + chunkZ + ") status: " + toStatus
-            );
-        }
-
         if (TickThread.isTickThreadFor(this.level, chunkX, chunkZ)) {
             ChunkTaskScheduler.pushChunkWait(this.level, chunkX, chunkZ);
             this.mainThreadProcessor.managedBlock(completable::isDone);
@@ -273,7 +261,6 @@ abstract class ServerChunkCacheMixin extends ChunkSource implements ChunkSystemS
     @Override
     @Overwrite
     public void close() throws IOException {
-        this.dataStorage.close();
         ((ChunkSystemServerLevel)this.level).moonrise$getChunkTaskScheduler().chunkHolderManager.close(true, true);
     }
 
@@ -322,28 +309,12 @@ abstract class ServerChunkCacheMixin extends ChunkSource implements ChunkSystemS
         return false;
     }
 
-
-    /**
-     * @reason We need to use {@link ChunkHolder#getChunkToSend()} as the new chunk system will not bring every chunk
-     *         sent to players up to block ticking.
-     * @author Spottedleaf
-     */
-    @Redirect(
-        method = "broadcastChangedChunks",
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/server/level/ChunkHolder;getTickingChunk()Lnet/minecraft/world/level/chunk/LevelChunk;")
-    )
-    private LevelChunk redirectTickingChunk(final ChunkHolder instance) {
-        return instance.getChunkToSend();
-    }
-
     /**
      * @reason Perform mid-tick chunk task processing during chunk tick
      * @author Spottedleaf
      */
     @Inject(
-            method = "tickChunks(Lnet/minecraft/util/profiling/ProfilerFiller;JLjava/util/List;)V",
+            method = "tickChunks",
             at = @At(
                     value = "INVOKE",
                     shift = At.Shift.AFTER,
@@ -364,13 +335,60 @@ abstract class ServerChunkCacheMixin extends ChunkSource implements ChunkSystemS
      * @author Spottedleaf
      */
     @Redirect(
-        method = "tickChunks(Lnet/minecraft/util/profiling/ProfilerFiller;JLjava/util/List;)V",
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/server/level/ServerLevel;shouldTickBlocksAt(J)Z"
-        )
+            method = "tickChunks",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/server/level/ServerLevel;isNaturalSpawningAllowed(Lnet/minecraft/world/level/ChunkPos;)Z"
+            )
+    )
+    private boolean shortNaturalSpawning(final ServerLevel instance, final ChunkPos chunkPos) {
+        return true;
+    }
+
+    /**
+     * @reason In the chunk system, ticking chunks always have loaded entities. Of course, they are also always
+     *         marked to be as ticking as well.
+     * @author Spottedleaf
+     */
+    @Redirect(
+            method = "tickChunks",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lnet/minecraft/server/level/ServerLevel;shouldTickBlocksAt(J)Z"
+            )
     )
     private boolean shortShouldTickBlocks(final ServerLevel instance, final long pos) {
         return true;
     }
+
+    /**
+     * @reason Since chunks in non-simulation range are only brought up to FULL status, not TICKING,
+     * those chunks may not be present in the ticking list and as a result we need to use our own list
+     * to ensure these chunks broadcast changes
+     * @author Spottedleaf
+     */
+    @Redirect(
+        method = "tickChunks",
+        at = @At(
+            value = "INVOKE",
+            target = "Ljava/util/List;forEach(Ljava/util/function/Consumer;)V"
+        )
+    )
+    private void fixBroadcastChanges(final List<ServerChunkCache.ChunkAndHolder> instance,
+                                     final Consumer<ServerChunkCache.ChunkAndHolder> consumer) {
+        final ReferenceList<ChunkHolder> unsyncedChunks = ((ChunkSystemServerLevel)this.level).moonrise$getUnsyncedChunks();
+        final ChunkHolder[] chunkHolders = unsyncedChunks.getRawDataUnchecked();
+        final int totalUnsyncedChunks = unsyncedChunks.size();
+
+        Objects.checkFromToIndex(0, totalUnsyncedChunks, chunkHolders.length);
+        for (int i = 0; i < totalUnsyncedChunks; ++i) {
+            final ChunkHolder chunkHolder = chunkHolders[i];
+            final LevelChunk chunk = chunkHolder.getChunkToSend();
+            if (chunk != null) {
+                chunkHolder.broadcastChanges(chunk);
+            }
+        }
+
+        ((ChunkSystemServerLevel)this.level).moonrise$clearUnsyncedChunks();
+    }
 }

src/main/java/ca/spottedleaf/moonrise/mixin/chunk_system/ServerLevelMixin.java

@@ -86,8 +86,8 @@ abstract class ServerLevelMixin extends Level implements ChunkSystemServerLevel,
     @Final
     private ServerChunkCache chunkSource;
 
-    protected ServerLevelMixin(final WritableLevelData writableLevelData, final ResourceKey<Level> resourceKey, final RegistryAccess registryAccess, final Holder<DimensionType> holder, final boolean bl, final boolean bl2, final long l, final int i) {
-        super(writableLevelData, resourceKey, registryAccess, holder, bl, bl2, l, i);
+    protected ServerLevelMixin(WritableLevelData writableLevelData, ResourceKey<Level> resourceKey, RegistryAccess registryAccess, Holder<DimensionType> holder, Supplier<ProfilerFiller> supplier, boolean bl, boolean bl2, long l, int i) {
+        super(writableLevelData, resourceKey, registryAccess, holder, supplier, bl, bl2, l, i);
     }
 
     @Unique
@@ -123,6 +123,9 @@ abstract class ServerLevelMixin extends Level implements ChunkSystemServerLevel,
     @Unique
     private static final ServerChunkCache.ChunkAndHolder[] EMPTY_CHUNK_AND_HOLDERS = new ServerChunkCache.ChunkAndHolder[0];
 
+    @Unique
+    private static final ChunkHolder[] EMPTY_CHUNK_HOLDERS = new ChunkHolder[0];
+
     @Unique
     private final ReferenceList<ServerChunkCache.ChunkAndHolder> loadedChunks = new ReferenceList<>(EMPTY_CHUNK_AND_HOLDERS);
 
@@ -132,6 +135,9 @@ abstract class ServerLevelMixin extends Level implements ChunkSystemServerLevel,
     @Unique
     private final ReferenceList<ServerChunkCache.ChunkAndHolder> entityTickingChunks = new ReferenceList<>(EMPTY_CHUNK_AND_HOLDERS);
 
+    @Unique
+    private final ReferenceList<ChunkHolder> unsyncedChunks = new ReferenceList<>(EMPTY_CHUNK_HOLDERS);
+
     /**
      * @reason Initialise fields / destroy entity manager state
      * @author Spottedleaf
@@ -348,6 +354,45 @@ abstract class ServerLevelMixin extends Level implements ChunkSystemServerLevel,
         return this.entityTickingChunks;
     }
 
+    @Override
+    public final ReferenceList<ChunkHolder> moonrise$getUnsyncedChunks() {
+        return this.unsyncedChunks;
+    }
+
+    @Override
+    public final void moonrise$addUnsyncedChunk(final ChunkHolder chunkHolder) {
+        if (((ChunkSystemChunkHolder)chunkHolder).moonrise$isMarkedDirtyForPlayers()) {
+            return;
+        }
+
+        ((ChunkSystemChunkHolder)chunkHolder).moonrise$markDirtyForPlayers(true);
+        this.unsyncedChunks.add(chunkHolder);
+    }
+
+    @Override
+    public final void moonrise$removeUnsyncedChunk(final ChunkHolder chunkHolder) {
+        if (!((ChunkSystemChunkHolder)chunkHolder).moonrise$isMarkedDirtyForPlayers()) {
+            return;
+        }
+
+        ((ChunkSystemChunkHolder)chunkHolder).moonrise$markDirtyForPlayers(false);
+        this.unsyncedChunks.remove(chunkHolder);
+    }
+
+    @Override
+    public final void moonrise$clearUnsyncedChunks() {
+        final ChunkHolder[] chunkHolders = this.unsyncedChunks.getRawDataUnchecked();
+        final int totalUnsyncedChunks = this.unsyncedChunks.size();
+
+        Objects.checkFromToIndex(0, totalUnsyncedChunks, chunkHolders.length);
+        for (int i = 0; i < totalUnsyncedChunks; ++i) {
+            final ChunkHolder chunkHolder = chunkHolders[i];
+
+            ((ChunkSystemChunkHolder)chunkHolder).moonrise$markDirtyForPlayers(false);
+        }
+        this.unsyncedChunks.clear();
+    }
+
     @Override
     public final boolean moonrise$areChunksLoaded(final int fromX, final int fromZ, final int toX, final int toZ) {
         final ServerChunkCache chunkSource = this.chunkSource;

src/main/java/ca/spottedleaf/moonrise/mixin/chunk_tick_iteration/ChunkMapMixin.java

@@ -84,21 +84,12 @@ abstract class ChunkMapMixin {
         ((ChunkTickDistanceManager)this.distanceManager).moonrise$removePlayer(player, SectionPos.of(player));
     }
 
-    /**
-     * @reason Avoid checking first if there are nearby players, as we make internal perform this implicitly.
-     * @author Spottedleaf
-     */
-    @Overwrite
-    public boolean anyPlayerCloseEnoughForSpawning(final ChunkPos pos) {
-        return this.anyPlayerCloseEnoughForSpawningInternal(pos);
-    }
-
     /**
      * @reason Use nearby players to avoid iterating over all online players
      * @author Spottedleaf
      */
     @Overwrite
-    public boolean anyPlayerCloseEnoughForSpawningInternal(final ChunkPos pos) {
+    public boolean anyPlayerCloseEnoughForSpawning(final ChunkPos pos) {
         final ReferenceList<ServerPlayer> players = ((ChunkSystemServerLevel)this.level).moonrise$getNearbyPlayers().getPlayers(
                 pos, NearbyPlayers.NearbyMapType.SPAWN_RANGE
         );

src/main/java/ca/spottedleaf/moonrise/mixin/chunk_tick_iteration/DistanceManagerMixin.java

@@ -4,7 +4,6 @@ import ca.spottedleaf.moonrise.common.misc.PositionCountingAreaMap;
 import ca.spottedleaf.moonrise.common.util.CoordinateUtils;
 import ca.spottedleaf.moonrise.patches.chunk_tick_iteration.ChunkTickConstants;
 import ca.spottedleaf.moonrise.patches.chunk_tick_iteration.ChunkTickDistanceManager;
-import it.unimi.dsi.fastutil.longs.LongIterator;
 import net.minecraft.core.SectionPos;
 import net.minecraft.server.level.DistanceManager;
 import net.minecraft.server.level.ServerPlayer;
@@ -107,13 +106,4 @@ abstract class DistanceManagerMixin implements ChunkTickDistanceManager {
     public boolean hasPlayersNearby(final long pos) {
         return this.spawnChunkTracker.hasObjectsNear(CoordinateUtils.getChunkX(pos), CoordinateUtils.getChunkZ(pos));
     }
-
-    /**
-     * @reason Use spawnChunkTracker instead
-     * @author Spottedleaf
-     */
-    @Overwrite
-    public LongIterator getSpawnCandidateChunks() {
-        return this.spawnChunkTracker.getPositions().iterator();
-    }
 }

src/main/java/ca/spottedleaf/moonrise/mixin/chunk_tick_iteration/ServerChunkCacheMixin.java

@@ -2,11 +2,13 @@ package ca.spottedleaf.moonrise.mixin.chunk_tick_iteration;
 
 import ca.spottedleaf.moonrise.common.list.ReferenceList;
 import ca.spottedleaf.moonrise.common.misc.NearbyPlayers;
-import ca.spottedleaf.moonrise.common.util.SimpleThreadUnsafeRandom;
+import ca.spottedleaf.moonrise.common.util.SimpleRandom;
 import ca.spottedleaf.moonrise.patches.chunk_system.level.chunk.ChunkData;
 import ca.spottedleaf.moonrise.patches.chunk_system.level.chunk.ChunkSystemChunkHolder;
 import ca.spottedleaf.moonrise.patches.chunk_system.level.chunk.ChunkSystemLevelChunk;
 import ca.spottedleaf.moonrise.patches.chunk_tick_iteration.ChunkTickServerLevel;
+import com.llamalad7.mixinextras.sugar.Local;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import net.minecraft.Util;
 import net.minecraft.server.level.ChunkMap;
 import net.minecraft.server.level.ServerChunkCache;
@@ -16,15 +18,22 @@ import net.minecraft.util.RandomSource;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.ChunkSource;
 import net.minecraft.world.level.chunk.LevelChunk;
+import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
 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.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Consumer;
 
 @Mixin(ServerChunkCache.class)
 abstract class ServerChunkCacheMixin extends ChunkSource {
@@ -33,18 +42,110 @@ abstract class ServerChunkCacheMixin extends ChunkSource {
     @Final
     public ServerLevel level;
 
-    @Shadow
-    @Final
-    public ChunkMap chunkMap;
-
+    @Unique
+    private ServerChunkCache.ChunkAndHolder[] iterationCopy;
 
     @Unique
-    private final SimpleThreadUnsafeRandom shuffleRandom = new SimpleThreadUnsafeRandom(0L);
+    private int iterationCopyLen;
 
     @Unique
-    private boolean isChunkNearPlayer(final ChunkMap chunkMap, final ChunkPos chunkPos, final LevelChunk levelChunk) {
-        final ChunkData chunkData = ((ChunkSystemChunkHolder)((ChunkSystemLevelChunk)levelChunk).moonrise$getChunkAndHolder().holder())
-            .moonrise$getRealChunkHolder().holderData;
+    private final SimpleRandom shuffleRandom = new SimpleRandom(0L);
+
+    /**
+     * @reason Avoid creating the list, which is sized at the chunkholder count. The actual number of ticking
+     *         chunks is always lower. The mixin below will initialise the list to non-null.
+     * @author Spottedleaf
+     */
+    @Redirect(
+            method = "tickChunks",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Lcom/google/common/collect/Lists;newArrayListWithCapacity(I)Ljava/util/ArrayList;"
+            )
+    )
+    private <T> ArrayList<T> avoidListCreation(final int initialArraySize) {
+        return null;
+    }
+
+    /**
+     * @reason Initialise the list to contain only the ticking chunks.
+     * @author Spottedleaf
+     */
+    @ModifyVariable(
+            method = "tickChunks",
+            at = @At(
+                    value = "STORE",
+                    opcode = Opcodes.ASTORE,
+                    ordinal = 0
+            )
+    )
+    private List<ServerChunkCache.ChunkAndHolder> initTickChunks(final List<ServerChunkCache.ChunkAndHolder> shouldBeNull) {
+        final ReferenceList<ServerChunkCache.ChunkAndHolder> tickingChunks =
+                ((ChunkTickServerLevel)this.level).moonrise$getPlayerTickingChunks();
+
+        final ServerChunkCache.ChunkAndHolder[] raw = tickingChunks.getRawDataUnchecked();
+        final int size = tickingChunks.size();
+
+        if (this.iterationCopy == null || this.iterationCopy.length < size) {
+            this.iterationCopy = new ServerChunkCache.ChunkAndHolder[raw.length];
+        }
+        this.iterationCopyLen = size;
+        System.arraycopy(raw, 0, this.iterationCopy, 0, size);
+
+        return ObjectArrayList.wrap(
+                this.iterationCopy, size
+        );
+    }
+
+    /**
+     * @reason Use random implementation which does not use CAS and has a faster nextInt(int)
+     *         function
+     * @author Spottedleaf
+     */
+    @Redirect(
+        method = "tickChunks",
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/Util;shuffle(Ljava/util/List;Lnet/minecraft/util/RandomSource;)V"
+        )
+    )
+    private <T> void useBetterRandom(final List<T> list, final RandomSource randomSource) {
+        this.shuffleRandom.setSeed(randomSource.nextLong());
+        Util.shuffle(list, this.shuffleRandom);
+    }
+
+    /**
+     * @reason Do not initialise ticking chunk list, as we did that above.
+     * @author Spottedleaf
+     */
+    @Redirect(
+            method = "tickChunks",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Ljava/util/Iterator;hasNext()Z",
+                    ordinal = 0
+            )
+    )
+    private <E> boolean skipTickAdd(final Iterator<E> instance) {
+        return false;
+    }
+
+    /**
+     * @reason Use the nearby players cache
+     * @author Spottedleaf
+     */
+    @Redirect(
+        method = "tickChunks",
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/server/level/ChunkMap;anyPlayerCloseEnoughForSpawning(Lnet/minecraft/world/level/ChunkPos;)Z"
+        )
+    )
+    private boolean useNearbyCache(final ChunkMap instance, final ChunkPos chunkPos,
+                                   @Local(ordinal = 0, argsOnly = false) final LevelChunk levelChunk) {
+        final ChunkData chunkData =
+            ((ChunkSystemChunkHolder)((ChunkSystemLevelChunk)levelChunk).moonrise$getChunkAndHolder().holder())
+                .moonrise$getRealChunkHolder().holderData;
         final NearbyPlayers.TrackedChunk nearbyPlayers = chunkData.nearbyPlayers;
         if (nearbyPlayers == null) {
             return false;
@@ -61,7 +162,7 @@ abstract class ServerChunkCacheMixin extends ChunkSource {
 
         Objects.checkFromIndexSize(0, len, raw.length);
         for (int i = 0; i < len; ++i) {
-            if (chunkMap.playerIsCloseEnoughForSpawning(raw[i], chunkPos)) {
+            if (instance.playerIsCloseEnoughForSpawning(raw[i], chunkPos)) {
                 return true;
             }
         }
@@ -70,47 +171,19 @@ abstract class ServerChunkCacheMixin extends ChunkSource {
     }
 
     /**
-     * @reason Use the player ticking chunks list, which already contains chunks that are:
-     *         1. block ticking
-     *         2. within spawn range (8 chunks on any axis)
+     * @reason Clear the iteration array after the list is done being used.
      * @author Spottedleaf
      */
-    @Overwrite
-    private void collectTickingChunks(final List<LevelChunk> list) {
-        final ReferenceList<ServerChunkCache.ChunkAndHolder> tickingChunks =
-            ((ChunkTickServerLevel)this.level).moonrise$getPlayerTickingChunks();
-
-        final ServerChunkCache.ChunkAndHolder[] raw = tickingChunks.getRawDataUnchecked();
-        final int size = tickingChunks.size();
-
-        final ChunkMap chunkMap = this.chunkMap;
-
-        for (int i = 0; i < size; ++i) {
-            final ServerChunkCache.ChunkAndHolder chunkAndHolder = raw[i];
-            final LevelChunk levelChunk = chunkAndHolder.chunk();
-
-            if (!this.isChunkNearPlayer(chunkMap, levelChunk.getPos(), levelChunk)) {
-                continue;
-            }
-
-            list.add(levelChunk);
-        }
-    }
-
-    /**
-     * @reason Use random implementation which does not use CAS and has a faster nextInt(int)
-     *         function
-     * @author Spottedleaf
-     */
-    @Redirect(
-        method = "tickChunks()V",
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/Util;shuffle(Ljava/util/List;Lnet/minecraft/util/RandomSource;)V"
-        )
+    @Inject(
+            method = "tickChunks",
+            at = @At(
+                    value = "INVOKE",
+                    target = "Ljava/util/List;forEach(Ljava/util/function/Consumer;)V",
+                    ordinal = 0,
+                    shift = At.Shift.AFTER
+            )
     )
-    private <T> void useBetterRandom(final List<T> list, final RandomSource randomSource) {
-        this.shuffleRandom.setSeed(randomSource.nextLong());
-        Util.shuffle(list, this.shuffleRandom);
+    private void broadcastChanges(final CallbackInfo ci) {
+        Arrays.fill(this.iterationCopy, 0, this.iterationCopyLen, null);
     }
 }

src/main/java/ca/spottedleaf/moonrise/mixin/collisions/ArmorStandMixin.java

@@ -6,32 +6,37 @@ import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.entity.decoration.ArmorStand;
 import net.minecraft.world.entity.vehicle.AbstractMinecart;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.AABB;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.Overwrite;
+import org.spongepowered.asm.mixin.Shadow;
 import java.util.List;
 import java.util.function.Predicate;
 
 @Mixin(ArmorStand.class)
 abstract class ArmorStandMixin extends LivingEntity {
 
+    @Shadow
+    @Final
+    private static Predicate<Entity> RIDABLE_MINECARTS;
+
     protected ArmorStandMixin(EntityType<? extends LivingEntity> entityType, Level level) {
         super(entityType, level);
     }
 
     /**
-     * @reason Optimise by making it use the class lookup
+     * @reason Optimise this method by making it use the class lookup
      * @author Spottedleaf
      */
-    @Redirect(
-        method = "pushEntities",
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/world/level/Level;getEntities(Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/AABB;Ljava/util/function/Predicate;)Ljava/util/List;"
-        )
-    )
-    private List<Entity> redirectGetEntities(final Level instance, final Entity entity, final AABB list, final Predicate<? super Entity> arg) {
-        return (List)this.level().getEntitiesOfClass(AbstractMinecart.class, this.getBoundingBox(), arg);
+    @Overwrite
+    public void pushEntities() {
+        final List<AbstractMinecart> nearby = this.level().getEntitiesOfClass(AbstractMinecart.class, this.getBoundingBox(), RIDABLE_MINECARTS);
+
+        for (int i = 0, len = nearby.size(); i < len; ++i) {
+            final AbstractMinecart minecart = nearby.get(i);
+            if (this.distanceToSqr(minecart) <= 0.2) {
+                minecart.push(this);
+            }
+        }
     }
 }

src/main/java/ca/spottedleaf/moonrise/mixin/collisions/BlockStateBaseMixin.java

@@ -5,12 +5,16 @@ import ca.spottedleaf.moonrise.patches.collisions.shape.CollisionVoxelShape;
 import com.mojang.serialization.MapCodec;
 import it.unimi.dsi.fastutil.HashCommon;
 import it.unimi.dsi.fastutil.objects.Reference2ObjectArrayMap;
+import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateHolder;
 import net.minecraft.world.level.block.state.properties.Property;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.shapes.CollisionContext;
 import net.minecraft.world.phys.shapes.Shapes;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import org.spongepowered.asm.mixin.Mixin;
@@ -28,13 +32,7 @@ abstract class BlockStateBaseMixin extends StateHolder<Block, BlockState> implem
     protected BlockBehaviour.BlockStateBase.Cache cache;
 
     @Shadow
-    public abstract boolean isAir();
-
-    @Shadow
-    public VoxelShape[] occlusionShapesByFace;
-
-    @Shadow
-    public VoxelShape occlusionShape;
+    public abstract VoxelShape getCollisionShape(BlockGetter blockGetter, BlockPos blockPos, CollisionContext collisionContext);
 
     protected BlockStateBaseMixin(Block object, Reference2ObjectArrayMap<Property<?>, Comparable<?>> reference2ObjectArrayMap, MapCodec<BlockState> mapCodec) {
         super(object, reference2ObjectArrayMap, mapCodec);
@@ -76,7 +74,7 @@ abstract class BlockStateBaseMixin extends StateHolder<Block, BlockState> implem
         }
         if (neighbours) {
             for (final Direction direction : DIRECTIONS_CACHED) {
-                initCaches(((CollisionVoxelShape)shape).moonrise$getFaceShapeClamped(direction), false);
+                initCaches(Shapes.getFaceShape(shape, direction), false);
                 initCaches(shape.getFaceShape(direction), false);
             }
         }
@@ -95,9 +93,10 @@ abstract class BlockStateBaseMixin extends StateHolder<Block, BlockState> implem
     private void initCollisionState(final CallbackInfo ci) {
         if (this.cache != null) {
             final VoxelShape collisionShape = this.cache.collisionShape;
-            if (this.isAir()) {
-                this.constantCollisionShape = Shapes.empty();
-            } else {
+            try {
+                this.constantCollisionShape = this.getCollisionShape(null, null, null);
+            } catch (final Throwable throwable) {
+                // :(
                 this.constantCollisionShape = null;
             }
             this.occludesFullBlock = ((CollisionVoxelShape)collisionShape).moonrise$occludesFullBlock();
@@ -108,21 +107,17 @@ abstract class BlockStateBaseMixin extends StateHolder<Block, BlockState> implem
             if (this.constantCollisionShape != null) {
                 initCaches(this.constantCollisionShape, true);
             }
+            if (this.cache.occlusionShapes != null) {
+                for (final VoxelShape shape : this.cache.occlusionShapes) {
+                    initCaches(shape, false);
+                }
+            }
         } else {
             this.occludesFullBlock = false;
             this.emptyCollisionShape = false;
             this.emptyConstantCollisionShape = false;
             this.constantCollisionShape = null;
         }
-
-        if (this.occlusionShape != null) {
-            initCaches(this.occlusionShape, true);
-        }
-        if (this.occlusionShapesByFace != null) {
-            for (final VoxelShape shape : this.occlusionShapesByFace) {
-                initCaches(shape, true);
-            }
-        }
     }
 
     @Override

src/main/java/ca/spottedleaf/moonrise/mixin/collisions/EntityGetterMixin.java

@@ -74,7 +74,7 @@ interface EntityGetterMixin {
     @Overwrite
     default boolean isUnobstructed(final Entity entity, final VoxelShape voxel) {
         if (voxel.isEmpty()) {
-            return true;
+            return false;
         }
 
         final AABB singleAABB = ((CollisionVoxelShape)voxel).moonrise$getSingleAABBRepresentation();

src/main/java/ca/spottedleaf/moonrise/mixin/collisions/EntityMixin.java

@@ -1,16 +1,20 @@
 package ca.spottedleaf.moonrise.mixin.collisions;
 
 import ca.spottedleaf.moonrise.common.util.WorldUtil;
+import ca.spottedleaf.moonrise.patches.chunk_system.level.ChunkSystemLevel;
 import ca.spottedleaf.moonrise.patches.collisions.CollisionUtil;
 import ca.spottedleaf.moonrise.patches.collisions.block.CollisionBlockState;
 import ca.spottedleaf.moonrise.patches.collisions.shape.CollisionVoxelShape;
+import ca.spottedleaf.moonrise.patches.collisions.util.NoneMatchStream;
 import it.unimi.dsi.fastutil.floats.FloatArraySet;
 import it.unimi.dsi.fastutil.floats.FloatArrays;
 import net.minecraft.core.BlockPos;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityDimensions;
 import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkSource;
 import net.minecraft.world.level.chunk.LevelChunkSection;
@@ -23,8 +27,11 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 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.Redirect;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Stream;
 
 @Mixin(Entity.class)
 abstract class EntityMixin {
@@ -50,6 +57,12 @@ abstract class EntityMixin {
     @Shadow
     private boolean onGround;
 
+    @Shadow
+    public abstract boolean isAlive();
+
+    @Shadow
+    protected abstract void onInsideBlock(final BlockState blockState);
+
     @Unique
     private static float[] calculateStepHeights(final AABB box, final List<VoxelShape> voxels, final List<AABB> aabbs, final float stepHeight,
                                                 final float collidedY) {
@@ -283,4 +296,163 @@ abstract class EntityMixin {
 
         return false;
     }
+
+    /**
+     * @reason Avoid streams for retrieving blocks
+     * @author Spottedleaf
+     */
+    @Redirect(
+        method = "move",
+        at = @At(
+            value = "INVOKE",
+            target = "Lnet/minecraft/world/level/Level;getBlockStatesIfLoaded(Lnet/minecraft/world/phys/AABB;)Ljava/util/stream/Stream;",
+            ordinal = 0
+        )
+    )
+    private <T> Stream<T> avoidStreams(final Level world, final AABB boundingBox) {
+        final int minBlockX = Mth.floor(boundingBox.minX);
+        final int minBlockY = Mth.floor(boundingBox.minY);
+        final int minBlockZ = Mth.floor(boundingBox.minZ);
+
+        final int maxBlockX = Mth.floor(boundingBox.maxX);
+        final int maxBlockY = Mth.floor(boundingBox.maxY);
+        final int maxBlockZ = Mth.floor(boundingBox.maxZ);
+
+        final int minChunkX = minBlockX >> 4;
+        final int minChunkY = minBlockY >> 4;
+        final int minChunkZ = minBlockZ >> 4;
+
+        final int maxChunkX = maxBlockX >> 4;
+        final int maxChunkY = maxBlockY >> 4;
+        final int maxChunkZ = maxBlockZ >> 4;
+
+        if (!((ChunkSystemLevel)world).moonrise$areChunksLoaded(minChunkX, minChunkZ, maxChunkX, maxChunkZ)) {
+            return new NoneMatchStream<>(true);
+        }
+
+        final int minSection = WorldUtil.getMinSection(world);
+        final ChunkSource chunkSource = world.getChunkSource();
+
+        for (int currChunkZ = minChunkZ; currChunkZ <= maxChunkZ; ++currChunkZ) {
+            for (int currChunkX = minChunkX; currChunkX <= maxChunkX; ++currChunkX) {
+                final LevelChunkSection[] sections = chunkSource.getChunk(currChunkX, currChunkZ, ChunkStatus.FULL, false).getSections();
+
+                for (int currChunkY = minChunkY; currChunkY <= maxChunkY; ++currChunkY) {
+                    final int sectionIdx = currChunkY - minSection;
+                    if (sectionIdx < 0 || sectionIdx >= sections.length) {
+                        continue;
+                    }
+                    final LevelChunkSection section = sections[sectionIdx];
+                    if (section.hasOnlyAir()) {
+                        // empty
+                        continue;
+                    }
+
+                    final PalettedContainer<BlockState> blocks = section.states;
+
+                    final int minXIterate = currChunkX == minChunkX ? (minBlockX & 15) : 0;
+                    final int maxXIterate = currChunkX == maxChunkX ? (maxBlockX & 15) : 15;
+                    final int minZIterate = currChunkZ == minChunkZ ? (minBlockZ & 15) : 0;
+                    final int maxZIterate = currChunkZ == maxChunkZ ? (maxBlockZ & 15) : 15;
+                    final int minYIterate = currChunkY == minChunkY ? (minBlockY & 15) : 0;
+                    final int maxYIterate = currChunkY == maxChunkY ? (maxBlockY & 15) : 15;
+
+                    for (int currY = minYIterate; currY <= maxYIterate; ++currY) {
+                        for (int currZ = minZIterate; currZ <= maxZIterate; ++currZ) {
+                            for (int currX = minXIterate; currX <= maxXIterate; ++currX) {
+                                final BlockState blockState = blocks.get((currX) | (currZ << 4) | ((currY) << 8));
+
+                                if (blockState.is(Blocks.LAVA) || blockState.is(BlockTags.FIRE)) {
+                                    return new NoneMatchStream<>(false);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return new NoneMatchStream<>(true);
+    }
+
+    /**
+     * @reason Retrieve blocks more efficiently
+     * @author Spottedleaf
+     */
+    @Overwrite
+    public void checkInsideBlocks() {
+        final AABB boundingBox = this.getBoundingBox();
+
+        final int minBlockX = Mth.floor(boundingBox.minX + CollisionUtil.COLLISION_EPSILON);
+        final int minBlockY = Mth.floor(boundingBox.minY + CollisionUtil.COLLISION_EPSILON);
+        final int minBlockZ = Mth.floor(boundingBox.minZ + CollisionUtil.COLLISION_EPSILON);
+
+        final int maxBlockX = Mth.floor(boundingBox.maxX - CollisionUtil.COLLISION_EPSILON);
+        final int maxBlockY = Mth.floor(boundingBox.maxY - CollisionUtil.COLLISION_EPSILON);
+        final int maxBlockZ = Mth.floor(boundingBox.maxZ - CollisionUtil.COLLISION_EPSILON);
+
+        final int minChunkX = minBlockX >> 4;
+        final int minChunkY = minBlockY >> 4;
+        final int minChunkZ = minBlockZ >> 4;
+
+        final int maxChunkX = maxBlockX >> 4;
+        final int maxChunkY = maxBlockY >> 4;
+        final int maxChunkZ = maxBlockZ >> 4;
+
+        final Level world = this.level;
+
+        if (!((ChunkSystemLevel)world).moonrise$areChunksLoaded(minChunkX, minChunkZ, maxChunkX, maxChunkZ)) {
+            return;
+        }
+
+        final int minSection = WorldUtil.getMinSection(world);
+        final ChunkSource chunkSource = world.getChunkSource();
+        final BlockPos.MutableBlockPos mutablePos = new BlockPos.MutableBlockPos();
+
+        for (int currChunkZ = minChunkZ; currChunkZ <= maxChunkZ; ++currChunkZ) {
+            for (int currChunkX = minChunkX; currChunkX <= maxChunkX; ++currChunkX) {
+                final LevelChunkSection[] sections = chunkSource.getChunk(currChunkX, currChunkZ, ChunkStatus.FULL, false).getSections();
+
+                for (int currChunkY = minChunkY; currChunkY <= maxChunkY; ++currChunkY) {
+                    final int sectionIdx = currChunkY - minSection;
+                    if (sectionIdx < 0 || sectionIdx >= sections.length) {
+                        continue;
+                    }
+                    final LevelChunkSection section = sections[sectionIdx];
+                    if (section.hasOnlyAir()) {
+                        // empty
+                        continue;
+                    }
+
+                    final PalettedContainer<BlockState> blocks = section.states;
+
+                    final int minXIterate = currChunkX == minChunkX ? (minBlockX & 15) : 0;
+                    final int maxXIterate = currChunkX == maxChunkX ? (maxBlockX & 15) : 15;
+                    final int minZIterate = currChunkZ == minChunkZ ? (minBlockZ & 15) : 0;
+                    final int maxZIterate = currChunkZ == maxChunkZ ? (maxBlockZ & 15) : 15;
+                    final int minYIterate = currChunkY == minChunkY ? (minBlockY & 15) : 0;
+                    final int maxYIterate = currChunkY == maxChunkY ? (maxBlockY & 15) : 15;
+
+                    for (int currY = minYIterate; currY <= maxYIterate; ++currY) {
+                        mutablePos.setY(currY | (currChunkY << 4));
+                        for (int currZ = minZIterate; currZ <= maxZIterate; ++currZ) {
+                            mutablePos.setZ(currZ | (currChunkZ << 4));
+                            for (int currX = minXIterate; currX <= maxXIterate; ++currX) {
+                                mutablePos.setX(currX | (currChunkX << 4));
+
+                                final BlockState blockState = blocks.get((currX) | (currZ << 4) | ((currY) << 8));
+
+                                if (!this.isAlive()) {
+                                    return;
+                                }
+
+                                blockState.entityInside(world, mutablePos, (Entity)(Object)this);
+                                this.onInsideBlock(blockState);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
 }

src/main/java/ca/spottedleaf/moonrise/mixin/collisions/ExplosionMixin.java

@@ -1,5 +1,6 @@
 package ca.spottedleaf.moonrise.mixin.collisions;
 
+import ca.spottedleaf.moonrise.common.PlatformHooks;
 import ca.spottedleaf.moonrise.common.util.CoordinateUtils;
 import ca.spottedleaf.moonrise.patches.getblock.GetBlockChunk;
 import ca.spottedleaf.moonrise.patches.collisions.CollisionUtil;
@@ -9,15 +10,20 @@ import it.unimi.dsi.fastutil.doubles.DoubleArrayList;
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.Mth;
+import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.ai.attributes.Attributes;
+import net.minecraft.world.entity.item.PrimedTnt;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.ExplosionDamageCalculator;
-import net.minecraft.world.level.ServerExplosion;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.LevelChunk;
+import net.minecraft.world.level.gameevent.GameEvent;
 import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
@@ -27,20 +33,33 @@ import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 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.Redirect;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
-@Mixin(ServerExplosion.class)
-abstract class ServerExplosionMixin {
+@Mixin(Explosion.class)
+abstract class ExplosionMixin {
 
     @Shadow
     @Final
-    private ServerLevel level;
+    private Level level;
+
+    @Shadow
+    @Final
+    private Entity source;
+
+    @Shadow
+    @Final
+    private double x;
+
+    @Shadow
+    @Final
+    private double y;
+
+    @Shadow
+    @Final
+    private double z;
 
     @Shadow
     @Final
@@ -50,13 +69,21 @@ abstract class ServerExplosionMixin {
     @Final
     private float radius;
 
+    @Shadow
+    @Final
+    private ObjectArrayList<BlockPos> toBlow;
+
+    @Shadow
+    @Final
+    private Map<Player, Vec3> hitPlayers;
+
     @Shadow
     @Final
     private boolean fire;
 
     @Shadow
     @Final
-    private Vec3 center;
+    private DamageSource damageSource;
 
 
     @Unique
@@ -115,12 +142,6 @@ abstract class ServerExplosionMixin {
     @Unique
     private LevelChunk[] chunkCache = null;
 
-    @Unique
-    private ExplosionBlockCache[] directMappedBlockCache;
-
-    @Unique
-    private BlockPos.MutableBlockPos mutablePos;
-
     @Unique
     private ExplosionBlockCache getOrCacheExplosionBlock(final int x, final int y, final int z,
                                                          final long key, final boolean calculateResistance) {
@@ -322,45 +343,29 @@ abstract class ServerExplosionMixin {
         return (float)missedRays / (float)totalRays;
     }
 
-
     /**
-     * @reason Init cache fields
-     * @author Spottedleaf
-     */
-    @Inject(
-        method = "explode",
-        at = @At(
-            value = "HEAD"
-        )
-    )
-    private void initCacheFields(final CallbackInfo ci) {
-        this.blockCache = new Long2ObjectOpenHashMap<>();
-        this.chunkPosCache = new long[CHUNK_CACHE_WIDTH * CHUNK_CACHE_WIDTH];
-        Arrays.fill(this.chunkPosCache, ChunkPos.INVALID_CHUNK_POS);
-        this.chunkCache = new LevelChunk[CHUNK_CACHE_WIDTH * CHUNK_CACHE_WIDTH];
-        this.directMappedBlockCache = new ExplosionBlockCache[BLOCK_EXPLOSION_CACHE_WIDTH * BLOCK_EXPLOSION_CACHE_WIDTH * BLOCK_EXPLOSION_CACHE_WIDTH];
-        this.mutablePos = new BlockPos.MutableBlockPos();
-    }
-
-
-    /**
-     * @reason Rewrite ray casting for performance
+     * @reason Rewrite ray casting and seen fraction calculation for performance
      * @author Spottedleaf
      */
     @Overwrite
-    public List<BlockPos> calculateExplodedPositions() {
-        final ObjectArrayList<BlockPos> ret = new ObjectArrayList<>();
+    public void explode() {
+        this.level.gameEvent(this.source, GameEvent.EXPLODE, new Vec3(this.x, this.y, this.z));
 
-        final Vec3 center = this.center;
+        this.blockCache = new Long2ObjectOpenHashMap<>();
 
-        final ExplosionBlockCache[] blockCache = this.directMappedBlockCache;
+        this.chunkPosCache = new long[CHUNK_CACHE_WIDTH * CHUNK_CACHE_WIDTH];
+        Arrays.fill(this.chunkPosCache, ChunkPos.INVALID_CHUNK_POS);
+
+        this.chunkCache = new LevelChunk[CHUNK_CACHE_WIDTH * CHUNK_CACHE_WIDTH];
+
+        final ExplosionBlockCache[] blockCache = new ExplosionBlockCache[BLOCK_EXPLOSION_CACHE_WIDTH * BLOCK_EXPLOSION_CACHE_WIDTH * BLOCK_EXPLOSION_CACHE_WIDTH];
 
         // use initial cache value that is most likely to be used: the source position
         final ExplosionBlockCache initialCache;
         {
-            final int blockX = Mth.floor(center.x);
-            final int blockY = Mth.floor(center.y);
-            final int blockZ = Mth.floor(center.z);
+            final int blockX = Mth.floor(this.x);
+            final int blockY = Mth.floor(this.y);
+            final int blockZ = Mth.floor(this.z);
 
             final long key = BlockPos.asLong(blockX, blockY, blockZ);
 
@@ -376,9 +381,9 @@ abstract class ServerExplosionMixin {
         for (int ray = 0, len = CACHED_RAYS.length; ray < len;) {
             ExplosionBlockCache cachedBlock = initialCache;
 
-            double currX = center.x;
-            double currY = center.y;
-            double currZ = center.z;
+            double currX = this.x;
+            double currY = this.y;
+            double currZ = this.z;
 
             final double incX = CACHED_RAYS[ray];
             final double incY = CACHED_RAYS[ray + 1];
@@ -397,7 +402,7 @@ abstract class ServerExplosionMixin {
 
                 if (cachedBlock.key != key) {
                     final int cacheKey =
-                        (blockX & BLOCK_EXPLOSION_CACHE_MASK) |
+                            (blockX & BLOCK_EXPLOSION_CACHE_MASK) |
                             (blockY & BLOCK_EXPLOSION_CACHE_MASK) << (BLOCK_EXPLOSION_CACHE_SHIFT) |
                             (blockZ & BLOCK_EXPLOSION_CACHE_MASK) << (BLOCK_EXPLOSION_CACHE_SHIFT + BLOCK_EXPLOSION_CACHE_SHIFT);
                     cachedBlock = blockCache[cacheKey];
@@ -419,7 +424,7 @@ abstract class ServerExplosionMixin {
                     cachedBlock.shouldExplode = shouldExplode ? Boolean.TRUE : Boolean.FALSE;
                     if (shouldExplode) {
                         if (this.fire || !cachedBlock.blockState.isAir()) {
-                            ret.add(cachedBlock.immutablePos);
+                            this.toBlow.add(cachedBlock.immutablePos);
                         }
                     }
                 }
@@ -431,42 +436,83 @@ abstract class ServerExplosionMixin {
             } while (power > 0.0f);
         }
 
-        return ret;
-    }
+        final double diameter = (double)this.radius * 2.0;
+        final List<Entity> entities = this.level.getEntities(this.source,
+                new AABB(
+                        (double)Mth.floor(this.x - (diameter + 1.0)),
+                        (double)Mth.floor(this.y - (diameter + 1.0)),
+                        (double)Mth.floor(this.z - (diameter + 1.0)),
 
-    /**
-     * @reason Use optimised getSeenPercent implementation
-     * @author Spottedleaf
-     */
-    @Redirect(
-        method = {
-            "hurtEntities()V",
-            "hurtEntities(Ljava/util/List;)V" // Neo moves logic into this new method
-        },
-        at = @At(
-            value = "INVOKE",
-            target = "Lnet/minecraft/world/level/ServerExplosion;getSeenPercent(Lnet/minecraft/world/phys/Vec3;Lnet/minecraft/world/entity/Entity;)F"
-        )
-    )
-    private float useBetterSeenPercent(final Vec3 center, final Entity target) {
-        return this.getSeenFraction(center, target, this.directMappedBlockCache, this.mutablePos);
-    }
+                        (double)Mth.floor(this.x + (diameter + 1.0)),
+                        (double)Mth.floor(this.y + (diameter + 1.0)),
+                        (double)Mth.floor(this.z + (diameter + 1.0))
+                )
+        );
+        final Vec3 center = new Vec3(this.x, this.y, this.z);
+
+        final BlockPos.MutableBlockPos blockPos = new BlockPos.MutableBlockPos();
+
+        final PlatformHooks platformHooks = PlatformHooks.get();
+
+        platformHooks.onExplosion(this.level, (Explosion)(Object)this, entities, diameter);
+        for (int i = 0, len = entities.size(); i < len; ++i) {
+            final Entity entity = entities.get(i);
+            if (entity.ignoreExplosion((Explosion)(Object)this)) {
+                continue;
+            }
+
+            final double normalizedDistanceToCenter = Math.sqrt(entity.distanceToSqr(center)) / diameter;
+            if (normalizedDistanceToCenter > 1.0) {
+                continue;
+            }
+
+            double distX = entity.getX() - this.x;
+            double distY = (entity instanceof PrimedTnt ? entity.getY() : entity.getEyeY()) - this.y;
+            double distZ = entity.getZ() - this.z;
+            final double distMag = Math.sqrt(distX * distX + distY * distY + distZ * distZ);
+
+            if (distMag == 0.0) {
+                continue;
+            }
+
+            distX /= distMag;
+            distY /= distMag;
+            distZ /= distMag;
+
+            // route to new visible fraction calculation, using the existing block cache
+            final double seenFraction = (double)this.getSeenFraction(center, entity, blockCache, blockPos);
+            if (this.damageCalculator.shouldDamageEntity((Explosion)(Object)this, entity)) {
+                // inline getEntityDamageAmount so that we can avoid double calling getSeenPercent, which is the MOST
+                // expensive part of this loop!!!!
+                final double factor = (1.0 - normalizedDistanceToCenter) * seenFraction;
+                entity.hurt(this.damageSource, (float)((factor * factor + factor) / 2.0 * 7.0 * diameter + 1.0));
+            }
+
+            final double intensityFraction = (1.0 - normalizedDistanceToCenter) * seenFraction * (double)this.damageCalculator.getKnockbackMultiplier(entity);
+
+
+            final double knockbackFraction;
+            if (entity instanceof LivingEntity livingEntity) {
+                knockbackFraction = intensityFraction * (1.0 - livingEntity.getAttributeValue(Attributes.EXPLOSION_KNOCKBACK_RESISTANCE));
+            } else {
+                knockbackFraction = intensityFraction;
+            }
+
+            Vec3 knockback = new Vec3(distX * knockbackFraction, distY * knockbackFraction, distZ * knockbackFraction);
+            knockback = platformHooks.modifyExplosionKnockback(this.level, (Explosion)(Object)this, entity, knockback);
+            entity.setDeltaMovement(entity.getDeltaMovement().add(knockback));
+
+            if (entity instanceof Player player) {
+                if (!player.isSpectator() && (!player.isCreative() || !player.getAbilities().flying)) {
+                    this.hitPlayers.put(player, knockback);
+                }
+            }
+
+            entity.onExplosionHit(this.source);
+        }
 
-    /**
-     * @reason Destroy cache fields
-     * @author Spottedleaf
-     */
-    @Inject(
-        method = "explode",
-        at = @At(
-            value = "RETURN"
-        )
-    )
-    private void destroyCacheFields(final CallbackInfo ci) {
         this.blockCache = null;
         this.chunkPosCache = null;
         this.chunkCache = null;
-        this.directMappedBlockCache = null;
-        this.mutablePos = null;
     }
 }

src/main/java/ca/spottedleaf/moonrise/mixin/collisions/LevelMixin.java

@@ -55,7 +55,7 @@ abstract class LevelMixin implements LevelAccessor, AutoCloseable {
     public boolean isUnobstructed(final Entity entity) {
         final AABB boundingBox = entity.getBoundingBox();
         if (CollisionUtil.isEmpty(boundingBox)) {
-            return true;
+            return false;
         }
 
         final List<Entity> entities = this.getEntities(
@@ -83,7 +83,7 @@ abstract class LevelMixin implements LevelAccessor, AutoCloseable {
         final Vec3 to = clipContext.getTo();
         final Vec3 from = clipContext.getFrom();
 
-        return BlockHitResult.miss(to, Direction.getApproximateNearest(from.x - to.x, from.y - to.y, from.z - to.z), BlockPos.containing(to.x, to.y, to.z));
+        return BlockHitResult.miss(to, Direction.getNearest(from.x - to.x, from.y - to.y, from.z - to.z), BlockPos.containing(to.x, to.y, to.z));
     }
 
     @Unique

src/main/java/ca/spottedleaf/moonrise/mixin/collisions/LiquidBlockRendererMixin.java

@@ -4,7 +4,9 @@ import ca.spottedleaf.moonrise.patches.collisions.CollisionUtil;
 import ca.spottedleaf.moonrise.patches.collisions.shape.CollisionVoxelShape;
 import it.unimi.dsi.fastutil.doubles.DoubleArrayList;
 import net.minecraft.client.renderer.block.LiquidBlockRenderer;
+import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.shapes.ArrayVoxelShape;
 import net.minecraft.world.phys.shapes.BooleanOp;
@@ -21,7 +23,12 @@ abstract class LiquidBlockRendererMixin {
      * @author Spottedleaf
      */
     @Overwrite
-    private static boolean isFaceOccludedByState(final Direction direction, final float height, final BlockState state) {
+    private static boolean isFaceOccludedByState(final BlockGetter world, final Direction direction, final float height,
+                                                 final BlockPos pos, final BlockState state) {
+        if (!state.canOcclude()) {
+            return false;
+        }
+
         // check for created shape is empty
         if (height < (float)CollisionUtil.COLLISION_EPSILON) {
             return false;
@@ -43,26 +50,25 @@ abstract class LiquidBlockRendererMixin {
         } else {
             // the extrusion includes the height
             heightShape = new ArrayVoxelShape(
-                Shapes.block().shape,
-                CollisionUtil.ZERO_ONE,
-                DoubleArrayList.wrap(new double[] { 0.0, heightDouble }),
-                CollisionUtil.ZERO_ONE
+                    Shapes.block().shape,
+                    CollisionUtil.ZERO_ONE,
+                    DoubleArrayList.wrap(new double[] { 0.0, heightDouble }),
+                    CollisionUtil.ZERO_ONE
             );
         }
 
-        final VoxelShape occlusionShape = ((CollisionVoxelShape)state.getFaceOcclusionShape(direction.getOpposite()))
-            .moonrise$getFaceShapeClamped(direction.getOpposite());
+        final VoxelShape stateShape = ((CollisionVoxelShape)state.getOcclusionShape(world, pos)).moonrise$getFaceShapeClamped(direction.getOpposite());
 
-        if (occlusionShape.isEmpty()) {
+        if (stateShape.isEmpty()) {
             // cannot occlude
             return false;
         }
 
         // fast check for box
-        if (heightShape == occlusionShape) {
+        if (heightShape == stateShape) {
             return true;
         }
 
-        return !Shapes.joinIsNotEmpty(heightShape, occlusionShape, BooleanOp.ONLY_FIRST);
+        return !Shapes.joinIsNotEmpty(heightShape, stateShape, BooleanOp.ONLY_FIRST);
     }
 }

src/main/java/ca/spottedleaf/moonrise/mixin/collisions/LivingEntityMixin.java

@@ -0,0 +1,55 @@
+package ca.spottedleaf.moonrise.mixin.collisions;
+
+import net.minecraft.world.entity.Attackable;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntitySelector;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.entity.LivingEntity;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.level.GameRules;
+import net.minecraft.world.level.Level;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+import org.spongepowered.asm.mixin.Shadow;
+import java.util.List;
+
+@Mixin(LivingEntity.class)
+abstract class LivingEntityMixin extends Entity implements Attackable {
+
+    @Shadow
+    protected abstract void doPush(Entity entity);
+
+    public LivingEntityMixin(EntityType<?> entityType, Level level) {
+        super(entityType, level);
+    }
+
+    /**
+     * @reason Optimise this method
+     * @author Spottedleaf
+     */
+    @Overwrite
+    public void pushEntities() {
+        if (this.level().isClientSide()) {
+            final List<Player> players = this.level().getEntitiesOfClass(Player.class, this.getBoundingBox(), EntitySelector.pushableBy(this));
+            for (int i = 0, len = players.size(); i < len; ++i) {
+                this.doPush(players.get(i));
+            }
+        } else {
+            final List<Entity> nearby = this.level().getEntities(this, this.getBoundingBox(), EntitySelector.pushableBy(this));
+
+            // only iterate ONCE
+            int nonPassengers = 0;
+            for (int i = 0, len = nearby.size(); i < len; ++i) {
+                final Entity entity = nearby.get(i);
+                nonPassengers += (entity.isPassenger() ? 0 : 1);
+                this.doPush(entity);
+            }
+
+            int maxCramming;
+            if (nonPassengers != 0 && (maxCramming = this.level().getGameRules().getInt(GameRules.RULE_MAX_ENTITY_CRAMMING)) > 0
+                && nonPassengers > (maxCramming - 1) && this.random.nextInt(4) == 0) {
+                this.hurt(this.damageSources().cramming(), 6.0F);
+            }
+        }
+    }
+}

src/main/java/ca/spottedleaf/moonrise/mixin/collisions/ParticleMixin.java

@@ -79,7 +79,8 @@ abstract class ParticleMixin {
         final List<VoxelShape> voxels = new ArrayList<>();
         final boolean collided = CollisionUtil.getCollisionsForBlocksOrWorldBorder(
                 world, entity, collisionBox, voxels, boxes,
-                0, null
+                0,
+                null
         );
 
         if (!collided) {

src/main/java/ca/spottedleaf/moonrise/mixin/collisions/ShapesMixin.java

@@ -278,6 +278,15 @@ abstract class ShapesMixin {
         return ret;
     }
 
+    /**
+     * @reason Route to use cache
+     * @author Spottedleaf
+     */
+    @Overwrite
+    public static VoxelShape getFaceShape(final VoxelShape shape, final Direction direction) {
+        return ((CollisionVoxelShape)shape).moonrise$getFaceShapeClamped(direction);
+    }
+
     @Unique
     private static boolean mergedMayOccludeBlock(final VoxelShape shape1, final VoxelShape shape2) {
         // if the combined bounds of the two shapes cannot occlude, then neither can the merged

src/main/java/ca/spottedleaf/moonrise/mixin/collisions/SliceShapeMixin.java

@@ -1,7 +1,9 @@
 package ca.spottedleaf.moonrise.mixin.collisions;
 
 import ca.spottedleaf.moonrise.patches.collisions.shape.CollisionVoxelShape;
+import net.minecraft.core.Direction;
 import net.minecraft.world.phys.shapes.SliceShape;
+import net.minecraft.world.phys.shapes.VoxelShape;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -20,7 +22,7 @@ abstract class SliceShapeMixin {
                     value = "RETURN"
             )
     )
-    private void initState(final CallbackInfo ci) {
+    private void initState(final VoxelShape parent, final Direction.Axis forAxis, final int forIndex, final CallbackInfo ci) {
         ((CollisionVoxelShape)this).moonrise$initCache();
     }
 }