From 9bc9da2fadb708c7952a41d092dfa8e1226014fb Mon Sep 17 00:00:00 2001 From: Gig Date: Sat, 16 May 2015 23:14:17 +0100 Subject: [PATCH] Fixed ItemIcons on machines --- src/main/java/techreborn/blocks/BlockMachineBase.java | 2 -- .../techreborn/blocks/machine/BlockAlloySmelter.java | 10 ++++++++++ .../blocks/machine/BlockAssemblingMachine.java | 10 ++++++++++ .../blocks/machine/BlockChemicalReactor.java | 10 ++++++++++ .../blocks/machine/BlockImplosionCompressor.java | 10 ++++++++++ .../java/techreborn/blocks/machine/BlockLathe.java | 10 ++++++++++ .../blocks/machine/BlockPlateCuttingMachine.java | 10 ++++++++++ 7 files changed, 60 insertions(+), 2 deletions(-) diff --git a/src/main/java/techreborn/blocks/BlockMachineBase.java b/src/main/java/techreborn/blocks/BlockMachineBase.java index 027859998..5a73ca51a 100644 --- a/src/main/java/techreborn/blocks/BlockMachineBase.java +++ b/src/main/java/techreborn/blocks/BlockMachineBase.java @@ -101,7 +101,5 @@ public class BlockMachineBase extends BlockContainer{ { return false; } - - } diff --git a/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java b/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java index e3c73263f..33a61e107 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java +++ b/src/main/java/techreborn/blocks/machine/BlockAlloySmelter.java @@ -85,5 +85,15 @@ public class BlockAlloySmelter extends BlockMachineBase { : (side == metadata ? this.iconFront : this.blockIcon)); } + + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int metadata) + { + 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)); + + } } diff --git a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java index ca0800165..e97257d2e 100644 --- a/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockAssemblingMachine.java @@ -84,5 +84,15 @@ public class BlockAssemblingMachine extends BlockMachineBase { : (side == metadata ? this.iconFront : this.blockIcon)); } + + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int metadata) + { + 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)); + + } } diff --git a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java index 9f4ce51d4..4b8c69e18 100644 --- a/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java +++ b/src/main/java/techreborn/blocks/machine/BlockChemicalReactor.java @@ -86,5 +86,15 @@ public class BlockChemicalReactor extends BlockMachineBase { : (side == metadata ? this.iconFront : this.blockIcon)); } + + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int metadata) + { + 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)); + + } } diff --git a/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java b/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java index 4bb78c68a..edd14417b 100644 --- a/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java +++ b/src/main/java/techreborn/blocks/machine/BlockImplosionCompressor.java @@ -81,4 +81,14 @@ public class BlockImplosionCompressor extends BlockMachineBase{ side == 0 ? this.iconBottom: (side == 0 ? this.iconTop : (side == metadata ? this.iconFront : this.blockIcon)); } + + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int metadata) + { + 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)); + + } } diff --git a/src/main/java/techreborn/blocks/machine/BlockLathe.java b/src/main/java/techreborn/blocks/machine/BlockLathe.java index 203f44130..357a92895 100644 --- a/src/main/java/techreborn/blocks/machine/BlockLathe.java +++ b/src/main/java/techreborn/blocks/machine/BlockLathe.java @@ -86,5 +86,15 @@ public class BlockLathe extends BlockMachineBase { : (side == metadata ? this.iconFront : this.blockIcon)); } + + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int metadata) + { + 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)); + + } } diff --git a/src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java b/src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java index 7d9905a3c..ab2d4a6c7 100644 --- a/src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java +++ b/src/main/java/techreborn/blocks/machine/BlockPlateCuttingMachine.java @@ -85,5 +85,15 @@ public class BlockPlateCuttingMachine extends BlockMachineBase { : (side == metadata ? this.iconFront : this.blockIcon)); } + + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int metadata) + { + 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)); + + } }