Skip to content

Commit 08d3adc

Browse files
committed
Improve shutdown speed & mark some ops safe
1 parent 4adc038 commit 08d3adc

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

c2me-notickvd/src/main/java/com/ishland/c2me/notickvd/common/NoTickSystem.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,13 @@ public void setNoTickViewDistance(int viewDistance) {
5454
this.pendingActions.add(() -> this.playerNoTickDistanceMap.setViewDistance(viewDistance));
5555
}
5656

57-
public void tick() {
57+
public void tickScheduler() {
5858
this.noThreadScheduler.tick(Throwable::printStackTrace);
59+
60+
}
61+
62+
public void tick() {
63+
tickScheduler();
5964
scheduleTick();
6065
}
6166

c2me-notickvd/src/main/java/com/ishland/c2me/notickvd/mixin/MixinChunkTicketManager.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ private void onHandleChunkLeave(ChunkSectionPos pos, ServerPlayerEntity player,
4646
this.noTickSystem.removePlayerSource(pos.toChunkPos());
4747
}
4848

49+
@Inject(method = "removePersistentTickets", at = @At("RETURN"))
50+
private void onRemovePersistentTickets(CallbackInfo ci) {
51+
this.noTickSystem.tick();
52+
}
53+
4954
@Inject(method = "purge", at = @At("RETURN"))
5055
private void onPurge(CallbackInfo ci) {
5156
this.noTickSystem.runPurge(this.age);

c2me-threading-worldgen/src/main/java/com/ishland/c2me/threading/worldgen/common/debug/StacktraceRecorder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public static class StacktraceHolder {
5353
private static final String BlendingData$getBlendingData = FabricLoader.getInstance().getMappingResolver()
5454
.mapMethodName("intermediary", "net.minecraft.class_6749", "method_39570", "(Lnet/minecraft/class_3233;II)Lnet/minecraft/class_6749;");
5555
private static final String ChunkGenerator$carve = FabricLoader.getInstance().getMappingResolver()
56-
.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");
56+
.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");
5757
private static final String SpawnHelper$populateEntities = FabricLoader.getInstance().getMappingResolver()
5858
.mapMethodName("intermediary", "net.minecraft.class_1948", "method_8661", "(Lnet/minecraft/class_5425;Lnet/minecraft/class_1959;Lnet/minecraft/class_1923;Ljava/util/Random;)V");
5959
private static final String StructureAccessor$method_41032 = FabricLoader.getInstance().getMappingResolver()

0 commit comments

Comments
 (0)