Fixes #149
This commit is contained in:
parent
c424e74473
commit
5d5f4ec929
2 changed files with 4 additions and 22 deletions
|
@ -10,14 +10,6 @@ import net.minecraft.world.World;
|
||||||
|
|
||||||
public class BlockComputerCube extends BlockMachineBase {
|
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) {
|
public BlockComputerCube(Material material) {
|
||||||
super(material);
|
super(material);
|
||||||
|
@ -28,22 +20,12 @@ public class BlockComputerCube extends BlockMachineBase {
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public void registerBlockIcons(IIconRegister icon) {
|
public void registerBlockIcons(IIconRegister icon) {
|
||||||
this.blockIcon = icon.registerIcon("techreborn:machine/computer_cube");
|
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
|
@Override
|
||||||
@SideOnly(Side.CLIENT)
|
@SideOnly(Side.CLIENT)
|
||||||
public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) {
|
public IIcon getIcon(IBlockAccess blockAccess, int x, int y, int z, int side) {
|
||||||
int metadata = getTileMeta(blockAccess, x, y, z);
|
return this.blockIcon;
|
||||||
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));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -143,19 +143,19 @@ public class BlockMachineBase extends BlockContainer {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setTileMeta(World world, int x, int y, int z, int meta){
|
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);
|
((TileMachineBase) world.getTileEntity(x, y, z)).setMeta(meta);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getTileMeta(World world, int x, int y, int z){
|
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 ((TileMachineBase) world.getTileEntity(x, y, z)).getMeta();
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getTileMeta(IBlockAccess blockAccess, int x, int y, int z){
|
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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue