Use expressions to workaround CONSTANT classValue not being remapped. Closes #757

Author: Earthcomputer

src/main/java/net/earthcomputer/clientcommands/mixin/rngevents/MushroomCowSheepAndSnowGolemMixin.java

@@ -1,6 +1,9 @@
 package net.earthcomputer.clientcommands.mixin.rngevents;
 
+import com.llamalad7.mixinextras.expression.Definition;
+import com.llamalad7.mixinextras.expression.Expression;
 import net.earthcomputer.clientcommands.features.PlayerRandCracker;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.animal.MushroomCow;
 import net.minecraft.world.entity.animal.SnowGolem;
@@ -13,7 +16,9 @@
 
 @Mixin({MushroomCow.class, Sheep.class, SnowGolem.class})
 public class MushroomCowSheepAndSnowGolemMixin {
-    @Inject(method = "mobInteract", at = @At(value = "CONSTANT", args = "classValue=net/minecraft/server/level/ServerLevel"))
+    @Definition(id = "ServerLevel", type = ServerLevel.class)
+    @Expression("? instanceof ServerLevel")
+    @Inject(method = "mobInteract", at = @At("MIXINEXTRAS:EXPRESSION"))
     public void onInteract(Player player, InteractionHand hand, CallbackInfoReturnable<Boolean> ci) {
         PlayerRandCracker.onItemDamage(1, player, player.getItemInHand(hand));
     }

src/main/java/net/earthcomputer/clientcommands/mixin/rngevents/PumpkinBlockMixin.java

@@ -1,7 +1,10 @@
 package net.earthcomputer.clientcommands.mixin.rngevents;
 
+import com.llamalad7.mixinextras.expression.Definition;
+import com.llamalad7.mixinextras.expression.Expression;
 import net.earthcomputer.clientcommands.features.PlayerRandCracker;
 import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
@@ -17,8 +20,9 @@
 
 @Mixin(PumpkinBlock.class)
 public class PumpkinBlockMixin {
-
-    @Inject(method = "useItemOn", at = @At(value = "CONSTANT", args = "classValue=net/minecraft/server/level/ServerLevel"))
+    @Definition(id = "ServerLevel", type = ServerLevel.class)
+    @Expression("? instanceof ServerLevel")
+    @Inject(method = "useItemOn", at = @At("MIXINEXTRAS:EXPRESSION"))
     public void onShear(ItemStack stack, BlockState state, Level level, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hitResult, CallbackInfoReturnable<InteractionResult> cir) {
         PlayerRandCracker.onItemDamage(1, player, stack);
     }