diff --git a/config/exnihilocreatio/OreRegistry.json b/config/exnihilocreatio/OreRegistry.json index 5074e9f0b..9283aa0bd 100644 --- a/config/exnihilocreatio/OreRegistry.json +++ b/config/exnihilocreatio/OreRegistry.json @@ -44,7 +44,7 @@ } }, { - "name": "aluminium", + "name": "aluminum", "color": { "r": 0.7490196, "g": 0.7490196, diff --git a/config/exnihilocreatio/SieveRegistry.json b/config/exnihilocreatio/SieveRegistry.json index ff23b178b..af6202344 100644 --- a/config/exnihilocreatio/SieveRegistry.json +++ b/config/exnihilocreatio/SieveRegistry.json @@ -396,7 +396,7 @@ }, { "drop": { - "name": "exnihilocreatio:item_ore_aluminium", + "name": "exnihilocreatio:item_ore_aluminum", "meta": 0 }, "chance": 0.2, @@ -404,7 +404,7 @@ }, { "drop": { - "name": "exnihilocreatio:item_ore_aluminium", + "name": "exnihilocreatio:item_ore_aluminum", "meta": 0 }, "chance": 0.2, @@ -412,7 +412,7 @@ }, { "drop": { - "name": "exnihilocreatio:item_ore_aluminium", + "name": "exnihilocreatio:item_ore_aluminum", "meta": 0 }, "chance": 0.1, @@ -930,7 +930,7 @@ }, { "drop": { - "name": "exnihilocreatio:item_ore_aluminium", + "name": "exnihilocreatio:item_ore_aluminum", "meta": 0 }, "chance": 0.2, @@ -938,7 +938,7 @@ }, { "drop": { - "name": "exnihilocreatio:item_ore_aluminium", + "name": "exnihilocreatio:item_ore_aluminum", "meta": 0 }, "chance": 0.2, @@ -946,7 +946,7 @@ }, { "drop": { - "name": "exnihilocreatio:item_ore_aluminium", + "name": "exnihilocreatio:item_ore_aluminum", "meta": 0 }, "chance": 0.1, @@ -1148,7 +1148,7 @@ }, { "drop": { - "name": "exnihilocreatio:item_ore_aluminium", + "name": "exnihilocreatio:item_ore_aluminum", "meta": 0 }, "chance": 0.2, @@ -1156,7 +1156,7 @@ }, { "drop": { - "name": "exnihilocreatio:item_ore_aluminium", + "name": "exnihilocreatio:item_ore_aluminum", "meta": 0 }, "chance": 0.2, @@ -1164,7 +1164,7 @@ }, { "drop": { - "name": "exnihilocreatio:item_ore_aluminium", + "name": "exnihilocreatio:item_ore_aluminum", "meta": 0 }, "chance": 0.1, diff --git a/config/ic2/block_cutter.ini b/config/ic2/block_cutter.ini index 55b6a7c34..7ed9e2cb4 100644 --- a/config/ic2/block_cutter.ini +++ b/config/ic2/block_cutter.ini @@ -58,21 +58,26 @@ minecraft:lapis_block = ic2:plate#lapis*9 @hardness:5 OreDict:blockCopper = thermalfoundation:material@320*9 @hardness:2 ; Wooden Planks OreDict:plankWood*2 = minecraft:stick*6 @hardness:1 - -;OreDict:blockElectrumFlux = redstonearsenal:material@128*9 @hardness:5 -;OreDict:blockSilver = thermalfoundation:material@322*9 @hardness:5 -;OreDict:blockAluminum = thermalfoundation:material@324*9 @hardness:5 -;OreDict:blockNickel = thermalfoundation:material@325*9 @hardness:5 -;OreDict:blockPlatinum = thermalfoundation:material@326*9 @hardness:5 -;OreDict:blockIridium = thermalfoundation:material@327*9 @hardness:5 -;OreDict:blockMithril = thermalfoundation:material@328*9 @hardness:5 -;OreDict:blockElectrum = thermalfoundation:material@353*9 @hardness:5 -;OreDict:blockInvar = thermalfoundation:material@354*9 @hardness:5 -;OreDict:blockConstantan = thermalfoundation:material@356*9 @hardness:5 -;OreDict:blockSignalum = thermalfoundation:material@357*9 @hardness:5 -;OreDict:blockLumium = thermalfoundation:material@358*9 @hardness:5 -;OreDict:blockEnderium = thermalfoundation:material@359*9 @hardness:5 -;OreDict:blockTitanium = libvulpes:productplate@7*9 @hardness:5 -;OreDict:blockTitaniumAluminide = advancedrocketry:productplate*9 @hardness:5 -;OreDict:blockTitaniumIridium = advancedrocketry:productplate@1*9 @hardness:5 -;OreDict:blockUranium = immersiveengineering:metal@35*9 @hardness:5 \ No newline at end of file +; Brass Plates +OreDict:blockBrass = thaumcraft:plate*9 @hardness:1 +; Thaumium Plates +OreDict:blockThaumium = thaumcraft:plate@2*9 @hardness:2 +; Void Plates +OreDict:blockVoid = thaumcraft:plate@3*9 @hardness:8 +OreDict:blockElectrumFlux = redstonearsenal:material@128*9 @hardness:5 +OreDict:blockSilver = thermalfoundation:material@322*9 @hardness:5 +OreDict:blockAluminum = thermalfoundation:material@324*9 @hardness:5 +OreDict:blockNickel = thermalfoundation:material@325*9 @hardness:5 +OreDict:blockPlatinum = thermalfoundation:material@326*9 @hardness:5 +OreDict:blockIridium = thermalfoundation:material@327*9 @hardness:5 +OreDict:blockMithril = thermalfoundation:material@328*9 @hardness:5 +OreDict:blockElectrum = thermalfoundation:material@353*9 @hardness:5 +OreDict:blockInvar = thermalfoundation:material@354*9 @hardness:5 +OreDict:blockConstantan = thermalfoundation:material@356*9 @hardness:5 +OreDict:blockSignalum = thermalfoundation:material@357*9 @hardness:5 +OreDict:blockLumium = thermalfoundation:material@358*9 @hardness:5 +OreDict:blockEnderium = thermalfoundation:material@359*9 @hardness:5 +OreDict:blockTitanium = libvulpes:productplate@7*9 @hardness:5 +OreDict:blockTitaniumAluminide = advancedrocketry:productplate*9 @hardness:5 +OreDict:blockTitaniumIridium = advancedrocketry:productplate@1*9 @hardness:5 +OreDict:blockUranium = immersiveengineering:metal@35*9 @hardness:5 \ No newline at end of file diff --git a/config/ic2/macerator.ini b/config/ic2/macerator.ini index 7696df762..102cf46a9 100644 --- a/config/ic2/macerator.ini +++ b/config/ic2/macerator.ini @@ -164,6 +164,16 @@ ic2:misc_resource#iridium_ore = ic2:misc_resource#iridium_shard*9 ; Coke Dust immersiveengineering:material@6 = immersiveengineering:material@17 thermalfoundation:material@802 = immersiveengineering:material@17 +; Quartz to Quartz Dust +minecraft:quartz = actuallyadditions:item_dust@5 +; Certus Quartz to Certus Quartz Dust +appliedenergistics2:material = appliedenergistics2:material@2 +; Charged Certus Quartz to Certus Quartz Dust +appliedenergistics2:material@1 = appliedenergistics2:material@2 +; Fluix Crystal to Fluix Dust +appliedenergistics2:material@7 = appliedenergistics2:material@8 +; Lithium Ingot to Lithium Dust +nuclearcraft:ingot@6 = ic2:dust@11 ; Charcoal Dust OreDict:itemCharcoal = thermalfoundation:material@769 OreDict:blockCharcoal = thermalfoundation:material@769*9 diff --git a/config/ic2/metal_former_rolling.ini b/config/ic2/metal_former_rolling.ini index 9706107cb..f0c57e8b5 100644 --- a/config/ic2/metal_former_rolling.ini +++ b/config/ic2/metal_former_rolling.ini @@ -58,4 +58,29 @@ OreDict:ingotCopper = thermalfoundation:material@320 ; Lead Ingot OreDict:ingotLead = thermalfoundation:material@323 ; Tin Plate -OreDict:plateTin = ic2:casing#tin*2 \ No newline at end of file +OreDict:plateTin = ic2:casing#tin*2 +; Brass Plate +OreDict:ingotBrass = thaumcraft:plate +; Thaumium Plate +OreDict:ingotThaumium = thaumcraft:plate@2 +; Void Plate +OreDict:ingotVoid = thaumcraft:plate@3 + +OreDict:ingotElectrumFlux = redstonearsenal:material@128 +OreDict:ingotSilver = thermalfoundation:material@322 +OreDict:ingotAluminum = thermalfoundation:material@324 +OreDict:ingotNickel = thermalfoundation:material@325 +OreDict:ingotPlatinum = thermalfoundation:material@326 +OreDict:ingotIridium = thermalfoundation:material@327 +OreDict:ingotMithril = thermalfoundation:material@328 +OreDict:ingotElectrum = thermalfoundation:material@353 +OreDict:ingotInvar = thermalfoundation:material@354 +OreDict:ingotConstantan = thermalfoundation:material@356 +OreDict:ingotSignalum = thermalfoundation:material@357 +OreDict:ingotLumium = thermalfoundation:material@358 +OreDict:ingotEnderium = thermalfoundation:material@359 +OreDict:ingotSilicon = libvulpes:productplate@3 +OreDict:ingotTitanium = libvulpes:productplate@7 +OreDict:ingotTitaniumAluminide = advancedrocketry:productplate +OreDict:ingotTitaniumIridium = advancedrocketry:productplate@1 +OreDict:ingotUranium = immersiveengineering:metal@35 \ No newline at end of file diff --git a/config/jaopca/materials/Aluminium.toml b/config/jaopca/materials/Aluminium.toml index 19a9dac25..06598b7e9 100644 --- a/config/jaopca/materials/Aluminium.toml +++ b/config/jaopca/materials/Aluminium.toml @@ -8,7 +8,7 @@ #Is the storage block of this material small (2x2). isSmallStorageBlock = false #The module blacklist of this material. - moduleBlacklist = [] + moduleBlacklist = ["*"] #Should items of this material have the enchanted glow. hasEffect = false #The model type of the material. diff --git a/scripts/ExNihilo&Compressum.zs b/scripts/ExNihilo&Compressum.zs index 1d28c73ef..817d188a0 100644 --- a/scripts/ExNihilo&Compressum.zs +++ b/scripts/ExNihilo&Compressum.zs @@ -108,19 +108,24 @@ import mods.jei.JEI.removeAndHide as rh; rh(); rh(); rh(); - rh(); + rh(); rh(); rh(); rh(); rh(); rh(); - + rh(); + rh(); + rh(); + rh(); + rh(); + rh(); # Ex Nihilo Dusts rh(); rh(); rh(); rh(); - rh(); + rh(); rh(); rh(); rh(); diff --git a/scripts/ThermalExpansion.zs b/scripts/ThermalExpansion.zs index b66c2a406..e5b0fce40 100644 --- a/scripts/ThermalExpansion.zs +++ b/scripts/ThermalExpansion.zs @@ -279,4 +279,4 @@ mods.thermalexpansion.Compactor.addGearRecipe(, < # Remove AE2 Seeds from Phytogenic Insolator mods.thermalexpansion.Insolator.removeRecipe(, ); mods.thermalexpansion.Insolator.removeRecipe(, ); -mods.thermalexpansion.Insolator.removeRecipe(, ); \ No newline at end of file +mods.thermalexpansion.Insolator.removeRecipe(, ); diff --git a/scripts/TwilightForest.zs b/scripts/TwilightForest.zs index a993251e6..6128d2867 100644 --- a/scripts/TwilightForest.zs +++ b/scripts/TwilightForest.zs @@ -14,7 +14,7 @@ val rockRecycleTable as IItemStack[][IIngredient] = { : [, , ], | | - : [, , ], + : [, , ], | | | diff --git a/scripts/process.zs b/scripts/process.zs index ad9e1fb52..e8bfb5f66 100644 --- a/scripts/process.zs +++ b/scripts/process.zs @@ -35,7 +35,7 @@ import crafttweaker.oredict.IOreDictEntry; import crafttweaker.liquid.ILiquidStack; import crafttweaker.data.IData; import mods.jaopca.JAOPCA; - +import mods.jaopca.OreEntry; import scripts.processWork.work; import scripts.processWork.workEx; import scripts.processUtils.wholesCalc; diff --git a/scripts/utils.zs b/scripts/utils.zs index c0e6ba7df..ec7a24c41 100644 --- a/scripts/utils.zs +++ b/scripts/utils.zs @@ -29,6 +29,48 @@ zenClass Utils { zenConstructor() { } + function getSomething(oreName as string, entryNames as string[]) as IItemStack { return getSomething(oreName, entryNames, 1); } + function getSomething(oreName as string, entryNames as string[], amount as int) as IItemStack { + if (isNull(oreName)) return null; + + // Find with JAOPCA + val JOREoutput = mods.jaopca.JAOPCA.getOre(oreName); + var something as IItemStack = null; + if (!isNull(JOREoutput)) { + var k = 0; + while k < entryNames.length && isNull(something) { + something = JOREoutput.getItemStack(entryNames[k]); + k += 1; + } + } + + // Find with Oredict + if (isNull(something)) { + for str in entryNames { + val oreItems = oreDict[str~oreName].items; + if (oreItems.length>0) { + for preffer in modPreference { + for item in oreItems { + if(item.definition.id.startsWith(preffer)) + return countOutput(item * amount, oreName); + } + } + return countOutput(oreDict[str~oreName].firstItem * amount, oreName); + } + } + } + + // Find with smelting + if (isNull(something) && entryNames has "any") { + val oreItems = oreDict['ore'~oreName].items; + if (oreItems.length>0) { + something = smelt(oreDict['ore'~oreName]); + } + } + + return isNull(something) ? null : countOutput(something * amount, oreName); + } + # Return result of smelting in vanilla furnace function smelt(input as IIngredient) as IItemStack { for r in furnace.all {