From 18d4032f6c70df7340a6e193bcb67caefbfbbc48 Mon Sep 17 00:00:00 2001 From: jottyfan Date: Mon, 27 Jul 2020 23:27:48 +0200 Subject: [PATCH] corrected signature --- .../minecraft/quickiefabric/event/BlockBreakMixin.java | 3 ++- .../minecraft/quickiefabric/event/BreakBlockCallback.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/event/BlockBreakMixin.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/event/BlockBreakMixin.java index a79a257..5f54809 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/event/BlockBreakMixin.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/event/BlockBreakMixin.java @@ -4,6 +4,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import org.spongepowered.asm.mixin.injection.callback.LocalCapture; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -19,7 +20,7 @@ import net.minecraft.world.World; */ @Mixin(Block.class) public class BlockBreakMixin { - @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/block/Block;onBreak(net/minecraft/world/World;net/minecraft/util/math/BlockPos;net/minecraft/block/BlockState;net/minecraft/entity/player/PlayerEntity)V"), method = "interactOnBreak", cancellable = true) + @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/block/Block;onBreak(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/player/PlayerEntity;)V"), method = "interactOnBreak", cancellable = true) private void interactOnBreak(final World world, final BlockPos blockPos, final BlockState blockState, final PlayerEntity player, final CallbackInfoReturnable info) { ActionResult result = BreakBlockCallback.EVENT.invoker().interact(world, blockPos, blockState, player); if (result == ActionResult.FAIL) { diff --git a/src/main/java/de/jottyfan/minecraft/quickiefabric/event/BreakBlockCallback.java b/src/main/java/de/jottyfan/minecraft/quickiefabric/event/BreakBlockCallback.java index 2c13bd1..325a0fb 100644 --- a/src/main/java/de/jottyfan/minecraft/quickiefabric/event/BreakBlockCallback.java +++ b/src/main/java/de/jottyfan/minecraft/quickiefabric/event/BreakBlockCallback.java @@ -13,7 +13,7 @@ import net.minecraft.world.World; * @author jotty * */ -public interface BreakBlockCallback { +public interface BreakBlockCallback { Event EVENT = EventFactory.createArrayBacked(BreakBlockCallback.class, (listeners) -> (world, blockPos, blockState, player) -> { for (BreakBlockCallback listener : listeners) { @@ -24,6 +24,6 @@ public interface BreakBlockCallback { } return ActionResult.PASS; }); - + ActionResult interact(World world, BlockPos blockPos, BlockState blockState, PlayerEntity player); }