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

Fixed copper and tin ingot generation

Browse source
This commit is contained in:
Calclavia 2015-01-11 12:10:56 +08:00
parent 639c183346
commit e0bf1b7373
2 changed files with 28 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
src/main/resources/assets/resonantinduction/models/glassJar.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 3.5 KiB

51
src/main/scala/resonantinduction/core/resource/AutoResourceFactory.scala
View file

@ -50,9 +50,6 @@ object AutoResourceFactory
def init()
{
//Add vanilla ores
registerMaterial("gold")
registerMaterial("iron")
//Register resource types
ResourceFactory.registerResourceItem("rubble", classOf[ItemRubble])
@ -68,35 +65,28 @@ object AutoResourceFactory
ResourceFactory.requestItem("ingot", "tin")
ResourceFactory.registerMaterialColor("tin", 0xAFBFB2)
//Add vanilla ore processing recipes
OreDictionary.initVanillaEntries()
//Add vanilla ingots to auto generate
registerAutoMaterial("gold")
registerAutoMaterial("iron")
registerAutoMaterial("copper")
registerAutoMaterial("tin")
}
def postInit()
{
//Add vanilla ore processing recipes
MachineRecipes.instance.addRecipe(RecipeType.SMELTER.name, new FluidStack(FluidRegistry.LAVA, FluidContainerRegistry.BUCKET_VOLUME), new ItemStack(Blocks.stone))
MachineRecipes.instance.addRecipe(RecipeType.CRUSHER.name, Blocks.cobblestone, Blocks.gravel)
MachineRecipes.instance.addRecipe(RecipeType.CRUSHER.name, Blocks.stone, Blocks.cobblestone)
MachineRecipes.instance.addRecipe(RecipeType.SAWMILL.name, Blocks.log, new ItemStack(Blocks.planks, 7, 0))
MachineRecipes.instance.addRecipe(RecipeType.GRINDER.name, Blocks.gravel, Blocks.sand)
MachineRecipes.instance.addRecipe(RecipeType.GRINDER.name, Blocks.glass, Blocks.sand)
}
def registerMaterial(material: String)
{
if (!materials.contains(material) && OreDictionary.getOres("ore" + material.capitalizeFirst).size > 0)
{
Settings.config.load()
val allowMaterial = Settings.config.get("Resource-Generator", "Enable " + material, true).getBoolean(true)
Settings.config.save()
if (allowMaterial && !blackList.contains(material))
{
materials += material
}
}
}
def postInit()
{
//Call generate() on all materials
materials.foreach(generate)
Reference.logger.fine("Resource Factory generated " + materials.size + " resources.")
}
@ -157,7 +147,22 @@ object AutoResourceFactory
{
val oreDictName = evt.Name.replace("ingot", "")
val materialName = oreDictName.decapitalizeFirst
registerMaterial(materialName)
registerAutoMaterial(materialName)
}
}
def registerAutoMaterial(material: String)
{
if (!materials.contains(material) && OreDictionary.getOres("ore" + material.capitalizeFirst).size > 0)
{
Settings.config.load()
val allowMaterial = Settings.config.get("Resource-Generator", "Enable " + material, true).getBoolean(true)
Settings.config.save()
if (allowMaterial && !blackList.contains(material))
{
materials += material
}
}
}