Merge branch 'ver/1.20.1' into ver/1.20.2

RelativityMC · Sep 1, 2023 · 590bf39 · 590bf39
2 parents 79ec795 + 0235355
commit 590bf39
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 41 deletions.
diff --git a/...ixes/worldgen/threading_issues/mixin/threading/MixinNetherFortressGeneratorPieceData.java b/...ixes/worldgen/threading_issues/mixin/threading/MixinNetherFortressGeneratorPieceData.java
@@ -23,7 +23,7 @@ private int redirectGetGeneratedCount(NetherFortressGenerator.PieceData pieceDat
 
     @SuppressWarnings("MixinAnnotationTarget")
     @Dynamic
-    @Redirect(method = "*", at = @At(value = "FIELD", target = "Lnet/minecraft/structure/NetherFortressGenerator$PieceData;generatedCount:I", opcode = Opcodes.PUTFIELD), require = 0)
+    @Redirect(method = "*", at = @At(value = "FIELD", target = "Lnet/minecraft/structure/NetherFortressGenerator$PieceData;generatedCount:I", opcode = Opcodes.PUTFIELD), require = 0, expect = 0)
     private void redirectSetGeneratedCount(NetherFortressGenerator.PieceData pieceData, int value) {
         this.generatedCountAtomic.set(value);
     }

diff --git a/...and/c2me/opts/chunkio/mixin/compression/increase_buffer_size/MixinChunkStreamVersion.java b/...and/c2me/opts/chunkio/mixin/compression/increase_buffer_size/MixinChunkStreamVersion.java
diff --git a/c2me-opts-chunkio/src/main/resources/c2me-opts-chunkio.mixins.json b/c2me-opts-chunkio/src/main/resources/c2me-opts-chunkio.mixins.json
@@ -4,7 +4,6 @@
   "package": "com.ishland.c2me.opts.chunkio.mixin",
   "plugin": "com.ishland.c2me.opts.chunkio.MixinPlugin",
   "mixins": [
-    "compression.increase_buffer_size.MixinChunkStreamVersion",
     "compression.modify_default_chunk_compression.MixinRegionFile",
     "hide_sync_disk_writes_behind_flag.MixinRegionBasedStorage",
     "limit_nbt_cache.MixinStorageIoWorker"