Patch redirected fluid height calls moved to lambda

Fixes #490
Sinytra · Nov 10, 2023 · daf0b33 · daf0b33
1 parent 04bc6ee
commit daf0b33
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/main/java/dev/su5ed/sinytra/connector/transformer/MixinPatchTransformer.java b/src/main/java/dev/su5ed/sinytra/connector/transformer/MixinPatchTransformer.java
@@ -76,11 +76,16 @@ public class MixinPatchTransformer implements Transformer {
             .targetInjectionPoint("Lnet/fabricmc/loader/impl/game/minecraft/Hooks;startServer(Ljava/io/File;Ljava/lang/Object;)V")
             .modifyInjectionPoint("Lnet/minecraftforge/server/loading/ServerModLoader;load()V")
             .build(),
+        Patch.builder()
+            .targetClass("net/minecraft/world/entity/Entity")
+            .targetMethod("m_204031_(Lnet/minecraft/tags/TagKey;D)Z")
+            .targetInjectionPoint("Lnet/minecraft/world/phys/Vec3;m_82553_()D")
+            .modifyTarget("lambda$updateFluidHeightAndDoFluidPushing$26")
+            .build(),
         Patch.builder()
             .targetClass("net/minecraft/world/entity/Entity")
             .targetMethod("m_204031_(Lnet/minecraft/tags/TagKey;D)Z")
             .targetInjectionPoint("Lnet/minecraft/world/entity/Entity;m_146899_()Z")
-            .targetMixinType(Patch.MODIFY_EXPR_VAL)
             .modifyTarget("updateFluidHeightAndDoFluidPushing()V")
             .build(),
         Patch.builder()
@@ -172,6 +177,9 @@ public class MixinPatchTransformer implements Transformer {
             .targetClass("net/minecraft/world/level/block/FireBlock")
             .targetMethod("m_221150_")
             .modifyTarget("tryCatchFire")
+            .modifyParams(b -> b
+                .insert(5, Type.getObjectType("net/minecraft/core/Direction"))
+                .targetType(ModifyMethodParams.TargetType.METHOD))
             .build(),
         Patch.builder()
             .targetClass("net/minecraft/world/level/block/FireBlock")