Fixed a load of crashes becuase of the new rotation system. Fixed powered tiles
This commit is contained in:
parent
5fe5fce53c
commit
fe11409b4e
14 changed files with 61 additions and 34 deletions
|
@ -53,8 +53,12 @@ public class BlockChunkLoader extends BlockMachineBase {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@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((World) blockAccess, x, y, z);
|
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
|
return metadata == 0 && side == 3 ? this.iconFront
|
||||||
: side == 1 ? this.iconTop :
|
: side == 1 ? this.iconTop :
|
||||||
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
||||||
|
|
|
@ -34,8 +34,12 @@ public class BlockComputerCube extends BlockMachineBase {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@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((World) blockAccess, x, y, z);
|
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
|
return metadata == 0 && side == 3 ? this.iconFront
|
||||||
: side == 1 ? this.iconTop :
|
: side == 1 ? this.iconTop :
|
||||||
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
||||||
|
|
|
@ -53,8 +53,12 @@ public class BlockDigitalChest extends BlockMachineBase {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@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((World) blockAccess, x, y, z);
|
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
|
return metadata == 0 && side == 3 ? this.iconFront
|
||||||
: side == 1 ? this.iconTop :
|
: side == 1 ? this.iconTop :
|
||||||
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
||||||
|
|
|
@ -34,8 +34,12 @@ public class BlockElectricCraftingTable extends BlockMachineBase {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@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((World) blockAccess, x, y, z);
|
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
|
return metadata == 0 && side == 3 ? this.iconFront
|
||||||
: side == 1 ? this.iconTop :
|
: side == 1 ? this.iconTop :
|
||||||
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
||||||
|
|
|
@ -34,8 +34,12 @@ public class BlockFusionCoil extends BlockMachineBase {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@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((World) blockAccess, x, y, z);
|
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
|
return metadata == 0 && side == 3 ? this.iconFront
|
||||||
: side == 1 ? this.iconTop :
|
: side == 1 ? this.iconTop :
|
||||||
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
||||||
|
|
|
@ -34,8 +34,12 @@ public class BlockFusionControlComputer extends BlockMachineBase {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@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((World) blockAccess, x, y, z);
|
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
|
return metadata == 0 && side == 3 ? this.iconFront
|
||||||
: side == 1 ? this.iconTop :
|
: side == 1 ? this.iconTop :
|
||||||
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
||||||
|
|
|
@ -34,8 +34,12 @@ public class BlockHighlyAdvancedMachine extends BlockMachineBase {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@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((World) blockAccess, x, y, z);
|
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
|
return metadata == 0 && side == 3 ? this.iconFront
|
||||||
: side == 1 ? this.iconTop :
|
: side == 1 ? this.iconTop :
|
||||||
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
||||||
|
|
|
@ -34,8 +34,12 @@ public class BlockSupercondensator extends BlockMachineBase {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@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((World) blockAccess, x, y, z);
|
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
|
return metadata == 0 && side == 3 ? this.iconFront
|
||||||
: side == 1 ? this.iconTop :
|
: side == 1 ? this.iconTop :
|
||||||
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
||||||
|
|
|
@ -34,8 +34,12 @@ public class BlockWoodenshelf extends BlockMachineBase {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@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((World) blockAccess, x, y, z);
|
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
|
return metadata == 0 && side == 3 ? this.iconFront
|
||||||
: side == 1 ? this.iconTop :
|
: side == 1 ? this.iconTop :
|
||||||
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
||||||
|
|
|
@ -69,12 +69,4 @@ public class BlockAesu extends BlockMachineBase {
|
||||||
: (side == metadata ? this.iconFront : this.blockIcon));
|
: (side == metadata ? this.iconFront : this.blockIcon));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemstack) {
|
|
||||||
super.onBlockPlacedBy(world, x, y, z, player, itemstack);
|
|
||||||
TileEntity tile = world.getTileEntity(x, y, z);
|
|
||||||
if (tile instanceof TileAesu) {
|
|
||||||
((TileAesu) tile).setFacing((short) world.getBlockMetadata(x, y, z));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,8 +42,12 @@ public class BlockIDSU extends BlockMachineBase {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@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((World) blockAccess, x, y, z);
|
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
|
return metadata == 0 && side == 3 ? this.iconFront
|
||||||
: side == 1 ? this.iconTop :
|
: side == 1 ? this.iconTop :
|
||||||
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
||||||
|
@ -65,13 +69,4 @@ public class BlockIDSU extends BlockMachineBase {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemstack) {
|
|
||||||
super.onBlockPlacedBy(world, x, y, z, player, itemstack);
|
|
||||||
TileEntity tile = world.getTileEntity(x, y, z);
|
|
||||||
if (tile instanceof TileIDSU) {
|
|
||||||
((TileIDSU) tile).ownerUdid = player.getUniqueID().toString();
|
|
||||||
System.out.println(((TileIDSU) tile).ownerUdid);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,8 +40,12 @@ public class BlockLesu extends BlockMachineBase {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@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((World) blockAccess, x, y, z);
|
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
|
return metadata == 0 && side == 3 ? this.iconFront
|
||||||
: side == 1 ? this.iconTop :
|
: side == 1 ? this.iconTop :
|
||||||
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
side == 0 ? this.iconBottom : (side == 0 ? this.iconTop
|
||||||
|
|
|
@ -53,12 +53,12 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public short getFacing() {
|
public short getFacing() {
|
||||||
return (short) worldObj.getBlockMetadata(xCoord, yCoord, zCoord);
|
return (short) getMeta();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setFacing(short facing) {
|
public void setFacing(short facing) {
|
||||||
worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, facing, 2);
|
setMeta(facing);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -142,12 +142,12 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canAcceptEnergy(ForgeDirection direction) {
|
public boolean canAcceptEnergy(ForgeDirection direction) {
|
||||||
return worldObj.getBlockMetadata(xCoord, yCoord, zCoord) != Functions.getIntDirFromDirection(direction);
|
return getMeta() != Functions.getIntDirFromDirection(direction);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canProvideEnergy(ForgeDirection direction) {
|
public boolean canProvideEnergy(ForgeDirection direction) {
|
||||||
return worldObj.getBlockMetadata(xCoord, yCoord, zCoord) == Functions.getIntDirFromDirection(direction);
|
return getMeta() == Functions.getIntDirFromDirection(direction);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -87,12 +87,12 @@ public class TileLesu extends TilePowerAcceptor {//TODO wrench
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canAcceptEnergy(ForgeDirection direction) {
|
public boolean canAcceptEnergy(ForgeDirection direction) {
|
||||||
return Functions.getIntDirFromDirection(direction) != worldObj.getBlockMetadata(xCoord, yCoord, zCoord);
|
return Functions.getIntDirFromDirection(direction) != getMeta();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canProvideEnergy(ForgeDirection direction) {
|
public boolean canProvideEnergy(ForgeDirection direction) {
|
||||||
return Functions.getIntDirFromDirection(direction) == worldObj.getBlockMetadata(xCoord, yCoord, zCoord);
|
return Functions.getIntDirFromDirection(direction) == getMeta();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Add table
Reference in a new issue