Raise priority of occlusion task

Having this at a higher priority than section render tasks seems to give better results anecdotally

fabric/build.gradle

@@ -24,8 +24,7 @@ dependencies {
     include "me.shedaniel.cloth:cloth-config-fabric:${rootProject.cloth_version}"
     modImplementation "com.terraformersmc:modmenu:${rootProject.modmenu_version}"
 
-    modImplementation fabricApiLibs.command.api.v2
-    modImplementation fabricApiLibs.lifecycle.events.v1
+    modImplementation fabricApiLibs.fabric.api
     include fabricApiLibs.command.api.v2
     include fabricApiLibs.base
 }

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

@@ -2,18 +2,15 @@ package ca.spottedleaf.moonrise.fabric;
 
 import ca.spottedleaf.moonrise.common.PlatformHooks;
 import ca.spottedleaf.moonrise.common.util.ConfigHolder;
-import com.mojang.datafixers.DSL;
+import ca.spottedleaf.moonrise.patches.chunk_system.scheduling.NewChunkHolder;
 import com.mojang.datafixers.DataFixer;
-import com.mojang.serialization.Dynamic;
 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.util.datafix.DataFixTypes;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.ChunkPos;
@@ -31,8 +28,6 @@ import java.util.function.Predicate;
 
 public final class FabricHooks implements PlatformHooks {
 
-    private static final boolean HAS_FABRIC_LIFECYCLE_EVENTS = FabricLoader.getInstance().isModLoaded("fabric-lifecycle-events-v1");
-
     @Override
     public String getBrand() {
         return "Moonrise";
@@ -67,10 +62,8 @@ public final class FabricHooks implements PlatformHooks {
 
     @Override
     public void chunkFullStatusComplete(final LevelChunk newChunk, final ProtoChunk original) {
-        if (HAS_FABRIC_LIFECYCLE_EVENTS) {
         ServerChunkEvents.CHUNK_LOAD.invoker().onChunkLoad((ServerLevel)newChunk.getLevel(), newChunk);
     }
-    }
 
     @Override
     public boolean allowAsyncTicketUpdates() {
@@ -78,16 +71,14 @@ public final class FabricHooks implements PlatformHooks {
     }
 
     @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);
     }
-    }
 
     @Override
     public void chunkSyncSave(final ServerLevel world, final ChunkAccess chunk, final SerializableChunkData data) {
@@ -162,12 +153,12 @@ public final class FabricHooks implements PlatformHooks {
     }
 
     @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;
     }
 
@@ -182,11 +173,9 @@ public final class FabricHooks implements PlatformHooks {
     }
 
     @Override
-    public CompoundTag convertNBT(final DSL.TypeReference type, final DataFixer dataFixer, final CompoundTag nbt,
+    public CompoundTag convertNBT(final DataFixTypes 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();
+        return type.update(dataFixer, nbt, fromVersion, toVersion);
     }
 
     @Override

gradle.properties

@@ -16,6 +16,6 @@ modmenu_version=12.0.0-beta.1
 fabric_lithium_version=mc1.21.1-0.14.0-beta.1
 neo_lithium_version=BrMIoIMv
 # Mod Properties
-mod_version=0.2.0-beta.1
+mod_version=0.2.0-SNAPSHOT
 maven_group=ca.spottedleaf.moonrise
 archives_base_name=moonrise

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

@@ -3,16 +3,14 @@ package ca.spottedleaf.moonrise.neoforge;
 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 ca.spottedleaf.moonrise.patches.chunk_system.scheduling.NewChunkHolder;
 import com.mojang.datafixers.DataFixer;
-import com.mojang.serialization.Dynamic;
 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.util.datafix.DataFixTypes;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.ChunkPos;
@@ -82,12 +80,10 @@ public final class NeoForgeHooks implements PlatformHooks {
     }
 
     @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
         );
     }
 
@@ -189,12 +185,12 @@ public final class NeoForgeHooks implements PlatformHooks {
     }
 
     @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;
     }
 
@@ -209,11 +205,9 @@ public final class NeoForgeHooks implements PlatformHooks {
     }
 
     @Override
-    public CompoundTag convertNBT(final DSL.TypeReference type, final DataFixer dataFixer, final CompoundTag nbt,
+    public CompoundTag convertNBT(final DataFixTypes 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();
+        return type.update(dataFixer, nbt, fromVersion, toVersion);
     }
 
     @Override

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

@@ -1,10 +1,9 @@
 package ca.spottedleaf.moonrise.common;
 
-import com.mojang.datafixers.DSL;
+import ca.spottedleaf.moonrise.patches.chunk_system.scheduling.NewChunkHolder;
 import com.mojang.datafixers.DataFixer;
 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;
@@ -45,7 +44,7 @@ public interface PlatformHooks {
 
     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);
 
@@ -80,16 +79,16 @@ public interface PlatformHooks {
 
     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,
+    public CompoundTag convertNBT(final DataFixTypes type, final DataFixer dataFixer, final CompoundTag nbt,
                                   final int fromVersion, final int toVersion);
 
     public boolean hasMainChunkLoadHook();

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/MoonriseCommon.java

@@ -32,6 +32,7 @@ public final class MoonriseCommon {
     public static final long WORKER_QUEUE_HOLD_TIME = (long)(20.0e6); // 20ms
     public static final int CLIENT_DIVISION = 0;
     public static final PrioritisedThreadPool.ExecutorGroup RENDER_EXECUTOR_GROUP = MoonriseCommon.WORKER_POOL.createExecutorGroup(CLIENT_DIVISION, 0);
+    public static final PrioritisedThreadPool.ExecutorGroup SECTION_OCCLUSION_EXECUTOR_GROUP = MoonriseCommon.WORKER_POOL.createExecutorGroup(CLIENT_DIVISION, 0);
     public static final int SERVER_DIVISION = 1;
     public static final PrioritisedThreadPool.ExecutorGroup PARALLEL_GEN_GROUP = MoonriseCommon.WORKER_POOL.createExecutorGroup(SERVER_DIVISION, 0);
     public static final PrioritisedThreadPool.ExecutorGroup RADIUS_AWARE_GROUP = MoonriseCommon.WORKER_POOL.createExecutorGroup(SERVER_DIVISION, 0);

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

@@ -538,21 +538,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<>();

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

@@ -315,15 +315,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/PoiManagerMixin.java

@@ -266,4 +266,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/SectionStorageMixin.java

@@ -26,6 +26,10 @@ abstract class SectionStorageMixin<R, P> implements ChunkSystemSectionStorage, A
     @Shadow
     private SimpleRegionStorage simpleRegionStorage;
 
+    @Shadow
+    @Final
+    static Logger LOGGER;
+
 
     @Unique
     private RegionFileStorage storage;
@@ -35,9 +39,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 +59,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);
+        }
     }
 
     /**
@@ -72,12 +77,24 @@ abstract class SectionStorageMixin<R, P> implements ChunkSystemSectionStorage, A
     }
 
     /**
-     * @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 = "writeChunk(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;
     }
 
     /**

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<>();
 
@@ -266,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);
     }
 

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/collisions/ServerExplosionMixin.java

@@ -15,6 +15,7 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.Explosion;
 import net.minecraft.world.level.ExplosionDamageCalculator;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.ServerExplosion;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.LevelChunk;

src/main/java/ca/spottedleaf/moonrise/mixin/render/SectionOcclusionGraphMixin.java

@@ -0,0 +1,56 @@
+package ca.spottedleaf.moonrise.mixin.render;
+
+import ca.spottedleaf.concurrentutil.executor.PrioritisedExecutor;
+import ca.spottedleaf.concurrentutil.executor.thread.PrioritisedThreadPool;
+import ca.spottedleaf.concurrentutil.util.Priority;
+import ca.spottedleaf.moonrise.common.util.MoonriseCommon;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import net.minecraft.client.renderer.SectionOcclusionGraph;
+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.Redirect;
+
+@Mixin(SectionOcclusionGraph.class)
+abstract class SectionOcclusionGraphMixin {
+
+    @Unique
+    private static final PrioritisedThreadPool.ExecutorGroup.ThreadPoolExecutor SECTION_OCCLUSION_EXECUTOR = MoonriseCommon.SECTION_OCCLUSION_EXECUTOR_GROUP.createExecutor(
+        -1, MoonriseCommon.WORKER_QUEUE_HOLD_TIME, 0
+    );
+
+    /**
+     * @reason Change executor to use our thread pool
+     *         Note: even at normal priority, our worker pool will try to share resources equally rather than having it
+     *         be a free-for-all
+     * @author jpenilla
+     */
+    @Redirect(
+        method = "scheduleFullUpdate",
+        at = @At(
+            value = "INVOKE",
+            target = "Ljava/util/concurrent/CompletableFuture;runAsync(Ljava/lang/Runnable;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;"
+        )
+    )
+    private CompletableFuture<Void> changeExecutor(final Runnable runnable, final Executor executor) {
+        final PrioritisedExecutor.PrioritisedTask[] prioritisedTask = new PrioritisedExecutor.PrioritisedTask[1];
+        final CompletableFuture<Void> future = new CompletableFuture<>() {
+            @Override
+            public Void get() throws InterruptedException, ExecutionException {
+                prioritisedTask[0].execute();
+                return super.get();
+            }
+        };
+        prioritisedTask[0] = SECTION_OCCLUSION_EXECUTOR.queueTask(() -> {
+            try {
+                runnable.run();
+                future.complete(null);
+            } catch (final Throwable throwable) {
+                future.completeExceptionally(throwable);
+            }
+        }, Priority.HIGH); // Higher than SectionRenderDispatcherMixin#changeExecutor
+        return future;
+    }
+}

src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/ChunkSystemConverters.java

@@ -5,7 +5,7 @@ import net.minecraft.SharedConstants;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
 import net.minecraft.server.level.ServerLevel;
-import net.minecraft.util.datafix.fixes.References;
+import net.minecraft.util.datafix.DataFixTypes;
 
 public final class ChunkSystemConverters {
 
@@ -26,13 +26,13 @@ public final class ChunkSystemConverters {
     public static CompoundTag convertPoiCompoundTag(final CompoundTag data, final ServerLevel world) {
         final int dataVersion = getDataVersion(data, DEFAULT_POI_DATA_VERSION);
 
-        return PlatformHooks.get().convertNBT(References.POI_CHUNK, world.getServer().getFixerUpper(), data, dataVersion, getCurrentVersion());
+        return PlatformHooks.get().convertNBT(DataFixTypes.POI_CHUNK, world.getServer().getFixerUpper(), data, dataVersion, getCurrentVersion());
     }
 
     public static CompoundTag convertEntityChunkCompoundTag(final CompoundTag data, final ServerLevel world) {
         final int dataVersion = getDataVersion(data, DEFAULT_ENTITY_CHUNK_DATA_VERSION);
 
-        return PlatformHooks.get().convertNBT(References.ENTITY_CHUNK, world.getServer().getFixerUpper(), data, dataVersion, getCurrentVersion());
+        return PlatformHooks.get().convertNBT(DataFixTypes.ENTITY_CHUNK, world.getServer().getFixerUpper(), data, dataVersion, getCurrentVersion());
     }
 
     private ChunkSystemConverters() {}

src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/entity/ChunkEntitySlices.java

@@ -165,7 +165,7 @@ public final class ChunkEntitySlices {
         return this.entities.size() != 0;
     }
 
-    public List<Entity> getAllEntities() {
+    private List<Entity> getAllEntities() {
         final int len = this.entities.size();
         if (len == 0) {
             return new ArrayList<>();

src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/level/storage/ChunkSystemSectionStorage.java

@@ -1,10 +1,15 @@
 package ca.spottedleaf.moonrise.patches.chunk_system.level.storage;
 
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.chunk.storage.RegionFileStorage;
 import java.io.IOException;
 
 public interface ChunkSystemSectionStorage {
 
+    public CompoundTag moonrise$read(final int chunkX, final int chunkZ) throws IOException;
+
+    public void moonrise$write(final int chunkX, final int chunkZ, final CompoundTag data) throws IOException;
+
     public RegionFileStorage moonrise$getRegionStorage();
 
     public void moonrise$close() throws IOException;

src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkHolderManager.java

@@ -231,8 +231,8 @@ public final class ChunkHolderManager {
     public void autoSave() {
         final List<NewChunkHolder> reschedule = new ArrayList<>();
         final long currentTick = this.currentTick;
-        final long maxSaveTime = currentTick - Math.max(1L, PlatformHooks.get().configAutoSaveInterval(this.world));
-        final int maxToSave = PlatformHooks.get().configMaxAutoSavePerTick(this.world);
+        final long maxSaveTime = currentTick - Math.max(1L, PlatformHooks.get().configAutoSaveInterval());
+        final int maxToSave = PlatformHooks.get().configMaxAutoSavePerTick();
         for (int autoSaved = 0; autoSaved < maxToSave && !this.autoSaveQueue.isEmpty();) {
             final NewChunkHolder holder = this.autoSaveQueue.first();
 

src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/ChunkTaskScheduler.java

@@ -6,6 +6,7 @@ import ca.spottedleaf.concurrentutil.executor.thread.PrioritisedThreadPool;
 import ca.spottedleaf.concurrentutil.lock.ReentrantAreaLock;
 import ca.spottedleaf.concurrentutil.util.ConcurrentUtil;
 import ca.spottedleaf.concurrentutil.util.Priority;
+import ca.spottedleaf.moonrise.common.config.moonrise.MoonriseConfig;
 import ca.spottedleaf.moonrise.common.util.CoordinateUtils;
 import ca.spottedleaf.moonrise.common.util.JsonUtil;
 import ca.spottedleaf.moonrise.common.util.MoonriseCommon;

src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/scheduling/NewChunkHolder.java

@@ -1078,7 +1078,7 @@ public final class NewChunkHolder {
         }
 
         // Don't really have a choice but to place this hook here
-        PlatformHooks.get().onChunkHolderTicketChange(this.world, this.vanillaChunkHolder, oldLevel, newLevel);
+        PlatformHooks.get().onChunkHolderTicketChange(this.world, this, oldLevel, newLevel);
     }
 
     static final int NEIGHBOUR_RADIUS = 2;

src/main/resources/moonrise.mixins.json

@@ -128,6 +128,7 @@
     "config.MinecraftMixin",
     "loading_screen.LevelLoadStatusManagerMixin",
     "profiler.MinecraftMixin",
+    "render.SectionOcclusionGraphMixin",
     "render.SectionRenderDispatcherMixin",
     "serverlist.ClientConnectionMixin",
     "serverlist.ServerAddressResolverMixin",