fix: defer all level events to avoid clearing deferred state

Author: ishland

c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/common/ducks/TicketDistanceLevelPropagatorExtension.java

@@ -0,0 +1,9 @@
+package com.ishland.c2me.rewrites.chunksystem.common.ducks;
+
+import it.unimi.dsi.fastutil.longs.Long2IntLinkedOpenHashMap;
+
+public interface TicketDistanceLevelPropagatorExtension {
+
+    Long2IntLinkedOpenHashMap c2me$getTicketLevelUpdates();
+
+}

c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/mixin/MixinChunkLevelManager.java

@@ -2,22 +2,38 @@
 
 import com.bawnorton.mixinsquared.TargetHandler;
 import com.ishland.c2me.rewrites.chunksystem.common.Config;
+import com.ishland.c2me.rewrites.chunksystem.common.ducks.TicketDistanceLevelPropagatorExtension;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import it.unimi.dsi.fastutil.longs.Long2IntLinkedOpenHashMap;
 import net.minecraft.server.world.ChunkHolder;
 import net.minecraft.server.world.ChunkLevelManager;
+import net.minecraft.server.world.ServerChunkLoadingManager;
 import net.minecraft.server.world.ThrottledChunkTaskScheduler;
+import net.minecraft.server.world.TicketDistanceLevelPropagator;
 import net.minecraft.util.thread.TaskExecutor;
+import org.jetbrains.annotations.Nullable;
 import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Dynamic;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.concurrent.Executor;
 
 @Mixin(value = ChunkLevelManager.class, priority = 1051)
-public class MixinChunkLevelManager {
+public abstract class MixinChunkLevelManager {
+
+    @Shadow
+    @Final
+    private TicketDistanceLevelPropagator ticketDistanceLevelPropagator;
+
+    @Shadow
+    protected abstract @Nullable ChunkHolder setLevel(long pos, int level, @Nullable ChunkHolder holder, int i);
 
     @Dynamic
     @TargetHandler(
@@ -58,4 +74,16 @@ private ThrottledChunkTaskScheduler syncPlayerTickets(TaskExecutor<Runnable> exe
         }
     }
 
+    @Inject(method = "update", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/TicketDistanceLevelPropagator;update(I)I", shift = At.Shift.AFTER))
+    private void postTicketPropagator(ServerChunkLoadingManager chunkLoadingManager, CallbackInfoReturnable<Boolean> cir) {
+        if (this.ticketDistanceLevelPropagator != null) { // ignore if replaced
+            Long2IntLinkedOpenHashMap updates = ((TicketDistanceLevelPropagatorExtension) this.ticketDistanceLevelPropagator).c2me$getTicketLevelUpdates();
+            while (!updates.isEmpty()) {
+                long pos = updates.firstLongKey();
+                int level = updates.removeFirstInt();
+                this.setLevel(pos, level, null, Integer.MAX_VALUE - 1); // holder and old level is ignored
+            }
+        }
+    }
+
 }

c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/mixin/MixinChunkTicketManagerTicketDistanceLevelPropagator.java

@@ -1,30 +1,35 @@
 package com.ishland.c2me.rewrites.chunksystem.mixin;
 
+import com.ishland.c2me.rewrites.chunksystem.common.ducks.TicketDistanceLevelPropagatorExtension;
+import it.unimi.dsi.fastutil.longs.Long2IntLinkedOpenHashMap;
 import it.unimi.dsi.fastutil.longs.Long2IntMap;
 import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
-import net.minecraft.server.world.ChunkHolder;
-import net.minecraft.server.world.ChunkLevelManager;
 import net.minecraft.server.world.TicketDistanceLevelPropagator;
-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.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(TicketDistanceLevelPropagator.class)
-public class MixinChunkTicketManagerTicketDistanceLevelPropagator {
+public class MixinChunkTicketManagerTicketDistanceLevelPropagator implements TicketDistanceLevelPropagatorExtension {
 
     @Shadow @Final private static int UNLOADED;
 
-    private final Long2IntMap levels = new Long2IntOpenHashMap();
+    @Unique
+    private Long2IntMap c2me$levels;
+
+    @Unique
+    private Long2IntLinkedOpenHashMap c2me$ticketLevelUpdates;
 
     @Inject(method = "<init>", at = @At("RETURN"))
     private void postInit(CallbackInfo ci) {
-        this.levels.defaultReturnValue(UNLOADED + 1);
+        this.c2me$levels = new Long2IntOpenHashMap();
+        this.c2me$levels.defaultReturnValue(UNLOADED + 1);
+        this.c2me$ticketLevelUpdates = new Long2IntLinkedOpenHashMap();
     }
 
     /**
@@ -33,26 +38,26 @@ private void postInit(CallbackInfo ci) {
      */
     @Overwrite
     public int getLevel(long id) {
-        return this.levels.get(id);
+        return this.c2me$levels.get(id);
     }
 
-    @Inject(method = "setLevel", at = @At("HEAD"))
-    private void preSetLevel(long id, int level, CallbackInfo ci) {
+    /**
+     * @author ishland
+     * @reason use internal levels, plus defer update
+     */
+    @Overwrite
+    protected void setLevel(long id, int level) {
         if (level >= UNLOADED) {
-            this.levels.remove(id);
+            this.c2me$levels.remove(id);
         } else {
-            this.levels.put(id, level);
+            this.c2me$levels.put(id, level);
         }
+        this.c2me$ticketLevelUpdates.putAndMoveToLast(id, level);
     }
 
-    @Redirect(method = "setLevel", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ChunkLevelManager;getChunkHolder(J)Lnet/minecraft/server/world/ChunkHolder;"))
-    private ChunkHolder fakeLevel(ChunkLevelManager instance, long l) {
-        return null;
-    }
-
-    @Redirect(method = "setLevel", at = @At(value = "FIELD", target = "Lnet/minecraft/server/world/TicketDistanceLevelPropagator;UNLOADED:I", opcode = Opcodes.GETSTATIC))
-    private int fakeLevel() {
-        return Integer.MAX_VALUE;
+    @Override
+    public Long2IntLinkedOpenHashMap c2me$getTicketLevelUpdates() {
+        return this.c2me$ticketLevelUpdates;
     }
 
 }