Last fixes

GTNewHorizons · Nov 13, 2023 · 3f8ba88 · 3f8ba88
1 parent 641ac96
commit 3f8ba88
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/squeek/applecore/mixins/early/minecraft/BlockMushroomMixin.java b/src/main/java/squeek/applecore/mixins/early/minecraft/BlockMushroomMixin.java
@@ -23,7 +23,7 @@ public class BlockMushroomMixin extends BlockBush {
     @ModifyExpressionValue(
             method = "updateTick",
             at = @At(value = "INVOKE", target = "Ljava/util/Random;nextInt(I)I", ordinal = 0))
-    private int onUpdateTick(int original, Random random, World worldIn, int x, int y, int z,
+    private int onUpdateTick(int original, World worldIn, int x, int y, int z, Random random,
             @Share("executedCondition") LocalBooleanRef executedCondition) {
         switch (AppleCoreAPI.dispatcher.validatePlantGrowth(this, worldIn, x, y, z, random)) {
             case ALLOW:

diff --git a/src/main/java/squeek/applecore/mixins/early/minecraft/BlockReedMixin.java b/src/main/java/squeek/applecore/mixins/early/minecraft/BlockReedMixin.java
@@ -28,9 +28,9 @@ private BlockReedMixin() {
 
     @Inject(
             method = "updateTick",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;getBlockMetadata(III)I"),
+            at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/world/World;getBlockMetadata(III)I"),
             cancellable = true)
-    private void beforeGetBlockMetadata(World world, int blockX, int blockY, int blockZ, Random random,
+    private void afterGetBlockMetadata(World world, int blockX, int blockY, int blockZ, Random random,
             CallbackInfo callbackInfo, @Local(name = "i1") int i1,
             @Share("wasAllowedToGrow") LocalBooleanRef wasAllowedToGrow,
             @Share("previousMetadata") LocalIntRef previousMetadata) {

diff --git a/src/main/java/squeek/applecore/mixins/early/minecraft/BlockStemMixin.java b/src/main/java/squeek/applecore/mixins/early/minecraft/BlockStemMixin.java
@@ -35,7 +35,7 @@ private int redirectGetBlockLightValue(int original, World worldIn, int x, int y
 
     @Inject(
             method = "updateTick",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/world/World;getBlockMetadata(III)I"))
+            at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/world/World;getBlockMetadata(III)I"))
     private void onGetBlockMetadata(World world, int blockX, int blockY, int blockZ, Random random,
             CallbackInfo callbackInfo, @Local(name = "l") int l,
             @Share("previousMetadata") LocalIntRef previousMetadata) {