Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Integrated Computer interface upgrades

Browse source
This commit is contained in:
Unknown 2019-01-12 04:00:57 +01:00 committed by unknown
parent 3d1ad6f6fb
commit e0bb581ca3
3 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/main/java/cr0s/warpdrive/block/breathing/BlockAirGeneratorTiered.java
View file

@ -1,6 +1,5 @@
package cr0s.warpdrive.block.breathing;
import cr0s.warpdrive.Commons;
import cr0s.warpdrive.api.IAirContainerItem;
import cr0s.warpdrive.block.BlockAbstractRotatingContainer;
import cr0s.warpdrive.config.WarpDriveConfig;
@ -39,12 +38,9 @@ public class BlockAirGeneratorTiered extends BlockAbstractRotatingContainer {
public boolean onBlockActivated(final World world, final BlockPos blockPos, final IBlockState blockState,
final EntityPlayer entityPlayer, final EnumHand enumHand,
final EnumFacing enumFacing, final float hitX, final float hitY, final float hitZ) {
if (world.isRemote) {
return false;
}
if (enumHand != EnumHand.MAIN_HAND) {
return true;
if ( world.isRemote
|| enumHand != EnumHand.MAIN_HAND ) {
return super.onBlockActivated(world, blockPos, blockState, entityPlayer, enumHand, enumFacing, hitX, hitY, hitZ);
}
// get context
@ -52,10 +48,7 @@ public class BlockAirGeneratorTiered extends BlockAbstractRotatingContainer {
final TileEntity tileEntity = world.getTileEntity(blockPos);
if (tileEntity instanceof TileEntityAirGeneratorTiered) {
final TileEntityAirGeneratorTiered airGenerator = (TileEntityAirGeneratorTiered) tileEntity;
if (itemStackHeld.isEmpty()) {
Commons.addChatMessage(entityPlayer, airGenerator.getStatus());
return true;
} else {
if (!itemStackHeld.isEmpty()) {
final Item itemHeld = itemStackHeld.getItem();
if (itemHeld instanceof IAirContainerItem) {
final IAirContainerItem airContainerItem = (IAirContainerItem) itemHeld;
@ -70,14 +63,15 @@ public class BlockAirGeneratorTiered extends BlockAbstractRotatingContainer {
final EntityItem entityItem = new EntityItem(entityPlayer.world, entityPlayer.posX, entityPlayer.posY, entityPlayer.posZ, toAdd);
entityPlayer.world.spawnEntity(entityItem);
}
((EntityPlayerMP)entityPlayer).sendContainerToPlayer(entityPlayer.inventoryContainer);
((EntityPlayerMP) entityPlayer).sendContainerToPlayer(entityPlayer.inventoryContainer);
airGenerator.energy_consume(WarpDriveConfig.BREATHING_ENERGY_PER_CANISTER, false);
}
return false;
}
}
}
}
return false;
return super.onBlockActivated(world, blockPos, blockState, entityPlayer, enumHand, enumFacing, hitX, hitY, hitZ);
}
}

9
src/main/java/cr0s/warpdrive/block/energy/BlockCapacitor.java
View file

@ -182,12 +182,9 @@ public class BlockCapacitor extends BlockAbstractContainer implements IExplosion
public boolean onBlockActivated(final World world, final BlockPos blockPos, final IBlockState blockState,
final EntityPlayer entityPlayer, final EnumHand enumHand,
final EnumFacing enumFacing, final float hitX, final float hitY, final float hitZ) {
if (world.isRemote) {
return false;
}
if (enumHand != EnumHand.MAIN_HAND) {
return true;
if ( world.isRemote
|| enumHand != EnumHand.MAIN_HAND ) {
return super.onBlockActivated(world, blockPos, blockState, entityPlayer, enumHand, enumFacing, hitX, hitY, hitZ);
}
// get context

3
src/main/java/cr0s/warpdrive/item/ItemComponent.java
View file

@ -2,6 +2,7 @@ package cr0s.warpdrive.item;
import cr0s.warpdrive.WarpDrive;
import cr0s.warpdrive.api.IAirContainerItem;
import cr0s.warpdrive.block.BlockAbstractContainer;
import cr0s.warpdrive.block.energy.BlockCapacitor;
import cr0s.warpdrive.data.EnumComponentType;
import cr0s.warpdrive.data.EnumTier;
@ -137,7 +138,7 @@ public class ItemComponent extends ItemAbstractBase implements IAirContainerItem
public boolean doesSneakBypassUse(final ItemStack itemStack, final IBlockAccess blockAccess, final BlockPos blockPos, final EntityPlayer player) {
final Block block = blockAccess.getBlockState(blockPos).getBlock();
return block instanceof BlockCapacitor
return block instanceof BlockAbstractContainer
|| super.doesSneakBypassUse(itemStack, blockAccess, blockPos, player);
}
}