build: 1.21.5-rc1

ishland · ishland · commit 440647be1434 · 2025-03-21T14:16:52.000+08:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -36,7 +36,7 @@ jobs:
         run: ./gradlew build
       - name: upload to modrinth and curseforge
         run: ./gradlew modrinth curseforge
-        if: github.ref == 'refs/heads/ver/1.21.4'
+        if: github.ref == 'refs/heads/ver/1.21.5'
         env:
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_UPLOAD_TOKEN }}
           CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_API_TOKEN }}
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.7-SNAPSHOT'
+	id 'fabric-loom' version '1.10-SNAPSHOT'
 	id 'maven-publish'
 	id 'com.github.johnrengelman.shadow' version '7.1.0'
 	id 'com.modrinth.minotaur' version '2.+'
diff --git a/gradle.properties b/gradle.properties
@@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx2G
 
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.1
-loader_version=0.16.9
+minecraft_version=1.21.5-rc1
+yarn_mappings=1.21.5-rc1+build.2
+loader_version=0.16.10
 
 # Mod Properties
 mod_version = 0.2.0+beta.7
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/com/ishland/vmp/VMPMod.java b/src/main/java/com/ishland/vmp/VMPMod.java
@@ -17,6 +17,6 @@ public void onInitialize() {
             NearbyEntityTracking.init();
         }
 
-//        MixinEnvironment.getCurrentEnvironment().audit();
+        MixinEnvironment.getCurrentEnvironment().audit();
     }
 }
diff --git a/src/main/java/com/ishland/vmp/common/chunk/loading/async_chunks_on_player_login/AsyncChunkLoadUtil.java b/src/main/java/com/ishland/vmp/common/chunk/loading/async_chunks_on_player_login/AsyncChunkLoadUtil.java
@@ -6,8 +6,10 @@
 import com.ishland.vmp.mixins.access.IThreadedAnvilChunkStorage;
 import com.mojang.datafixers.util.Either;
 import net.minecraft.server.world.ChunkHolder;
+import net.minecraft.server.world.ChunkLevelManager;
 import net.minecraft.server.world.ChunkLevelType;
 import net.minecraft.server.world.ChunkLevels;
+import net.minecraft.server.world.ChunkTicket;
 import net.minecraft.server.world.ChunkTicketManager;
 import net.minecraft.server.world.ChunkTicketType;
 import net.minecraft.server.world.OptionalChunk;
@@ -23,7 +25,7 @@
 
 public class AsyncChunkLoadUtil {
 
-    private static final ChunkTicketType<Unit> ASYNC_CHUNK_LOAD = ChunkTicketType.create("vmp_async_chunk_load", (unit, unit2) -> 0);
+    private static final ChunkTicketType ASYNC_CHUNK_LOAD = new ChunkTicketType(0L, false, ChunkTicketType.Use.LOADING);
 
     public static final AsyncSemaphore SEMAPHORE = new FairAsyncSemaphore(12);
 
@@ -43,10 +45,12 @@ public static CompletableFuture<OptionalChunk<Chunk>> scheduleChunkLoadWithLevel
         final ServerChunkManager chunkManager = world.getChunkManager();
         final ChunkTicketManager ticketManager = ((IServerChunkManager) chunkManager).getTicketManager();
 
+        ChunkTicket chunkTicket = new ChunkTicket(ASYNC_CHUNK_LOAD, level);
+
         final CompletableFuture<OptionalChunk<Chunk>> future = SEMAPHORE.acquire()
                 .toCompletableFuture()
                 .thenComposeAsync(unused -> {
-                    ticketManager.addTicketWithLevel(ASYNC_CHUNK_LOAD, pos, level, Unit.INSTANCE);
+                    ticketManager.addTicket(chunkTicket, pos);
                     ((IServerChunkManager) chunkManager).invokeUpdateChunks();
                     final ChunkHolder chunkHolder = ((IThreadedAnvilChunkStorage) chunkManager.chunkLoadingManager).invokeGetCurrentChunkHolder(pos.toLong());
                     if (chunkHolder == null) {
@@ -63,7 +67,7 @@ public static CompletableFuture<OptionalChunk<Chunk>> scheduleChunkLoadWithLevel
         future.whenCompleteAsync((unused, throwable) -> {
             SEMAPHORE.release();
             if (throwable != null) throwable.printStackTrace();
-            ticketManager.removeTicketWithLevel(ASYNC_CHUNK_LOAD, pos, level, Unit.INSTANCE);
+            ticketManager.removeTicket(chunkTicket, pos);
         }, world.getServer());
         return future;
     }
diff --git a/src/main/java/com/ishland/vmp/common/playerwatching/NearbyEntityTracking.java b/src/main/java/com/ishland/vmp/common/playerwatching/NearbyEntityTracking.java
@@ -6,7 +6,7 @@
 import com.ishland.vmp.common.util.SimpleObjectPool;
 import com.ishland.vmp.mixins.access.IThreadedAnvilChunkStorage;
 import com.ishland.vmp.mixins.access.IThreadedAnvilChunkStorageEntityTracker;
-import com.ishland.vmp.mixins.access.IThreadedAnvilChunkStorageTicketManager;
+import com.ishland.vmp.mixins.access.IThreadedAnvilChunkStorageLevelManager;
 import it.unimi.dsi.fastutil.objects.ObjectLinkedOpenHashSet;
 import it.unimi.dsi.fastutil.objects.ObjectListIterator;
 import it.unimi.dsi.fastutil.objects.Reference2LongMap;
@@ -23,7 +23,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicLong;
@@ -149,7 +148,7 @@ private static ChunkPos getEntityChunkPos(Entity entity) {
         return new ChunkPos(ChunkSectionPos.getSectionCoord(pos.x), ChunkSectionPos.getSectionCoord(pos.z));
     }
 
-    public void tick(ServerChunkLoadingManager.TicketManager ticketManager) {
+    public void tick(ServerChunkLoadingManager.LevelManager ticketManager) {
         tickStaging(ticketManager);
 
         for (Reference2LongMap.Entry<ServerChunkLoadingManager.EntityTracker> entry : this.tracker2ChunkPos.reference2LongEntrySet()) {
@@ -194,7 +193,7 @@ public void tick(ServerChunkLoadingManager.TicketManager ticketManager) {
         }
     }
 
-    private void tickStaging(ServerChunkLoadingManager.TicketManager ticketManager) {
+    private void tickStaging(ServerChunkLoadingManager.LevelManager ticketManager) {
         // migrate staging trackers to AreaMap
         final long currentTicks = this.ticks.incrementAndGet();
         for (ObjectListIterator<StagedTracker> iterator = this.stagingTrackers.iterator(); iterator.hasNext(); ) {
@@ -208,7 +207,7 @@ private void tickStaging(ServerChunkLoadingManager.TicketManager ticketManager)
             }
         }
 
-        final List<ServerPlayerEntity> players = ((IThreadedAnvilChunkStorage) ((IThreadedAnvilChunkStorageTicketManager) ticketManager).getField_17443()).getWorld().getPlayers();
+        final List<ServerPlayerEntity> players = ((IThreadedAnvilChunkStorage) ((IThreadedAnvilChunkStorageLevelManager) ticketManager).getField_17443()).getWorld().getPlayers();
         for (StagedTracker staged : this.stagingTrackers) {
             final ServerChunkLoadingManager.EntityTracker entityTracker = staged.tracker();
             ChunkSectionPos chunkSectionPos = ((IThreadedAnvilChunkStorageEntityTracker) entityTracker).getTrackedSection();
@@ -230,7 +229,7 @@ private void tickStaging(ServerChunkLoadingManager.TicketManager ticketManager)
         }
     }
 
-    private void handleTracker(ServerChunkLoadingManager.TicketManager ticketManager, ServerPlayerEntity player, boolean isPlayerPositionUpdated, ServerChunkLoadingManager.EntityTracker entityTracker) {
+    private void handleTracker(ServerChunkLoadingManager.LevelManager ticketManager, ServerPlayerEntity player, boolean isPlayerPositionUpdated, ServerChunkLoadingManager.EntityTracker entityTracker) {
         final ChunkSectionPos trackedPos = ((IThreadedAnvilChunkStorageEntityTracker) entityTracker).getTrackedSection();
         if (trackerTickList.add(entityTracker) && ticketManager.shouldTickEntities(ChunkPos.toLong(trackedPos.getSectionX(), trackedPos.getSectionZ()))) {
             tryTickTracker(entityTracker);
diff --git a/src/main/java/com/ishland/vmp/mixins/access/IChunkTicket.java b/src/main/java/com/ishland/vmp/mixins/access/IChunkTicket.java
@@ -2,12 +2,8 @@
 
 import net.minecraft.server.world.ChunkTicket;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Invoker;
 
 @Mixin(ChunkTicket.class)
 public interface IChunkTicket {
 
-    @Invoker("isExpired")
-    boolean invokeIsExpired1(long currentTick); // compiler doing shit
-
 }
diff --git a/src/main/java/com/ishland/vmp/mixins/access/IThreadedAnvilChunkStorageLevelManager.java b/src/main/java/com/ishland/vmp/mixins/access/IThreadedAnvilChunkStorageLevelManager.java
@@ -4,8 +4,8 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
 
-@Mixin(ServerChunkLoadingManager.TicketManager.class)
-public interface IThreadedAnvilChunkStorageTicketManager {
+@Mixin(ServerChunkLoadingManager.LevelManager.class)
+public interface IThreadedAnvilChunkStorageLevelManager {
 
     @Accessor
     ServerChunkLoadingManager getField_17443();
diff --git a/src/main/java/com/ishland/vmp/mixins/chunk/loading/async_chunk_on_player_login/MixinServerConfigurationNetworkHandler.java b/src/main/java/com/ishland/vmp/mixins/chunk/loading/async_chunk_on_player_login/MixinServerConfigurationNetworkHandler.java
@@ -60,8 +60,9 @@ public abstract class MixinServerConfigurationNetworkHandler extends ServerCommo
     @Shadow private SyncedClientOptions syncedOptions;
 
     @Shadow @Final private static Text INVALID_PLAYER_DATA_TEXT;
+
     @Unique
-    private static final ChunkTicketType<Unit> VMP_PLAYER_ASYNC_CHUNKS = ChunkTicketType.create("vmp_player_async_chunk", (unit, unit2) -> 0);
+    private static final ChunkTicketType VMP_PLAYER_ASYNC_CHUNKS = new ChunkTicketType(0L, false, ChunkTicketType.Use.LOADING);
 
     @Unique
     private ChunkPos vmp$ticketHeld;
@@ -84,7 +85,7 @@ private void onDisconnect(DisconnectionInfo info, CallbackInfo ci) {
     @Unique
     private void vmp$dropTicket() {
         if (this.vmp$ticketHeld != null && this.vmp$ticketHeldWorld != null) {
-            ((IServerChunkManager) this.vmp$ticketHeldWorld.getChunkManager()).getTicketManager().removeTicketWithLevel(VMP_PLAYER_ASYNC_CHUNKS, this.vmp$ticketHeld, 31, Unit.INSTANCE);
+            ((IServerChunkManager) this.vmp$ticketHeldWorld.getChunkManager()).getTicketManager().removeTicket(VMP_PLAYER_ASYNC_CHUNKS, this.vmp$ticketHeld, 2);
             this.vmp$ticketHeld = null;
             this.vmp$ticketHeldWorld = null;
         }
@@ -137,7 +138,7 @@ private void delayJoinWorld(ServerPlayerConfigurationTask instance, Consumer<Pac
             Stopwatch timing = Stopwatch.createStarted();
             AsyncChunkLoadUtil.SEMAPHORE.acquire().thenApplyAsync(unused -> {
                 try {
-                    ((IServerChunkManager) actualWorld.getChunkManager()).getTicketManager().addTicketWithLevel(VMP_PLAYER_ASYNC_CHUNKS, chunkPos, 31, Unit.INSTANCE);
+                    ((IServerChunkManager) actualWorld.getChunkManager()).getTicketManager().addTicket(VMP_PLAYER_ASYNC_CHUNKS, chunkPos, 2);
                     ((IServerChunkManager) actualWorld.getChunkManager()).invokeUpdateChunks();
                     final ChunkHolder chunkHolder = ((IThreadedAnvilChunkStorage) actualWorld.getChunkManager().chunkLoadingManager).invokeGetCurrentChunkHolder(chunkPos.toLong());
                     if (chunkHolder == null) {
diff --git a/src/main/java/com/ishland/vmp/mixins/networking/eventloops/MixinClientConnection.java b/src/main/java/com/ishland/vmp/mixins/networking/eventloops/MixinClientConnection.java
@@ -7,8 +7,8 @@
 import io.netty.channel.EventLoopGroup;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.NetworkSide;
-import net.minecraft.network.NetworkState;
 import net.minecraft.network.listener.PacketListener;
+import net.minecraft.network.state.NetworkState;
 import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Mixin;
diff --git a/src/main/java/com/ishland/vmp/mixins/playerwatching/MixinThreadedAnvilChunkStorage.java b/src/main/java/com/ishland/vmp/mixins/playerwatching/MixinThreadedAnvilChunkStorage.java
@@ -9,6 +9,7 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.PlayerChunkWatchingManager;
 import net.minecraft.server.world.ServerChunkLoadingManager;
+import net.minecraft.util.TriState;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.util.math.ChunkSectionPos;
 import org.slf4j.Logger;
@@ -32,7 +33,7 @@ public abstract class MixinThreadedAnvilChunkStorage implements TACSExtension {
 
     @Shadow @Final private static Logger LOGGER;
 
-    @Shadow @Final private ServerChunkLoadingManager.TicketManager ticketManager;
+    @Shadow @Final private ServerChunkLoadingManager.LevelManager levelManager;
 
     @Shadow protected abstract boolean canTickChunk(ServerPlayerEntity player, ChunkPos pos);
 
@@ -118,7 +119,7 @@ public List<ServerPlayerEntity> getPlayersWatchingChunk(ChunkPos chunkPos, boole
     @Overwrite
     public List<ServerPlayerEntity> getPlayersWatchingChunk(ChunkPos pos) {
         long l = pos.toLong();
-        if (!this.ticketManager.shouldTick(l)) {
+        if (!this.levelManager.shouldTick(l).asBoolean(true)) {
             return List.of();
         } else {
             ImmutableList.Builder<ServerPlayerEntity> builder = ImmutableList.builder();
@@ -142,8 +143,9 @@ public List<ServerPlayerEntity> getPlayersWatchingChunk(ChunkPos pos) {
     @Overwrite
     public boolean shouldTick(ChunkPos pos) {
         long l = pos.toLong();
-        if (!this.ticketManager.shouldTick(l)) {
-            return false;
+        TriState triState = this.levelManager.shouldTick(l);
+        if (triState != TriState.DEFAULT) {
+            return triState.asBoolean(true);
         } else {
             for (Object __player : this.areaPlayerChunkWatchingManager.getPlayersInGeneralAreaMap(l)) {
                 if (__player instanceof ServerPlayerEntity serverPlayerEntity) {
diff --git a/src/main/java/com/ishland/vmp/mixins/playerwatching/optimize_nearby_entity_tracking_lookups/MixinThreadedAnvilChunkStorage.java b/src/main/java/com/ishland/vmp/mixins/playerwatching/optimize_nearby_entity_tracking_lookups/MixinThreadedAnvilChunkStorage.java
@@ -1,7 +1,6 @@
 package com.ishland.vmp.mixins.playerwatching.optimize_nearby_entity_tracking_lookups;
 
 import com.ishland.vmp.common.playerwatching.NearbyEntityTracking;
-import com.ishland.vmp.mixins.access.IThreadedAnvilChunkStorageEntityTracker;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMaps;
 import it.unimi.dsi.fastutil.objects.ObjectCollection;
@@ -24,7 +23,7 @@ public class MixinThreadedAnvilChunkStorage {
     @Shadow
     @Final
     private Int2ObjectMap<ServerChunkLoadingManager.EntityTracker> entityTrackers;
-    @Shadow @Final private ServerChunkLoadingManager.TicketManager ticketManager;
+    @Shadow @Final private ServerChunkLoadingManager.LevelManager levelManager;
     @Shadow @Final private PlayerChunkWatchingManager playerChunkWatchingManager;
     @Unique
     private final NearbyEntityTracking nearbyEntityTracking = new NearbyEntityTracking();
@@ -74,7 +73,7 @@ public void tickEntityMovement() {
 //        }
 
         try {
-            this.nearbyEntityTracking.tick(this.ticketManager);
+            this.nearbyEntityTracking.tick(this.levelManager);
         } catch (Throwable t) {
             t.printStackTrace();
         }
diff --git a/src/main/java/com/ishland/vmp/mixins/playerwatching/optimize_nearby_player_lookups/MixinThreadedAnvilChunkStorage.java b/src/main/java/com/ishland/vmp/mixins/playerwatching/optimize_nearby_player_lookups/MixinThreadedAnvilChunkStorage.java
@@ -14,15 +14,6 @@
 @Mixin(ServerChunkLoadingManager.class)
 public abstract class MixinThreadedAnvilChunkStorage {
 
-    @Shadow @Final private PlayerChunkWatchingManager playerChunkWatchingManager;
-
-    @Shadow @Final private ServerChunkLoadingManager.TicketManager ticketManager;
-
-    @Shadow
-    private static double getSquaredDistance(ChunkPos pos, Entity entity) {
-        throw new AbstractMethodError();
-    }
-
 //    /**
 //     * @author ishland
 //     * @reason optimize nearby player lookups
diff --git a/src/main/java/com/ishland/vmp/mixins/ticketsystem/ticketpropagator/MixinChunkLevelManager.java b/src/main/java/com/ishland/vmp/mixins/ticketsystem/ticketpropagator/MixinChunkLevelManager.java
@@ -5,15 +5,13 @@
 import com.ishland.vmp.mixins.access.IThreadedAnvilChunkStorage;
 import io.papermc.paper.util.misc.Delayed8WayDistancePropagator2D;
 import it.unimi.dsi.fastutil.longs.Long2IntLinkedOpenHashMap;
-import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.longs.LongSet;
 import it.unimi.dsi.fastutil.objects.ObjectArrayFIFOQueue;
 import net.minecraft.server.world.ChunkHolder;
+import net.minecraft.server.world.ChunkLevelManager;
 import net.minecraft.server.world.ChunkLevels;
-import net.minecraft.server.world.ChunkTicket;
 import net.minecraft.server.world.ChunkTicketManager;
 import net.minecraft.server.world.ServerChunkLoadingManager;
-import net.minecraft.util.collection.SortedArraySet;
+import net.minecraft.server.world.TicketDistanceLevelPropagator;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -27,30 +25,19 @@
 
 import java.util.ArrayList;
 import java.util.ConcurrentModificationException;
-import java.util.Set;
 import java.util.concurrent.Executor;
 
-@Mixin(ChunkTicketManager.class)
-public abstract class MixinChunkTicketManager {
+@Mixin(ChunkLevelManager.class)
+public abstract class MixinChunkLevelManager {
 
     @Mutable
-    @Shadow @Final private ChunkTicketManager.TicketDistanceLevelPropagator distanceFromTicketTracker;
+    @Shadow @Final private TicketDistanceLevelPropagator ticketDistanceLevelPropagator;
 
     @Shadow protected @Nullable abstract ChunkHolder getChunkHolder(long pos);
 
     @Shadow protected @Nullable abstract ChunkHolder setLevel(long pos, int level, @Nullable ChunkHolder holder, int i);
 
-    @Shadow @Final private ChunkTicketManager.NearbyChunkTicketUpdater nearbyChunkTicketUpdater;
-    @Shadow @Final private Set<ChunkHolder> chunkHoldersWithPendingUpdates;
     @Shadow @Final private Executor mainThreadExecutor;
-    @Shadow @Final private LongSet freshPlayerTicketPositions;
-
-    @Shadow protected abstract SortedArraySet<ChunkTicket<?>> getTicketSet(long position);
-
-    @Shadow
-    protected static int getLevel(SortedArraySet<ChunkTicket<?>> sortedArraySet) {
-        throw new AbstractMethodError();
-    }
 
     @Unique
     protected Long2IntLinkedOpenHashMap ticketLevelUpdates;
@@ -80,8 +67,8 @@ protected final void updateTicketLevel(final long coordinate, final int ticketLe
     }
 
     @Inject(method = "<init>", at = @At("RETURN"))
-    private void onInit(Executor workerExecutor, Executor mainThreadExecutor, CallbackInfo ci) {
-        this.distanceFromTicketTracker = null; // fail-fast incompatibility
+    private void onInit(ChunkTicketManager ticketManager, Executor executor, Executor mainThreadExecutor, CallbackInfo ci) {
+        this.ticketDistanceLevelPropagator = null; // fail-fast incompatibility
 
         this.ticketLevelUpdates = new Long2IntLinkedOpenHashMap() {
             @Override
@@ -98,15 +85,12 @@ protected void rehash(int newN) {
                 }
         );
         this.pendingChunkHolderUpdates = new ObjectArrayFIFOQueue<>();
-    }
 
-    @Redirect(method = {"purgeExpiredTickets", "addTicket(JLnet/minecraft/server/world/ChunkTicket;)V", "removeTicket(JLnet/minecraft/server/world/ChunkTicket;)V", "removePersistentTickets"}, at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ChunkTicketManager$TicketDistanceLevelPropagator;updateLevel(JIZ)V"), require = 4, expect = 4)
-    private void redirectUpdate(ChunkTicketManager.TicketDistanceLevelPropagator instance, long l, int i, boolean b) {
-        this.updateTicketLevel(l, i);
+        ticketManager.setLoadingLevelUpdater((pos, level, added) -> this.updateTicketLevel(pos, level));
     }
 
-    @Redirect(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ChunkTicketManager$TicketDistanceLevelPropagator;update(I)I"))
-    public int tickTickets(ChunkTicketManager.TicketDistanceLevelPropagator __, int distance, ServerChunkLoadingManager threadedAnvilChunkStorage) {
+    @Redirect(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/TicketDistanceLevelPropagator;update(I)I"))
+    public int tickTickets(TicketDistanceLevelPropagator instance, int distance, ServerChunkLoadingManager threadedAnvilChunkStorage) {
         if (!((IThreadedAnvilChunkStorage) threadedAnvilChunkStorage).getMainThreadExecutor().isOnThread()) {
             throw new ConcurrentModificationException("Attempted to tick tickets asynchronously");
         }
diff --git a/src/main/resources/vmp.accesswidener b/src/main/resources/vmp.accesswidener
@@ -1,10 +1,10 @@
 accessWidener	v1	named
 
-accessible    class    net/minecraft/server/world/ChunkTicketManager$TicketDistanceLevelPropagator
-accessible    class    net/minecraft/server/world/ChunkTicketManager$DistanceFromNearestPlayerTracker
-accessible    class    net/minecraft/server/world/ChunkTicketManager$NearbyChunkTicketUpdater
+accessible    class    net/minecraft/server/world/TicketDistanceLevelPropagator
+accessible    class    net/minecraft/server/world/ChunkLevelManager$DistanceFromNearestPlayerTracker
+accessible    class    net/minecraft/server/world/ChunkLevelManager$NearbyChunkTicketUpdater
 accessible    class    net/minecraft/server/world/ServerChunkLoadingManager$EntityTracker
-accessible    class    net/minecraft/server/world/ServerChunkLoadingManager$TicketManager
+accessible    class    net/minecraft/server/world/ServerChunkLoadingManager$LevelManager
 accessible    class    net/minecraft/world/SpawnDensityCapper$DensityCap
 accessible    class    net/minecraft/server/command/SpreadPlayersCommand$Pile
 
diff --git a/src/main/resources/vmp.mixins.json b/src/main/resources/vmp.mixins.json

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@ public void onInitialize() {`
`17`	`17`	`NearbyEntityTracking.init();`
`18`	`18`	`}`
`19`	`19`
`20`		`-// MixinEnvironment.getCurrentEnvironment().audit();`
	`20`	`+ MixinEnvironment.getCurrentEnvironment().audit();`
`21`	`21`	`}`
`22`	`22`	`}`