From 2dd4e93f41a321ba553a7437dcf16ef1a56b1a43 Mon Sep 17 00:00:00 2001 From: Modmuss50 Date: Wed, 11 Nov 2015 16:46:50 +0000 Subject: [PATCH] Cleaned up ore recipes, closes #241 --- src/main/java/techreborn/Core.java | 2 + .../techreborn/compat/recipes/RecipesIC2.java | 140 ++------ src/main/java/techreborn/init/ModRecipes.java | 326 +----------------- 3 files changed, 39 insertions(+), 429 deletions(-) diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index ee732ff73..81ff8cbed 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -17,6 +17,7 @@ import reborncore.common.multiblock.MultiblockEventHandler; import reborncore.common.multiblock.MultiblockServerTickHandler; import reborncore.common.packets.AddDiscriminatorEvent; import reborncore.common.util.LogHelper; +import reborncore.common.util.OreUtil; import reborncore.common.util.VersionChecker; import techreborn.achievement.TRAchievements; import techreborn.api.recipe.RecipeHandler; @@ -86,6 +87,7 @@ public class Core { // Recipes StopWatch watch = new StopWatch(); watch.start(); + OreUtil.scanForOres(); ModRecipes.init(); logHelper.all(watch + " : main recipes"); watch.stop(); diff --git a/src/main/java/techreborn/compat/recipes/RecipesIC2.java b/src/main/java/techreborn/compat/recipes/RecipesIC2.java index 702878432..187d175a0 100644 --- a/src/main/java/techreborn/compat/recipes/RecipesIC2.java +++ b/src/main/java/techreborn/compat/recipes/RecipesIC2.java @@ -32,6 +32,9 @@ import techreborn.init.ModFluids; import techreborn.init.ModItems; import techreborn.items.*; +import java.util.ArrayList; +import java.util.List; + public class RecipesIC2 implements ICompatModule { @Override @@ -1193,55 +1196,27 @@ public class RecipesIC2 implements ICompatModule { static void addTRMaceratorRecipes() { //Macerator - if (OreUtil.doesOreExistAndValid("oreAluminum")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreAluminum"), null, ItemCrushedOre.getCrushedOreByName("Aluminum", 2)); - } - if (OreUtil.doesOreExistAndValid("oreArdite")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreArdite"), null, ItemCrushedOre.getCrushedOreByName("Ardite", 2)); - } - if (OreUtil.doesOreExistAndValid("oreBauxite")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreBauxite"), null, ItemCrushedOre.getCrushedOreByName("Bauxite", 2)); - } - if (OreUtil.doesOreExistAndValid("oreCadmium")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreCadmium"), null, ItemCrushedOre.getCrushedOreByName("Cadmium", 2)); - } - if (OreUtil.doesOreExistAndValid("oreCinnabar")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreCinnabar"), null, ItemCrushedOre.getCrushedOreByName("Cinnabar", 2)); - } - if (OreUtil.doesOreExistAndValid("oreCobalt")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreCobalt"), null, ItemCrushedOre.getCrushedOreByName("Cobalt", 2)); - } - if (OreUtil.doesOreExistAndValid("oreDarkIron")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreDarkIron"), null, ItemCrushedOre.getCrushedOreByName("DarkIron", 2)); - } - if (OreUtil.doesOreExistAndValid("oreIndium")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreIndium"), null, ItemCrushedOre.getCrushedOreByName("Indium", 2)); - } - if (OreUtil.doesOreExistAndValid("oreIridium")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreIridium"), null, ItemCrushedOre.getCrushedOreByName("Iridium", 2)); - } - if (OreUtil.doesOreExistAndValid("oreNickel")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreNickel"), null, ItemCrushedOre.getCrushedOreByName("Nickel", 2)); - } - if (OreUtil.doesOreExistAndValid("orePlatinum")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("orePlatinum"), null, ItemCrushedOre.getCrushedOreByName("Platinum", 2)); - } - if (OreUtil.doesOreExistAndValid("orePyrite")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("orePyrite"), null, ItemCrushedOre.getCrushedOreByName("Pyrite", 2)); - } - if (OreUtil.doesOreExistAndValid("oreSphalerite")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSphalerite"), null, ItemCrushedOre.getCrushedOreByName("Sphalerite", 2)); - } - if (OreUtil.doesOreExistAndValid("oreTetrahedrite")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreTetrahedrite"), null, ItemCrushedOre.getCrushedOreByName("Tetrahedrite", 2)); - } - if (OreUtil.doesOreExistAndValid("oreTungsten")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreTungsten"), null, ItemCrushedOre.getCrushedOreByName("Tungsten", 2)); - } - if (OreUtil.doesOreExistAndValid("oreGalena")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreGalena"), null, ItemCrushedOre.getCrushedOreByName("Galena", 2)); - } + List blackList = new ArrayList(); + blackList.add("lapis"); + blackList.add("redstone"); + blackList.add("teslatite"); + for(String ore : OreUtil.oreNames){ + if(OreUtil.hasCrushedOre(ore) && OreUtil.hasOre(ore)){ + try{ + Recipes.macerator.addRecipe(new RecipeInputOreDict("ore" + OreUtil.capitalizeFirstLetter(ore)), null, OreUtil.getStackFromName("crushed" + OreUtil.capitalizeFirstLetter(ore), 2)); + } catch (Exception e){ + Core.logHelper.error("Failed to load recipe for " + ore + " crushed ore"); + } + } + if(OreUtil.hasOre(ore) && OreUtil.hasDust(ore) && !blackList.contains(ore)){ + try{ + Recipes.macerator.addRecipe(new RecipeInputOreDict("ore" + OreUtil.capitalizeFirstLetter(ore)), null, OreUtil.getStackFromName("dust" + OreUtil.capitalizeFirstLetter(ore), 2)); + } catch (Exception e){ + Core.logHelper.error("Failed to load recipe for " + ore); + } + } + } if (!IC2Classic.isIc2ClassicLoaded() && OreUtil.doesOreExistAndValid("oreRedstone")) { Recipes.macerator.addRecipe(new RecipeInputOreDict("oreRedstone"), null, new ItemStack(Items.redstone, 10)); @@ -1249,80 +1224,11 @@ public class RecipesIC2 implements ICompatModule { if (OreUtil.doesOreExistAndValid("oreLapis")) { Recipes.macerator.addRecipe(new RecipeInputOreDict("oreLapis"), null, ItemDusts.getDustByName("lapis", 12)); } - if (OreUtil.doesOreExistAndValid("oreDiamond")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreDiamond"), null, ItemDusts.getDustByName("diamond", 2)); - } - if (OreUtil.doesOreExistAndValid("oreEmerald")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreEmerald"), null, ItemDusts.getDustByName("emerald", 2)); - } - if (OreUtil.doesOreExistAndValid("oreRuby")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreRuby"), null, ItemGems.getGemByName("ruby", 2)); - } - if (OreUtil.doesOreExistAndValid("oreSapphire")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSapphire"), null, ItemDusts.getDustByName("sapphire", 2)); - } - if (OreUtil.doesOreExistAndValid("orePeridot")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("orePeridot"), null, ItemDusts.getDustByName("peridot", 2)); - } - if (OreUtil.doesOreExistAndValid("oreSulfur")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSulfur"), null, ItemDusts.getDustByName("sulfur", 2)); - } - if (OreUtil.doesOreExistAndValid("oreSaltpeter")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSaltpeter"), null, ItemDusts.getDustByName("saltpeter", 2)); - } if (OreUtil.doesOreExistAndValid("oreTeslatite")) { ItemStack teslatiteStack = OreDictionary.getOres("dustTeslatite").get(0); teslatiteStack.stackSize = 10; Recipes.macerator.addRecipe(new RecipeInputOreDict("oreTeslatite"), null, teslatiteStack); } - if (OreUtil.doesOreExistAndValid("oreMithril")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreMithril"), null, ItemDusts.getDustByName("mithril", 2)); - } - if (OreUtil.doesOreExistAndValid("oreVinteum")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreVinteum"), null, ItemDusts.getDustByName("vinteum", 2)); - } - if (OreUtil.doesOreExistAndValid("limestone")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("limestone"), null, ItemDusts.getDustByName("limestone", 2)); - } - if (OreUtil.doesOreExistAndValid("stoneNetherrack")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("stoneNetherrack"), null, ItemDusts.getDustByName("netherrack", 2)); - } - if (OreUtil.doesOreExistAndValid("stoneEndstone")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("stoneEndstone"), null, ItemDusts.getDustByName("endstone", 2)); - } - if (OreUtil.doesOreExistAndValid("stoneRedrock")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("stoneRedrock"), null, ItemDusts.getDustByName("redrock", 2)); - } - if (OreUtil.doesOreExistAndValid("oreMagnetite")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreMagnetite"), null, ItemDusts.getDustByName("magnetite", 2)); - } - if (OreUtil.doesOreExistAndValid("oreLodestone")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreLodestone"), null, ItemDusts.getDustByName("lodestone", 2)); - } - if (OreUtil.doesOreExistAndValid("oreTellurium")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreTellurium"), null, ItemDusts.getDustByName("tellurium", 2)); - } - if (OreUtil.doesOreExistAndValid("oreSilicon")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSilicon"), null, ItemDusts.getDustByName("silicon", 2)); - } - if (OreUtil.doesOreExistAndValid("oreVoidstone")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreVoidstone"), null, ItemDusts.getDustByName("voidstone", 2)); - } - if (OreUtil.doesOreExistAndValid("oreCalcite")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreCalcite"), null, ItemDusts.getDustByName("calcite", 2)); - } - if (OreUtil.doesOreExistAndValid("oreSodalite")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreSodalite"), null, ItemDusts.getDustByName("sodalite", 2)); - } - if (OreUtil.doesOreExistAndValid("oreGraphite")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("oreGraphite"), null, ItemDusts.getDustByName("graphite", 2)); - } - if (OreUtil.doesOreExistAndValid("blockMarble")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("blockMarble"), null, ItemDusts.getDustByName("marble", 2)); - } - if (OreUtil.doesOreExistAndValid("blockBasalt")) { - Recipes.macerator.addRecipe(new RecipeInputOreDict("blockBasalt"), null, ItemDusts.getDustByName("basalt", 2)); - } if (OreUtil.doesOreExistAndValid("gemRuby")) { Recipes.macerator.getRecipes().put(new RecipeInputOreDict("gemRuby"), new RecipeOutput(new NBTTagCompound(), ItemDusts.getDustByName("ruby"))); } diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 5ec32049d..ce526474f 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -9,6 +9,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; import org.apache.commons.lang3.ArrayUtils; import reborncore.common.util.CraftingHelper; +import reborncore.common.util.LogHelper; import reborncore.common.util.OreUtil; import techreborn.Core; import techreborn.api.TechRebornAPI; @@ -22,6 +23,7 @@ import techreborn.items.*; import techreborn.utils.RecipeUtils; import java.security.InvalidParameterException; +import java.util.ArrayList; public class ModRecipes { @@ -333,6 +335,7 @@ public class } static void addAlloySmelterRecipes() { + //Bronze RecipeHandler.addRecipe(new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3), ItemIngots.getIngotByName("tin", 1), ItemIngots.getIngotByName("bronze", 4), 200, 16)); RecipeHandler.addRecipe(new AlloySmelterRecipe(ItemIngots.getIngotByName("copper", 3), ItemDusts.getDustByName("tin", 1), ItemIngots.getIngotByName("bronze", 4), 200, 16)); @@ -476,134 +479,11 @@ public class } static void addPlateCuttingMachineRecipes() { - //Storage Blocks - if (OreUtil.doesOreExistAndValid("blockAluminum")) { - ItemStack blockStack = OreDictionary.getOres("blockAluminum").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("aluminum", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockBrass")) { - ItemStack blockStack = OreDictionary.getOres("blockBrass").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("brass", 9), 200, 116)); - } - if (OreUtil.doesOreExistAndValid("blockBronze")) { - ItemStack blockStack = OreDictionary.getOres("blockBronze").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("bronze", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockCoal")) { - ItemStack blockStack = OreDictionary.getOres("blockCoal").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("carbon", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockChrome")) { - ItemStack blockStack = OreDictionary.getOres("blockChrome").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("chrome", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockCopper")) { - ItemStack blockStack = OreDictionary.getOres("blockCopper").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("copper", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockDiamond")) { - ItemStack blockStack = OreDictionary.getOres("blockDiamond").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("diamond", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockElectrum")) { - ItemStack blockStack = OreDictionary.getOres("blockElectrum").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("electrum", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockEmerald")) { - ItemStack blockStack = OreDictionary.getOres("blockEmerald").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("emerald", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockGold")) { - ItemStack blockStack = OreDictionary.getOres("blockGold").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("gold", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockInvar")) { - ItemStack blockStack = OreDictionary.getOres("blockInvar").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("invar", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockIridium")) { - ItemStack blockStack = OreDictionary.getOres("blockIridium").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("iridium", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockIron")) { - ItemStack blockStack = OreDictionary.getOres("blockIron").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("iron", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockLapis")) { - ItemStack blockStack = OreDictionary.getOres("blockLapis").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("lapis", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockLead")) { - ItemStack blockStack = OreDictionary.getOres("blockLead").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("lead", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockNickel")) { - ItemStack blockStack = OreDictionary.getOres("blockNickel").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("nickel", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockOsmium")) { - ItemStack blockStack = OreDictionary.getOres("blockOsmium").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("osmium", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockPeridot")) { - ItemStack blockStack = OreDictionary.getOres("blockPeridot").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("peridot", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockPlatinum")) { - ItemStack blockStack = OreDictionary.getOres("blockPlatinum").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("platinum", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockRedGarnet")) { - ItemStack blockStack = OreDictionary.getOres("blockRedGarnet").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("redGarnet", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("BlockRedstone")) { - ItemStack blockStack = OreDictionary.getOres("blockRedstone").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("redstone", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockRuby")) { - ItemStack blockStack = OreDictionary.getOres("blockRuby").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("ruby", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockSapphire")) { - ItemStack blockStack = OreDictionary.getOres("blockSapphire").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("sapphire", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockSilver")) { - ItemStack blockStack = OreDictionary.getOres("blockSilver").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("silver", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockSteel")) { - ItemStack blockStack = OreDictionary.getOres("blockSteel").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("steel", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockTeslatite")) { - ItemStack blockStack = OreDictionary.getOres("blockTeslatite").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("teslatite", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockTin")) { - ItemStack blockStack = OreDictionary.getOres("blockTin").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("tin", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockTitanium")) { - ItemStack blockStack = OreDictionary.getOres("blockTitanium").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("titanium", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockTungsten")) { - ItemStack blockStack = OreDictionary.getOres("blockTungsten").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("tungsten", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockTungstensteel")) { - ItemStack blockStack = OreDictionary.getOres("blockTungstensteel").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("tungstensteel", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockYellowGarnet")) { - ItemStack blockStack = OreDictionary.getOres("blockYellowGarnet").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("yellowGarnet", 9), 200, 16)); - } - if (OreUtil.doesOreExistAndValid("blockZinc")) { - ItemStack blockStack = OreDictionary.getOres("blockZinc").get(0); - RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(blockStack, ItemPlates.getPlateByName("zinc", 9), 200, 16)); + + for(String ore : OreUtil.oreNames){ + if(OreUtil.hasBlock(ore) && OreUtil.hasPlate(ore)){ + RecipeHandler.addRecipe(new PlateCuttingMachineRecipe(OreUtil.getStackFromName("block" + capitalizeFirstLetter(ore)), OreUtil.getStackFromName("plate" + capitalizeFirstLetter(ore), 9), 200, 16)); + } } //Obsidian @@ -965,42 +845,12 @@ public class } static void addIndustrialGrinderRecipes() { - //Coal Ore - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.coal_ore, 1), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Items.coal, 1), ItemDustsSmall.getSmallDustByName("Coal", 6), ItemDustsSmall.getSmallDustByName("Coal", 2), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.coal_ore, 1), new ItemStack(Items.water_bucket), null, new ItemStack(Items.coal, 1), ItemDustsSmall.getSmallDustByName("Coal", 6), ItemDustsSmall.getSmallDustByName("Coal", 2), new ItemStack(Items.bucket), 100, 120)); - - //Iron Ore - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.iron_ore, 1), null, new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("iron", 2), ItemDustsSmall.getSmallDustByName("Nickel", 1), ItemDustsSmall.getSmallDustByName("Tin", 1), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.iron_ore, 1), new ItemStack(Items.water_bucket), null, ItemDusts.getDustByName("iron", 2), ItemDustsSmall.getSmallDustByName("Nickel", 1), ItemDustsSmall.getSmallDustByName("Tin", 1), new ItemStack(Items.bucket), 100, 120)); - - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.iron_ore, 1), null, new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), ItemDusts.getDustByName("iron", 2), ItemDusts.getDustByName("nickel", 1), ItemDustsSmall.getSmallDustByName("Tin", 1), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.iron_ore, 1), new ItemStack(ModItems.bucketSodiumpersulfate), null, ItemDusts.getDustByName("iron", 2), ItemDusts.getDustByName("nickel", 1), ItemDustsSmall.getSmallDustByName("Tin", 1), new ItemStack(Items.bucket), 100, 120)); - - //Gold Ore - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.gold_ore, 1), null, new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("gold", 2), ItemDustsSmall.getSmallDustByName("Copper", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.gold_ore, 1), new ItemStack(Items.water_bucket), null, ItemDusts.getDustByName("gold", 2), ItemDustsSmall.getSmallDustByName("Copper", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), new ItemStack(Items.bucket), 100, 120)); - - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.gold_ore, 1), null, new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), ItemDusts.getDustByName("gold", 2), ItemDusts.getDustByName("copper", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.gold_ore, 1), new ItemStack(ModItems.bucketSodiumpersulfate), null, ItemDusts.getDustByName("gold", 2), ItemDusts.getDustByName("copper", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), new ItemStack(Items.bucket), 100, 120)); - - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.gold_ore, 1), null, new FluidStack(ModFluids.fluidMercury, 1000), ItemDusts.getDustByName("gold", 3), ItemDustsSmall.getSmallDustByName("Copper", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.gold_ore, 1), new ItemStack(ModItems.bucketMercury), null, ItemDusts.getDustByName("gold", 3), ItemDustsSmall.getSmallDustByName("Copper", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), new ItemStack(Items.bucket), 100, 120)); - - //Diamond Ore - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.diamond_ore, 1), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Items.diamond, 1), ItemDustsSmall.getSmallDustByName("Diamond", 6), ItemDustsSmall.getSmallDustByName("Coal", 2), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.diamond_ore, 1), new ItemStack(Items.water_bucket), null, new ItemStack(Items.diamond, 1), ItemDustsSmall.getSmallDustByName("Diamond", 6), ItemDustsSmall.getSmallDustByName("Coal", 2), new ItemStack(Items.bucket), 100, 120)); - - //Emerald Ore - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.emerald_ore, 1), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Items.emerald, 1), ItemDustsSmall.getSmallDustByName("Emerald", 6), ItemDustsSmall.getSmallDustByName("Aluminum", 2), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.emerald_ore, 1), new ItemStack(Items.water_bucket), null, new ItemStack(Items.emerald, 1), ItemDustsSmall.getSmallDustByName("Emerald", 6), ItemDustsSmall.getSmallDustByName("Aluminum", 2), new ItemStack(Items.bucket), 100, 120)); - - //Redstone - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.redstone_ore, 1), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Items.redstone, 10), ItemDustsSmall.getSmallDustByName("Cinnabar", 1), ItemDustsSmall.getSmallDustByName("Glowstone", 1), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.redstone_ore, 1), new ItemStack(Items.water_bucket), null, new ItemStack(Items.redstone, 10), ItemDustsSmall.getSmallDustByName("Cinnabar", 1), ItemDustsSmall.getSmallDustByName("Glowstone", 1), new ItemStack(Items.bucket), 100, 120)); - - //Lapis Lazuli Ore - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.lapis_ore, 1), null, new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Items.dye, 6, 4), ItemDustsSmall.getSmallDustByName("Lapis", 36), ItemDustsSmall.getSmallDustByName("Lazurite", 8), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(new ItemStack(Blocks.lapis_ore, 1), new ItemStack(Items.water_bucket), null, new ItemStack(Items.dye, 6, 4), ItemDustsSmall.getSmallDustByName("Lapis", 36), ItemDustsSmall.getSmallDustByName("Lazurite", 8), new ItemStack(Items.bucket), 100, 120)); + for(String ore : OreUtil.oreNames){ + if(OreUtil.hasIngot(ore) && OreUtil.hasDustSmall(ore) && OreUtil.hasBlock(ore)){ + RecipeHandler.addRecipe(new GrinderRecipe(OreUtil.getStackFromName("block" + capitalizeFirstLetter(ore)), null, new FluidStack(FluidRegistry.WATER, 1000), OreUtil.getStackFromName("ingot" + capitalizeFirstLetter(ore)), OreUtil.getStackFromName("dustSmall" + capitalizeFirstLetter(ore), 6), OreUtil.getStackFromName("dustSmall" + capitalizeFirstLetter(ore), 2), null, 100, 120)); + RecipeHandler.addRecipe(new GrinderRecipe(OreUtil.getStackFromName("block" + capitalizeFirstLetter(ore)), new ItemStack(Items.water_bucket), null, OreUtil.getStackFromName("ingot" + capitalizeFirstLetter(ore)), OreUtil.getStackFromName("dustSmall" + capitalizeFirstLetter(ore), 6), OreUtil.getStackFromName("dustSmall" + capitalizeFirstLetter(ore), 2), new ItemStack(Items.bucket), 100, 120)); + } + } //Copper Ore if (OreUtil.doesOreExistAndValid("oreCopper")) { @@ -1092,154 +942,6 @@ public class } } - - //Aluminum Ore - if (OreUtil.doesOreExistAndValid("oreAluminum")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreAluminum").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("aluminum", 2), ItemDustsSmall.getSmallDustByName("Bauxite", 1), ItemDustsSmall.getSmallDustByName("Bauxite", 1), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, ItemDusts.getDustByName("aluminum", 2), ItemDustsSmall.getSmallDustByName("Bauxite", 1), ItemDustsSmall.getSmallDustByName("Bauxite", 1), new ItemStack(Items.bucket), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Lead Ore"); - } - } - - //Ardite Ore - if (OreUtil.doesOreExistAndValid("oreArdite")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreArdite").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("ardite", 2), ItemDustsSmall.getSmallDustByName("Ardite", 1), ItemDustsSmall.getSmallDustByName("Ardite", 1), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, ItemDusts.getDustByName("ardite", 2), ItemDustsSmall.getSmallDustByName("Ardite", 1), ItemDustsSmall.getSmallDustByName("Ardite", 1), new ItemStack(Items.bucket), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Ardite Ore"); - } - } - - //Cobalt Ore - if (OreUtil.doesOreExistAndValid("oreCobalt")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreCobalt").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("cobalt", 2), ItemDustsSmall.getSmallDustByName("Cobalt", 1), ItemDustsSmall.getSmallDustByName("Cobalt", 1), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, ItemDusts.getDustByName("cobalt", 2), ItemDustsSmall.getSmallDustByName("Cobalt", 1), ItemDustsSmall.getSmallDustByName("Cobalt", 1), new ItemStack(Items.bucket), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Cobalt Ore"); - } - } - - //Dark Iron Ore - if (OreUtil.doesOreExistAndValid("oreDarkIron")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreDarkIron").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("darkIron", 2), ItemDustsSmall.getSmallDustByName("DarkIron", 1), ItemDustsSmall.getSmallDustByName("Iron", 1), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, ItemDusts.getDustByName("darkIron", 2), ItemDustsSmall.getSmallDustByName("DarkIron", 1), ItemDustsSmall.getSmallDustByName("Iron", 1), new ItemStack(Items.bucket), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Dark Iron Ore"); - } - } - - //Cadmium Ore - if (OreUtil.doesOreExistAndValid("oreCadmium")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreCadmium").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("cadmium", 2), ItemDustsSmall.getSmallDustByName("Cadmium", 1), ItemDustsSmall.getSmallDustByName("Cadmium", 1), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, ItemDusts.getDustByName("cadmium", 2), ItemDustsSmall.getSmallDustByName("Cadmium", 1), ItemDustsSmall.getSmallDustByName("Cadmium", 1), new ItemStack(Items.bucket), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Cadmium Ore"); - } - } - - //Indium Ore - if (OreUtil.doesOreExistAndValid("oreIndium")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreIndium").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("indium", 2), ItemDustsSmall.getSmallDustByName("Indium", 1), ItemDustsSmall.getSmallDustByName("Indium", 1), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, ItemDusts.getDustByName("indium", 2), ItemDustsSmall.getSmallDustByName("Indium", 1), ItemDustsSmall.getSmallDustByName("Indium", 1), new ItemStack(Items.bucket), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Indium Ore"); - } - } - - //Calcite Ore - if (OreUtil.doesOreExistAndValid("oreCalcite") && OreUtil.doesOreExistAndValid("gemCalcite")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreCalcite").get(0); - ItemStack gemStack = OreDictionary.getOres("gemCalcite").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), gemStack, ItemDustsSmall.getSmallDustByName("Calcite", 6), null, null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, gemStack, ItemDustsSmall.getSmallDustByName("Calcite", 6), null, new ItemStack(Items.bucket), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Calcite Ore"); - } - } - - //Magnetite Ore - if (OreUtil.doesOreExistAndValid("oreMagnetite") && OreUtil.doesOreExistAndValid("chunkMagnetite")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreMagnetite").get(0); - ItemStack chunkStack = OreDictionary.getOres("chunkMagnetite").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), chunkStack, ItemDustsSmall.getSmallDustByName("Magnetite", 6), null, null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, chunkStack, ItemDustsSmall.getSmallDustByName("Magnetite", 6), null, new ItemStack(Items.bucket), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Magnetite Ore"); - } - } - - //Graphite Ore - if (OreUtil.doesOreExistAndValid("oreGraphite") && OreUtil.doesOreExistAndValid("chunkGraphite")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreGraphite").get(0); - ItemStack chunkStack = OreDictionary.getOres("chunkGraphite").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), chunkStack, ItemDustsSmall.getSmallDustByName("Graphite", 6), null, null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, chunkStack, ItemDustsSmall.getSmallDustByName("Graphite", 6), null, new ItemStack(Items.bucket), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Graphite Ore"); - } - } - - //Osmium Ore - if (OreUtil.doesOreExistAndValid("oreOsmium")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreOsmium").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("osmium", 2), ItemDustsSmall.getSmallDustByName("Osmium", 1), ItemDustsSmall.getSmallDustByName("Osmium", 1), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, ItemDusts.getDustByName("osmium", 2), ItemDustsSmall.getSmallDustByName("Osmium", 1), ItemDustsSmall.getSmallDustByName("Osmium", 1), new ItemStack(Items.bucket), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Osmium Ore"); - } - } - - //Teslatite Ore - if (OreUtil.doesOreExistAndValid("oreTeslatite") && OreUtil.doesOreExistAndValid("dustTeslatite")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreTeslatite").get(0); - ItemStack dustStack = OreDictionary.getOres("dustTeslatite").get(0); - dustStack.stackSize = 10; - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), dustStack, ItemDustsSmall.getSmallDustByName("Sodalite", 1), ItemDustsSmall.getSmallDustByName("Glowstone", 1), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, dustStack, ItemDustsSmall.getSmallDustByName("Sodalite", 1), ItemDustsSmall.getSmallDustByName("Glowstone", 1), new ItemStack(Items.bucket), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Teslatite Ore"); - } - } - - //Sulfur Ore - if (OreUtil.doesOreExistAndValid("oreSulfur")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreSulfur").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("sulfur", 2), ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDustsSmall.getSmallDustByName("Sulfur", 1), null, 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Sulfur Ore"); - } - } - - //Saltpeter Ore - if (OreUtil.doesOreExistAndValid("oreSaltpeter")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreSaltpeter").get(0); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, null, new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("saltpeter", 2), ItemDustsSmall.getSmallDustByName("Saltpeter", 1), ItemDustsSmall.getSmallDustByName("Saltpeter", 1), null, 100, 120)); - RecipeHandler.addRecipe(new GrinderRecipe(oreStack, new ItemStack(Items.water_bucket), null, ItemDusts.getDustByName("saltpeter", 2), ItemDustsSmall.getSmallDustByName("Saltpeter", 1), ItemDustsSmall.getSmallDustByName("Saltpeter", 1), new ItemStack(Items.bucket), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load Grinder Recipe for Saltpeter Ore"); - } - } - //Apatite Ore if (OreUtil.doesOreExistAndValid("oreApatite") & OreUtil.doesOreExistAndValid("gemApatite")) { try {