From b67d7eed82d5608a3cb00c6c0d8505ce8b324eff Mon Sep 17 00:00:00 2001 From: Gunther De Wachter Date: Sun, 2 Jul 2017 07:33:16 +0200 Subject: [PATCH] Fixed tools getting deleted when being used in off-hand. --- .../appeng/items/tools/ToolBiometricCard.java | 6 +++--- .../appeng/items/tools/ToolNetworkTool.java | 2 +- .../tools/powered/ToolEntropyManipulator.java | 4 ++-- .../items/tools/powered/ToolMatterCannon.java | 20 +++++++++---------- .../tools/quartz/ToolQuartzCuttingKnife.java | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/appeng/items/tools/ToolBiometricCard.java b/src/main/java/appeng/items/tools/ToolBiometricCard.java index 00cce88f0..3409f4ce4 100644 --- a/src/main/java/appeng/items/tools/ToolBiometricCard.java +++ b/src/main/java/appeng/items/tools/ToolBiometricCard.java @@ -55,12 +55,12 @@ public class ToolBiometricCard extends AEBaseItem implements IBiometricCard { if( p.isSneaking() ) { - this.encode( p.getHeldItemMainhand(), p ); + this.encode( p.getHeldItem(hand), p ); p.swingArm( hand ); - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItemMainhand() ); + return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem(hand) ); } - return new ActionResult( EnumActionResult.PASS, p.getHeldItemMainhand() ); + return new ActionResult( EnumActionResult.PASS, p.getHeldItem(hand) ); } @Override diff --git a/src/main/java/appeng/items/tools/ToolNetworkTool.java b/src/main/java/appeng/items/tools/ToolNetworkTool.java index 3b2d24ee2..70ca61c99 100644 --- a/src/main/java/appeng/items/tools/ToolNetworkTool.java +++ b/src/main/java/appeng/items/tools/ToolNetworkTool.java @@ -90,7 +90,7 @@ public class ToolNetworkTool extends AEBaseItem implements IGuiItem, IAEWrench / } } - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItemMainhand() ); + return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem(hand) ); } @Override diff --git a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java index a6afecf83..1a85ddb4b 100644 --- a/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java +++ b/src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java @@ -215,7 +215,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT if( target == null ) { - return new ActionResult( EnumActionResult.FAIL, p.getHeldItemMainhand() ); + return new ActionResult( EnumActionResult.FAIL, p.getHeldItem(hand) ); } else { @@ -232,7 +232,7 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT } } - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItemMainhand() ); + return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem(hand) ); } @Override diff --git a/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java b/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java index 3a1ef5b36..7cc2572cb 100644 --- a/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java +++ b/src/main/java/appeng/items/tools/powered/ToolMatterCannon.java @@ -108,17 +108,17 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell @Override public ActionResult onItemRightClick( final World w, final EntityPlayer p, final @Nullable EnumHand hand ) { - if( this.getAECurrentPower( p.getHeldItemMainhand() ) > 1600 ) + if( this.getAECurrentPower( p.getHeldItem(hand) ) > 1600 ) { int shots = 1; - final CellUpgrades cu = (CellUpgrades) this.getUpgradesInventory( p.getHeldItemMainhand() ); + final CellUpgrades cu = (CellUpgrades) this.getUpgradesInventory( p.getHeldItem(hand) ); if( cu != null ) { shots += cu.getInstalledUpgrades( Upgrades.SPEED ); } - final IMEInventory inv = AEApi.instance().registries().cell().getCellInventory( p.getHeldItemMainhand(), null, StorageChannel.ITEMS ); + final IMEInventory inv = AEApi.instance().registries().cell().getCellInventory( p.getHeldItem(hand), null, StorageChannel.ITEMS ); if( inv != null ) { final IItemList itemList = inv.getAvailableItems( AEApi.instance().storage().createItemList() ); @@ -128,25 +128,25 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell shots = Math.min( shots, (int) aeAmmo.getStackSize() ); for( int sh = 0; sh < shots; sh++ ) { - this.extractAEPower( p.getHeldItemMainhand(), 1600 ); + this.extractAEPower( p.getHeldItem(hand), 1600 ); if( Platform.isClient() ) { - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItemMainhand() ); + return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem(hand) ); } aeAmmo.setStackSize( 1 ); final ItemStack ammo = ( (IAEItemStack) aeAmmo ).getItemStack(); if( ammo == null ) { - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItemMainhand() ); + return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem(hand) ); } ammo.setCount( 1 ); aeAmmo = inv.extractItems( aeAmmo, Actionable.MODULATE, new PlayerSource( p, null ) ); if( aeAmmo == null ) { - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItemMainhand() ); + return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem(hand) ); } final LookDirection dir = Platform.getPlayerRay( p, p.getEyeHeight() ); @@ -168,7 +168,7 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell { this.shootPaintBalls( type, w, p, Vec3d, Vec3d1, direction, d0, d1, d2 ); } - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItemMainhand() ); + return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem(hand) ); } else { @@ -182,11 +182,11 @@ public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell { p.sendMessage( PlayerMessages.AmmoDepleted.get() ); } - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItemMainhand() ); + return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem(hand) ); } } } - return new ActionResult( EnumActionResult.FAIL, p.getHeldItemMainhand() ); + return new ActionResult( EnumActionResult.FAIL, p.getHeldItem(hand) ); } private void shootPaintBalls( final ItemStack type, final World w, final EntityPlayer p, final Vec3d Vec3d, final Vec3d Vec3d1, final Vec3d direction, final double d0, final double d1, final double d2 ) diff --git a/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java b/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java index b54cc59eb..95a507b74 100644 --- a/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java +++ b/src/main/java/appeng/items/tools/quartz/ToolQuartzCuttingKnife.java @@ -67,7 +67,7 @@ public class ToolQuartzCuttingKnife extends AEBaseItem implements IGuiItem Platform.openGUI( p, null, AEPartLocation.INTERNAL, GuiBridge.GUI_QUARTZ_KNIFE ); } p.swingArm( hand ); - return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItemMainhand() ); + return new ActionResult( EnumActionResult.SUCCESS, p.getHeldItem(hand) ); } @Override