From 7a8499c455490f866d8c3a6015489d4739f89ec1 Mon Sep 17 00:00:00 2001 From: Gunther De Wachter Date: Fri, 30 Jun 2017 19:17:06 +0200 Subject: [PATCH] Fixed tools not working due to a change in the onItemUse method fields in ItemStack.java I will have to fix the dispenser logic. Manually right clicking works. --- src/main/java/appeng/hooks/DispenserBlockTool.java | 3 ++- src/main/java/appeng/hooks/IBlockTool.java | 2 +- .../java/appeng/items/tools/powered/ToolColorApplicator.java | 3 ++- .../appeng/items/tools/powered/ToolEntropyManipulator.java | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/appeng/hooks/DispenserBlockTool.java b/src/main/java/appeng/hooks/DispenserBlockTool.java index 298d0e4c1..9f5d217a9 100644 --- a/src/main/java/appeng/hooks/DispenserBlockTool.java +++ b/src/main/java/appeng/hooks/DispenserBlockTool.java @@ -47,7 +47,8 @@ public final class DispenserBlockTool extends BehaviorDefaultDispenseItem final World w = dispenser.getWorld(); if( w instanceof WorldServer ) { - tm.onItemUse( dispensedItem, Platform.getPlayer( (WorldServer) w ), w, dispenser.getBlockPos().offset( enumfacing ), EnumHand.MAIN_HAND, enumfacing, 0.5f, 0.5f, 0.5f ); + // TODO : Fix dispenser logic. + tm.onItemUse( Platform.getPlayer( (WorldServer) w ), w, dispenser.getBlockPos().offset( enumfacing ), EnumHand.MAIN_HAND, enumfacing, 0.5f, 0.5f, 0.5f ); } } return dispensedItem; diff --git a/src/main/java/appeng/hooks/IBlockTool.java b/src/main/java/appeng/hooks/IBlockTool.java index fab0435ca..425c65e22 100644 --- a/src/main/java/appeng/hooks/IBlockTool.java +++ b/src/main/java/appeng/hooks/IBlockTool.java @@ -31,6 +31,6 @@ import net.minecraft.world.World; public interface IBlockTool { - EnumActionResult onItemUse( ItemStack is, EntityPlayer p, World w, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ ); + EnumActionResult onItemUse( EntityPlayer p, World w, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ ); } diff --git a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java index ba54305b2..24778fde4 100644 --- a/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java +++ b/src/main/java/appeng/items/tools/powered/ToolColorApplicator.java @@ -103,8 +103,9 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe } @Override - public EnumActionResult onItemUse( ItemStack is, EntityPlayer p, World w, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ ) + public EnumActionResult onItemUse( EntityPlayer p, World w, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ ) { + final ItemStack is = p.getHeldItem(hand); final Block blk = w.getBlockState( pos ).getBlock(); ItemStack paintBall = this.getColor( is ); diff --git a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java index 36e90ded0..b6e0e1c8d 100644 --- a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java +++ b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java @@ -236,8 +236,9 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT } @Override - public EnumActionResult onItemUse( ItemStack item, EntityPlayer p, World w, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ ) + public EnumActionResult onItemUse( EntityPlayer p, World w, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ ) { + final ItemStack item = p.getHeldItem(hand); if( this.getAECurrentPower( item ) > 1600 ) { if( !p.canPlayerEdit( pos, side, item ) )