diff --git a/src/main/java/techreborn/blocks/BlockComputerCube.java b/src/main/java/techreborn/blocks/BlockComputerCube.java index fa30e2571..320cf4bb8 100644 --- a/src/main/java/techreborn/blocks/BlockComputerCube.java +++ b/src/main/java/techreborn/blocks/BlockComputerCube.java @@ -10,14 +10,6 @@ import net.minecraft.world.World; public class BlockComputerCube extends BlockMachineBase { - @SideOnly(Side.CLIENT) - private IIcon iconFront; - - @SideOnly(Side.CLIENT) - private IIcon iconTop; - - @SideOnly(Side.CLIENT) - private IIcon iconBottom; public BlockComputerCube(Material material) { super(material); @@ -28,22 +20,12 @@ public class BlockComputerCube extends BlockMachineBase { @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister icon) { this.blockIcon = icon.registerIcon("techreborn:machine/computer_cube"); - this.iconFront = icon.registerIcon("techreborn:machine/computer_cube"); - this.iconTop = icon.registerIcon("techreborn:machine/computer_cube"); - this.iconBottom = icon.registerIcon("techreborn:machine/computer_cube"); } @Override @SideOnly(Side.CLIENT) public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) { - int metadata = getTileMeta(blockAccess, x, y, z); - if (side == metadata && blockAccess.getBlockMetadata(x, y, z) == 1) { - return this.iconFront; - } - return metadata == 0 && side == 3 ? this.iconFront - : side == 1 ? this.iconTop : - side == 0 ? this.iconBottom : (side == 0 ? this.iconTop - : (side == metadata ? this.iconFront : this.blockIcon)); + return this.blockIcon; } } \ No newline at end of file diff --git a/src/main/java/techreborn/blocks/BlockMachineBase.java b/src/main/java/techreborn/blocks/BlockMachineBase.java index 7f990bae5..efc42d5ae 100644 --- a/src/main/java/techreborn/blocks/BlockMachineBase.java +++ b/src/main/java/techreborn/blocks/BlockMachineBase.java @@ -143,19 +143,19 @@ public class BlockMachineBase extends BlockContainer { } public void setTileMeta(World world, int x, int y, int z, int meta){ - if(world.getTileEntity(x, y, z) instanceof TileMachineBase){ + if(world.getTileEntity(x, y, z) != null && world.getTileEntity(x, y, z) instanceof TileMachineBase){ ((TileMachineBase) world.getTileEntity(x, y, z)).setMeta(meta); } } public int getTileMeta(World world, int x, int y, int z){ - if(world.getTileEntity(x, y, z) instanceof TileMachineBase){ + if(world.getTileEntity(x, y, z) != null && world.getTileEntity(x, y, z) instanceof TileMachineBase){ return ((TileMachineBase) world.getTileEntity(x, y, z)).getMeta(); } return 0; } public int getTileMeta(IBlockAccess blockAccess, int x, int y, int z){ - return getTileMeta(blockAccess.getTileEntity(x, y,z).getWorldObj(), x, y, z); + return blockAccess.getTileEntity(x, y, z) != null ? getTileMeta(blockAccess.getTileEntity(x, y,z).getWorldObj(), x, y, z) : null; } }