build: 24w44a

RelativityMC · Oct 30, 2024 · dc4861f · dc4861f
1 parent 354b818
commit dc4861f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 37 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -46,7 +46,7 @@ jobs:
 
     - name: upload to modrinth and curseforge
       run: ./gradlew modrinth curseforge
-      if: github.ref == 'refs/heads/ver/1.21.3'
+      if: github.ref == 'refs/heads/dev/1.21.4'
       env:
         MODRINTH_TOKEN: ${{ secrets.MODRINTH_UPLOAD_TOKEN }}
         CURSEFORGE_TOKEN: ${{ secrets.CURSEFORGE_API_TOKEN }}

diff --git a/...es/worldgen/threading_issues/mixin/threading/MixinOceanMonumentGeneratorPieceSetting.java b/...es/worldgen/threading_issues/mixin/threading/MixinOceanMonumentGeneratorPieceSetting.java
@@ -12,9 +12,9 @@ public class MixinOceanMonumentGeneratorPieceSetting {
     @Shadow private boolean used;
 
     @MakeVolatile
-    @Shadow private boolean field_14484;
+    @Shadow private boolean entrance;
 
     @MakeVolatile
-    @Shadow private int field_14483;
+    @Shadow private int entranceDistance;
 
 }
diff --git a/c2me-opts-allocs/src/main/java/com/ishland/c2me/opts/allocs/mixin/MixinNbtList1.java b/c2me-opts-allocs/src/main/java/com/ishland/c2me/opts/allocs/mixin/MixinNbtList1.java
diff --git a/...ain/java/com/ishland/c2me/rewrites/chunksystem/common/NewChunkHolderVanillaInterface.java b/...ain/java/com/ishland/c2me/rewrites/chunksystem/common/NewChunkHolderVanillaInterface.java
@@ -210,6 +210,11 @@ public void flushUpdates(WorldChunk chunk) {
         super.flushUpdates(chunk); // use vanilla impl
     }
 
+    @Override
+    public boolean hasPendingUpdates() {
+        return super.hasPendingUpdates(); // use vanilla impl
+    }
+
     @Override
     public void combinePostProcessingFuture(CompletableFuture<?> postProcessingFuture) {
         super.combinePostProcessingFuture(postProcessingFuture); // use vanilla impl

diff --git a/...s-chunkio/src/main/java/com/ishland/c2me/rewrites/chunkio/mixin/MixinStorageIoWorker.java b/...s-chunkio/src/main/java/com/ishland/c2me/rewrites/chunkio/mixin/MixinStorageIoWorker.java
@@ -3,7 +3,6 @@
 import com.ishland.c2me.rewrites.chunkio.common.C2MEStorageVanillaInterface;
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.util.thread.PrioritizedConsecutiveExecutor;
-import net.minecraft.util.thread.TaskQueue;
 import net.minecraft.world.storage.RegionBasedStorage;
 import net.minecraft.world.storage.StorageIoWorker;
 import org.spongepowered.asm.mixin.Final;
@@ -14,7 +13,6 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import java.util.Map;
 import java.util.SequencedMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -31,7 +29,7 @@ public class MixinStorageIoWorker {
     @Shadow @Final private AtomicBoolean closed;
 
     @Mutable
-    @Shadow @Final private PrioritizedConsecutiveExecutor field_54149;
+    @Shadow @Final private PrioritizedConsecutiveExecutor executor;
 
     @SuppressWarnings("ConstantConditions")
     @Inject(method = "<init>", at = @At("RETURN"))
@@ -41,7 +39,7 @@ private void onInit(CallbackInfo ci) {
             this.results = null;
             this.storage = null;
             this.closed = null;
-            this.field_54149 = null;
+            this.executor = null;
         }
     }
 

diff --git a/gradle.properties b/gradle.properties
@@ -5,9 +5,9 @@ org.gradle.warning.mode=all
 #org.gradle.configuration-cache=true
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.21.3
-yarn_mappings=1.21.3+build.2
-loader_version=0.16.7
+minecraft_version=24w44a
+yarn_mappings=24w44a+build.1
+loader_version=0.16.9
 fabric_version=0.107.0+1.21.3
 # Mod Properties
 mod_version=0.3.0+alpha.0

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -26,7 +26,7 @@
     ]
   },
   "depends": {
-    "fabricloader": ">=0.16.0",
+    "fabricloader": ">=0.16.9",
     "java": ">=21",
     "minecraft": ">=1.21.2-rc.1"
   },