build: 25w43a

Author: ishland

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

@@ -1,14 +1,9 @@
 package com.ishland.c2me.base.mixin.access;
 
-import net.minecraft.world.storage.ChunkPosKeyedStorage;
 import net.minecraft.world.storage.SerializingRegionBasedStorage;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.gen.Accessor;
 
 @Mixin(SerializingRegionBasedStorage.class)
 public interface ISerializingRegionBasedStorage {
 
-    @Accessor
-    ChunkPosKeyedStorage getStorageAccess();
-
 }

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

@@ -34,4 +34,13 @@ private void preventAsyncEntityUnload(CallbackInfo ci) {
         }
     }
 
+    @Inject(method = "markChunkNeedsSaving", at = @At("HEAD"))
+    private void onMarkChunkNeedsSaving(CallbackInfo ci) {
+        if (!this.mainThreadExecutor.isOnThread()) {
+            final ConcurrentModificationException e = new ConcurrentModificationException("Async chunk modification");
+            e.printStackTrace();
+            throw e;
+        }
+    }
+
 }

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

@@ -8,6 +8,7 @@
 import com.ishland.c2me.rewrites.chunk_serializer.common.NbtWriter;
 import com.ishland.c2me.rewrites.chunk_serializer.common.utils.ValidationUtils;
 import com.mojang.datafixers.DataFixer;
+import net.minecraft.datafixer.DataFixTypes;
 import net.minecraft.nbt.NbtElement;
 import net.minecraft.server.world.ChunkHolder;
 import net.minecraft.server.world.ServerChunkLoadingManager;
@@ -48,8 +49,8 @@ public abstract class MixinThreadedAnvilChunkStorage extends VersionedChunkStora
     @Shadow
     ServerWorld world;
 
-    public MixinThreadedAnvilChunkStorage(StorageKey arg, Path path, DataFixer dataFixer, boolean bl) {
-        super(arg, path, dataFixer, bl);
+    public MixinThreadedAnvilChunkStorage(StorageKey storageKey, Path path, DataFixer dataFixer, boolean bl, DataFixTypes dataFixTypes) {
+        super(storageKey, path, dataFixer, bl, dataFixTypes);
     }
 
     @Shadow

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

@@ -239,7 +239,7 @@ private Completable asyncSave(ChunkLoadingContext context, Chunk chunk) {
                     .flatMapCompletable(either -> {
                         if (either.left().isPresent()) {
                             NbtCompound nbtCompound = either.left().get();
-                            return Completable.fromCompletionStage(context.tacs().setNbt(chunkPos, () -> nbtCompound));
+                            return Completable.fromCompletionStage(context.tacs().set(chunkPos, () -> nbtCompound));
                         } else {
                             return Completable.fromCompletionStage(((IDirectStorage) ((IVersionedChunkStorage) context.tacs()).getWorker()).setRawChunkData(chunkPos, either.right().get()));
                         }

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

@@ -2,7 +2,9 @@
 
 import com.mojang.datafixers.DataFixer;
 import net.minecraft.SharedConstants;
+import net.minecraft.datafixer.DataFixTypes;
 import net.minecraft.nbt.NbtCompound;
+import net.minecraft.nbt.NbtHelper;
 import net.minecraft.server.world.ChunkHolder;
 import net.minecraft.server.world.ServerChunkLoadingManager;
 import net.minecraft.util.Util;
@@ -20,8 +22,8 @@
 @Mixin(ServerChunkLoadingManager.class)
 public abstract class MixinThreadedAnvilChunkStorage extends VersionedChunkStorage implements ChunkHolder.PlayersWatchingChunkProvider {
 
-    public MixinThreadedAnvilChunkStorage(StorageKey arg, Path path, DataFixer dataFixer, boolean bl) {
-        super(arg, path, dataFixer, bl);
+    public MixinThreadedAnvilChunkStorage(StorageKey storageKey, Path path, DataFixer dataFixer, boolean bl, DataFixTypes dataFixTypes) {
+        super(storageKey, path, dataFixer, bl, dataFixTypes);
     }
 
     @Shadow protected abstract NbtCompound updateChunkNbt(NbtCompound nbt);
@@ -36,7 +38,7 @@ private CompletableFuture<Optional<NbtCompound>> getUpdatedChunkNbt(ChunkPos chu
         return this.getNbt(chunkPos).thenCompose(nbt -> {
             if (nbt.isPresent()) {
                 final NbtCompound compound = nbt.get();
-                if (VersionedChunkStorage.getDataVersion(compound) != SharedConstants.getGameVersion().dataVersion().id()) {
+                if (NbtHelper.getDataVersion(compound, -1) != SharedConstants.getGameVersion().dataVersion().id()) {
                     return CompletableFuture.supplyAsync(() -> Optional.of(updateChunkNbt(compound)), Util.getMainWorkerExecutor());
                 } else {
                     return CompletableFuture.completedFuture(nbt);

c2me-rewrites-chunkio/src/main/java/com/ishland/c2me/rewrites/chunkio/mixin/MixinChunkPosKeyedStorage.java

@@ -14,7 +14,7 @@
 @Mixin(VersionedChunkStorage.class)
 public class MixinVersionedChunkStorage {
 
-    @Redirect(method = "<init>", at = @At(value = "NEW", target = "(Lnet/minecraft/world/storage/StorageKey;Ljava/nio/file/Path;Z)Lnet/minecraft/world/storage/StorageIoWorker;"))
+    @Redirect(method = "<init>(Lnet/minecraft/world/storage/StorageKey;Ljava/nio/file/Path;Lcom/mojang/datafixers/DataFixer;ZLnet/minecraft/datafixer/DataFixTypes;Ljava/util/function/Supplier;)V", at = @At(value = "NEW", target = "(Lnet/minecraft/world/storage/StorageKey;Ljava/nio/file/Path;Z)Lnet/minecraft/world/storage/StorageIoWorker;"))
     private StorageIoWorker redirectStorageIoWorker(StorageKey arg, Path path, boolean bl) {
         if (this instanceof IVanillaChunkManager vanillaChunkManager) {
             return new C2MEStorageVanillaInterface(arg, path, bl, pos -> vanillaChunkManager.c2me$getSchedulingManager().positionedExecutor(pos));

c2me-rewrites-chunkio/src/main/java/com/ishland/c2me/rewrites/chunkio/mixin/MixinRecreatedChunkStorage.java

@@ -4,8 +4,6 @@
   "package": "com.ishland.c2me.rewrites.chunkio.mixin",
   "plugin": "com.ishland.c2me.base.common.ModuleMixinPlugin",
   "mixins": [
-    "MixinChunkPosKeyedStorage",
-    "MixinRecreatedChunkStorage",
     "MixinRecreationStorage",
     "MixinStorageIoWorker",
     "MixinVersionedChunkStorage"

c2me-rewrites-chunkio/src/main/java/com/ishland/c2me/rewrites/chunkio/mixin/MixinVersionedChunkStorage.java

@@ -11,10 +11,10 @@ gradle-curseforge-publish.interop.neogradle=false
 #org.gradle.configuration-cache=true
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=25w42a
-yarn_mappings=25w42a+build.2
+minecraft_version=25w43a
+yarn_mappings=25w43a+build.3
 loader_version=0.17.3
-fabric_version=0.135.1+1.21.11
+fabric_version=0.136.1+1.21.11
 # Mod Properties
 mod_version=0.3.6+alpha.0
 maven_group=com.ishland.c2me