From c24116e259f988652cb6798752f028bf800c3e05 Mon Sep 17 00:00:00 2001 From: ProfessorProspector Date: Fri, 30 Dec 2016 23:45:42 -0800 Subject: [PATCH] Redo all Industrial Grinder recipes, and move them to a separate class (Here starts the great recipe cleanup of 2017!) --- .../techreborn/api/recipe/BaseRecipe.java | 15 +- .../machines/IndustrialGrinderRecipe.java | 12 + src/main/java/techreborn/init/ModRecipes.java | 1051 +---------------- .../recipes/IndustrialGrinderRecipes.java | 177 +++ .../init/recipes/RecipeMethods.java | 58 + src/main/java/techreborn/items/ItemDusts.java | 2 +- .../java/techreborn/items/ItemDustsSmall.java | 2 +- .../java/techreborn/items/ItemPlates.java | 9 +- 8 files changed, 270 insertions(+), 1056 deletions(-) create mode 100644 src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java create mode 100644 src/main/java/techreborn/init/recipes/RecipeMethods.java diff --git a/src/main/java/techreborn/api/recipe/BaseRecipe.java b/src/main/java/techreborn/api/recipe/BaseRecipe.java index 826fe1790..6e96cb89a 100644 --- a/src/main/java/techreborn/api/recipe/BaseRecipe.java +++ b/src/main/java/techreborn/api/recipe/BaseRecipe.java @@ -13,11 +13,12 @@ import java.util.List; */ public abstract class BaseRecipe implements IBaseRecipeType, Cloneable { - private ArrayList inputs; public String name; public int tickTime; public int euPerTick; + private ArrayList inputs; private ArrayList outputs; + private boolean oreDict = true; public BaseRecipe(String name, int tickTime, int euPerTick) { inputs = new ArrayList<>(); @@ -39,7 +40,7 @@ public abstract class BaseRecipe implements IBaseRecipeType, Cloneable { } public void addOutput(ItemStack stack) { - if(stack == null || stack.isEmpty()){ + if (stack == null || stack.isEmpty()) { throw new InvalidParameterException("output is invalid!"); } outputs.add(stack); @@ -86,9 +87,13 @@ public abstract class BaseRecipe implements IBaseRecipeType, Cloneable { return super.clone(); } + public void setOreDict(boolean oreDict) { + this.oreDict = oreDict; + } + @Override public boolean useOreDic() { - return true; + return oreDict; } @Override @@ -96,8 +101,8 @@ public abstract class BaseRecipe implements IBaseRecipeType, Cloneable { return outputs; } - public void addInput(ItemStack inuput){ - if(inuput == null || inuput.isEmpty()){ + public void addInput(ItemStack inuput) { + if (inuput == null || inuput.isEmpty()) { throw new InvalidParameterException("input is invalid!"); } inputs.add(inuput); diff --git a/src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java b/src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java index 5f0cf0229..c5444b0ea 100644 --- a/src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java +++ b/src/main/java/techreborn/api/recipe/machines/IndustrialGrinderRecipe.java @@ -8,6 +8,7 @@ import techreborn.api.recipe.BaseRecipe; public class IndustrialGrinderRecipe extends BaseRecipe { public FluidStack fluidStack; + boolean useOreDic = true; public IndustrialGrinderRecipe(ItemStack input1, FluidStack fluidStack, ItemStack output1, ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick) { @@ -25,8 +26,19 @@ public class IndustrialGrinderRecipe extends BaseRecipe { this.fluidStack = fluidStack; } + public IndustrialGrinderRecipe(ItemStack input1, FluidStack fluidStack, ItemStack output1, + ItemStack output2, ItemStack output3, ItemStack output4, int tickTime, int euPerTick, boolean useOreDict) { + this(input1, fluidStack, output1, output2, output3, output4, tickTime, euPerTick); + this.useOreDic = useOreDict; + } + @Override public String getUserFreindlyName() { return "IndustrialGrinder"; } + + @Override + public boolean useOreDic() { + return useOreDic; + } } diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 0bcaa5a70..1e13ecdfa 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -11,7 +11,6 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.ForgeModContainer; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.UniversalBucket; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.oredict.OreDictionary; @@ -33,6 +32,7 @@ import techreborn.api.recipe.machines.*; import techreborn.blocks.*; import techreborn.compat.CompatManager; import techreborn.config.ConfigTechReborn; +import techreborn.init.recipes.IndustrialGrinderRecipes; import techreborn.items.*; import techreborn.parts.powerCables.ItemStandaloneCables; import techreborn.utils.RecipeUtils; @@ -89,7 +89,7 @@ public class ModRecipes { addIndustrialElectrolyzerRecipes(); addBlastFurnaceRecipes(); - addIndustrialGrinderRecipes(); + IndustrialGrinderRecipes.init(); addImplosionCompressorRecipes(); addVacuumFreezerRecipes(); @@ -1537,7 +1537,7 @@ public class ModRecipes { new CentrifugeRecipe(new ItemStack(Items.MAGMA_CREAM, 1), null, new ItemStack(Items.BLAZE_POWDER, 1), new ItemStack(Items.SLIME_BALL, 1), null, null, 2500, 5)); - // Dust Byproducts + // Type Byproducts // RecipeHandler.addRecipe(new // CentrifugeRecipe(ItemDusts.getDustByName("platinum", 1), null, // ItemDustsTiny.getTinyDustByName("Iridium", 1), @@ -1587,401 +1587,6 @@ public class ModRecipes { new ItemStack(Items.REDSTONE), null, 25000, 20)); } - static void addIndustrialGrinderRecipes() { - for (String ore : OreUtil.oreNames) { - if (OreUtil.hasIngot(ore) && OreUtil.hasDustSmall(ore) && OreUtil.hasBlock(ore)) { - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(OreUtil.getStackFromName("block" + StringUtils.toFirstCapital(ore)), - new FluidStack(FluidRegistry.WATER, 1000), - OreUtil.getStackFromName("ingot" + StringUtils.toFirstCapital(ore)), - OreUtil.getStackFromName("dustSmall" + StringUtils.toFirstCapital(ore), 6), - OreUtil.getStackFromName("dustSmall" + StringUtils.toFirstCapital(ore), 2), null, 100, - 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(OreUtil.getStackFromName("block" + StringUtils.toFirstCapital(ore)), - new FluidStack(FluidRegistry.WATER, 1000), - OreUtil.getStackFromName("ingot" + StringUtils.toFirstCapital(ore)), - OreUtil.getStackFromName("dustSmall" + StringUtils.toFirstCapital(ore), 6), - OreUtil.getStackFromName("dustSmall" + StringUtils.toFirstCapital(ore), 2), - new ItemStack(Items.BUCKET), 100, 120)); - } - } - - // Copper Ore - if (OreUtil.doesOreExistAndValid("oreCopper")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreCopper").get(0); - - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("copper", 2), ItemDustsSmall.getSmallDustByName("Gold", 1), - ItemDustsSmall.getSmallDustByName("Nickel", 1), null, 100, 120)); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, - new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), ItemDusts.getDustByName("copper", 2), - ItemDusts.getDustByName("gold", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), null, 100, - 120)); - - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(ModFluids.fluidMercury, 1000), - ItemDusts.getDustByName("copper", 2), ItemDustsSmall.getSmallDustByName("Gold", 1), - ItemDusts.getDustByName("nickel", 1), null, 100, 120)); - - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Copper Ore"); - } - } - - // Tin Ore - if (OreUtil.doesOreExistAndValid("oreTin")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreTin").get(0); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("tin", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDustsSmall.getSmallDustByName("Zinc", 1), null, 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("tin", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDustsSmall.getSmallDustByName("Zinc", 1), new ItemStack(Items.BUCKET), 100, 120)); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, - new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), ItemDusts.getDustByName("tin", 2), - ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("zinc", 1), null, 100, - 120)); - - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Tin Ore"); - } - } - - // Nickel Ore - if (OreUtil.doesOreExistAndValid("oreNickel")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreNickel").get(0); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("nickel", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDustsSmall.getSmallDustByName("Platinum", 1), null, 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("nickel", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDustsSmall.getSmallDustByName("Platinum", 1), new ItemStack(Items.BUCKET), 100, 120)); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, - new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), ItemDusts.getDustByName("nickel", 3), - ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDustsSmall.getSmallDustByName("Platinum", 1), - null, 100, 120)); - - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(ModFluids.fluidMercury, 1000), - ItemDusts.getDustByName("nickel", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDusts.getDustByName("platinum", 1), null, 100, 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(ModFluids.fluidMercury, 1000), - ItemDusts.getDustByName("nickel", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDusts.getDustByName("platinum", 1), new ItemStack(Items.BUCKET), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Nickel Ore"); - } - } - - // Zinc Ore - if (OreUtil.doesOreExistAndValid("oreZinc")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreZinc").get(0); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("zinc", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDustsSmall.getSmallDustByName("Tin", 1), null, 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("zinc", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDustsSmall.getSmallDustByName("Tin", 1), new ItemStack(Items.BUCKET), 100, 120)); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, - new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), ItemDusts.getDustByName("zinc", 2), - ItemDustsSmall.getSmallDustByName("Iron", 1), ItemDusts.getDustByName("iron", 1), null, 100, - 120)); - - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Zinc Ore"); - } - } - - // Silver Ore - if (OreUtil.doesOreExistAndValid("oreSilver")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreSilver").get(0); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("silver", 2), ItemDustsSmall.getSmallDustByName("Lead", 1), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), null, 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("silver", 2), ItemDustsSmall.getSmallDustByName("Lead", 1), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), new ItemStack(Items.BUCKET), 100, 120)); - - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(ModFluids.fluidMercury, 1000), - ItemDusts.getDustByName("silver", 3), ItemDustsSmall.getSmallDustByName("Lead", 1), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), null, 100, 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(ModFluids.fluidMercury, 1000), - ItemDusts.getDustByName("silver", 3), ItemDustsSmall.getSmallDustByName("Lead", 1), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), new ItemStack(Items.BUCKET), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Silver Ore"); - } - } - - // Lead Ore - if (OreUtil.doesOreExistAndValid("oreLead")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreLead").get(0); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("lead", 2), ItemDustsSmall.getSmallDustByName("Silver", 1), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), null, 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("lead", 2), ItemDustsSmall.getSmallDustByName("Silver", 1), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), new ItemStack(Items.BUCKET), 100, 120)); - - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(ModFluids.fluidMercury, 1000), - ItemDusts.getDustByName("lead", 2), ItemDusts.getDustByName("silver", 1), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), null, 100, 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(ModFluids.fluidMercury, 1000), - ItemDusts.getDustByName("lead", 2), ItemDusts.getDustByName("silver", 1), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), new ItemStack(Items.BUCKET), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Lead Ore"); - } - } - - // Apatite Ore - if (OreUtil.doesOreExistAndValid("oreApatite") & OreUtil.doesOreExistAndValid("gemApatite")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreApatite").get(0); - ItemStack gemStack = OreDictionary.getOres("gemApatite").get(0); - gemStack.setCount(6); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack, - gemStack, ItemDustsSmall.getSmallDustByName("Phosphorous", 4), null, 100, 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack, - gemStack, ItemDustsSmall.getSmallDustByName("Phosphorous", 4), - new ItemStack(Items.BUCKET), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Apatite Ore"); - } - } - - // Nether Quartz Ore - if (OreUtil.doesOreExistAndValid("dustNetherQuartz")) { - try { - ItemStack dustStack = OreDictionary.getOres("dustNetherQuartz").get(0); - dustStack.setCount(4); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.QUARTZ_ORE, 1), - new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Items.QUARTZ, 2), dustStack, - ItemDustsSmall.getSmallDustByName("Netherrack", 2), null, 100, 120)); - - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Nether Quartz Ore"); - } - } - - // Certus Quartz Ore - if (OreUtil.doesOreExistAndValid("oreCertusQuartz")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreCertusQuartz").get(0); - ItemStack gemStack = OreDictionary.getOres("crystalCertusQuartz").get(0); - ItemStack dustStack = OreDictionary.getOres("dustCertusQuartz").get(0); - dustStack.setCount(2); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack, - dustStack, null, null, 100, 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack, - dustStack, null, new ItemStack(Items.BUCKET), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Certus Quartz Ore"); - } - } - - // Charged Certus Quartz Ore - if (OreUtil.doesOreExistAndValid("oreChargedCertusQuartz")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreChargedCertusQuartz").get(0); - ItemStack gemStack = OreDictionary.getOres("crystalChargedCertusQuartz").get(0); - ItemStack dustStack = OreDictionary.getOres("dustCertusQuartz").get(0); - dustStack.setCount(2); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack, - dustStack, null, null, 100, 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack, - dustStack, null, new ItemStack(Items.BUCKET), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Charged Certus Quartz Ore"); - } - } - - // Amethyst Ore - if (OreUtil.doesOreExistAndValid("oreAmethyst") && OreUtil.doesOreExistAndValid("gemAmethyst")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreAmethyst").get(0); - ItemStack gemStack = OreDictionary.getOres("gemAmethyst").get(0); - gemStack.setCount(2); - ItemStack dustStack = OreDictionary.getOres("gemAmethyst").get(0); - dustStack.setCount(1); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack, - dustStack, null, null, 100, 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack, - dustStack, null, new ItemStack(Items.BUCKET), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Certus Quartz Ore"); - } - } - - // Topaz Ore - if (OreUtil.doesOreExistAndValid("oreTopaz") && OreUtil.doesOreExistAndValid("gemTopaz")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreTopaz").get(0); - ItemStack gemStack = OreDictionary.getOres("gemTopaz").get(0); - gemStack.setCount(2); - ItemStack dustStack = OreDictionary.getOres("gemTopaz").get(0); - dustStack.setCount(1); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack, - dustStack, null, null, 100, 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack, - dustStack, null, new ItemStack(Items.BUCKET), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Topaz Ore"); - } - } - - // Tanzanite Ore - if (OreUtil.doesOreExistAndValid("oreTanzanite") && OreUtil.doesOreExistAndValid("gemTanzanite")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreTanzanite").get(0); - ItemStack gemStack = OreDictionary.getOres("gemTanzanite").get(0); - gemStack.setCount(2); - ItemStack dustStack = OreDictionary.getOres("gemTanzanite").get(0); - dustStack.setCount(1); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack, - dustStack, null, null, 100, 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack, - dustStack, null, new ItemStack(Items.BUCKET), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Tanzanite Ore"); - } - } - - // Malachite Ore - if (OreUtil.doesOreExistAndValid("oreMalachite") && OreUtil.doesOreExistAndValid("gemMalachite")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreMalachite").get(0); - ItemStack gemStack = OreDictionary.getOres("gemMalachite").get(0); - gemStack.setCount(2); - ItemStack dustStack = OreDictionary.getOres("gemMalachite").get(0); - dustStack.setCount(1); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack, - dustStack, null, null, 100, 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), gemStack, - dustStack, null, new ItemStack(Items.BUCKET), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Malachite Ore"); - } - } - - // Galena Ore - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 0), - new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("galena", 2), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDustsSmall.getSmallDustByName("Silver", 1), null, - 100, 120)); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 0), - new FluidStack(ModFluids.fluidMercury, 1000), ItemDusts.getDustByName("galena", 2), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDusts.getDustByName("silver", 1), null, 100, 120)); - - // Ruby Ore - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 2), - new FluidStack(FluidRegistry.WATER, 1000), ItemGems.getGemByName("ruby", 1), - ItemDustsSmall.getSmallDustByName("Ruby", 6), ItemDustsSmall.getSmallDustByName("Chrome", 2), null, 100, - 120)); - - // Sapphire Ore - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 3), - new FluidStack(FluidRegistry.WATER, 1000), ItemGems.getGemByName("sapphire", 1), - ItemDustsSmall.getSmallDustByName("Sapphire", 6), ItemDustsSmall.getSmallDustByName("Aluminum", 2), - null, 100, 120)); - - // Bauxite Ore - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 4), - new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("bauxite", 2), - ItemDustsSmall.getSmallDustByName("Grossular", 4), ItemDustsSmall.getSmallDustByName("Titanium", 4), - null, 100, 120)); - - // Pyrite Ore - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 5), - new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("pyrite", 2), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemDustsSmall.getSmallDustByName("Phosphorous", 1), - null, 100, 120)); - - // Cinnabar Ore - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 6), - new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("cinnabar", 2), - ItemDustsSmall.getSmallDustByName("Redstone", 1), ItemDustsSmall.getSmallDustByName("Glowstone", 1), - null, 100, 120)); - - // Sphalerite Ore - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 7), - new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("sphalerite", 2), - ItemDustsSmall.getSmallDustByName("Zinc", 1), ItemDustsSmall.getSmallDustByName("yellow_garnet", 1), - null, 100, 120)); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 7), - new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), ItemDusts.getDustByName("sphalerite", 2), - ItemDusts.getDustByName("zinc", 1), ItemDustsSmall.getSmallDustByName("yellow_garnet", 1), null, 100, - 120)); - - // Tungsten Ore - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 8), new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("tungsten", 2), ItemDustsSmall.getSmallDustByName("Manganese", 1), - ItemDustsSmall.getSmallDustByName("Silver", 1), null, 100, 120)); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 8), - new FluidStack(ModFluids.fluidMercury, 1000), ItemDusts.getDustByName("tungsten", 2), - ItemDustsSmall.getSmallDustByName("Manganese", 1), ItemDusts.getDustByName("silver", 2), null, 100, - 120)); - - // Sheldonite Ore - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 9), - new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("platinum", 2), - ItemNuggets.getNuggetByName("iridium", 2), ItemDusts.getDustByName("nickel", 1), null, 100, 120)); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 9), - new FluidStack(ModFluids.fluidMercury, 1000), ItemDusts.getDustByName("platinum", 3), - ItemNuggets.getNuggetByName("iridium", 2), ItemDusts.getDustByName("nickel", 1), null, 100, 120)); - - // Peridot Ore - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 10), - new FluidStack(FluidRegistry.WATER, 1000), ItemGems.getGemByName("peridot", 1), - ItemDustsSmall.getSmallDustByName("Peridot", 6), ItemDustsSmall.getSmallDustByName("Pyrope", 2), null, - 100, 120)); - // Sodalite Ore - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(ModBlocks.ore, 1, 11), - new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("sodalite", 12), - ItemDusts.getDustByName("aluminum", 3), null, null, 100, 120)); - } - static void addImplosionCompressorRecipes() { } @@ -2347,7 +1952,7 @@ public class ModRecipes { ItemCells.getCellByName("oil", 1), ItemDusts.getDustByName("saltpeter", 4), ItemDusts.getDustByName("coal", 1), new ItemStack(Blocks.SAND, 10), 2500, 5)); - // Dust Byproducts + // Type Byproducts RecipeHandler.addRecipe( new CentrifugeRecipe(new ItemStack(Items.GLOWSTONE_DUST, 16), ItemCells.getCellByName("empty"), @@ -2388,532 +1993,7 @@ public class ModRecipes { ItemIngots.getIngotByName("copper", 2), ItemDustsSmall.getSmallDustByName("Tungsten", 1), ItemIngots.getIngotByName("tin", 2), 6000, 5)); - // IndustrialGrinderRecipes - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.COAL_ORE, 1), - new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Items.COAL, 1), - ItemDustsSmall.getSmallDustByName("Coal", 6), ItemDustsSmall.getSmallDustByName("Coal", 2), - null, 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.IRON_ORE, 1), - new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("iron", 2), - ItemDustsSmall.getSmallDustByName("Nickel", 1), ItemDustsSmall.getSmallDustByName("Tin", 1), - null, 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.GOLD_ORE, 1), - new FluidStack(FluidRegistry.WATER, 1000), ItemDusts.getDustByName("gold", 2), - ItemDustsSmall.getSmallDustByName("Copper", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), - null, 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.IRON_ORE, 1), - new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), ItemDusts.getDustByName("iron", 2), - ItemDusts.getDustByName("nickel", 1), ItemDustsSmall.getSmallDustByName("Tin", 1), - null, 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.GOLD_ORE, 1), - new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), ItemDusts.getDustByName("gold", 2), - ItemDusts.getDustByName("copper", 1), ItemDustsSmall.getSmallDustByName("Nickel", 1), - null, 100, 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(new ItemStack(Blocks.GOLD_ORE, 1), new FluidStack(ModFluids.fluidMercury, 1000), - ItemDusts.getDustByName("gold", 3), ItemDustsSmall.getSmallDustByName("Copper", 1), - ItemDustsSmall.getSmallDustByName("Nickel", 1), null, 100, 120)); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.DIAMOND_ORE, 1), - new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Items.DIAMOND, 1), - ItemDustsSmall.getSmallDustByName("Diamond", 6), ItemDustsSmall.getSmallDustByName("Coal", 2), - null, 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.EMERALD_ORE, 1), - new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Items.EMERALD, 1), - ItemDustsSmall.getSmallDustByName("Emerald", 6), ItemDustsSmall.getSmallDustByName("Aluminum", 2), - null, 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.REDSTONE_ORE, 1), - new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Items.REDSTONE, 10), - ItemDustsSmall.getSmallDustByName("Cinnabar", 1), ItemDustsSmall.getSmallDustByName("Glowstone", 1), - null, 100, 120)); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.LAPIS_ORE, 1), - new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Items.DYE, 6, 4), - ItemDustsSmall.getSmallDustByName("Lazurite", 3), null, null, 100, 120)); - - // Copper Ore - if (OreUtil.doesOreExistAndValid("oreCopper")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreCopper").get(0); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("copper", 2), ItemDustsSmall.getSmallDustByName("Gold", 1), - ItemDustsSmall.getSmallDustByName("Nickel", 1), ItemCells.getCellByName("empty"), 100, - 120)); - - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), - ItemDusts.getDustByName("copper", 2), ItemDusts.getDustByName("gold", 1), - ItemDustsSmall.getSmallDustByName("Nickel", 1), null, 100, - 120)); - - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(ModFluids.fluidMercury, 1000), - ItemDusts.getDustByName("copper", 2), ItemDustsSmall.getSmallDustByName("Gold", 1), - ItemDusts.getDustByName("nickel", 1), null, 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Copper Ore"); - } - } - - // Tin Ore - if (OreUtil.doesOreExistAndValid("oreTin")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreTin").get(0); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("tin", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDustsSmall.getSmallDustByName("Zinc", 1), null, 100, - 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), - ItemDusts.getDustByName("tin", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDusts.getDustByName("zinc", 1), null, 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Tin Ore"); - } - } - - // Nickel Ore - if (OreUtil.doesOreExistAndValid("oreNickel")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreNickel").get(0); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("nickel", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDustsSmall.getSmallDustByName("Platinum", 1), ItemCells.getCellByName("empty"), 100, - 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), - ItemDusts.getDustByName("nickel", 3), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDustsSmall.getSmallDustByName("Platinum", 1), null, 100, - 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(ModFluids.fluidMercury, 1000), - ItemDusts.getDustByName("nickel", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDusts.getDustByName("platinum", 1), null, 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Nickel Ore"); - } - } - - // Zinc Ore - if (OreUtil.doesOreExistAndValid("oreZinc")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreZinc").get(0); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("zinc", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDustsSmall.getSmallDustByName("Tin", 1), null, 100, - 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), - ItemDusts.getDustByName("zinc", 2), ItemDustsSmall.getSmallDustByName("Iron", 1), - ItemDusts.getDustByName("iron", 1), null, 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Zinc Ore"); - } - } - - // Silver Ore - if (OreUtil.doesOreExistAndValid("oreSilver")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreSilver").get(0); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("silver", 2), ItemDustsSmall.getSmallDustByName("Lead", 1), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), null, 100, - 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(ModFluids.fluidMercury, 1000), - ItemDusts.getDustByName("silver", 3), ItemDustsSmall.getSmallDustByName("Lead", 1), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), null, 100, - 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Silver Ore"); - } - } - - // Lead Ore - if (OreUtil.doesOreExistAndValid("oreLead")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreLead").get(0); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("lead", 2), ItemDustsSmall.getSmallDustByName("Silver", 1), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), null, 100, - 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(ModFluids.fluidMercury, 1000), - ItemDusts.getDustByName("lead", 2), ItemDusts.getDustByName("silver", 1), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), null, 100, - 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Lead Ore"); - } - } - - // Uranium Ore - if (OreUtil.doesOreExistAndValid("oreUranium")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreUranium").get(0); - ItemStack uranium238Stack = getOre("uran238"); - uranium238Stack.setCount(8); - ItemStack uranium235Stack = getOre("smallUran235"); - uranium235Stack.setCount(2); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - uranium238Stack, uranium235Stack, null, null, 100, 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - uranium238Stack, uranium235Stack, null, ItemCells.getCellByName("empty"), 100, 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), uranium238Stack, - uranium235Stack, null, new ItemStack(Items.BUCKET), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Uranium Ore"); - } - } - - // Pitchblende Ore - if (OreUtil.doesOreExistAndValid("orePitchblende")) { - try { - ItemStack oreStack = OreDictionary.getOres("orePitchblende").get(0); - ItemStack uranium238Stack = getOre("uran238"); - uranium238Stack.setCount(8); - ItemStack uranium235Stack = getOre("uran235"); - uranium235Stack.setCount(2); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - uranium238Stack, uranium235Stack, null, null, 100, 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - uranium238Stack, uranium235Stack, null, ItemCells.getCellByName("empty"), 100, 120)); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), uranium238Stack, - uranium235Stack, null, new ItemStack(Items.BUCKET), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Uranium Ore"); - } - } - - // Aluminum Ore - if (OreUtil.doesOreExistAndValid("oreAluminum")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreAluminum").get(0); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("aluminum", 2), ItemDustsSmall.getSmallDustByName("Bauxite", 1), - ItemDustsSmall.getSmallDustByName("Bauxite", 1), ItemCells.getCellByName("empty"), 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 IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("ardite", 2), ItemDustsSmall.getSmallDustByName("Ardite", 1), - ItemDustsSmall.getSmallDustByName("Ardite", 1), ItemCells.getCellByName("empty"), 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 IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("cobalt", 2), ItemDustsSmall.getSmallDustByName("Cobalt", 1), - ItemDustsSmall.getSmallDustByName("Cobalt", 1), ItemCells.getCellByName("empty"), 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 IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("darkIron", 2), - ItemDustsSmall.getSmallDustByName("DarkIron", 1), - ItemDustsSmall.getSmallDustByName("Iron", 1), ItemCells.getCellByName("empty"), 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 IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("cadmium", 2), ItemDustsSmall.getSmallDustByName("Cadmium", 1), - ItemDustsSmall.getSmallDustByName("Cadmium", 1), ItemCells.getCellByName("empty"), 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 IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("indium", 2), ItemDustsSmall.getSmallDustByName("Indium", 1), - ItemDustsSmall.getSmallDustByName("Indium", 1), ItemCells.getCellByName("empty"), 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 IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - gemStack, ItemDustsSmall.getSmallDustByName("Calcite", 6), null, - ItemCells.getCellByName("empty"), 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 IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - chunkStack, ItemDustsSmall.getSmallDustByName("Magnetite", 6), null, - ItemCells.getCellByName("empty"), 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 IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - chunkStack, ItemDustsSmall.getSmallDustByName("Graphite", 6), null, - ItemCells.getCellByName("empty"), 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 IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("osmium", 2), ItemDustsSmall.getSmallDustByName("Osmium", 1), - ItemDustsSmall.getSmallDustByName("Osmium", 1), ItemCells.getCellByName("empty"), 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.setCount(10); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - dustStack, ItemDustsSmall.getSmallDustByName("Sodalite", 1), - ItemDustsSmall.getSmallDustByName("Glowstone", 1), ItemCells.getCellByName("empty"), - 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 IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("sulfur", 2), ItemDustsSmall.getSmallDustByName("Sulfur", 1), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), ItemCells.getCellByName("empty"), 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 IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("saltpeter", 2), - ItemDustsSmall.getSmallDustByName("Saltpeter", 1), - ItemDustsSmall.getSmallDustByName("Saltpeter", 1), ItemCells.getCellByName("empty"), - 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 { - ItemStack oreStack = OreDictionary.getOres("oreApatite").get(0); - ItemStack gemStack = OreDictionary.getOres("gemApatite").get(0); - gemStack.setCount(6); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - gemStack, gemStack, ItemDustsSmall.getSmallDustByName("Phosphorous", 4), - ItemCells.getCellByName("empty"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Apatite Ore"); - } - } - - // Nether Quartz Ore - if (OreUtil.doesOreExistAndValid("dustNetherQuartz")) { - try { - ItemStack dustStack = OreDictionary.getOres("dustNetherQuartz").get(0); - dustStack.setCount(4); - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(new ItemStack(Blocks.QUARTZ_ORE, 1), - new FluidStack(FluidRegistry.WATER, 1000), new ItemStack(Items.QUARTZ, 2), - dustStack, ItemDustsSmall.getSmallDustByName("Netherrack", 2), ItemCells.getCellByName("empty"), - 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Nether Quartz Ore"); - } - } - - // Certus Quartz Ore - if (OreUtil.doesOreExistAndValid("oreCertusQuartz")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreCertusQuartz").get(0); - ItemStack gemStack = OreDictionary.getOres("crystalCertusQuartz").get(0); - ItemStack dustStack = OreDictionary.getOres("dustCertusQuartz").get(0); - dustStack.setCount(2); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - gemStack, dustStack, null, ItemCells.getCellByName("empty"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Certus Quartz Ore"); - } - } - - // Charged Certus Quartz Ore - if (OreUtil.doesOreExistAndValid("oreChargedCertusQuartz")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreChargedCertusQuartz").get(0); - ItemStack gemStack = OreDictionary.getOres("crystalChargedCertusQuartz").get(0); - ItemStack dustStack = OreDictionary.getOres("dustCertusQuartz").get(0); - dustStack.setCount(2); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - gemStack, dustStack, null, ItemCells.getCellByName("empty"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Charged Certus Quartz Ore"); - } - } - - // Amethyst Ore - if (OreUtil.doesOreExistAndValid("oreAmethyst") && OreUtil.doesOreExistAndValid("gemAmethyst")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreAmethyst").get(0); - ItemStack gemStack = OreDictionary.getOres("gemAmethyst").get(0); - gemStack.setCount(2); - ItemStack dustStack = OreDictionary.getOres("gemAmethyst").get(0); - dustStack.setCount(1); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, new FluidStack(FluidRegistry.WATER, 1000), - gemStack, dustStack, null, ItemCells.getCellByName("empty"), 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Certus Quartz Ore"); - } - } - - // Topaz Ore - if (OreUtil.doesOreExistAndValid("oreTopaz") && OreUtil.doesOreExistAndValid("gemTopaz")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreTopaz").get(0); - ItemStack gemStack = OreDictionary.getOres("gemTopaz").get(0); - gemStack.setCount(2); - ItemStack dustStack = OreDictionary.getOres("gemTopaz").get(0); - dustStack.setCount(1); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, - new FluidStack(FluidRegistry.WATER, 1000), - gemStack, dustStack, - null, null, 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Topaz Ore"); - } - } - - // Tanzanite Ore - if (OreUtil.doesOreExistAndValid("oreTanzanite") && OreUtil.doesOreExistAndValid("gemTanzanite")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreTanzanite").get(0); - ItemStack gemStack = OreDictionary.getOres("gemTanzanite").get(0); - gemStack.setCount(2); - ItemStack dustStack = OreDictionary.getOres("gemTanzanite").get(0); - dustStack.setCount(1); - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe(oreStack, - new FluidStack(FluidRegistry.WATER, 1000), - gemStack, dustStack, - null, null, 100, 120)); - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Tanzanite Ore"); - } - } - - // Malachite Ore - if (OreUtil.doesOreExistAndValid("oreMalachite") && OreUtil.doesOreExistAndValid("gemMalachite")) { - try { - ItemStack oreStack = OreDictionary.getOres("oreMalachite").get(0); - ItemStack gemStack = OreDictionary.getOres("gemMalachite").get(0); - gemStack.setCount(2); - ItemStack dustStack = OreDictionary.getOres("gemMalachite").get(0); - dustStack.setCount(1); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe(oreStack, - new FluidStack(FluidRegistry.WATER, 1000), - gemStack, dustStack, - null, null, 100, 120)); - - } catch (Exception e) { - Core.logHelper.info("Failed to Load grinder Recipe for Malachite Ore"); - } - } - // Implosion compressor - RecipeHandler.addRecipe(new ImplosionCompressorRecipe(ItemIngots.getIngotByName("iridium_alloy"), new ItemStack(Blocks.TNT, 8), OreDictionary.getOres("plateIridium").get(0).copy(), ItemDusts.getDustByName("dark_ashes", 4), 20, 30)); @@ -2940,129 +2020,6 @@ public class ModRecipes { new ItemStack(Blocks.TNT, 24), ItemGems.getGemByName("peridot", 3), ItemDusts.getDustByName("dark_ashes", 12), 20, 30)); - // grinder - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe( - new ItemStack(ModBlocks.ore, 1, 0), - new FluidStack(ModFluids.fluidMercury, 1000), - ItemDusts.getDustByName("galena", 2), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), - ItemDustsSmall.getSmallDustByName("Silver", 1), - null, 100, 120)); - - // Iridium Ore - RecipeHandler.addRecipe(new IndustrialGrinderRecipe( - new ItemStack(ModBlocks.ore, 1, 1), - new FluidStack(FluidRegistry.WATER, 1000), - OreDictionary.getOres("ingotIridium").get(0), - ItemDustsSmall.getSmallDustByName("Platinum", 2), - null, null, 100, 120)); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe( - new ItemStack(ModBlocks.ore, 1, 2), - new FluidStack(FluidRegistry.WATER, 1000), - ItemGems.getGemByName("ruby", 1), - ItemDustsSmall.getSmallDustByName("Ruby", 6), - ItemDustsSmall.getSmallDustByName("Chrome", 2), - null, 100, 120)); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe( - new ItemStack(ModBlocks.ore, 1, 3), - new FluidStack(FluidRegistry.WATER, 1000), - ItemGems.getGemByName("sapphire", 1), - ItemDustsSmall.getSmallDustByName("Sapphire", 6), - ItemDustsSmall.getSmallDustByName("Aluminum", 2), - null, 100, 120)); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe( - new ItemStack(ModBlocks.ore, 1, 4), - new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("bauxite", 2), - ItemDustsSmall.getSmallDustByName("Grossular", 4), - ItemDustsSmall.getSmallDustByName("Titanium", 4), - null, 100, 120)); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe( - new ItemStack(ModBlocks.ore, 1, 5), - new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("pyrite", 2), - ItemDustsSmall.getSmallDustByName("Sulfur", 1), - ItemDustsSmall.getSmallDustByName("Phosphorous", 1), - null, 100, 120)); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe( - new ItemStack(ModBlocks.ore, 1, 6), - new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("cinnabar", 2), - ItemDustsSmall.getSmallDustByName("Redstone", 1), - ItemDustsSmall.getSmallDustByName("Glowstone", 1), - null, 100, 120)); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe( - new ItemStack(ModBlocks.ore, 1, 7), - new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("sphalerite", 2), - ItemDustsSmall.getSmallDustByName("Zinc", 1), - ItemDustsSmall.getSmallDustByName("yellow_garnet", 1), - null, 100, 120)); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe( - new ItemStack(ModBlocks.ore, 1, 7), - new FluidStack(ModFluids.fluidSodiumpersulfate, 1000), - ItemDusts.getDustByName("sphalerite", 2), - ItemDusts.getDustByName("zinc", 1), - ItemDustsSmall.getSmallDustByName("yellow_garnet", 1), - null, 100, 120)); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe( - new ItemStack(ModBlocks.ore, 1, 8), - new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("tungsten", 2), - ItemDustsSmall.getSmallDustByName("Manganese", 1), - ItemDustsSmall.getSmallDustByName("Silver", 1), - null, 100, 120)); - - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe( - new ItemStack(ModBlocks.ore, 1, 8), - new FluidStack(ModFluids.fluidMercury, 1000), - ItemDusts.getDustByName("tungsten", 2), - ItemDustsSmall.getSmallDustByName("Manganese", 2), - ItemDusts.getDustByName("silver", 3), - null, 100, 120)); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe( - new ItemStack(ModBlocks.ore, 1, 9), - new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("platinum", 2), - ItemDusts.getDustByName("nickel", 1), - ItemNuggets.getNuggetByName("iridium", 2), - null, 100, 120)); - - RecipeHandler.addRecipe( - new IndustrialGrinderRecipe( - new ItemStack(ModBlocks.ore, 1, 9), - new FluidStack(ModFluids.fluidMercury, 1000), - ItemDusts.getDustByName("platinum", 3), - ItemDusts.getDustByName("nickel", 1), - ItemNuggets.getNuggetByName("iridium", 3), - null, 100, 120)); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe( - new ItemStack(ModBlocks.ore, 1, 10), - new FluidStack(FluidRegistry.WATER, 1000), - ItemGems.getGemByName("peridot", 1), - ItemDustsSmall.getSmallDustByName("Peridot", 6), - ItemDustsSmall.getSmallDustByName("Pyrope", 2), - null, 100, 120)); - - RecipeHandler.addRecipe(new IndustrialGrinderRecipe( - new ItemStack(ModBlocks.ore, 1, 11), - new FluidStack(FluidRegistry.WATER, 1000), - ItemDusts.getDustByName("sodalite", 12), - ItemDustsSmall.getSmallDustByName("aluminum", 3), - null, null, 100, 120)); - // Chemical Reactor RecipeHandler.addRecipe(new ChemicalReactorRecipe(ItemDusts.getDustByName("calcite", 1), null, new ItemStack(OreDictionary.getOres("fertilizer").get(0).getItem(), 1), 100, 30)); diff --git a/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java b/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java new file mode 100644 index 000000000..98d1c536b --- /dev/null +++ b/src/main/java/techreborn/init/recipes/IndustrialGrinderRecipes.java @@ -0,0 +1,177 @@ +package techreborn.init.recipes; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import org.apache.logging.log4j.Level; +import reborncore.api.recipe.RecipeHandler; +import techreborn.Core; +import techreborn.api.recipe.machines.IndustrialGrinderRecipe; +import techreborn.blocks.BlockOre; +import techreborn.init.ModFluids; + +/** + * Created by Prospector + */ +public class IndustrialGrinderRecipes extends RecipeMethods { + + static FluidStack WATER = new FluidStack(FluidRegistry.WATER, 1000); + static FluidStack MERCURY = new FluidStack(ModFluids.fluidMercury, 1000); + static FluidStack SODIUM_PERSULFATE = new FluidStack(ModFluids.fluidSodiumpersulfate, 1000); + + public static void init() { + + register(new ItemStack(Blocks.NETHERRACK, 16), WATER, 1600, 128, getMaterial("netherrack", 16, Type.DUST), new ItemStack(Items.GOLD_NUGGET)); + register(new ItemStack(Blocks.NETHERRACK, 8), MERCURY, 800, 128, getMaterial("netherrack", 8, Type.DUST), new ItemStack(Items.GOLD_NUGGET)); + + register(getOre("oreCopper"), WATER, 100, 128, getMaterial("copper", 2, Type.DUST), getMaterial("gold", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); + register(getOre("oreCopper"), SODIUM_PERSULFATE, 100, 128, getMaterial("copper", 3, Type.DUST), getMaterial("gold", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); + register(getOre("oreCopper"), MERCURY, 100, 128, getMaterial("copper", 3, Type.DUST), getMaterial("gold", Type.DUST)); + + register(getOre("oreTin"), WATER, 100, 128, getMaterial("tin", 2, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("zinc", Type.SMALL_DUST)); + register(getOre("oreTin"), SODIUM_PERSULFATE, 100, 128, getMaterial("tin", 2, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("zinc", Type.DUST)); + + if (oresExist("oreUranium", "dustUranium", "smallDustPlutonium")) { + register(getOre("oreUranium"), WATER, 100, 128, getOre("dustUranium", 2), getOre("smallDustPlutonium")); + } + + if (oresExist("dustSmallThorium")) { + register(getOre("oreCoal"), WATER, 100, 128, getMaterial("coal", 2, Type.DUST), getOre("dustSmallThorium")); + } else { + register(getOre("oreCoal"), WATER, 100, 128, getMaterial("coal", 2, Type.DUST)); + } + + register(getOre("oreIron"), WATER, 100, 128, getMaterial("iron", 2, Type.DUST), getMaterial("tin", Type.SMALL_DUST), getMaterial("nickel", 1, Type.DUST)); + register(getOre("oreLapis"), WATER, 100, 128, new ItemStack(Items.DYE, 12, 4), getMaterial("lazurite", 3, Type.DUST)); + register(getOre("oreRedstone"), WATER, 100, 128, new ItemStack(Items.REDSTONE, 10), getMaterial("glowstone", 2, Type.SMALL_DUST)); + + register(getOre("oreGold"), WATER, 100, 128, getMaterial("gold", 2, Type.DUST), getMaterial("copper", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); + register(getOre("oreGold"), MERCURY, 100, 128, getMaterial("gold", 3, Type.DUST), getMaterial("copper", Type.SMALL_DUST), getMaterial("nickel", Type.SMALL_DUST)); + register(getOre("oreGold"), SODIUM_PERSULFATE, 100, 128, getMaterial("gold", 2, Type.DUST), getMaterial("copper", Type.DUST), getMaterial("nickel", Type.SMALL_DUST)); + + register(getOre("oreDiamond"), WATER, 100, 128, new ItemStack(Items.DIAMOND), getMaterial("diamond", 6, Type.SMALL_DUST), getMaterial("coal", Type.DUST)); + register(getOre("oreEmerald"), WATER, 100, 128, new ItemStack(Items.EMERALD), getMaterial("emerald", 6, Type.SMALL_DUST)); + + register(getOre("oreGalena"), WATER, 100, 128, getMaterial("galena", 2, Type.DUST), getMaterial("sulfur", Type.DUST)); + register(getOre("oreGalena"), MERCURY, 100, 128, getMaterial("galena", 2, Type.DUST), getMaterial("sulfur", Type.DUST), getMaterial("silver", Type.DUST)); + + register(getOre("oreLead"), WATER, 100, 128, getMaterial("lead", 2, Type.DUST), getMaterial("galena", 2, Type.SMALL_DUST)); + register(getOre("oreSilver"), WATER, 100, 128, getMaterial("silver", 2, Type.DUST), getMaterial("galena", 2, Type.SMALL_DUST)); + + register(getOre("oreIridium"), WATER, 100, 128, getMaterial("iridium", Type.INGOT), getMaterial("platinum", 2, Type.SMALL_DUST)); + register(getOre("oreIridium"), MERCURY, 100, 128, getMaterial("iridium", Type.INGOT), getMaterial("platinum", Type.DUST)); + + register(getOre("oreRuby"), WATER, 100, 128, getMaterial("ruby", Type.GEM), getMaterial("ruby", 6, Type.SMALL_DUST), getMaterial("red_garnet", 2, Type.SMALL_DUST)); + register(getOre("oreSapphire"), WATER, 100, 128, getMaterial("sapphire", Type.GEM), getMaterial("sapphire", 6, Type.SMALL_DUST), getMaterial("peridot", 2, Type.SMALL_DUST)); + register(BlockOre.getOreByName("bauxite"), WATER, 100, 128, getMaterial("bauxite", 4, Type.DUST), getMaterial("aluminum", Type.DUST)); + register(getOre("oreQuartz"), WATER, 100, 128, new ItemStack(Items.QUARTZ, 2), getMaterial("sulfur", 2, Type.SMALL_DUST)); + register(getOre("orePyrite"), WATER, 100, 128, getMaterial("pyrite", 5, Type.DUST), getMaterial("sulfur", 2, Type.DUST)); + register(getOre("oreCinnabar"), WATER, 100, 128, getMaterial("cinnabar", 5, Type.DUST), getMaterial("redstone", 2, Type.SMALL_DUST), getMaterial("glowstone", Type.SMALL_DUST)); + + register(getOre("oreSphalerite"), WATER, 100, 128, getMaterial("sphalerite", 5, Type.DUST), getMaterial("zinc", Type.DUST), getMaterial("yellow_garnet", Type.SMALL_DUST)); + register(getOre("oreSphalerite"), SODIUM_PERSULFATE, 100, 128, getMaterial("sphalerite", 5, Type.DUST), getMaterial("zinc", 3, Type.DUST), getMaterial("yellow_garnet", Type.SMALL_DUST)); + + register(getOre("oreTungsten"), WATER, 100, 128, getMaterial("tungsten", 2, Type.DUST), getMaterial("iron", 3, Type.SMALL_DUST), getMaterial("manganese", 3, Type.SMALL_DUST)); + + register(getOre("oreSheldonite"), WATER, 100, 128, getMaterial("platinum", 2, Type.DUST), getMaterial("nickel", Type.DUST), getMaterial("iridium", 2, Type.NUGGET)); + register(getOre("oreSheldonite"), MERCURY, 100, 128, getMaterial("platinum", 3, Type.DUST), getMaterial("nickel", Type.DUST), getMaterial("iridium", 2, Type.NUGGET)); + + register(getOre("orePeridot"), WATER, 100, 128, getMaterial("peridot", Type.GEM), getMaterial("peridot", 6, Type.SMALL_DUST), getMaterial("emerald", 2, Type.SMALL_DUST)); + register(getOre("oreSodalite"), WATER, 100, 128, getMaterial("sodalite", 12, Type.DUST), getMaterial("aluminum", 3, Type.DUST)); + + if (oresExist("oreApatite", "gemApatite")) { + register(getOre("oreApatite"), WATER, 100, 128, getOre("gemApatite", 8), getMaterial("phosphorous", 2, Type.SMALL_DUST)); + } + + if (oresExist("oreCertusQuartz", "crystalCertusQuartz", "dustCertusQuartz")) { + register(getOre("oreCertusQuartz"), WATER, 100, 128, getOre("crystalCertusQuartz", 2), getOre("dustCertusQuartz")); + } + + if (oresExist("oreChargedCertusQuartz", "crystalChargedCertusQuartz", "dustCertusQuartz")) { + register(getOre("oreChargedCertusQuartz"), WATER, 100, 128, getOre("crystalChargedCertusQuartz", 2), getOre("dustCertusQuartz", 2)); + } + + if (oresExist("oreNickel")) { + register(getOre("oreNickel"), WATER, 100, 128, getMaterial("nickel", 2, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("platinum", Type.SMALL_DUST)); + register(getOre("oreNickel"), MERCURY, 100, 128, getMaterial("nickel", 3, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("platinum", Type.DUST)); + register(getOre("oreNickel"), SODIUM_PERSULFATE, 100, 128, getMaterial("nickel", 3, Type.DUST), getMaterial("iron", Type.SMALL_DUST), getMaterial("platinum", Type.SMALL_DUST)); + } + + if (oresExist("oreZinc")) { + register(getOre("oreZinc"), WATER, 100, 128, getMaterial("zinc", 2, Type.DUST), getMaterial("iron", 2, Type.SMALL_DUST), getMaterial("tin", Type.SMALL_DUST)); + register(getOre("oreZinc"), SODIUM_PERSULFATE, 100, 128, getMaterial("zinc", 2, Type.DUST), getMaterial("iron", Type.DUST), getMaterial("tin", Type.SMALL_DUST)); + } + + if (oresExist("oreAmethyst", "gemAmethyst")) { + register(getOre("oreAmethyst"), WATER, 100, 128, getOre("gemAmethyst", 2)); + } + + if (oresExist("oreTopaz", "gemTopaz")) { + register(getOre("oreTopaz"), WATER, 100, 128, getOre("gemTopaz", 2)); + } + + if (oresExist("oreTanzanite", "gemTanzanite")) { + register(getOre("oreTanzanite"), WATER, 100, 128, getOre("gemTanzanite", 2)); + } + + if (oresExist("oreMalachite", "gemMalachite")) { + register(getOre("oreMalachite"), WATER, 100, 128, getOre("gemMalachite", 2)); + } + + if (oresExist("oreUranium", "uran238", "smallUran235")) { + register(getOre("oreUranium"), WATER, 100, 128, getOre("uran238", 8), getOre("smallUran235", 2)); + } + + if (oresExist("orePitchblende", "uran238", "uran235")) { + register(getOre("orePitchblende"), WATER, 100, 128, getOre("uran238", 8), getOre("smallUran235", 2)); + } + + if (oresExist("oreAluminum")) { + register(getOre("oreAluminum"), WATER, 100, 128, getMaterial("aluminum", 2, Type.DUST), getMaterial("bauxite", 2, Type.SMALL_DUST)); + } + + if (oresExist("oreArdite", "dustArdite")) { + register(getOre("oreArdite"), WATER, 100, 128, getOre("dustArdite", 2), getMaterial("sulfur", 2, Type.SMALL_DUST)); + } + + if (oresExist("oreCobalt", "dustCobalt")) { + register(getOre("oreCobalt"), WATER, 100, 128, getOre("dustCobalt", 2), getMaterial("sulfur", 2, Type.SMALL_DUST)); + } + + if (oresExist("oreOsmium", "dustOsmium")) { + register(getOre("oreOsmium"), WATER, 100, 128, getOre("dustOsmium", 2), getMaterial("platinum", 2, Type.SMALL_DUST), getMaterial("iron", 1, Type.SMALL_DUST)); + } + + if (oresExist("oreTeslatite", "dustTeslatite")) { + register(getOre("oreTeslatite"), WATER, 100, 128, getOre("dustTeslatite", 2), getMaterial("redstone", 3, Type.SMALL_DUST)); + } + + if (oresExist("oreSulfur")) { + register(getOre("oreSulfur"), WATER, 100, 128, getMaterial("sulfur", 2, Type.DUST), getMaterial("sulfur", Type.SMALL_DUST)); + } + + if (oresExist("oreSaltpeter")) { + register(getOre("oreSaltpeter"), WATER, 100, 128, getMaterial("saltpeter", 2, Type.DUST), getMaterial("saltpeter", Type.SMALL_DUST)); + } + } + + static void register(ItemStack output, FluidStack fluid, int ticks, int euPerTick, ItemStack... inputs) { + if (inputs.length == 3) + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(output, + fluid, inputs[0], inputs[1], inputs[2], null, ticks, euPerTick)); + else if (inputs.length == 2) + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(output, + fluid, inputs[0], inputs[1], null, null, ticks, euPerTick)); + else if (inputs.length == 1) + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(output, + fluid, inputs[0], null, null, null, ticks, euPerTick)); + else if (inputs.length == 4) { + RecipeHandler.addRecipe(new IndustrialGrinderRecipe(output, + fluid, inputs[0], inputs[1], inputs[2], inputs[3], ticks, euPerTick)); + } else { + Core.logHelper.log(Level.ERROR, "Invalid industrial grinder recipe. Too many or too few inputs."); + } + } +} diff --git a/src/main/java/techreborn/init/recipes/RecipeMethods.java b/src/main/java/techreborn/init/recipes/RecipeMethods.java new file mode 100644 index 000000000..5cd202d09 --- /dev/null +++ b/src/main/java/techreborn/init/recipes/RecipeMethods.java @@ -0,0 +1,58 @@ +package techreborn.init.recipes; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; +import reborncore.common.util.OreUtil; +import techreborn.items.*; + +/** + * Created by Prospector + */ +public class RecipeMethods { + static ItemStack getMaterial(String name, int count, Type type) { + if (type == Type.DUST) { + return ItemDusts.getDustByName(name, count); + } + if (type == Type.SMALL_DUST) { + return ItemDustsSmall.getSmallDustByName(name, count); + } + if (type == Type.INGOT) { + return ItemIngots.getIngotByName(name, count); + } + if (type == Type.GEM) { + return ItemGems.getGemByName(name, count); + } + if (type == Type.PLATE) { + return ItemPlates.getPlateByName(name, count); + } + if (type == Type.NUGGET) { + return ItemNuggets.getNuggetByName(name, count); + } + return ItemStack.EMPTY; + } + + static ItemStack getMaterial(String name, Type type) { + return getMaterial(name, 1, type); + } + + static ItemStack getOre(String name, int count) { + return OreUtil.getStackFromName(name, count); + } + + static ItemStack getOre(String name) { + return getOre(name, 1); + } + + static boolean oresExist(String... names) { + for (String name : names) { + if (!OreDictionary.doesOreNameExist(name)) { + return false; + } + } + return true; + } + + enum Type { + DUST, SMALL_DUST, INGOT, NUGGET, PLATE, GEM + } +} diff --git a/src/main/java/techreborn/items/ItemDusts.java b/src/main/java/techreborn/items/ItemDusts.java index 5be5516a9..a3f5fe7d8 100644 --- a/src/main/java/techreborn/items/ItemDusts.java +++ b/src/main/java/techreborn/items/ItemDusts.java @@ -19,7 +19,7 @@ public class ItemDusts extends ItemTRNoDestroy { "nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "red_garnet", ModItems.META_PLACEHOLDER, "ruby", "saltpeter", "sapphire", "saw_dust", "silver", "sodalite", "spessartine", "sphalerite", "steel", "sulfur", "tin", "titanium", "tungsten", "uvarovite", ModItems.META_PLACEHOLDER, "yellow_garnet", "zinc", - "olivine", "andesite", "diorite", "granite" }; + ModItems.META_PLACEHOLDER, "andesite", "diorite", "granite" }; public ItemDusts() { setUnlocalizedName("techreborn.dust"); diff --git a/src/main/java/techreborn/items/ItemDustsSmall.java b/src/main/java/techreborn/items/ItemDustsSmall.java index 1655ab0ec..3c8a58ccf 100644 --- a/src/main/java/techreborn/items/ItemDustsSmall.java +++ b/src/main/java/techreborn/items/ItemDustsSmall.java @@ -19,7 +19,7 @@ public class ItemDustsSmall extends ItemTRNoDestroy { "nickel", "obsidian", "peridot", "phosphorous", "platinum", "pyrite", "pyrope", "red_garnet", ModItems.META_PLACEHOLDER, "ruby", "saltpeter", "sapphire", "saw_dust", "silver", "sodalite", "spessartine", "sphalerite", "steel", "sulfur", "tin", "titanium", "tungsten", "uvarovite", ModItems.META_PLACEHOLDER, "yellow_garnet", "zinc", - "olivine", "redstone", "glowstone", "andesite", "diorite", "granite" }; + ModItems.META_PLACEHOLDER, "redstone", "glowstone", "andesite", "diorite", "granite" }; public ItemDustsSmall() { setUnlocalizedName("techreborn.dustsmall"); diff --git a/src/main/java/techreborn/items/ItemPlates.java b/src/main/java/techreborn/items/ItemPlates.java index 7b136cbf4..ef78764b4 100644 --- a/src/main/java/techreborn/items/ItemPlates.java +++ b/src/main/java/techreborn/items/ItemPlates.java @@ -15,7 +15,7 @@ public class ItemPlates extends ItemTRNoDestroy { //Vanilla plates or plates not from ingots or gems public static String[] types = new String[] { - "iron", "gold", "carbon", "wood", "redstone", "diamond", "emerald", "lapis", "coal", "obsidian", "lazurite" + "iron", "gold", "carbon", "wood", "redstone", "diamond", "emerald", ModItems.META_PLACEHOLDER, "coal", "obsidian", "lazurite" }; public ItemPlates() { @@ -28,6 +28,9 @@ public class ItemPlates extends ItemTRNoDestroy { name = CaseFormat.LOWER_CAMEL.to(CaseFormat.LOWER_UNDERSCORE, name); for (int i = 0; i < types.length; i++) { if (types[i].equalsIgnoreCase(name)) { + if (types[i].equals(ModItems.META_PLACEHOLDER)) { + throw new InvalidParameterException("The dust " + name + " could not be found."); + } return new ItemStack(ModItems.plate, count, i); } } @@ -66,7 +69,9 @@ public class ItemPlates extends ItemTRNoDestroy { // Adds Dusts SubItems To Creative Tab public void getSubItems(Item item, CreativeTabs creativeTabs, NonNullList list) { for (int meta = 0; meta < types.length; ++meta) { - list.add(new ItemStack(item, 1, meta)); + if (!types[meta].equals(ModItems.META_PLACEHOLDER)) { + list.add(new ItemStack(item, 1, meta)); + } } } }