feat(events): add missing Hand parameter to EntityInteractEvent for 1.20

Skytils · Aug 14, 2024 · 0463791 · 0463791
1 parent 8d76c7e
commit 0463791
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 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
@@ -67,7 +67,13 @@ private void onEntityInteract(Entity targetEntity,
                                   CallbackInfoReturnable<Boolean> cir
                                   //#endif
     ) {
-        if (EventsKt.postCancellableSync(new EntityInteractEvent(targetEntity))) {
+        if (EventsKt.postCancellableSync(new EntityInteractEvent(
+                //#if MC>=12000
+                //$$ targetEntity, hand
+                //#else
+                targetEntity
+                //#endif
+        ))) {
             //#if MC>12000
             //$$ cir.setReturnValue(ActionResult.FAIL);
             //#else

diff --git a/events/src/main/kotlin/gg/skytils/event/impl/play/world.kt b/events/src/main/kotlin/gg/skytils/event/impl/play/world.kt
@@ -25,6 +25,10 @@ import net.minecraft.item.ItemStack
 import net.minecraft.util.BlockPos
 import net.minecraft.world.World
 
+//#if MC>=12000
+//$$ import net.minecraft.util.Hand;
+//#endif
+
 /**
  * [gg.skytils.event.mixins.MixinMinecraft.worldChange]
  */
@@ -36,4 +40,9 @@ class WorldUnloadEvent(val world: World) : Event()
  */
 class BlockInteractEvent(val item: ItemStack, val pos: BlockPos) : CancellableEvent()
 
-class EntityInteractEvent(val entity: Entity) : CancellableEvent()
+class EntityInteractEvent(
+    val entity: Entity,
+    //#if MC>=12000
+    //$$ val hand: Hand
+    //#endif
+) : CancellableEvent()