tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Fixed firebox, hotplate, millstone, and yellowcake texture

Browse source
This commit is contained in:
Robert S 2014-09-09 07:17:12 -04:00
parent c81418ac74
commit e0185f5ab5
4 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/main/scala/resonantinduction/archaic/firebox/TileFirebox.java
View file

@ -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 @Override
public void click(EntityPlayer player) public void click(EntityPlayer player)
{ {
@ -303,26 +323,6 @@ public class TileFirebox extends TileElectricInventory implements IPacketReceive
return interactCurrentItem((IInventory) this, 0, player); 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 @Override
public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List)
{ {

2
src/main/scala/resonantinduction/archaic/firebox/TileHotPlate.java
View file

@ -238,7 +238,7 @@ public class TileHotPlate extends TileInventory implements IPacketReceiver
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public IIcon getIcon(int side, int meta) 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 @Override

4
src/main/scala/resonantinduction/archaic/process/TileMillstone.java
View file

@ -105,7 +105,7 @@ public class TileMillstone extends TileInventory implements IPacketReceiver
@Override @Override
public void registerIcons(IIconRegister iconReg) 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")); 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_top");
} }
return SpatialBlock.icon().get("millstone"); return SpatialBlock.icon().get("millstone_side");
} }
@Override @Override

2
src/main/scala/resonantinduction/atomic/Atomic.scala
View file

@ -186,7 +186,7 @@ object Atomic
AtomicContent.itemDarkMatter = new ItemCell("darkMatter") AtomicContent.itemDarkMatter = new ItemCell("darkMatter")
AtomicContent.itemAntimatter = new ItemAntimatter() AtomicContent.itemAntimatter = new ItemAntimatter()
AtomicContent.itemBreedingRod = new ItemBreederFuel() 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) AtomicContent.itemUranium = Atomic.contentRegistry.newItem(classOf[ItemUranium]).setCreativeTab(ResonantTab)
GameRegistry.registerItem(AtomicContent.itemHazmatTop, "HazmatMask", "ResonantInduction|Atomic"); GameRegistry.registerItem(AtomicContent.itemHazmatTop, "HazmatMask", "ResonantInduction|Atomic");