Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed shift + click battery with wrench

Browse source
This commit is contained in:
Robert Seifert 2014-03-03 15:51:19 -05:00
parent fabbf289b0
commit da2bd6f54b
1 changed files with 106 additions and 118 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
electrical/src/main/java/resonantinduction/electrical/battery/BlockBattery.java
View file

@ -18,15 +18,13 @@ import universalelectricity.api.CompatibilityModule;
import universalelectricity.api.UniversalElectricity;
import calclavia.lib.prefab.block.BlockSidedIO;
import calclavia.lib.render.block.BlockRenderingHandler;
import calclavia.lib.utility.inventory.InventoryUtility;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
/**
* A block that detects power.
/** A block that detects power.
*
* @author Calclavia
*
*/
* @author Calclavia */
public class BlockBattery extends BlockSidedIO implements ITileEntityProvider
{
public BlockBattery(int id)
@ -76,22 +74,21 @@ public class BlockBattery extends BlockSidedIO implements ITileEntityProvider
{
if (!world.isRemote)
{
TileEntity tileEntity = world.getBlockTileEntity(x, y, z);
dropBlockAsItem(world, x, y, z, world.getBlockMetadata(x, y, z), 0);
world.setBlock(x, y, z, 0);
InventoryUtility.dropBlockAsItem(world, x, y, z, true);
}
return true;
}
/**
* Temporarily "cheat" var for dropping with damage.
*/
ItemStack dropStack = null;
@Override
public void breakBlock(World world, int x, int y, int z, int par5, int par6)
{
super.breakBlock(world, x, y, z, par5, par6);
}
@Override
public ArrayList<ItemStack> getBlockDropped(World world, int x, int y, int z, int metadata, int fortune)
{
ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
ItemStack itemStack = new ItemStack(this, 1);
if (world.getBlockTileEntity(x, y, z) instanceof TileBattery)
@ -101,16 +98,7 @@ public class BlockBattery extends BlockSidedIO implements ITileEntityProvider
ItemBlockBattery.setTier(itemStack, (byte) world.getBlockMetadata(x, y, z));
itemBlock.setEnergy(itemStack, battery.energy.getEnergy());
}
dropStack = itemStack;
super.breakBlock(world, x, y, z, par5, par6);
}
@Override
public ArrayList<ItemStack> getBlockDropped(World world, int x, int y, int z, int metadata, int fortune)
{
ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
ret.add(dropStack);
ret.add(itemStack);
return ret;
}