build: 23w33a

c2me-base/src/main/java/com/ishland/c2me/base/mixin/access/IChunkHolder.java

@@ -11,6 +11,6 @@
 public interface IChunkHolder {
 
     @Invoker
-    void invokeTick(ThreadedAnvilChunkStorage chunkStorage, Executor executor);
+    void invokeUpdateFutures(ThreadedAnvilChunkStorage chunkStorage, Executor executor);
 
 }

c2me-base/src/main/java/com/ishland/c2me/base/mixin/access/IServerChunkManager.java

@@ -16,6 +16,6 @@ public interface IServerChunkManager {
     ServerChunkManager.MainThreadExecutor getMainThreadExecutor();
 
     @Invoker
-    boolean invokeTick();
+    boolean invokeUpdateChunks();
 
 }

c2me-fixes-chunkio-threading-issues/src/main/java/com/ishland/c2me/fixes/chunkio/threading_issues/mixin/MixinChunkHolder.java

@@ -13,7 +13,7 @@
 @Mixin(ChunkHolder.class)
 public class MixinChunkHolder {
 
-    @Inject(method = "tick", at = @At("HEAD"))
+    @Inject(method = "updateFutures", at = @At("HEAD"))
     private void beforeTick(ThreadedAnvilChunkStorage chunkStorage, Executor executor, CallbackInfo ci) {
         ((IThreadedAnvilChunkStorage) chunkStorage).invokeUpdateHolderMap();
     }

c2me-fixes-general-threading-issues/src/main/java/com/ishland/c2me/fixes/general/threading_issues/mixin/MixinChunkTicketManager.java

@@ -12,7 +12,7 @@
 public class MixinChunkTicketManager {
 
     @SuppressWarnings("unchecked")
-    @Redirect(method = "tick", at = @At(value = "INVOKE", target = "Ljava/util/Set;forEach(Ljava/util/function/Consumer;)V"))
+    @Redirect(method = "update", at = @At(value = "INVOKE", target = "Ljava/util/Set;forEach(Ljava/util/function/Consumer;)V"))
     private <T> void replaceIterationForHolderTicking(Set<T> instance, Consumer<T> consumer) {
         if (instance.isEmpty()) return;
         for (Object object : instance.toArray()) {

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

@@ -56,12 +56,12 @@ private void onPurge(CallbackInfo ci) {
         this.noTickSystem.runPurge(this.age);
     }
 
-    @Inject(method = "tick", at = @At("HEAD"))
+    @Inject(method = "update", at = @At("HEAD"))
     private void beforeTick(ThreadedAnvilChunkStorage chunkStorage, CallbackInfoReturnable<Boolean> cir) {
         this.noTickSystem.beforeTicketTicks();
     }
 
-    @Inject(method = "tick", at = @At("RETURN"))
+    @Inject(method = "update", at = @At("RETURN"))
     private void onTick(ThreadedAnvilChunkStorage chunkStorage, CallbackInfoReturnable<Boolean> cir) {
         if (this.simulationDistanceTracker instanceof NoOPTickingMap map) {
             map.setTACS(chunkStorage);

c2me-opts-chunk-access/src/main/java/com/ishland/c2me/opts/chunk_access/mixin/async_chunk_request/MixinServerChunkManager.java

@@ -52,7 +52,7 @@ public abstract class MixinServerChunkManager {
     ServerWorld world;
 
     @Shadow
-    public abstract boolean tick();
+    public abstract boolean updateChunks();
 
     @Shadow @Final public ThreadedAnvilChunkStorage threadedAnvilChunkStorage;
     @Shadow @Final public ServerChunkManager.MainThreadExecutor mainThreadExecutor;
@@ -95,7 +95,7 @@ private void onGetChunk(int chunkX, int chunkZ, ChunkStatus leastStatus, boolean
                 if (this.isMissingForLevel(chunkHolder, ticketLevel)) {
                     Profiler profiler = this.world.getProfiler();
                     profiler.push("chunkLoad");
-                    this.tick();
+                    this.updateChunks();
                     chunkHolder = this.getChunkHolder(chunkPosLong);
                     profiler.pop();
                     if (this.isMissingForLevel(chunkHolder, ticketLevel)) {

c2me-threading-worldgen/src/main/java/com/ishland/c2me/threading/worldgen/mixin/cancellation/MixinChunkHolder.java

@@ -22,7 +22,7 @@ public abstract class MixinChunkHolder {
 
     @Shadow @Final public static Either<Chunk, ChunkHolder.Unloaded> UNLOADED_CHUNK;
 
-//    @Redirect(method = "tick", at = @At(value = "INVOKE", target = "Ljava/util/concurrent/atomic/AtomicReferenceArray;get(I)Ljava/lang/Object;"))
+//    @Redirect(method = "updateChunks", at = @At(value = "INVOKE", target = "Ljava/util/concurrent/atomic/AtomicReferenceArray;get(I)Ljava/lang/Object;"))
 //    private <E> E captureWorldGenCancellation(AtomicReferenceArray<E> instance, int i, ThreadedAnvilChunkStorage chunkStorage, Executor executor) {
 //        if (instance == this.futuresByStatus) {
 //            final CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>> future = this.futuresByStatus.get(i);

gradle.properties

@@ -4,8 +4,8 @@ org.gradle.parallel=true
 fabric.loom.multiProjectOptimisation=true
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=23w32a
-yarn_mappings=23w32a+build.6
+minecraft_version=23w33a
+yarn_mappings=23w33a+build.1
 loader_version=0.14.22
 # Mod Properties
 mod_version=0.2.0+alpha.10

tests/test-mod/src/main/java/com/ishland/c2me/tests/testmod/PreGenTask.java

@@ -248,7 +248,7 @@ private static ArrayList<ChunkPos> createPreGenChunks0(ChunkPos center, int radi
     private static CompletableFuture<Void> getChunkAtAsync(ServerWorld world, ChunkPos pos) {
         CompletableFuture<Void> future = new CompletableFuture<>();
         world.getChunkManager().addTicket(TICKET, pos, 0, Unit.INSTANCE);
-        ((IServerChunkManager) world.getChunkManager()).invokeTick();
+        ((IServerChunkManager) world.getChunkManager()).invokeUpdateChunks();
         final ChunkHolder chunkHolder = ((IThreadedAnvilChunkStorage) world.getChunkManager().threadedAnvilChunkStorage).invokeGetChunkHolder(pos.toLong());
         Preconditions.checkNotNull(chunkHolder, "chunkHolder is null");
         chunkHolder.getChunkAt(ChunkStatus.FULL, world.getChunkManager().threadedAnvilChunkStorage).thenAcceptAsync(either -> {

tests/test-mod/src/main/java/com/ishland/c2me/tests/testmod/mixin/IServerChunkManager.java

@@ -14,7 +14,7 @@
 public interface IServerChunkManager {
 
     @Invoker
-    boolean invokeTick();
+    boolean invokeUpdateChunks();
 
     @Invoker
     CompletableFuture<Either<Chunk, ChunkHolder.Unloaded>> invokeGetChunkFuture(int chunkX, int chunkZ, ChunkStatus leastStatus, boolean create);