Handle ModifyExpressionValue in UTP

Author: Su5eD

definition/src/main/java/org/sinytra/adapter/patch/api/MixinConstants.java

@@ -18,6 +18,7 @@ public class MixinConstants {
     public static final String INVOKER = "Lorg/spongepowered/asm/mixin/gen/Invoker;";
     // Mixinextras annotations
     public static final String MODIFY_EXPR_VAL = "Lcom/llamalad7/mixinextras/injector/ModifyExpressionValue;";
+    public static final String MODIFY_EXPR_VAL_INTERNAL_NAME = "com/llamalad7/mixinextras/injector/ModifyExpressionValue";
     public static final String MODIFY_RETURN_VAL = "Lcom/llamalad7/mixinextras/injector/ModifyReturnValue;";
     public static final String WRAP_OPERATION = "Lcom/llamalad7/mixinextras/injector/wrapoperation/WrapOperation;";
     public static final String WRAP_OPERATION_INTERNAL_NAME = "com/llamalad7/mixinextras/injector/wrapoperation/WrapOperation";

definition/src/next/java/org/sinytra/adapter/next/env/ann/ModifyExpressionValueMixinData.java

@@ -0,0 +1,9 @@
+package org.sinytra.adapter.next.env.ann;
+
+import org.sinytra.adapter.patch.util.MethodQualifier;
+
+public class ModifyExpressionValueMixinData extends MixinData {
+    public ModifyExpressionValueMixinData(ClassTarget targetClass, MethodQualifier targetMethod, AtData atData) {
+        super(targetClass, targetMethod, atData);
+    }
+}

definition/src/next/java/org/sinytra/adapter/next/env/param/MethodParameters.java

@@ -7,6 +7,7 @@
 import java.util.*;
 import java.util.function.Predicate;
 
+// TODO Support for @Local
 public class MethodParameters {
     public sealed interface ParamGroup {
         ParamGroup METHOD_PARAMS = new Variable("method_params");

definition/src/next/java/org/sinytra/adapter/next/type/MixinTypes.java

@@ -19,6 +19,7 @@ public class MixinTypes {
         registerMixinType(ModifyArg.class, new ModifyArgMixin());
         registerMixinType(Redirect.class, new RedirectMixin());
         registerMixinType(MixinConstants.WRAP_OPERATION_INTERNAL_NAME, new WrapOperationMixin());
+        registerMixinType(MixinConstants.MODIFY_EXPR_VAL_INTERNAL_NAME, new ModifyExpressionValueMixin());
     }
 
     @Nullable

definition/src/next/java/org/sinytra/adapter/next/type/ModifyExpressionValueMixin.java

@@ -0,0 +1,49 @@
+package org.sinytra.adapter.next.type;
+
+import org.objectweb.asm.Type;
+import org.sinytra.adapter.next.env.MixinContext;
+import org.sinytra.adapter.next.env.ann.AtData;
+import org.sinytra.adapter.next.env.ann.ClassTarget;
+import org.sinytra.adapter.next.env.ann.ModifyExpressionValueMixinData;
+import org.sinytra.adapter.next.env.param.MethodParameters;
+import org.sinytra.adapter.next.pipeline.Recipe;
+import org.sinytra.adapter.next.pipeline.config.Configuration;
+import org.sinytra.adapter.next.pipeline.config.MutableConfiguration;
+import org.sinytra.adapter.patch.analysis.selector.AnnotationHandle;
+import org.sinytra.adapter.patch.util.MethodQualifier;
+
+import java.util.List;
+
+import static org.sinytra.adapter.next.env.param.MethodParameters.ParamGroup.*;
+
+public class ModifyExpressionValueMixin implements MixinType<ModifyExpressionValueMixinData> {
+    @Override
+    public ModifyExpressionValueMixinData parse(MixinContext context, ClassTarget targetClass, MethodQualifier targetMethod, AtData atData, AnnotationHandle handle) {
+        return new ModifyExpressionValueMixinData(targetClass, targetMethod, atData);
+    }
+
+    @Override
+    public void preProcess(ModifyExpressionValueMixinData mixin, MixinContext context, MutableConfiguration clean, Recipe recipe) {
+        clean.setParameters(MethodParameters.create(context.methodNode().desc, List.of(SINGLE_ANY, CAPTURED_PARAMS)));
+    }
+
+    // TODO Find universal way of handling captured method params
+    @Override
+    public void postProcess(ModifyExpressionValueMixinData mixin, MixinContext context, Configuration clean, MutableConfiguration dirty, Recipe recipe) {
+        if (dirty.getTargetMethod() == null) return;
+
+        MethodQualifier targetDesc = dirty.getAtData().getTarget().flatMap(MethodQualifier::create).orElse(null);
+        if (targetDesc == null) return;
+
+        List<Type> dirtyCaptured = context.methods().resolveCapturedMethodParams(recipe.clean(), recipe.dirty());
+        Type modifyingType = Type.getReturnType(targetDesc.desc());
+
+        MethodParameters params = MethodParameters.builder()
+            .put(SINGLE_ANY, modifyingType)
+            .put(CAPTURED_PARAMS, dirtyCaptured)
+            .build();
+
+        dirty.setParameters(params);
+        dirty.setReturnType(modifyingType);
+    }
+}

test/src/test/java/org/sinytra/adapter/patch/test/mixin/DynamicMixinPatchTest.java

@@ -65,6 +65,15 @@ void testChangedTargetMethodWrapOperation() throws Exception {
         );
     }
 
+    @Test
+    void testChangedTargetMethodModifyExpressionValue() throws Exception {
+        assertSameCode(
+            "org/sinytra/adapter/test/mixin/pipeline/CropBlockMixin",
+            "getAvailableMoisture",
+            assertTargetMethod()
+        );
+    }
+
     @Test
     void testChangeMethodParamsInPipeline() throws Exception {
         assertSameCode(

test/src/testClasses/java/org/sinytra/adapter/test/mixin/pipeline/CropBlockMixin.java

@@ -1,5 +1,6 @@
 package org.sinytra.adapter.test.mixin.pipeline;
 
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import net.minecraft.world.level.block.Block;
@@ -32,4 +33,28 @@ private static boolean isOnFarmland(BlockState instance, Block block, Operation<
     private static boolean isOnFarmlandExpected(BlockState instance, Block block, Operation<Boolean> original) {
         return Blocks.FARMLAND.equals(block) || original.call(instance, block);
     }
+
+    @ModifyExpressionValue(
+        method = "getGrowthSpeed(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)F",
+        at = @At(
+            value = "INVOKE",
+            ordinal = 0,
+            target = "Lnet/minecraft/world/level/BlockGetter;getBlockState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState;"
+        )
+    )
+    private static BlockState getAvailableMoisture(BlockState original) {
+        return original;
+    }
+
+    @ModifyExpressionValue(
+        method = "getGrowthSpeed(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;)F",
+        at = @At(
+            value = "INVOKE",
+            ordinal = 0,
+            target = "Lnet/minecraft/world/level/BlockGetter;getBlockState(Lnet/minecraft/core/BlockPos;)Lnet/minecraft/world/level/block/state/BlockState;"
+        )
+    )
+    private static BlockState getAvailableMoistureExpected(BlockState original) {
+        return original;
+    }
 }