From fe11409b4e0228bd8647a3a2712ffb6ab392e5bd Mon Sep 17 00:00:00 2001 From: Modmuss50 Date: Sat, 5 Sep 2015 11:44:41 +0100 Subject: [PATCH] Fixed a load of crashes becuase of the new rotation system. Fixed powered tiles --- .../java/techreborn/blocks/BlockChunkLoader.java | 6 +++++- .../java/techreborn/blocks/BlockComputerCube.java | 6 +++++- .../java/techreborn/blocks/BlockDigitalChest.java | 6 +++++- .../blocks/BlockElectricCraftingTable.java | 6 +++++- .../java/techreborn/blocks/BlockFusionCoil.java | 6 +++++- .../blocks/BlockFusionControlComputer.java | 6 +++++- .../blocks/BlockHighlyAdvancedMachine.java | 6 +++++- .../techreborn/blocks/BlockSupercondensator.java | 6 +++++- .../java/techreborn/blocks/BlockWoodenshelf.java | 6 +++++- .../java/techreborn/blocks/storage/BlockAesu.java | 8 -------- .../java/techreborn/blocks/storage/BlockIDSU.java | 15 +++++---------- .../java/techreborn/blocks/storage/BlockLesu.java | 6 +++++- src/main/java/techreborn/tiles/TileAesu.java | 8 ++++---- src/main/java/techreborn/tiles/lesu/TileLesu.java | 4 ++-- 14 files changed, 61 insertions(+), 34 deletions(-) diff --git a/src/main/java/techreborn/blocks/BlockChunkLoader.java b/src/main/java/techreborn/blocks/BlockChunkLoader.java index f995819fd..31e52a323 100644 --- a/src/main/java/techreborn/blocks/BlockChunkLoader.java +++ b/src/main/java/techreborn/blocks/BlockChunkLoader.java @@ -53,8 +53,12 @@ public class BlockChunkLoader extends BlockMachineBase { } @Override + @SideOnly(Side.CLIENT) 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 : side == 1 ? this.iconTop : side == 0 ? this.iconBottom : (side == 0 ? this.iconTop diff --git a/src/main/java/techreborn/blocks/BlockComputerCube.java b/src/main/java/techreborn/blocks/BlockComputerCube.java index 286b6ed49..fa30e2571 100644 --- a/src/main/java/techreborn/blocks/BlockComputerCube.java +++ b/src/main/java/techreborn/blocks/BlockComputerCube.java @@ -34,8 +34,12 @@ public class BlockComputerCube extends BlockMachineBase { } @Override + @SideOnly(Side.CLIENT) 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 : side == 1 ? this.iconTop : side == 0 ? this.iconBottom : (side == 0 ? this.iconTop diff --git a/src/main/java/techreborn/blocks/BlockDigitalChest.java b/src/main/java/techreborn/blocks/BlockDigitalChest.java index 5b8a83d3e..d3553afe7 100644 --- a/src/main/java/techreborn/blocks/BlockDigitalChest.java +++ b/src/main/java/techreborn/blocks/BlockDigitalChest.java @@ -53,8 +53,12 @@ public class BlockDigitalChest extends BlockMachineBase { } @Override + @SideOnly(Side.CLIENT) 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 : side == 1 ? this.iconTop : side == 0 ? this.iconBottom : (side == 0 ? this.iconTop diff --git a/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java b/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java index 6a44d4205..8c5629a89 100644 --- a/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java +++ b/src/main/java/techreborn/blocks/BlockElectricCraftingTable.java @@ -34,8 +34,12 @@ public class BlockElectricCraftingTable extends BlockMachineBase { } @Override + @SideOnly(Side.CLIENT) 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 : side == 1 ? this.iconTop : side == 0 ? this.iconBottom : (side == 0 ? this.iconTop diff --git a/src/main/java/techreborn/blocks/BlockFusionCoil.java b/src/main/java/techreborn/blocks/BlockFusionCoil.java index 43f28f799..feb740415 100644 --- a/src/main/java/techreborn/blocks/BlockFusionCoil.java +++ b/src/main/java/techreborn/blocks/BlockFusionCoil.java @@ -34,8 +34,12 @@ public class BlockFusionCoil extends BlockMachineBase { } @Override + @SideOnly(Side.CLIENT) 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 : side == 1 ? this.iconTop : side == 0 ? this.iconBottom : (side == 0 ? this.iconTop diff --git a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java index 14e0031fd..300b8cb73 100644 --- a/src/main/java/techreborn/blocks/BlockFusionControlComputer.java +++ b/src/main/java/techreborn/blocks/BlockFusionControlComputer.java @@ -34,8 +34,12 @@ public class BlockFusionControlComputer extends BlockMachineBase { } @Override + @SideOnly(Side.CLIENT) 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 : side == 1 ? this.iconTop : side == 0 ? this.iconBottom : (side == 0 ? this.iconTop diff --git a/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java b/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java index c88170c2a..eddc4afea 100644 --- a/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java +++ b/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java @@ -34,8 +34,12 @@ public class BlockHighlyAdvancedMachine extends BlockMachineBase { } @Override + @SideOnly(Side.CLIENT) 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 : side == 1 ? this.iconTop : side == 0 ? this.iconBottom : (side == 0 ? this.iconTop diff --git a/src/main/java/techreborn/blocks/BlockSupercondensator.java b/src/main/java/techreborn/blocks/BlockSupercondensator.java index 0354f8ec5..0658a462a 100644 --- a/src/main/java/techreborn/blocks/BlockSupercondensator.java +++ b/src/main/java/techreborn/blocks/BlockSupercondensator.java @@ -34,8 +34,12 @@ public class BlockSupercondensator extends BlockMachineBase { } @Override + @SideOnly(Side.CLIENT) 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 : side == 1 ? this.iconTop : side == 0 ? this.iconBottom : (side == 0 ? this.iconTop diff --git a/src/main/java/techreborn/blocks/BlockWoodenshelf.java b/src/main/java/techreborn/blocks/BlockWoodenshelf.java index 5916d5b08..a4f48c1e7 100644 --- a/src/main/java/techreborn/blocks/BlockWoodenshelf.java +++ b/src/main/java/techreborn/blocks/BlockWoodenshelf.java @@ -34,8 +34,12 @@ public class BlockWoodenshelf extends BlockMachineBase { } @Override + @SideOnly(Side.CLIENT) 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 : side == 1 ? this.iconTop : side == 0 ? this.iconBottom : (side == 0 ? this.iconTop diff --git a/src/main/java/techreborn/blocks/storage/BlockAesu.java b/src/main/java/techreborn/blocks/storage/BlockAesu.java index ddcf2a9b8..7f2eb1283 100644 --- a/src/main/java/techreborn/blocks/storage/BlockAesu.java +++ b/src/main/java/techreborn/blocks/storage/BlockAesu.java @@ -69,12 +69,4 @@ public class BlockAesu extends BlockMachineBase { : (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)); - } - } } diff --git a/src/main/java/techreborn/blocks/storage/BlockIDSU.java b/src/main/java/techreborn/blocks/storage/BlockIDSU.java index 4e6764aa5..e00aa827e 100644 --- a/src/main/java/techreborn/blocks/storage/BlockIDSU.java +++ b/src/main/java/techreborn/blocks/storage/BlockIDSU.java @@ -42,8 +42,12 @@ public class BlockIDSU extends BlockMachineBase { } @Override + @SideOnly(Side.CLIENT) 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 : side == 1 ? this.iconTop : side == 0 ? this.iconBottom : (side == 0 ? this.iconTop @@ -65,13 +69,4 @@ public class BlockIDSU extends BlockMachineBase { 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); - } - } } diff --git a/src/main/java/techreborn/blocks/storage/BlockLesu.java b/src/main/java/techreborn/blocks/storage/BlockLesu.java index aa2d09e5b..5bf9bf979 100644 --- a/src/main/java/techreborn/blocks/storage/BlockLesu.java +++ b/src/main/java/techreborn/blocks/storage/BlockLesu.java @@ -40,8 +40,12 @@ public class BlockLesu extends BlockMachineBase { } @Override + @SideOnly(Side.CLIENT) 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 : side == 1 ? this.iconTop : side == 0 ? this.iconBottom : (side == 0 ? this.iconTop diff --git a/src/main/java/techreborn/tiles/TileAesu.java b/src/main/java/techreborn/tiles/TileAesu.java index b0469a3cd..ba11c8bd2 100644 --- a/src/main/java/techreborn/tiles/TileAesu.java +++ b/src/main/java/techreborn/tiles/TileAesu.java @@ -53,12 +53,12 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable { @Override public short getFacing() { - return (short) worldObj.getBlockMetadata(xCoord, yCoord, zCoord); + return (short) getMeta(); } @Override public void setFacing(short facing) { - worldObj.setBlockMetadataWithNotify(xCoord, yCoord, zCoord, facing, 2); + setMeta(facing); } @Override @@ -142,12 +142,12 @@ public class TileAesu extends TilePowerAcceptor implements IWrenchable { @Override public boolean canAcceptEnergy(ForgeDirection direction) { - return worldObj.getBlockMetadata(xCoord, yCoord, zCoord) != Functions.getIntDirFromDirection(direction); + return getMeta() != Functions.getIntDirFromDirection(direction); } @Override public boolean canProvideEnergy(ForgeDirection direction) { - return worldObj.getBlockMetadata(xCoord, yCoord, zCoord) == Functions.getIntDirFromDirection(direction); + return getMeta() == Functions.getIntDirFromDirection(direction); } @Override diff --git a/src/main/java/techreborn/tiles/lesu/TileLesu.java b/src/main/java/techreborn/tiles/lesu/TileLesu.java index c5a6f6f03..08e3cd966 100644 --- a/src/main/java/techreborn/tiles/lesu/TileLesu.java +++ b/src/main/java/techreborn/tiles/lesu/TileLesu.java @@ -87,12 +87,12 @@ public class TileLesu extends TilePowerAcceptor {//TODO wrench @Override public boolean canAcceptEnergy(ForgeDirection direction) { - return Functions.getIntDirFromDirection(direction) != worldObj.getBlockMetadata(xCoord, yCoord, zCoord); + return Functions.getIntDirFromDirection(direction) != getMeta(); } @Override public boolean canProvideEnergy(ForgeDirection direction) { - return Functions.getIntDirFromDirection(direction) == worldObj.getBlockMetadata(xCoord, yCoord, zCoord); + return Functions.getIntDirFromDirection(direction) == getMeta(); } @Override