Improve shutdown speed & mark some ops safe

RelativityMC · Jun 8, 2022 · 08d3adc · 08d3adc
1 parent 4adc038
commit 08d3adc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/c2me-notickvd/src/main/java/com/ishland/c2me/notickvd/common/NoTickSystem.java b/c2me-notickvd/src/main/java/com/ishland/c2me/notickvd/common/NoTickSystem.java
@@ -54,8 +54,13 @@ public void setNoTickViewDistance(int viewDistance) {
         this.pendingActions.add(() -> this.playerNoTickDistanceMap.setViewDistance(viewDistance));
     }
 
-    public void tick() {
+    public void tickScheduler() {
         this.noThreadScheduler.tick(Throwable::printStackTrace);
+
+    }
+
+    public void tick() {
+        tickScheduler();
         scheduleTick();
     }
 

diff --git a/c2me-notickvd/src/main/java/com/ishland/c2me/notickvd/mixin/MixinChunkTicketManager.java b/c2me-notickvd/src/main/java/com/ishland/c2me/notickvd/mixin/MixinChunkTicketManager.java
@@ -46,6 +46,11 @@ private void onHandleChunkLeave(ChunkSectionPos pos, ServerPlayerEntity player,
         this.noTickSystem.removePlayerSource(pos.toChunkPos());
     }
 
+    @Inject(method = "removePersistentTickets", at = @At("RETURN"))
+    private void onRemovePersistentTickets(CallbackInfo ci) {
+        this.noTickSystem.tick();
+    }
+
     @Inject(method = "purge", at = @At("RETURN"))
     private void onPurge(CallbackInfo ci) {
         this.noTickSystem.runPurge(this.age);

diff --git a/...en/src/main/java/com/ishland/c2me/threading/worldgen/common/debug/StacktraceRecorder.java b/...en/src/main/java/com/ishland/c2me/threading/worldgen/common/debug/StacktraceRecorder.java
@@ -53,7 +53,7 @@ public static class StacktraceHolder {
         private static final String BlendingData$getBlendingData = FabricLoader.getInstance().getMappingResolver()
                 .mapMethodName("intermediary", "net.minecraft.class_6749", "method_39570", "(Lnet/minecraft/class_3233;II)Lnet/minecraft/class_6749;");
         private static final String ChunkGenerator$carve = FabricLoader.getInstance().getMappingResolver()
-                .mapMethodName("intermediary", "net.minecraft.class_2794", "method_12108", "(Lnet/minecraft/class_3233;JLnet/minecraft/class_4543;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_2893$class_2894;)V");
+                .mapMethodName("intermediary", "net.minecraft.class_2794", "method_12108", "(Lnet/minecraft/class_3233;JLnet/minecraft/class_7138;Lnet/minecraft/class_4543;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;Lnet/minecraft/class_2893$class_2894;)V");
         private static final String SpawnHelper$populateEntities = FabricLoader.getInstance().getMappingResolver()
                 .mapMethodName("intermediary", "net.minecraft.class_1948", "method_8661", "(Lnet/minecraft/class_5425;Lnet/minecraft/class_1959;Lnet/minecraft/class_1923;Ljava/util/Random;)V");
         private static final String StructureAccessor$method_41032 = FabricLoader.getInstance().getMappingResolver()