diff --git a/src/main/java/mekanism/common/block/BlockBounding.java b/src/main/java/mekanism/common/block/BlockBounding.java index 0050baee5..176585493 100644 --- a/src/main/java/mekanism/common/block/BlockBounding.java +++ b/src/main/java/mekanism/common/block/BlockBounding.java @@ -84,13 +84,13 @@ public class BlockBounding extends Block } @Override - public float getBlockHardness(World world, int x, int y, int z) + public float getPlayerRelativeBlockHardness(EntityPlayer player, World world, int x, int y, int z) { try { TileEntityBoundingBlock tileEntity = (TileEntityBoundingBlock)world.getTileEntity(x, y, z); - return world.getBlock(tileEntity.mainX, tileEntity.mainY, tileEntity.mainZ).getBlockHardness(world, tileEntity.mainX, tileEntity.mainY, tileEntity.mainZ); + return world.getBlock(tileEntity.mainX, tileEntity.mainY, tileEntity.mainZ).getPlayerRelativeBlockHardness(player, world, tileEntity.mainX, tileEntity.mainY, tileEntity.mainZ); } catch(Exception e) { - return blockHardness; + return super.getPlayerRelativeBlockHardness(player, world, x, y, z); } } diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index 8902bf29b..e28def1b2 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -12,7 +12,6 @@ import mekanism.common.base.ISustainedInventory; import mekanism.common.item.ItemBlockEnergyCube; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; -import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityEnergyCube; import mekanism.common.util.MekanismUtils; @@ -139,16 +138,11 @@ public class BlockEnergyCube extends BlockContainer } @Override - public float getBlockHardness(World world, int x, int y, int z) + public float getPlayerRelativeBlockHardness(EntityPlayer player, World world, int x, int y, int z) { TileEntity tile = world.getTileEntity(x, y, z); - if(tile instanceof ISecurityTile) - { - return SecurityUtils.getSecurity((ISecurityTile)tile) == SecurityMode.PUBLIC ? blockHardness : -1; - } - - return blockHardness; + return SecurityUtils.canAccess(player, tile) ? super.getPlayerRelativeBlockHardness(player, world, x, y, z) : 0.0F; } @Override diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index 1e6082ebc..e8b3bee6a 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -9,7 +9,6 @@ import mekanism.common.base.ISustainedInventory; import mekanism.common.base.ITierItem; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; -import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityGasTank; import mekanism.common.util.MekanismUtils; @@ -86,16 +85,11 @@ public class BlockGasTank extends BlockContainer } @Override - public float getBlockHardness(World world, int x, int y, int z) + public float getPlayerRelativeBlockHardness(EntityPlayer player, World world, int x, int y, int z) { TileEntity tile = world.getTileEntity(x, y, z); - if(tile instanceof ISecurityTile) - { - return SecurityUtils.getSecurity((ISecurityTile)tile) == SecurityMode.PUBLIC ? blockHardness : -1; - } - - return blockHardness; + return SecurityUtils.canAccess(player, tile) ? super.getPlayerRelativeBlockHardness(player, world, x, y, z) : 0.0F; } @Override diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index adc68705f..b4c09a459 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -41,7 +41,6 @@ import mekanism.common.network.PacketLogisticalSorterGui.SorterGuiPacket; import mekanism.common.recipe.ShapedMekanismRecipe; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; -import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityAdvancedFactory; import mekanism.common.tile.TileEntityAmbientAccumulator; import mekanism.common.tile.TileEntityBasicBlock; @@ -763,16 +762,11 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IBlo } @Override - public float getBlockHardness(World world, int x, int y, int z) + public float getPlayerRelativeBlockHardness(EntityPlayer player, World world, int x, int y, int z) { TileEntity tile = world.getTileEntity(x, y, z); - if(tile instanceof ISecurityTile) - { - return SecurityUtils.getSecurity((ISecurityTile)tile) == SecurityMode.PUBLIC ? blockHardness : -1; - } - - return blockHardness; + return SecurityUtils.canAccess(player, tile) ? super.getPlayerRelativeBlockHardness(player, world, x, y, z) : 0.0F; } @Override diff --git a/src/main/java/mekanism/generators/common/block/BlockGenerator.java b/src/main/java/mekanism/generators/common/block/BlockGenerator.java index 63be3713e..7c7de7678 100644 --- a/src/main/java/mekanism/generators/common/block/BlockGenerator.java +++ b/src/main/java/mekanism/generators/common/block/BlockGenerator.java @@ -19,7 +19,6 @@ import mekanism.common.base.ISustainedTank; import mekanism.common.multiblock.IMultiblock; import mekanism.common.security.ISecurityItem; import mekanism.common.security.ISecurityTile; -import mekanism.common.security.ISecurityTile.SecurityMode; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityContainerBlock; import mekanism.common.tile.TileEntityElectricBlock; @@ -266,16 +265,11 @@ public class BlockGenerator extends BlockContainer implements ISpecialBounds, IB } @Override - public float getBlockHardness(World world, int x, int y, int z) + public float getPlayerRelativeBlockHardness(EntityPlayer player, World world, int x, int y, int z) { TileEntity tile = world.getTileEntity(x, y, z); - if(tile instanceof ISecurityTile) - { - return SecurityUtils.getSecurity((ISecurityTile)tile) == SecurityMode.PUBLIC ? blockHardness : -1; - } - - return blockHardness; + return SecurityUtils.canAccess(player, tile) ? super.getPlayerRelativeBlockHardness(player, world, x, y, z) : 0.0F; } @Override