fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix more items and unsafe checks that made items get deleted.

Browse Source
This commit is contained in:
Gunther De Wachter
2017-07-02 07:44:21 +02:00
parent b67d7eed82
commit e96339dd2b
10 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/block/AEBaseTileBlock.java
+3 -3
View File
@@ -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 ) public boolean onBlockActivated( World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ )
{ {
ItemStack heldItem; 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() ) 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 @Override
src/main/java/appeng/debug/ToolReplicatorCard.java
+2 -2
View File
@@ -67,7 +67,7 @@ public class ToolReplicatorCard extends AEBaseItem
tag.setInteger( "z", z ); tag.setInteger( "z", z );
tag.setInteger( "side", side.ordinal() ); tag.setInteger( "side", side.ordinal() );
tag.setInteger( "dimid", world.provider.getDimension() ); tag.setInteger( "dimid", world.provider.getDimension() );
player.getHeldItemMainhand().setTagCompound( tag ); player.getHeldItem(hand).setTagCompound( tag );
} }
else else
{ {
@@ -76,7 +76,7 @@ public class ToolReplicatorCard extends AEBaseItem
} }
else else
{ {
final NBTTagCompound ish = player.getHeldItemMainhand().getTagCompound(); final NBTTagCompound ish = player.getHeldItem(hand).getTagCompound();
if( ish != null ) if( ish != null )
{ {
final int src_x = ish.getInteger( "x" ); final int src_x = ish.getInteger( "x" );
src/main/java/appeng/items/materials/ItemMaterial.java
+4 -4
View File
@@ -302,10 +302,10 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent,
upgrades = ( (ISegmentedInventory) te ).getInventoryByName( "upgrades" ); 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 IUpgradeModule um = (IUpgradeModule) player.getHeldItem(hand).getItem();
final Upgrades u = um.getType( player.getHeldItemMainhand() ); final Upgrades u = um.getType( player.getHeldItem(hand) );
if( u != null ) if( u != null )
{ {
@@ -317,7 +317,7 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent,
return EnumActionResult.PASS; 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; return EnumActionResult.SUCCESS;
} }
} }
src/main/java/appeng/items/misc/ItemEncodedPattern.java
+3 -3
View File
@@ -58,15 +58,15 @@ public class ItemEncodedPattern extends AEBaseItem implements ICraftingPatternIt
@Override @Override
public ActionResult<ItemStack> onItemRightClick( final World w, final EntityPlayer player, final EnumHand hand ) public ActionResult<ItemStack> onItemRightClick( final World w, final EntityPlayer player, final EnumHand hand )
{ {
this.clearPattern( player.getHeldItemMainhand(), player ); this.clearPattern( player.getHeldItem(hand), player );
return new ActionResult<ItemStack>( EnumActionResult.SUCCESS, player.getHeldItemMainhand() ); return new ActionResult<ItemStack>( EnumActionResult.SUCCESS, player.getHeldItem(hand) );
} }
@Override @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 ) 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 ) private boolean clearPattern( final ItemStack stack, final EntityPlayer player )
src/main/java/appeng/items/parts/ItemFacade.java
+1 -1
View File
@@ -72,7 +72,7 @@ public class ItemFacade extends AEBaseItem implements IFacadeItem, IAlphaPassIte
@Override @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 ) 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 @Override
src/main/java/appeng/items/parts/ItemPart.java
+2 -2
View File
@@ -155,12 +155,12 @@ public final class ItemPart extends AEBaseItem implements IPartItem, IItemGroup
@Override @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 ) 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 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 @Override
src/main/java/appeng/items/storage/ItemBasicStorageCell.java
+3 -3
View File
@@ -216,8 +216,8 @@ public final class ItemBasicStorageCell extends AEBaseItem implements IStorageCe
@Override @Override
public ActionResult<ItemStack> onItemRightClick( final World world, final EntityPlayer player, final EnumHand hand ) public ActionResult<ItemStack> onItemRightClick( final World world, final EntityPlayer player, final EnumHand hand )
{ {
this.disassembleDrive( player.getHeldItemMainhand(), world, player ); this.disassembleDrive( player.getHeldItem(hand), world, player );
return new ActionResult<ItemStack>( EnumActionResult.SUCCESS, player.getHeldItemMainhand() ); return new ActionResult<ItemStack>( EnumActionResult.SUCCESS, player.getHeldItem(hand) );
} }
private boolean disassembleDrive( final ItemStack stack, final World world, final EntityPlayer player ) 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 @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 ) 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 @Override
src/main/java/appeng/items/tools/ToolMemoryCard.java
+2 -2
View File
@@ -144,9 +144,9 @@ public class ToolMemoryCard extends AEBaseItem implements IMemoryCard
{ {
if( player.isSneaking() && !w.isRemote ) 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 ); mem.notifyUser( player, MemoryCardMessages.SETTINGS_CLEARED );
player.getHeldItemMainhand().setTagCompound( null ); player.getHeldItem(hand).setTagCompound( null );
return EnumActionResult.SUCCESS; return EnumActionResult.SUCCESS;
} }
else else
src/main/java/appeng/items/tools/powered/ToolPortableCell.java
+1 -1
View File
@@ -67,7 +67,7 @@ public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell,
public ActionResult<ItemStack> onItemRightClick( final World w, final EntityPlayer player, final EnumHand hand ) public ActionResult<ItemStack> onItemRightClick( final World w, final EntityPlayer player, final EnumHand hand )
{ {
Platform.openGUI( player, null, AEPartLocation.INTERNAL, GuiBridge.GUI_PORTABLE_CELL ); Platform.openGUI( player, null, AEPartLocation.INTERNAL, GuiBridge.GUI_PORTABLE_CELL );
return new ActionResult<ItemStack>( EnumActionResult.SUCCESS, player.getHeldItemMainhand() ); return new ActionResult<ItemStack>( EnumActionResult.SUCCESS, player.getHeldItem(hand) );
} }
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )
src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java
+2 -2
View File
@@ -58,8 +58,8 @@ public class ToolWirelessTerminal extends AEBasePoweredItem implements IWireless
@Override @Override
public ActionResult<ItemStack> onItemRightClick( final World w, final EntityPlayer player, final EnumHand hand ) public ActionResult<ItemStack> onItemRightClick( final World w, final EntityPlayer player, final EnumHand hand )
{ {
AEApi.instance().registries().wireless().openWirelessTerminalGui( player.getHeldItemMainhand(), w, player ); AEApi.instance().registries().wireless().openWirelessTerminalGui( player.getHeldItem(hand), w, player );
return new ActionResult<ItemStack>( EnumActionResult.SUCCESS, player.getHeldItemMainhand() ); return new ActionResult<ItemStack>( EnumActionResult.SUCCESS, player.getHeldItem(hand) );
} }
@SideOnly( Side.CLIENT ) @SideOnly( Side.CLIENT )