From 6642d4fac1e39c17e02970c17cd6b20f740c7a99 Mon Sep 17 00:00:00 2001 From: TarzanBuzzyMan Date: Thu, 28 Mar 2013 23:15:37 +1300 Subject: [PATCH 1/2] Update BlockOilFlowing.java Strip off unnecessary code after Krapht's Forge PR merge. --- common/buildcraft/energy/BlockOilFlowing.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/common/buildcraft/energy/BlockOilFlowing.java b/common/buildcraft/energy/BlockOilFlowing.java index 4e72070f..2e8a8e37 100644 --- a/common/buildcraft/energy/BlockOilFlowing.java +++ b/common/buildcraft/energy/BlockOilFlowing.java @@ -30,9 +30,6 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid { boolean isOptimalFlowDirection[] = new boolean[4]; int flowCost[] = new int[4]; - @SideOnly(Side.CLIENT) - private Icon[] field_94425_a; - public BlockOilFlowing(int i, Material material) { super(i, material); @@ -269,13 +266,7 @@ public class BlockOilFlowing extends BlockFluid implements ILiquid { @Override @SideOnly(Side.CLIENT) public void registerIcons(IconRegister iconRegister){ - this.field_94425_a = new Icon[] {iconRegister.registerIcon("buildcraft:oil"), iconRegister.registerIcon("buildcraft:oil_flow")}; + this.theIcon = new Icon[] {iconRegister.registerIcon("buildcraft:oil"), iconRegister.registerIcon("buildcraft:oil_flow")}; } - @Override - @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) { - return par1 != 0 && par1 != 1 ? this.field_94425_a[1] : this.field_94425_a[0]; - } - } From 254c671cec0fc46ed52d0591622c271a12a007fc Mon Sep 17 00:00:00 2001 From: TarzanBuzzyMan Date: Thu, 28 Mar 2013 23:19:19 +1300 Subject: [PATCH 2/2] Update BlockOilStill.java Strip off unnecessary code after Krapht's Forge PR merge. --- common/buildcraft/energy/BlockOilStill.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/common/buildcraft/energy/BlockOilStill.java b/common/buildcraft/energy/BlockOilStill.java index 64361d3f..21bf3eed 100644 --- a/common/buildcraft/energy/BlockOilStill.java +++ b/common/buildcraft/energy/BlockOilStill.java @@ -22,9 +22,6 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockOilStill extends BlockStationary implements ILiquid { - @SideOnly(Side.CLIENT) - private Icon[] theIcon; - public BlockOilStill(int i, Material material) { super(i, material); @@ -63,10 +60,4 @@ public class BlockOilStill extends BlockStationary implements ILiquid { this.theIcon = new Icon[] { iconRegister.registerIcon("buildcraft:oil"), iconRegister.registerIcon("buildcraft:oil_flow") }; } - @Override - @SideOnly(Side.CLIENT) - public Icon getBlockTextureFromSideAndMetadata(int par1, int par2) { - return par1 != 0 && par1 != 1 ? this.theIcon[1] : this.theIcon[0]; - } - }