tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Fixes #2542: Prevent memory card from opening a GUI

Browse source 
Some additional cleanup of AEBaseTileBlock#onBlockActivated()

(cherry picked from commit b6d3be41e1)
This commit is contained in:
yueh 2016-11-01 00:48:49 +08:00 committed by xsun2001
parent ca2dc468f9
commit a2e11b1a3a
1 changed files with 72 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

144
src/main/java/appeng/block/AEBaseTileBlock.java
View file

@ -240,92 +240,92 @@ public abstract class AEBaseTileBlock extends AEBaseBlock implements IAEFeature,
{ {
if( player != null ) if( player != null )
{ {
final ItemStack is = player.inventory.getCurrentItem(); final ItemStack heldItem = player.inventory.getCurrentItem();
if( is != null ) if( Platform.isWrench( player, heldItem, x, y, z ) && player.isSneaking() )
{ {
if( Platform.isWrench( player, is, x, y, z ) && player.isSneaking() ) final Block block = w.getBlock( x, y, z );
if( block == null )
{ {
final Block id = w.getBlock( x, y, z );
if( id != null )
{
final AEBaseTile tile = this.getTileEntity( w, x, y, z );
final ItemStack[] drops = Platform.getBlockDrops( w, x, y, z );
if( tile == null )
{
return false;
}
if( tile instanceof TileCableBus || tile instanceof TileSkyChest )
{
return false;
}
BlockEvent.BreakEvent event = new BlockEvent.BreakEvent( x, y, z, w, this, 0, player );
MinecraftForge.EVENT_BUS.post( event );
if( event.isCanceled() )
{
return false;
}
final ItemStack op = new ItemStack( this );
for( final ItemStack ol : drops )
{
if( Platform.isSameItemType( ol, op ) )
{
final NBTTagCompound tag = tile.downloadSettings( SettingsFrom.DISMANTLE_ITEM );
if( tag != null )
{
ol.setTagCompound( tag );
}
}
}
if( id.removedByPlayer( w, player, x, y, z, false ) )
{
final List<ItemStack> l = Lists.newArrayList( drops );
Platform.spawnDrops( w, x, y, z, l );
w.setBlockToAir( x, y, z );
}
}
return false; return false;
} }
if( is.getItem() instanceof IMemoryCard && !( this instanceof BlockCableBus ) ) final AEBaseTile tile = this.getTileEntity( w, x, y, z );
if( tile == null )
{ {
final IMemoryCard memoryCard = (IMemoryCard) is.getItem(); return false;
if( player.isSneaking() ) }
if( tile instanceof TileCableBus || tile instanceof TileSkyChest )
{
return false;
}
final ItemStack[] itemDropCandidates = Platform.getBlockDrops( w, x, y, z );
final ItemStack op = new ItemStack( this );
for( final ItemStack ol : itemDropCandidates )
{
if( Platform.isSameItemType( ol, op ) )
{ {
final AEBaseTile t = this.getTileEntity( w, x, y, z ); final NBTTagCompound tag = tile.downloadSettings( SettingsFrom.DISMANTLE_ITEM );
if( t != null ) if( tag != null )
{ {
final String name = this.getUnlocalizedName(); ol.setTagCompound( tag );
final NBTTagCompound data = t.downloadSettings( SettingsFrom.MEMORY_CARD );
if( data != null )
{
memoryCard.setMemoryCardContents( is, name, data );
memoryCard.notifyUser( player, MemoryCardMessages.SETTINGS_SAVED );
return true;
}
} }
} }
}
if( block.removedByPlayer( w, player, x, y, z, false) )
{
final List<ItemStack> itemsToDrop = Lists.newArrayList( itemDropCandidates );
Platform.spawnDrops( w, x, y, z, itemsToDrop );
w.setBlockToAir( x, y, z );
}
return false;
}
if( heldItem.getItem() instanceof IMemoryCard && !( this instanceof BlockCableBus ) )
{
final IMemoryCard memoryCard = (IMemoryCard) heldItem.getItem();
final AEBaseTile tileEntity = this.getTileEntity( w, x, y, z );
if( tileEntity == null )
{
return false;
}
final String name = this.getUnlocalizedName();
if( player.isSneaking() )
{
final NBTTagCompound data = tileEntity.downloadSettings( SettingsFrom.MEMORY_CARD );
if( data != null )
{
memoryCard.setMemoryCardContents( heldItem, name, data );
memoryCard.notifyUser( player, MemoryCardMessages.SETTINGS_SAVED );
}
}
else
{
final String savedName = memoryCard.getSettingsName( heldItem );
final NBTTagCompound data = memoryCard.getData( heldItem );
if( this.getUnlocalizedName().equals( savedName ) )
{
tileEntity.uploadSettings( SettingsFrom.MEMORY_CARD, data );
memoryCard.notifyUser( player, MemoryCardMessages.SETTINGS_LOADED );
}
else else
{ {
final String name = memoryCard.getSettingsName( is ); memoryCard.notifyUser( player, MemoryCardMessages.INVALID_MACHINE );
final NBTTagCompound data = memoryCard.getData( is );
if( this.getUnlocalizedName().equals( name ) )
{
final AEBaseTile t = this.getTileEntity( w, x, y, z );
t.uploadSettings( SettingsFrom.MEMORY_CARD, data );
memoryCard.notifyUser( player, MemoryCardMessages.SETTINGS_LOADED );
}
else
{
memoryCard.notifyUser( player, MemoryCardMessages.INVALID_MACHINE );
}
return false;
} }
} }
return true;
} }
} }