tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Cleanup

Browse source 
Remove unused vars, add @Overrides, update deprecated methods.
This commit is contained in:
Ben Spiers 2014-08-28 20:07:51 +01:00
parent e3fc694532
commit 9294719ab2
5 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/mekanism/common/block/BlockBasic.java
View file

@ -750,11 +750,10 @@ public class BlockBasic extends Block
} }
@Override @Override
public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest)
{ {
if(!player.capabilities.isCreativeMode && !world.isRemote && canHarvestBlock(player, world.getBlockMetadata(x, y, z))) if(!player.capabilities.isCreativeMode && !world.isRemote && canHarvestBlock(player, world.getBlockMetadata(x, y, z)))
{ {
TileEntityBasicBlock tileEntity = (TileEntityBasicBlock)world.getTileEntity(x, y, z);
float motion = 0.7F; float motion = 0.7F;
double motionX = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D; double motionX = (world.rand.nextFloat() * motion) + (1.0F - motion) * 0.5D;
@ -803,6 +802,7 @@ public class BlockBasic extends Block
} }
} }
@Override
public ForgeDirection[] getValidRotations(World world, int x, int y, int z) public ForgeDirection[] getValidRotations(World world, int x, int y, int z)
{ {
TileEntity tile = world.getTileEntity(x, y, z); TileEntity tile = world.getTileEntity(x, y, z);
@ -821,6 +821,7 @@ public class BlockBasic extends Block
return valid; return valid;
} }
@Override
public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis) public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis)
{ {
TileEntity tile = world.getTileEntity(x, y, z); TileEntity tile = world.getTileEntity(x, y, z);

2
src/main/java/mekanism/common/block/BlockCardboardBox.java
View file

@ -165,7 +165,7 @@ public class BlockCardboardBox extends BlockContainer
} }
@Override @Override
public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest)
{ {
if(!player.capabilities.isCreativeMode && !world.isRemote && canHarvestBlock(player, world.getBlockMetadata(x, y, z))) if(!player.capabilities.isCreativeMode && !world.isRemote && canHarvestBlock(player, world.getBlockMetadata(x, y, z)))
{ {

2
src/main/java/mekanism/common/block/BlockEnergyCube.java
View file

@ -324,6 +324,7 @@ public class BlockEnergyCube extends BlockContainer implements IPeripheralProvid
return true; return true;
} }
@Override
public ForgeDirection[] getValidRotations(World world, int x, int y, int z) public ForgeDirection[] getValidRotations(World world, int x, int y, int z)
{ {
TileEntity tile = world.getTileEntity(x, y, z); TileEntity tile = world.getTileEntity(x, y, z);
@ -342,6 +343,7 @@ public class BlockEnergyCube extends BlockContainer implements IPeripheralProvid
return valid; return valid;
} }
@Override
public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis) public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis)
{ {
TileEntity tile = world.getTileEntity(x, y, z); TileEntity tile = world.getTileEntity(x, y, z);

4
src/main/java/mekanism/common/block/BlockGasTank.java
View file

@ -148,7 +148,7 @@ public class BlockGasTank extends BlockContainer
} }
@Override @Override
public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest)
{ {
if(!player.capabilities.isCreativeMode && !world.isRemote && canHarvestBlock(player, world.getBlockMetadata(x, y, z))) if(!player.capabilities.isCreativeMode && !world.isRemote && canHarvestBlock(player, world.getBlockMetadata(x, y, z)))
{ {
@ -237,6 +237,7 @@ public class BlockGasTank extends BlockContainer
return itemStack; return itemStack;
} }
@Override
public ForgeDirection[] getValidRotations(World world, int x, int y, int z) public ForgeDirection[] getValidRotations(World world, int x, int y, int z)
{ {
TileEntity tile = world.getTileEntity(x, y, z); TileEntity tile = world.getTileEntity(x, y, z);
@ -255,6 +256,7 @@ public class BlockGasTank extends BlockContainer
return valid; return valid;
} }
@Override
public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis) public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis)
{ {
TileEntity tile = world.getTileEntity(x, y, z); TileEntity tile = world.getTileEntity(x, y, z);

4
src/main/java/mekanism/common/block/BlockMachine.java
View file

@ -827,7 +827,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer
} }
@Override @Override
public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z) public boolean removedByPlayer(World world, EntityPlayer player, int x, int y, int z, boolean willHarvest)
{ {
if(!player.capabilities.isCreativeMode && !world.isRemote && canHarvestBlock(player, world.getBlockMetadata(x, y, z))) if(!player.capabilities.isCreativeMode && !world.isRemote && canHarvestBlock(player, world.getBlockMetadata(x, y, z)))
{ {
@ -1278,6 +1278,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer
return null; return null;
} }
@Override
public ForgeDirection[] getValidRotations(World world, int x, int y, int z) public ForgeDirection[] getValidRotations(World world, int x, int y, int z)
{ {
TileEntity tile = world.getTileEntity(x, y, z); TileEntity tile = world.getTileEntity(x, y, z);
@ -1296,6 +1297,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer
return valid; return valid;
} }
@Override
public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis) public boolean rotateBlock(World world, int x, int y, int z, ForgeDirection axis)
{ {
TileEntity tile = world.getTileEntity(x, y, z); TileEntity tile = world.getTileEntity(x, y, z);