From a386a35eadc3a0e00b4477dd663649b4655cb39a Mon Sep 17 00:00:00 2001 From: Gig Date: Sun, 3 May 2015 22:27:19 +0100 Subject: [PATCH] Fixed bottom textures --- .../techreborn/blocks/BlockAlloySmelter.java | 3 +- .../techreborn/blocks/BlockBlastFurnace.java | 3 +- .../techreborn/blocks/BlockCentrifuge.java | 3 +- .../techreborn/blocks/BlockChunkLoader.java | 4 +- .../blocks/BlockDragonEggSiphoner.java | 3 +- .../java/techreborn/blocks/BlockGrinder.java | 3 +- .../blocks/BlockHighlyAdvancedMachine.java | 3 +- .../blocks/BlockImplosionCompressor.java | 3 +- .../blocks/BlockMagicEnergyConverter.java | 3 +- .../blocks/BlockMatterFabricator.java | 3 +- .../techreborn/blocks/BlockQuantumChest.java | 3 +- .../blocks/BlockRollingMachine.java | 72 +----------------- .../blocks/BlockThermalGenerator.java | 3 +- .../blocks/machine/rollingmachine_top.png | Bin 603 -> 0 bytes 14 files changed, 27 insertions(+), 82 deletions(-) delete mode 100644 src/main/resources/assets/techreborn/textures/blocks/machine/rollingmachine_top.png diff --git a/src/main/java/techreborn/blocks/BlockAlloySmelter.java b/src/main/java/techreborn/blocks/BlockAlloySmelter.java index 30fd9404d..ae3406745 100644 --- a/src/main/java/techreborn/blocks/BlockAlloySmelter.java +++ b/src/main/java/techreborn/blocks/BlockAlloySmelter.java @@ -70,7 +70,8 @@ public class BlockAlloySmelter extends BlockMachineBase { { return metadata == 0 && side == 3 ? this.iconFront - : side == 1 ? this.iconTop : (side == 0 ? this.iconTop + : side == 1 ? this.iconTop : + side == 6 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockBlastFurnace.java b/src/main/java/techreborn/blocks/BlockBlastFurnace.java index d300fc1fa..30d27985d 100644 --- a/src/main/java/techreborn/blocks/BlockBlastFurnace.java +++ b/src/main/java/techreborn/blocks/BlockBlastFurnace.java @@ -82,7 +82,8 @@ public class BlockBlastFurnace extends BlockMachineBase { { return metadata == 0 && side == 3 ? this.iconFront - : side == 1 ? this.iconTop : (side == 0 ? this.iconTop + : side == 1 ? this.iconTop : + side == 6 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockCentrifuge.java b/src/main/java/techreborn/blocks/BlockCentrifuge.java index 05ed96ec8..4b80dce6a 100644 --- a/src/main/java/techreborn/blocks/BlockCentrifuge.java +++ b/src/main/java/techreborn/blocks/BlockCentrifuge.java @@ -65,7 +65,8 @@ public class BlockCentrifuge extends BlockMachineBase { { return metadata == 0 && side == 3 ? this.iconFront - : side == 1 ? this.iconTop : (side == 0 ? this.iconTop + : side == 1 ? this.iconTop : + side == 6 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockChunkLoader.java b/src/main/java/techreborn/blocks/BlockChunkLoader.java index 574783dbb..8a7bcd427 100644 --- a/src/main/java/techreborn/blocks/BlockChunkLoader.java +++ b/src/main/java/techreborn/blocks/BlockChunkLoader.java @@ -58,8 +58,10 @@ public class BlockChunkLoader extends BlockMachineBase{ @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int metadata) { + return metadata == 0 && side == 3 ? this.iconFront - : side == 1 ? this.iconTop : (side == 0 ? this.iconTop + : side == 1 ? this.iconTop : + side == 6 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockDragonEggSiphoner.java b/src/main/java/techreborn/blocks/BlockDragonEggSiphoner.java index 465a9fd29..c8c5a3b2f 100644 --- a/src/main/java/techreborn/blocks/BlockDragonEggSiphoner.java +++ b/src/main/java/techreborn/blocks/BlockDragonEggSiphoner.java @@ -53,7 +53,8 @@ public class BlockDragonEggSiphoner extends BlockMachineBase { { return metadata == 0 && side == 3 ? this.iconFront - : side == 1 ? this.iconTop : (side == 0 ? this.iconTop + : side == 1 ? this.iconTop : + side == 6 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockGrinder.java b/src/main/java/techreborn/blocks/BlockGrinder.java index a37deee75..5faaf294d 100644 --- a/src/main/java/techreborn/blocks/BlockGrinder.java +++ b/src/main/java/techreborn/blocks/BlockGrinder.java @@ -66,7 +66,8 @@ public class BlockGrinder extends BlockMachineBase{ { return metadata == 0 && side == 3 ? this.iconFront - : side == 1 ? this.iconTop : (side == 0 ? this.iconTop + : side == 1 ? this.iconTop : + side == 6 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java b/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java index ec715f3b2..24331b7de 100644 --- a/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java +++ b/src/main/java/techreborn/blocks/BlockHighlyAdvancedMachine.java @@ -38,7 +38,8 @@ public class BlockHighlyAdvancedMachine extends BlockMachineBase{ { return metadata == 0 && side == 3 ? this.iconFront - : side == 1 ? this.iconTop : (side == 0 ? this.iconTop + : side == 1 ? this.iconTop : + side == 6 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockImplosionCompressor.java b/src/main/java/techreborn/blocks/BlockImplosionCompressor.java index f990046c9..596b48bae 100644 --- a/src/main/java/techreborn/blocks/BlockImplosionCompressor.java +++ b/src/main/java/techreborn/blocks/BlockImplosionCompressor.java @@ -66,7 +66,8 @@ public class BlockImplosionCompressor extends BlockMachineBase{ { return metadata == 0 && side == 3 ? this.iconFront - : side == 1 ? this.iconTop : (side == 0 ? this.iconTop + : side == 1 ? this.iconTop : + side == 6 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockMagicEnergyConverter.java b/src/main/java/techreborn/blocks/BlockMagicEnergyConverter.java index fae07f7a6..0aaa11d4f 100644 --- a/src/main/java/techreborn/blocks/BlockMagicEnergyConverter.java +++ b/src/main/java/techreborn/blocks/BlockMagicEnergyConverter.java @@ -53,7 +53,8 @@ public class BlockMagicEnergyConverter extends BlockMachineBase { { return metadata == 0 && side == 3 ? this.iconFront - : side == 1 ? this.iconTop : (side == 0 ? this.iconTop + : side == 1 ? this.iconTop : + side == 6 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockMatterFabricator.java b/src/main/java/techreborn/blocks/BlockMatterFabricator.java index b987c39f7..12a74c5bb 100644 --- a/src/main/java/techreborn/blocks/BlockMatterFabricator.java +++ b/src/main/java/techreborn/blocks/BlockMatterFabricator.java @@ -66,7 +66,8 @@ public class BlockMatterFabricator extends BlockMachineBase{ { return metadata == 0 && side == 3 ? this.iconFront - : side == 1 ? this.iconTop : (side == 0 ? this.iconTop + : side == 1 ? this.iconTop : + side == 6 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockQuantumChest.java b/src/main/java/techreborn/blocks/BlockQuantumChest.java index adb654d06..643fe339f 100644 --- a/src/main/java/techreborn/blocks/BlockQuantumChest.java +++ b/src/main/java/techreborn/blocks/BlockQuantumChest.java @@ -61,7 +61,8 @@ public class BlockQuantumChest extends BlockMachineBase { { return metadata == 0 && side == 3 ? this.iconFront - : side == 1 ? this.iconTop : (side == 0 ? this.iconTop + : side == 1 ? this.iconTop : + side == 6 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/java/techreborn/blocks/BlockRollingMachine.java b/src/main/java/techreborn/blocks/BlockRollingMachine.java index 60394f052..7672f3b8d 100644 --- a/src/main/java/techreborn/blocks/BlockRollingMachine.java +++ b/src/main/java/techreborn/blocks/BlockRollingMachine.java @@ -66,78 +66,10 @@ public class BlockRollingMachine extends BlockMachineBase { { return metadata == 0 && side == 3 ? this.iconFront - : side == 1 ? this.iconTop : (side == 0 ? this.iconTop + : side == 1 ? this.iconTop : + side == 6 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } - public void onBlockAdded(World world, int x, int y, int z) - { - - super.onBlockAdded(world, x, y, z); - this.setDefaultDirection(world, x, y, z); - - } - - private void setDefaultDirection(World world, int x, int y, int z) - { - - if (!world.isRemote) - { - Block block1 = world.getBlock(x, y, z - 1); - Block block2 = world.getBlock(x, y, z + 1); - Block block3 = world.getBlock(x - 1, y, z); - Block block4 = world.getBlock(x + 1, y, z); - - byte b = 3; - - if (block1.func_149730_j() && !block2.func_149730_j()) - { - b = 3; - } - if (block2.func_149730_j() && !block1.func_149730_j()) - { - b = 2; - } - if (block3.func_149730_j() && !block4.func_149730_j()) - { - b = 5; - } - if (block4.func_149730_j() && !block3.func_149730_j()) - { - b = 4; - } - - world.setBlockMetadataWithNotify(x, y, z, b, 2); - - } - - } - - public void onBlockPlacedBy(World world, int x, int y, int z, - EntityLivingBase player, ItemStack itemstack) - { - - int l = MathHelper - .floor_double((double) (player.rotationYaw * 4.0F / 360F) + 0.5D) & 3; - - if (l == 0) - { - world.setBlockMetadataWithNotify(x, y, z, 2, 2); - } - if (l == 1) - { - world.setBlockMetadataWithNotify(x, y, z, 5, 2); - } - if (l == 2) - { - world.setBlockMetadataWithNotify(x, y, z, 3, 2); - } - if (l == 3) - { - world.setBlockMetadataWithNotify(x, y, z, 4, 2); - } - - } - } diff --git a/src/main/java/techreborn/blocks/BlockThermalGenerator.java b/src/main/java/techreborn/blocks/BlockThermalGenerator.java index 64cca4c9f..481ad80dd 100644 --- a/src/main/java/techreborn/blocks/BlockThermalGenerator.java +++ b/src/main/java/techreborn/blocks/BlockThermalGenerator.java @@ -70,7 +70,8 @@ public class BlockThermalGenerator extends BlockMachineBase { { return metadata == 0 && side == 3 ? this.iconFront - : side == 1 ? this.iconTop : (side == 0 ? this.iconTop + : side == 1 ? this.iconTop : + side == 6 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } diff --git a/src/main/resources/assets/techreborn/textures/blocks/machine/rollingmachine_top.png b/src/main/resources/assets/techreborn/textures/blocks/machine/rollingmachine_top.png deleted file mode 100644 index f066828423cbe52a397294ed09d9503dc1239398..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 603 zcmV-h0;K(kP)c_Z_F$6*gc<=Gv6GZUN1)CnBUAWN~wg@ z@Am;H%aYAJC&q}k9)RQHA%i?0x%qnI2sH%8Vr)}qMk4r zkI|FSn5)a_on(Nk>6Gc^CHn^-0oZ%@q2+4tEyL3@hNowki^(|;A3tI^8qv%1l>$32 zU#!^TB@w8#X1&|R{Jy?s{Xv)g_lGE@+D&sFooU3k+qalmL=w4LYrOXuYb~y^9338T zAL(su@aFXnuXgwF)?vJLG)8NBl6{{P+L>002ovPDHLkV1msd4L1M)