From e0185f5ab5fb11be9e8bd4f186706a7e625e36e4 Mon Sep 17 00:00:00 2001 From: Robert S Date: Tue, 9 Sep 2014 07:17:12 -0400 Subject: [PATCH] Fixed firebox, hotplate, millstone, and yellowcake texture --- .../archaic/firebox/TileFirebox.java | 40 +++++++++---------- .../archaic/firebox/TileHotPlate.java | 2 +- .../archaic/process/TileMillstone.java | 4 +- .../resonantinduction/atomic/Atomic.scala | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.java b/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.java index 6c610f02e..8c9d3dc11 100644 --- a/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.java +++ b/src/main/scala/resonantinduction/archaic/firebox/TileFirebox.java @@ -282,6 +282,26 @@ public class TileFirebox extends TileElectricInventory implements IPacketReceive } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) + { + if (side == 0) + { + return SpatialBlock.icon().get("firebox"); + } + + boolean isElectric = meta == 1; + boolean isBurning = false; + + if (side == 1) + { + return isBurning ? (isElectric ? SpatialBlock.icon().get("firebox_electric_top_on") : SpatialBlock.icon().get("firebox_top_on")) : (isElectric ? SpatialBlock.icon().get("firebox_electric_top_off") : SpatialBlock.icon().get("firebox_top_off")); + } + + return isBurning ? (isElectric ? SpatialBlock.icon().get("firebox_electric_side_on") : SpatialBlock.icon().get("firebox_side_on")) : (isElectric ? SpatialBlock.icon().get("firebox_electric_side_off") : SpatialBlock.icon().get("firebox_side_off")); + } + @Override public void click(EntityPlayer player) { @@ -303,26 +323,6 @@ public class TileFirebox extends TileElectricInventory implements IPacketReceive return interactCurrentItem((IInventory) this, 0, player); } - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(int side, int meta) - { - if (side == 0) - { - return SpatialBlock.icon().get("firebox"); - } - - boolean isElectric = meta == 1; - boolean isBurning = false; - - if (side == 1) - { - return isBurning ? (isElectric ? SpatialBlock.icon().get("firebox_eletric_top_on") : SpatialBlock.icon().get("firebox_top_on")) : (isElectric ? SpatialBlock.icon().get("firebox_eletric_top_off") : SpatialBlock.icon().get("firebox_top_off")); - } - - return isBurning ? (isElectric ? SpatialBlock.icon().get("firebox_eletric_side_on") : SpatialBlock.icon().get("firebox_side_on")) : (isElectric ? SpatialBlock.icon().get("firebox_eletric_side_off") : SpatialBlock.icon().get("firebox_side_off")); - } - @Override public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) { diff --git a/src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.java b/src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.java index 953559dc0..7c229ccb7 100644 --- a/src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.java +++ b/src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.java @@ -238,7 +238,7 @@ public class TileHotPlate extends TileInventory implements IPacketReceiver @SideOnly(Side.CLIENT) public IIcon getIcon(int side, int meta) { - return meta == 1 ? SpatialBlock.icon().get("electricHotPlate") : SpatialBlock.icon().get("HotPlate"); + return meta == 1 ? SpatialBlock.icon().get("electricHotPlate") : SpatialBlock.icon().get(getTextureName()); } @Override diff --git a/src/main/scala/resonantinduction/archaic/process/TileMillstone.java b/src/main/scala/resonantinduction/archaic/process/TileMillstone.java index e47808b6a..4e315fd76 100644 --- a/src/main/scala/resonantinduction/archaic/process/TileMillstone.java +++ b/src/main/scala/resonantinduction/archaic/process/TileMillstone.java @@ -105,7 +105,7 @@ public class TileMillstone extends TileInventory implements IPacketReceiver @Override public void registerIcons(IIconRegister iconReg) { - super.registerIcons(iconReg); + SpatialBlock.icon().put("millstone_side", iconReg.registerIcon(Reference.prefix() + "millstone_side")); SpatialBlock.icon().put("millstone_top", iconReg.registerIcon(Reference.prefix() + "millstone_top")); } @@ -118,7 +118,7 @@ public class TileMillstone extends TileInventory implements IPacketReceiver return SpatialBlock.icon().get("millstone_top"); } - return SpatialBlock.icon().get("millstone"); + return SpatialBlock.icon().get("millstone_side"); } @Override diff --git a/src/main/scala/resonantinduction/atomic/Atomic.scala b/src/main/scala/resonantinduction/atomic/Atomic.scala index 154bfd7db..0b1e596b2 100644 --- a/src/main/scala/resonantinduction/atomic/Atomic.scala +++ b/src/main/scala/resonantinduction/atomic/Atomic.scala @@ -186,7 +186,7 @@ object Atomic AtomicContent.itemDarkMatter = new ItemCell("darkMatter") AtomicContent.itemAntimatter = new ItemAntimatter() AtomicContent.itemBreedingRod = new ItemBreederFuel() - AtomicContent.itemYellowCake = new ItemRadioactive().setUnlocalizedName("yellowcake").setTextureName("yellowcake").setCreativeTab(ResonantTab) + AtomicContent.itemYellowCake = new ItemRadioactive().setUnlocalizedName("yellowcake").setTextureName(Reference.prefix + "yellowcake").setCreativeTab(ResonantTab) AtomicContent.itemUranium = Atomic.contentRegistry.newItem(classOf[ItemUranium]).setCreativeTab(ResonantTab) GameRegistry.registerItem(AtomicContent.itemHazmatTop, "HazmatMask", "ResonantInduction|Atomic");