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

Fixed creative tab icon

Browse source
This commit is contained in:
Calclavia 2014-12-11 08:53:31 +08:00
parent ede327dc01
commit f70e6e757c
10 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/scala/resonantinduction/archaic/ArchaicContent.scala
View file

@ -47,6 +47,7 @@ object ArchaicContent extends ContentHolder
{
OreDictionary.registerOre("cobblestone", Blocks.cobblestone)
}
if (OreDictionary.getOres("stickWood") == null)
{
OreDictionary.registerOre("stickWood", Items.stick)

2
src/main/scala/resonantinduction/archaic/blocks/ItemImprint.scala
View file

@ -92,7 +92,7 @@ class ItemImprint extends Item
//Constructor
setUnlocalizedName(Reference.prefix + "imprint")
setTextureName(Reference.prefix + "imprint")
setCreativeTab(RICreativeTab.tab)
setCreativeTab(RICreativeTab)
setHasSubtypes(true)
setMaxStackSize(1)

13
src/main/scala/resonantinduction/atomic/AtomicContent.scala
View file

@ -135,7 +135,7 @@ object AtomicContent extends ContentHolder
PacketAnnotationManager.INSTANCE.register(classOf[TileAccelerator])
//Buckets
itemBucketToxic = manager.newItem("bucketToxicWaste", new ItemBucket(AtomicContent.blockPlasma)).setCreativeTab(RICreativeTab.tab).setContainerItem(Items.bucket).setTextureName(Reference.prefix + "bucketToxicWaste")
itemBucketToxic = manager.newItem("bucketToxicWaste", new ItemBucket(AtomicContent.blockPlasma)).setCreativeTab(RICreativeTab).setContainerItem(Items.bucket).setTextureName(Reference.prefix + "bucketToxicWaste")
//Schematics
SchematicRegistry.register("resonantInduction.atomic.accelerator", new SchematicAccelerator)
@ -191,27 +191,29 @@ object AtomicContent extends ContentHolder
}
})
Settings.config.save
RICreativeTab.itemStack(new ItemStack(AtomicContent.blockReactorCell))
}
override def postInit()
{
super.postInit()
if (Loader.isModLoaded("IC2") && Settings.allowAlternateRecipes)
{
OreDictionary.registerOre("cellEmpty", IC2Items.getItem("cell"))
val cellEmptyName: String = OreDictionary.getOreName(OreDictionary.getOreID("cellEmpty"))
if (cellEmptyName eq "Unknown")
if (cellEmptyName == "Unknown")
{
}
GameRegistry.addRecipe(new ShapelessOreRecipe(AtomicContent.itemYellowCake, IC2Items.getItem("reactorUraniumSimple")))
GameRegistry.addRecipe(new ShapelessOreRecipe(IC2Items.getItem("cell"), AtomicContent.itemCell))
GameRegistry.addRecipe(new ShapelessOreRecipe(AtomicContent.itemCell, "cellEmpty"))
}
EntityRegistry.registerGlobalEntityID(classOf[EntityParticle], "ASParticle", EntityRegistry.findGlobalUniqueEntityId)
EntityRegistry.registerModEntity(classOf[EntityParticle], "ASParticle", ENTITY_ID_PREFIX, ResonantInduction, 80, 3, true)
Settings.config.load
Settings.config.load()
for (oreName <- OreDictionary.getOreNames)
{
if (oreName.startsWith("ingot"))
@ -225,7 +227,8 @@ object AtomicContent extends ContentHolder
}
}
}
Settings.config.save
Settings.config.save()
recipes += shapeless(new ItemStack(itemAntimatter, 1, 1), itemAntimatter, itemAntimatter, itemAntimatter, itemAntimatter, itemAntimatter, AtomicContent.itemAntimatter, itemAntimatter, itemAntimatter)
recipes += shapeless(new ItemStack(itemAntimatter, 8, 0), new ItemStack(AtomicContent.itemAntimatter, 1, 1))

2
src/main/scala/resonantinduction/atomic/items/ItemAntimatter.scala
View file

@ -23,7 +23,7 @@ class ItemAntimatter extends ItemCell
this.setHasSubtypes(true)
this.setUnlocalizedName(Reference.prefix + "antimatter")
this.setTextureName(Reference.prefix + "antimatter")
setCreativeTab(RICreativeTab.tab)
setCreativeTab(RICreativeTab)
@SideOnly(Side.CLIENT) override def registerIcons(iconRegister: IIconRegister)
{

2
src/main/scala/resonantinduction/atomic/items/ItemCell.scala
View file

@ -17,7 +17,7 @@ class ItemCell extends ItemTooltip
if (!name.equalsIgnoreCase("cellEmpty")) this.setContainerItem(AtomicContent.itemCell)
this.setUnlocalizedName(Reference.prefix + name)
this.setTextureName(Reference.prefix + name)
setCreativeTab(RICreativeTab.tab)
setCreativeTab(RICreativeTab)
}
override def getUnlocalizedName(itemstack: ItemStack): String =

2
src/main/scala/resonantinduction/atomic/items/ItemFissileFuel.scala
View file

@ -45,7 +45,7 @@ class ItemFissileFuel extends ItemRadioactive with IReactorComponent
this.setNoRepair
this.setUnlocalizedName(Reference.prefix + "rodBreederFuel")
this.setTextureName(Reference.prefix + "breederFuel")
setCreativeTab(RICreativeTab.tab)
setCreativeTab(RICreativeTab)
def onReact(itemStack: ItemStack, reactor: IReactor)
{

2
src/main/scala/resonantinduction/atomic/items/ItemHazmat.scala
View file

@ -24,7 +24,7 @@ class ItemHazmat(slot: Int) extends ItemArmor(ItemHazmat.hazmatArmorMaterial, Re
{
this(slot)
this.setUnlocalizedName(Reference.prefix + name)
this.setCreativeTab(RICreativeTab.tab)
this.setCreativeTab(RICreativeTab)
this.setMaxDamage(200000)
}

13
src/main/scala/resonantinduction/core/RICreativeTab.scala
View file

@ -15,16 +15,5 @@ object RICreativeTab extends CreativeTabs(CreativeTabs.getNextID, "resonantinduc
{
var itemStack: ItemStack = null
override def getTabIconItem: Item =
{
if (itemStack != null)
return itemStack.getItem
else
return Items.iron_ingot
}
def itemStack(item: ItemStack)
{ itemStack = item }
def tab = this
override def getTabIconItem: Item =itemStack.getItem
}

2
src/main/scala/resonantinduction/core/ResonantInduction.scala
View file

@ -57,8 +57,6 @@ final object ResonantInduction
loadables.applyModule(AtomicContent)
loadables.preInit()
RICreativeTab.itemStack = new ItemStack(CoreContent.decoration)
}
@EventHandler

2
src/main/scala/resonantinduction/mechanical/MechanicalContent.scala
View file

@ -58,8 +58,6 @@ object MechanicalContent extends ContentHolder
NodeRegistry.register(classOf[TNodeMechanical], classOf[NodeMechanical])
RICreativeTab.itemStack(new ItemStack(MechanicalContent.blockGrinderWheel))
PacketAnnotationManager.INSTANCE.register(classOf[TileWindTurbine])
PacketAnnotationManager.INSTANCE.register(classOf[TileWaterTurbine])