From e96339dd2bfc72d32b54df1cad658f9564c4822e Mon Sep 17 00:00:00 2001 From: Gunther De Wachter Date: Sun, 2 Jul 2017 07:44:21 +0200 Subject: [PATCH] Fix more items and unsafe checks that made items get deleted. --- src/main/java/appeng/block/AEBaseTileBlock.java | 6 +++--- src/main/java/appeng/debug/ToolReplicatorCard.java | 4 ++-- src/main/java/appeng/items/materials/ItemMaterial.java | 8 ++++---- src/main/java/appeng/items/misc/ItemEncodedPattern.java | 6 +++--- src/main/java/appeng/items/parts/ItemFacade.java | 2 +- src/main/java/appeng/items/parts/ItemPart.java | 4 ++-- .../java/appeng/items/storage/ItemBasicStorageCell.java | 6 +++--- src/main/java/appeng/items/tools/ToolMemoryCard.java | 4 ++-- .../java/appeng/items/tools/powered/ToolPortableCell.java | 2 +- .../appeng/items/tools/powered/ToolWirelessTerminal.java | 4 ++-- 10 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/main/java/appeng/block/AEBaseTileBlock.java b/src/main/java/appeng/block/AEBaseTileBlock.java index 4ed55c193..8042b2da8 100644 --- a/src/main/java/appeng/block/AEBaseTileBlock.java +++ b/src/main/java/appeng/block/AEBaseTileBlock.java @@ -274,9 +274,9 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity public boolean onBlockActivated( World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ ) { ItemStack heldItem; - if( player != null && !player.getHeldItemMainhand().isEmpty() ) + if( player != null && !player.getHeldItem(hand).isEmpty() ) { - heldItem = player.getHeldItemMainhand(); + heldItem = player.getHeldItem(hand); if( Platform.isWrench( player, heldItem, pos ) && player.isSneaking() ) { @@ -366,7 +366,7 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements ITileEntity } } - return this.onActivated( world, pos, player, hand, player.getHeldItemMainhand(), facing, hitX, hitY, hitZ ); + return this.onActivated( world, pos, player, hand, player.getHeldItem(hand), facing, hitX, hitY, hitZ ); } @Override diff --git a/src/main/java/appeng/debug/ToolReplicatorCard.java b/src/main/java/appeng/debug/ToolReplicatorCard.java index 3457ab539..95111eda5 100644 --- a/src/main/java/appeng/debug/ToolReplicatorCard.java +++ b/src/main/java/appeng/debug/ToolReplicatorCard.java @@ -67,7 +67,7 @@ public class ToolReplicatorCard extends AEBaseItem tag.setInteger( "z", z ); tag.setInteger( "side", side.ordinal() ); tag.setInteger( "dimid", world.provider.getDimension() ); - player.getHeldItemMainhand().setTagCompound( tag ); + player.getHeldItem(hand).setTagCompound( tag ); } else { @@ -76,7 +76,7 @@ public class ToolReplicatorCard extends AEBaseItem } else { - final NBTTagCompound ish = player.getHeldItemMainhand().getTagCompound(); + final NBTTagCompound ish = player.getHeldItem(hand).getTagCompound(); if( ish != null ) { final int src_x = ish.getInteger( "x" ); diff --git a/src/main/java/appeng/items/materials/ItemMaterial.java b/src/main/java/appeng/items/materials/ItemMaterial.java index 0ab9ca512..72b714a02 100644 --- a/src/main/java/appeng/items/materials/ItemMaterial.java +++ b/src/main/java/appeng/items/materials/ItemMaterial.java @@ -302,10 +302,10 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent, upgrades = ( (ISegmentedInventory) te ).getInventoryByName( "upgrades" ); } - if( upgrades != null && !player.getHeldItemMainhand().isEmpty() && player.getHeldItemMainhand().getItem() instanceof IUpgradeModule ) + if( upgrades != null && !player.getHeldItem(hand).isEmpty() && player.getHeldItem(hand).getItem() instanceof IUpgradeModule ) { - final IUpgradeModule um = (IUpgradeModule) player.getHeldItemMainhand().getItem(); - final Upgrades u = um.getType( player.getHeldItemMainhand() ); + final IUpgradeModule um = (IUpgradeModule) player.getHeldItem(hand).getItem(); + final Upgrades u = um.getType( player.getHeldItem(hand) ); if( u != null ) { @@ -317,7 +317,7 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent, return EnumActionResult.PASS; } - player.inventory.setInventorySlotContents( player.inventory.currentItem, ad.addItems( player.getHeldItemMainhand() ) ); + player.inventory.setInventorySlotContents( player.inventory.currentItem, ad.addItems( player.getHeldItem(hand) ) ); return EnumActionResult.SUCCESS; } } diff --git a/src/main/java/appeng/items/misc/ItemEncodedPattern.java b/src/main/java/appeng/items/misc/ItemEncodedPattern.java index fc3be1eec..ffde94b68 100644 --- a/src/main/java/appeng/items/misc/ItemEncodedPattern.java +++ b/src/main/java/appeng/items/misc/ItemEncodedPattern.java @@ -58,15 +58,15 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt @Override public ActionResult onItemRightClick( final World w, final EntityPlayer player, final EnumHand hand ) { - this.clearPattern( player.getHeldItemMainhand(), player ); + this.clearPattern( player.getHeldItem(hand), player ); - return new ActionResult( EnumActionResult.SUCCESS, player.getHeldItemMainhand() ); + return new ActionResult( EnumActionResult.SUCCESS, player.getHeldItem(hand) ); } @Override public EnumActionResult onItemUseFirst( final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ, final EnumHand hand ) { - return this.clearPattern( player.getHeldItemMainhand(), player ) ? EnumActionResult.SUCCESS : EnumActionResult.PASS; + return this.clearPattern( player.getHeldItem(hand), player ) ? EnumActionResult.SUCCESS : EnumActionResult.PASS; } private boolean clearPattern( final ItemStack stack, final EntityPlayer player ) diff --git a/src/main/java/appeng/items/parts/ItemFacade.java b/src/main/java/appeng/items/parts/ItemFacade.java index c92d96d2a..63a86ef32 100644 --- a/src/main/java/appeng/items/parts/ItemFacade.java +++ b/src/main/java/appeng/items/parts/ItemFacade.java @@ -72,7 +72,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte @Override public EnumActionResult onItemUseFirst( final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ, final EnumHand hand ) { - return AEApi.instance().partHelper().placeBus( player.getHeldItemMainhand(), pos, side, player, hand, world ); + return AEApi.instance().partHelper().placeBus( player.getHeldItem(hand), pos, side, player, hand, world ); } @Override diff --git a/src/main/java/appeng/items/parts/ItemPart.java b/src/main/java/appeng/items/parts/ItemPart.java index a193dd2c4..544e36750 100644 --- a/src/main/java/appeng/items/parts/ItemPart.java +++ b/src/main/java/appeng/items/parts/ItemPart.java @@ -155,12 +155,12 @@ public final class ItemPart extends AEBaseItem implements IPartItem, IItemGroup @Override public EnumActionResult onItemUse( final EntityPlayer player, final World w, final BlockPos pos, final EnumHand hand, final EnumFacing side, final float hitX, final float hitY, final float hitZ ) { - if( this.getTypeByStack( player.getHeldItemMainhand() ) == PartType.InvalidType ) + if( this.getTypeByStack( player.getHeldItem(hand) ) == PartType.InvalidType ) { return EnumActionResult.FAIL; } - return AEApi.instance().partHelper().placeBus( player.getHeldItemMainhand(), pos, side, player, hand, w ); + return AEApi.instance().partHelper().placeBus( player.getHeldItem(hand), pos, side, player, hand, w ); } @Override diff --git a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java index c9259a979..365ae9450 100644 --- a/src/main/java/appeng/items/storage/ItemBasicStorageCell.java +++ b/src/main/java/appeng/items/storage/ItemBasicStorageCell.java @@ -216,8 +216,8 @@ public final class ItemBasicStorageCell extends AEBaseItem implements IStorageCe @Override public ActionResult onItemRightClick( final World world, final EntityPlayer player, final EnumHand hand ) { - this.disassembleDrive( player.getHeldItemMainhand(), world, player ); - return new ActionResult( EnumActionResult.SUCCESS, player.getHeldItemMainhand() ); + this.disassembleDrive( player.getHeldItem(hand), world, player ); + return new ActionResult( EnumActionResult.SUCCESS, player.getHeldItem(hand) ); } private boolean disassembleDrive( final ItemStack stack, final World world, final EntityPlayer player ) @@ -283,7 +283,7 @@ public final class ItemBasicStorageCell extends AEBaseItem implements IStorageCe @Override public EnumActionResult onItemUseFirst( final EntityPlayer player, final World world, final BlockPos pos, final EnumFacing side, final float hitX, final float hitY, final float hitZ, final EnumHand hand ) { - return this.disassembleDrive( player.getHeldItemMainhand(), world, player ) ? EnumActionResult.SUCCESS : EnumActionResult.PASS; + return this.disassembleDrive( player.getHeldItem(hand), world, player ) ? EnumActionResult.SUCCESS : EnumActionResult.PASS; } @Override diff --git a/src/main/java/appeng/items/tools/ToolMemoryCard.java b/src/main/java/appeng/items/tools/ToolMemoryCard.java index a7d9a8ede..8ee870476 100644 --- a/src/main/java/appeng/items/tools/ToolMemoryCard.java +++ b/src/main/java/appeng/items/tools/ToolMemoryCard.java @@ -144,9 +144,9 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard { if( player.isSneaking() && !w.isRemote ) { - final IMemoryCard mem = (IMemoryCard) player.getHeldItemMainhand().getItem(); + final IMemoryCard mem = (IMemoryCard) player.getHeldItem(hand).getItem(); mem.notifyUser( player, MemoryCardMessages.SETTINGS_CLEARED ); - player.getHeldItemMainhand().setTagCompound( null ); + player.getHeldItem(hand).setTagCompound( null ); return EnumActionResult.SUCCESS; } else diff --git a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java index 210453ad5..cbea01221 100644 --- a/src/main/java/appeng/items/tools/powered/ToolPortableCell.java +++ b/src/main/java/appeng/items/tools/powered/ToolPortableCell.java @@ -67,7 +67,7 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell, public ActionResult onItemRightClick( final World w, final EntityPlayer player, final EnumHand hand ) { Platform.openGUI( player, null, AEPartLocation.INTERNAL, GuiBridge.GUI_PORTABLE_CELL ); - return new ActionResult( EnumActionResult.SUCCESS, player.getHeldItemMainhand() ); + return new ActionResult( EnumActionResult.SUCCESS, player.getHeldItem(hand) ); } @SideOnly( Side.CLIENT ) diff --git a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java index c8fd84ef8..191801c0e 100644 --- a/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java +++ b/src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java @@ -58,8 +58,8 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless @Override public ActionResult onItemRightClick( final World w, final EntityPlayer player, final EnumHand hand ) { - AEApi.instance().registries().wireless().openWirelessTerminalGui( player.getHeldItemMainhand(), w, player ); - return new ActionResult( EnumActionResult.SUCCESS, player.getHeldItemMainhand() ); + AEApi.instance().registries().wireless().openWirelessTerminalGui( player.getHeldItem(hand), w, player ); + return new ActionResult( EnumActionResult.SUCCESS, player.getHeldItem(hand) ); } @SideOnly( Side.CLIENT )