chore(events): preprocess MixinEntityPlayer

Skytils · Aug 9, 2024 · 18ba4b0 · 18ba4b0
1 parent 053d4fd
commit 18ba4b0
Showing 1 changed file with 16 additions and 8 deletions.
diff --git a/events/src/main/java/gg/skytils/event/mixins/entity/MixinEntityPlayer.java b/events/src/main/java/gg/skytils/event/mixins/entity/MixinEntityPlayer.java
@@ -36,21 +36,29 @@
 
 @Mixin(EntityPlayer.class)
 public class MixinEntityPlayer {
-    private static final String skytils$entityInteractTarget =
-            //#if MC>12000
-            //$$ "Lnet/minecraft/entity/player/PlayerEntity;getStackInHand(Lnet/minecraft/util/Hand;)Lnet/minecraft/item/ItemStack;";
-            //#else
-            "Lnet/minecraft/entity/player/EntityPlayer;getCurrentEquippedItem()Lnet/minecraft/item/ItemStack;";
-            //#endif
-
     @Inject(method = "attackTargetEntityWithCurrentItem", at = @At("HEAD"), cancellable = true)
     private void onAttack(Entity targetEntity, CallbackInfo ci) {
         if (EventsKt.postCancellableSync(new EntityAttackEvent((Entity) (Object) this, targetEntity))) {
             ci.cancel();
         }
     }
 
-    @Inject(method = "interactWith", at = @At(value = "INVOKE", target = skytils$entityInteractTarget), cancellable = true)
+    @Inject(
+            method =
+            //#if MC>12000
+            //$$ "interact",
+            //#else
+            "interactWith",
+            //#endif
+            at = @At(value = "INVOKE",
+                target =
+                    //#if MC>12000
+                    //$$ "Lnet/minecraft/entity/player/PlayerEntity;getStackInHand(Lnet/minecraft/util/Hand;)Lnet/minecraft/item/ItemStack;",
+                    //#else
+                    "Lnet/minecraft/entity/player/EntityPlayer;getCurrentEquippedItem()Lnet/minecraft/item/ItemStack;",
+                    //#endif
+                ordinal = 0
+            ), cancellable = true)
     private void onEntityInteract(Entity targetEntity,
                                   //#if MC>12000
                                   //$$ Hand hand,