build: 1.21.2-pre3

Author: ishland

c2me-opts-scheduling/src/main/java/com/ishland/c2me/opts/scheduling/mixin/idle_tasks/autosave/disable_vanilla_mid_tick_autosave/MixinThreadedAnvilChunkStorage.java

@@ -1,22 +1,18 @@
 package com.ishland.c2me.opts.scheduling.mixin.idle_tasks.autosave.disable_vanilla_mid_tick_autosave;
 
-import it.unimi.dsi.fastutil.longs.Long2ObjectLinkedOpenHashMap;
-import net.minecraft.server.world.ChunkHolder;
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import net.minecraft.server.world.ServerChunkLoadingManager;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
+
+import java.util.function.BooleanSupplier;
 
 @Mixin(ServerChunkLoadingManager.class)
 public class MixinThreadedAnvilChunkStorage {
 
-    @Unique
-    private static final Long2ObjectLinkedOpenHashMap<ChunkHolder> anEmptyChunkHoldersMap = new Long2ObjectLinkedOpenHashMap<>();
-
-    @Redirect(method = "unloadChunks", at = @At(value = "FIELD", target = "Lnet/minecraft/server/world/ServerChunkLoadingManager;chunkHolders:Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;"))
-    private Long2ObjectLinkedOpenHashMap<ChunkHolder> stopAutoSaveInUnloading(ServerChunkLoadingManager instance) {
-        return anEmptyChunkHoldersMap; // prevent autosave from happening in unloading stage
+    @WrapWithCondition(method = "unloadChunks", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/world/ServerChunkLoadingManager;saveChunks(Ljava/util/function/BooleanSupplier;)V"))
+    private boolean stopAutoSavingDuringTick(ServerChunkLoadingManager instance, BooleanSupplier shouldKeepTicking) {
+        return false;
     }
 
 }

c2me-rewrites-chunk-serializer/src/main/java/com/ishland/c2me/rewrites/chunk_serializer/mixin/MixinThreadedAnvilChunkStorage.java

@@ -59,11 +59,10 @@ public MixinThreadedAnvilChunkStorage(StorageKey arg, Path path, DataFixer dataF
     private boolean save(Chunk chunk) {
         // [VanillaCopy]
         this.pointOfInterestStorage.saveChunk(chunk.getPos());
-        if (!chunk.needsSaving()) {
+        if (!chunk.tryMarkSaved()) {
             return false;
         }
 
-        chunk.setNeedsSaving(false);
         ChunkPos chunkPos = chunk.getPos();
 
         try {

c2me-rewrites-chunk-system/src/main/java/com/ishland/c2me/rewrites/chunksystem/common/statuses/ReadFromDiskAsync.java

@@ -104,10 +104,9 @@ public CompletionStage<Void> downgradeFromThis(ChunkLoadingContext context) {
 
     private CompletionStage<Void> asyncSave(ServerChunkLoadingManager tacs, Chunk chunk) {
         ((IThreadedAnvilChunkStorage) tacs).getPointOfInterestStorage().saveChunk(chunk.getPos());
-        if (!chunk.needsSaving()) {
+        if (!chunk.tryMarkSaved()) {
             return CompletableFuture.completedStage(null);
         } else {
-            chunk.setNeedsSaving(false);
             ChunkPos chunkPos = chunk.getPos();
 
             SerializedChunk serializer = SerializedChunk.fromChunk(((IThreadedAnvilChunkStorage) tacs).getWorld(), chunk);
@@ -125,7 +124,7 @@ private CompletionStage<Void> asyncSave(ServerChunkLoadingManager tacs, Chunk ch
                     .exceptionallyCompose(throwable -> {
                         LOGGER.error("Failed to save chunk {},{} asynchronously, falling back to sync saving", chunkPos.x, chunkPos.z, throwable);
                         return CompletableFuture.runAsync(() -> {
-                            chunk.setNeedsSaving(true);
+                            chunk.markNeedsSaving();
                             ((IThreadedAnvilChunkStorage) tacs).invokeSave(chunk);
                         }, ((IThreadedAnvilChunkStorage) tacs).getMainThreadExecutor());
                     });

gradle.properties

@@ -5,10 +5,10 @@ org.gradle.warning.mode=all
 fabric.loom.multiProjectOptimisation=true
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.21.2-pre1
-yarn_mappings=1.21.2-pre1+build.1
-loader_version=0.16.5
-fabric_version=0.105.2+1.21.2
+minecraft_version=1.21.2-pre3
+yarn_mappings=1.21.2-pre3+build.2
+loader_version=0.16.7
+fabric_version=0.105.4+1.21.2
 # Mod Properties
 mod_version=0.3.0+alpha.0
 maven_group=com.ishland.c2me