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

Fixed boiler returning null for getDirection causing a render crash

Browse source
This commit is contained in:
Robert S 2014-10-07 18:11:40 -04:00
parent 2d337c0e80
commit ae25876952
2 changed files with 23 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/scala/resonantinduction/atomic/machine/boiler/TileNuclearBoiler.scala
View file

@ -289,13 +289,4 @@ class TileNuclearBoiler extends TileElectricInventory(Material.iron) with IPacke
{
return slotID == 2
}
override def getDirection: ForgeDirection =
{
return null
}
override def setDirection(direction: ForgeDirection)
{
}
}

44
src/main/scala/resonantinduction/core/content/BlockDecoration.scala
View file

@ -8,6 +8,7 @@ import net.minecraft.client.renderer.texture.IIconRegister
import net.minecraft.creativetab.CreativeTabs
import net.minecraft.item.{Item, ItemStack}
import net.minecraft.util.IIcon
import resonant.content.prefab.itemblock.ItemBlockMetadata
import resonant.content.spatial.block.SpatialBlock
import resonant.lib.wrapper.WrapList._
import resonantinduction.core.Reference
@ -20,33 +21,34 @@ import resonantinduction.core.Reference
*/
object BlockDecoration
{
var iconNames = Array("material_stone_brick", "material_stone_brick2", "material_stone_chiseled", "material_stone_cobble", "material_stone_cracked", "material_stone", "material_stone_slab", "material_stone_mossy", "material_steel_dark", "material_steel_tint", "material_steel")
var icons = new Array[IIcon](iconNames.length)
var iconNames = Array("material_stone_brick", "material_stone_brick2", "material_stone_chiseled", "material_stone_cobble", "material_stone_cracked", "material_stone", "material_stone_slab", "material_stone_mossy", "material_steel_dark", "material_steel_tint", "material_steel")
var icons = new Array[IIcon](iconNames.length)
}
class BlockDecoration extends SpatialBlock(Material.rock)
{
blockHardness = 1
stepSound = Block.soundTypeStone
blockHardness = 1
stepSound = Block.soundTypeStone
this.itemBlock = classOf[ItemBlockMetadata]
def damageDropped(par1: Int): Int =
{
return par1
}
def damageDropped(par1: Int): Int =
{
return par1
}
override def getIcon(side: Int, metadata: Int): IIcon =
{
return BlockDecoration.icons(metadata)
}
override def getIcon(side: Int, metadata: Int): IIcon =
{
return BlockDecoration.icons(metadata)
}
override def registerIcons(register: IIconRegister)
{
super.registerIcons(register)
(0 until BlockDecoration.icons.size) foreach (i => BlockDecoration.icons(i) = register.registerIcon(Reference.prefix + BlockDecoration.iconNames(i)))
}
override def registerIcons(register: IIconRegister)
{
super.registerIcons(register)
(0 until BlockDecoration.icons.size) foreach (i => BlockDecoration.icons(i) = register.registerIcon(Reference.prefix + BlockDecoration.iconNames(i)))
}
override def getSubBlocks(item: Item, par2CreativeTabs: CreativeTabs, list: List[_])
{
(0 until BlockDecoration.iconNames.length) foreach (i => list.add(new ItemStack(item, 1, i)))
}
override def getSubBlocks(item: Item, par2CreativeTabs: CreativeTabs, list: List[_])
{
(0 until BlockDecoration.iconNames.length) foreach (i => list.add(new ItemStack(item, 1, i)))
}
}