From 255e3cc793cb50e1c709ae8b47b8c3f9a5f3d067 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Sun, 25 Aug 2024 17:50:52 +0100 Subject: [PATCH] Remove lots of colliding recipes (#947) * remove duplicate pams fluid extraction * remove duplicate sand recipes * remove duplicate soldering alloy recipe * remove duplicate obsidian alloy smelting * remove another duplicate sand recipe * remove and fix colliding mixed metal recipes * remove duplicate recipes from transistors * remove duplicate computronics recipe from placement in loop * remove doubled recipe * fix sand --- .../recipes/AlloySmelterRecipes.java | 15 +- .../gthandler/recipes/AssemblerRecipes.java | 134 +++--------------- .../recipes/BendingMachineRecipes.java | 6 - .../recipes/FluidExtractorRecipes.java | 119 ---------------- .../gthandler/recipes/MaceratorRecipes.java | 20 ++- .../gthandler/recipes/MixerRecipes.java | 5 - 6 files changed, 32 insertions(+), 267 deletions(-) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AlloySmelterRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AlloySmelterRecipes.java index 943c53ff1..e67de7645 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AlloySmelterRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AlloySmelterRecipes.java @@ -1,11 +1,11 @@ package com.dreammaster.gthandler.recipes; +import static com.dreammaster.scripts.IScriptLoader.wildcard; import static gregtech.api.enums.Mods.EnderIO; import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.recipe.RecipeMaps.alloySmelterRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; -import static gregtech.api.util.GT_RecipeBuilder.TICKS; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -147,10 +147,6 @@ public void run() { .itemOutputs(ItemList.Circuit_Parts_Glass_Tube.get(1L)).duration(6 * SECONDS).eut(16) .addTo(alloySmelterRecipes); - GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.obsidian, 1, 0), ItemList.Shape_Mold_Ingot.get(0L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Obsidian, 2L)) - .duration(6 * SECONDS + 10 * TICKS).eut(3).addTo(alloySmelterRecipes); - GT_Values.RA.stdBuilder() .itemInputs( GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemPartIridium", 2L), @@ -158,12 +154,9 @@ public void run() { .itemOutputs(com.dreammaster.item.ItemList.IridiumAlloyItemCasing.getIS().splitStack(3)) .duration(60 * SECONDS).eut(256).addTo(alloySmelterRecipes); - // recipes for everything that uses sand - for (int i = 0; i < OreDictionary.getOres("sand").size(); ++i) { - GT_Values.RA.stdBuilder().itemInputs(OreDictionary.getOres("sand").get(i), new ItemStack(Items.clay_ball)) - .itemOutputs(com.dreammaster.item.ItemList.CokeOvenBrick.getIS().splitStack(2)) - .duration(10 * SECONDS).eut(8).addTo(alloySmelterRecipes); - } + GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.sand, 1, wildcard), new ItemStack(Items.clay_ball)) + .itemOutputs(com.dreammaster.item.ItemList.CokeOvenBrick.getIS().splitStack(2)).duration(10 * SECONDS) + .eut(8).addTo(alloySmelterRecipes); if (EnderIO.isModLoaded()) { // EnderIO Fused Quartz and Glass diff --git a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java index 683700d1b..9e736cc88 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/AssemblerRecipes.java @@ -6901,33 +6901,6 @@ private void makeMixedMetalIngotRecipes() { .itemOutputs(GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemIngot", 1L, 4)).duration(5 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(3), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Nickel, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Zinc, 1)) - .itemOutputs(GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemIngot", 1L, 4)).duration(5 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(3), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Nickel, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Tin, 1)) - .itemOutputs(GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemIngot", 1L, 4)).duration(5 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - GT_Utility.getIntegratedCircuit(3), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Nickel, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Bronze, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1)) - .itemOutputs(GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemIngot", 1L, 4)).duration(5 * SECONDS) - .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() .itemInputs( GT_Utility.getIntegratedCircuit(3), @@ -7464,7 +7437,7 @@ private void makeMixedMetalIngotRecipes() { GT_Utility.getIntegratedCircuit(3), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Naquadah, 1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iridium, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSE, 1)) + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 1)) .itemOutputs(GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemIngot", 26L, 4)).duration(5 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -7491,7 +7464,7 @@ private void makeMixedMetalIngotRecipes() { GT_Utility.getIntegratedCircuit(3), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.NaquadahAlloy, 1), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Osmiridium, 1), - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSE, 1)) + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.HSSS, 1)) .itemOutputs(GT_ModHandler.getModItem(IndustrialCraft2.ID, "itemIngot", 32L, 4)).duration(5 * SECONDS) .eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); @@ -9100,6 +9073,23 @@ private void makeNEIPlanetRecipes() { .duration(15 * SECONDS).eut(TierEU.RECIPE_UMV).addTo(assemblerRecipes); } } + if (Computronics.isModLoaded()) { + // Audio Cable + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Silver, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1)) + .fluidInputs(Materials.Bismuth.getMolten(GT_Values.L)) + .itemOutputs(GT_ModHandler.getModItem(Computronics.ID, "computronics.audioCable", 1L)) + .duration(3 * SECONDS + 4 * TICKS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Silver, 1), + GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1)) + .fluidInputs(Materials.Lead.getMolten(GT_Values.L)) + .itemOutputs(GT_ModHandler.getModItem(Computronics.ID, "computronics.audioCable", 1L)) + .duration(3 * SECONDS + 4 * TICKS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); + } } private void makeSolderingAlloyRecipes() { @@ -9270,17 +9260,6 @@ private void makeSolderingAlloyRecipes() { .itemOutputs(GT_ModHandler.getModItem(OpenComputers.ID, "screen1", 1L, 0)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS).eut(64) .addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Casing_MV.get(1L), - ItemList.Cover_Screen.get(1L), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.MV, 2L), - ItemList.Circuit_Parts_TransistorSMD.get(1L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getModItem(OpenComputers.ID, "screen1", 1L, 0)) - .fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS).eut(64) - .addTo(assemblerRecipes); // display t2 GT_Values.RA.stdBuilder() @@ -9293,17 +9272,6 @@ private void makeSolderingAlloyRecipes() { .itemOutputs(GT_ModHandler.getModItem(OpenComputers.ID, "screen2", 1L, 0)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Casing_HV.get(1L), - GT_ModHandler.getModItem(OpenComputers.ID, "screen1", 1L, 0), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.HV, 2L), - ItemList.Circuit_Parts_TransistorSMD.get(2L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getModItem(OpenComputers.ID, "screen2", 1L, 0)) - .fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS) - .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); // display t3 GT_Values.RA.stdBuilder() @@ -9317,17 +9285,6 @@ private void makeSolderingAlloyRecipes() { .fluidInputs(tMat.getMolten(288L * tMultiplier / 2L)).duration(12 * SECONDS).eut(256) .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Casing_EV.get(1L), - GT_ModHandler.getModItem(OpenComputers.ID, "screen2", 1L, 0), - GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.EV, 2L), - ItemList.Circuit_Parts_TransistorSMD.get(4L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getModItem(OpenComputers.ID, "screen3", 1L, 0)) - .fluidInputs(tMat.getMolten(288L * tMultiplier / 2L)).duration(12 * SECONDS).eut(256) - .addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() .itemInputs( ItemList.Casing_EV.get(1L), @@ -9389,18 +9346,6 @@ private void makeSolderingAlloyRecipes() { .itemOutputs(GT_ModHandler.getModItem(OpenComputers.ID, "item", 1L, 63)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Plastic_Advanced.get(1L), - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Aluminium, 2L), - GT_ModHandler.getModItem(OpenComputers.ID, "capacitor", 1L, 0), - ItemList.Circuit_Parts_TransistorSMD.get(1L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.RedAlloy, 4L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getModItem(OpenComputers.ID, "item", 1L, 63)) - .fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_MV).addTo(assemblerRecipes); // battery upgrade 2 GT_Values.RA.stdBuilder() @@ -9414,18 +9359,6 @@ private void makeSolderingAlloyRecipes() { .itemOutputs(GT_ModHandler.getModItem(OpenComputers.ID, "item", 1L, 64)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS + 10 * TICKS) .eut(256).addTo(assemblerRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Epoxy_Advanced.get(1L), - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.Titanium, 2L), - GT_ModHandler.getModItem(OpenComputers.ID, "capacitor", 2L, 0), - ItemList.Circuit_Parts_TransistorSMD.get(2L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Silver, 8L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getModItem(OpenComputers.ID, "item", 1L, 64)) - .fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS + 10 * TICKS) - .eut(256).addTo(assemblerRecipes); // battery upgrade 3 GT_Values.RA.stdBuilder() @@ -9440,18 +9373,6 @@ private void makeSolderingAlloyRecipes() { .fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - ItemList.Circuit_Board_Fiberglass_Advanced.get(1L), - GT_OreDictUnificator.get(OrePrefixes.itemCasing, Materials.TungstenSteel, 2L), - GT_ModHandler.getModItem(OpenComputers.ID, "capacitor", 4L, 0), - ItemList.Circuit_Parts_TransistorSMD.get(4L), - GT_OreDictUnificator.get(OrePrefixes.bolt, Materials.Electrum, 16L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_ModHandler.getModItem(OpenComputers.ID, "item", 1L, 65)) - .fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS + 10 * TICKS) - .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() .itemInputs( ItemList.Circuit_Board_Fiberglass_Advanced.get(1L), @@ -10079,23 +10000,6 @@ private void makeSolderingAlloyRecipes() { .itemOutputs(GT_ModHandler.getModItem(Computronics.ID, "computronics.dockingUpgrade", 1L, 0)) .fluidInputs(tMat.getMolten(144L * tMultiplier / 2L)).duration(12 * SECONDS + 10 * TICKS) .eut(TierEU.RECIPE_HV).addTo(assemblerRecipes); - - // Audio Cable - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Silver, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1)) - .fluidInputs(Materials.Bismuth.getMolten(GT_Values.L)) - .itemOutputs(GT_ModHandler.getModItem(Computronics.ID, "computronics.audioCable", 1L)) - .duration(3 * SECONDS + 4 * TICKS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.wireGt02, Materials.Silver, 1), - GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Paper, 1)) - .fluidInputs(Materials.Lead.getMolten(GT_Values.L)) - .itemOutputs(GT_ModHandler.getModItem(Computronics.ID, "computronics.audioCable", 1L)) - .duration(3 * SECONDS + 4 * TICKS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes); - } } } diff --git a/src/main/java/com/dreammaster/gthandler/recipes/BendingMachineRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/BendingMachineRecipes.java index 994960999..ca96346a7 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/BendingMachineRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/BendingMachineRecipes.java @@ -62,12 +62,6 @@ public void run() { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lapis, 1L)) .duration(3 * MINUTES).eut(TierEU.RECIPE_MV * 3 / 4).addTo(benderRecipes); - GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Plastic, 1L), - GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Plastic, 1L)).duration(10 * SECONDS) - .eut(TierEU.RECIPE_LV / 2).addTo(benderRecipes); GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.stickLong, Materials.Plastic, 1L), diff --git a/src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java index 561c1b01e..442b47bb8 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/FluidExtractorRecipes.java @@ -1,7 +1,6 @@ package com.dreammaster.gthandler.recipes; import static gregtech.api.enums.Mods.OpenBlocks; -import static gregtech.api.enums.Mods.PamsHarvestCraft; import static gregtech.api.enums.Mods.TinkerConstruct; import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; import static gregtech.api.util.GT_RecipeBuilder.SECONDS; @@ -31,124 +30,6 @@ public void run() { .fluidOutputs(Materials.GalliumArsenide.getMolten(288L)).duration(2 * SECONDS + 8 * TICKS).eut(37) .addTo(fluidExtractionRecipes); - if (PamsHarvestCraft.isModLoaded()) { - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "catfishrawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "crayfishrawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "jellyfishrawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "mudfishrawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder() - .itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "greenheartfishItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "catfishrawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "anchovyrawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "bassrawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "carprawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "octopusrawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "charrrawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "clamrawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "crabrawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "crayfishrawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "eelrawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "frograwItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "grouperrawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "herringrawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "perchrawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "scalloprawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "shrimprawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "snailrawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "snapperrawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "tilapiarawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "troutrawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "tunarawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "turtlerawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "walleyerawItem", 1, 0)) - .fluidOutputs(Materials.FishOil.getFluid(50L)).duration(16 * TICKS).eut(4) - .addTo(fluidExtractionRecipes); - - } - if (OpenBlocks.isModLoaded() && TinkerConstruct.isModLoaded()) { GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(TinkerConstruct.ID, "oreBerries", 1L, 5)) diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java index 085b96309..1b9b2280e 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/MaceratorRecipes.java @@ -1,5 +1,6 @@ package com.dreammaster.gthandler.recipes; +import static com.dreammaster.scripts.IScriptLoader.wildcard; import static gregtech.api.enums.Mods.AdvancedSolarPanel; import static gregtech.api.enums.Mods.Avaritia; import static gregtech.api.enums.Mods.GalacticraftCore; @@ -14,9 +15,9 @@ import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; import com.dreammaster.gthandler.CustomItemList; @@ -83,16 +84,13 @@ public void run() { .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.GalliumArsenide, 1)) .outputChances(10000).duration(1 * SECONDS + 5 * TICKS).eut(4).addTo(maceratorRecipes); - // recipes for everything that uses sand - for (int i = 0; i < OreDictionary.getOres("sand").size(); ++i) { - GT_Values.RA.stdBuilder().itemInputs(OreDictionary.getOres("sand").get(i)) - .itemOutputs( - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 1L), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 1L)) - .outputChances(10000, 2500, 2000, 1500).duration(10 * SECONDS).eut(8).addTo(maceratorRecipes); - } + GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Blocks.sand, 1, wildcard)) + .itemOutputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 1L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 1L)) + .outputChances(10000, 2500, 2000, 1500).duration(10 * SECONDS).eut(8).addTo(maceratorRecipes); if (OpenPrinters.isModLoaded()) { diff --git a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java index f2690395e..a148d691f 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/MixerRecipes.java @@ -987,11 +987,6 @@ public void run() { .itemOutputs(Materials.AstralSilver.getDust(3)).duration(3 * SECONDS).eut(TierEU.RECIPE_HV) .addTo(mixerRecipes); - GT_Values.RA.stdBuilder() - .itemInputs(Materials.Tin.getDust(9), Materials.Antimony.getDust(1), GT_Utility.getIntegratedCircuit(1)) - .itemOutputs(Materials.SolderingAlloy.getDust(10)).duration(3 * SECONDS).eut(TierEU.RECIPE_LV) - .addTo(mixerRecipes); - if (PamsHarvestCraft.isModLoaded()) { GT_Values.RA.stdBuilder().itemInputs(GT_ModHandler.getModItem(PamsHarvestCraft.ID, "soybeanItem", 1, 0))