From 373bb7da644e52c1ebd3e7b20a0de8335cd19ae2 Mon Sep 17 00:00:00 2001 From: asie Date: Wed, 16 Jan 2019 23:15:51 +0100 Subject: [PATCH] fix #68 --- .../fabric/events/PlayerInteractionEvent.java | 1 + .../MixinServerPlayerInteractionManager.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/fabricmc/fabric/events/PlayerInteractionEvent.java b/src/main/java/net/fabricmc/fabric/events/PlayerInteractionEvent.java index 388d4bf3a..15f54573e 100644 --- a/src/main/java/net/fabricmc/fabric/events/PlayerInteractionEvent.java +++ b/src/main/java/net/fabricmc/fabric/events/PlayerInteractionEvent.java @@ -54,6 +54,7 @@ public final class PlayerInteractionEvent { ActionResult interact(PlayerEntity player, World world, Hand hand, net.minecraft.entity.Entity entity); } + // TODO: Use class_3965 @FunctionalInterface public interface BlockPositioned { ActionResult interact(PlayerEntity player, World world, Hand hand, BlockPos pos, Direction direction, float hitX, float hitY, float hitZ); diff --git a/src/main/java/net/fabricmc/fabric/mixin/events/playerinteraction/MixinServerPlayerInteractionManager.java b/src/main/java/net/fabricmc/fabric/mixin/events/playerinteraction/MixinServerPlayerInteractionManager.java index 4505825d9..d8547a463 100644 --- a/src/main/java/net/fabricmc/fabric/mixin/events/playerinteraction/MixinServerPlayerInteractionManager.java +++ b/src/main/java/net/fabricmc/fabric/mixin/events/playerinteraction/MixinServerPlayerInteractionManager.java @@ -18,6 +18,7 @@ package net.fabricmc.fabric.mixin.events.playerinteraction; import net.fabricmc.fabric.events.PlayerInteractionEvent; import net.fabricmc.fabric.util.HandlerArray; +import net.minecraft.class_3965; import net.minecraft.client.network.packet.BlockUpdateClientPacket; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.item.ItemStack; @@ -27,6 +28,7 @@ import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; +import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -56,8 +58,16 @@ public class MixinServerPlayerInteractionManager { } @Inject(at = @At("HEAD"), method = "interactBlock", cancellable = true) - public void interactBlock(PlayerEntity player, World world, ItemStack stack, Hand hand, BlockPos pos, Direction direction, float hitX, float hitY, float hitZ, CallbackInfoReturnable info) { + public void interactBlock(PlayerEntity player, World world, ItemStack stack, Hand hand, class_3965 blockHitResult, CallbackInfoReturnable info) { for (PlayerInteractionEvent.BlockPositioned handler : ((HandlerArray) PlayerInteractionEvent.INTERACT_BLOCK).getBackingArray()) { + Vec3d vec = blockHitResult.method_17784(); + BlockPos pos = blockHitResult.method_17777(); + Direction direction = blockHitResult.method_17780(); + + float hitX = (float) (vec.x - pos.getX()); + float hitY = (float) (vec.y - pos.getY()); + float hitZ = (float) (vec.z - pos.getZ()); + ActionResult result = handler.interact(player, world, hand, pos, direction, hitX, hitY, hitZ); if (result != ActionResult.PASS) { info.setReturnValue(result);