From 71c9c339aaa2074fb8e4851a206d6b2140294d19 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Tue, 23 Jan 2024 18:19:03 +0000 Subject: Convert GG to RA2 (#232) * convert assembler recipes to RA2 * deprecate custom builders * clean up and RA2 solder assembler recipes * use GT for mod load checks * should be safe to remove * RA2 remaining assembler recipes * RA2 mixer recipes * RA2 compressor recipes * RA2 forming press * ra2 electrolyzer * ra2 extruder * RA2 autoclave * ra2 vac freezer and remove duplicate * RA2 canner * RA2 unpacking * ra2 chembath * fluidextractor ra2 * use GT enum, no loadedlist * RA2 Bender * RA2 forgehammer * RA2 remaining chem bath * RA2 Implosion * RA2 EBF * RA2 centrifuge * RA2 fuel * RA2 macerator * RA2 single chem * RA2 multi chem * RA2 wiremill * RA2 fluid solidifier * RA2 fluid canner * RA2 universal chem * ra2 distillery * ra2 DT * RA2 universal dist * RA2 AL part 1 * RA2 AL part 2 * add missing modloaded check * RA2 fusion * ra2 plasma forge * ra2 cracking * fix BW overwrites for atomicseparationcatalyst * fix shirabon freezing --- .../java/goodgenerator/util/CrackRecipeAdder.java | 390 ++++++++------------- src/main/java/goodgenerator/util/MaterialFix.java | 310 ++++++++-------- 2 files changed, 313 insertions(+), 387 deletions(-) (limited to 'src/main/java/goodgenerator/util') diff --git a/src/main/java/goodgenerator/util/CrackRecipeAdder.java b/src/main/java/goodgenerator/util/CrackRecipeAdder.java index bf2779b64d..c37fb1059f 100644 --- a/src/main/java/goodgenerator/util/CrackRecipeAdder.java +++ b/src/main/java/goodgenerator/util/CrackRecipeAdder.java @@ -1,5 +1,16 @@ package goodgenerator.util; +import static gregtech.api.recipe.RecipeMaps.blastFurnaceRecipes; +import static gregtech.api.recipe.RecipeMaps.crackingRecipes; +import static gregtech.api.recipe.RecipeMaps.distillationTowerRecipes; +import static gregtech.api.recipe.RecipeMaps.distilleryRecipes; +import static gregtech.api.recipe.RecipeMaps.extruderRecipes; +import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; +import static gregtech.api.recipe.RecipeMaps.wiremillRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GT_RecipeBuilder.TICKS; +import static gregtech.api.util.GT_RecipeConstants.COIL_HEAT; + import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; @@ -11,9 +22,11 @@ import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Cable; import gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid; import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_RecipeBuilder; import gregtech.api.util.GT_Utility; public class CrackRecipeAdder { @@ -29,27 +42,17 @@ public class CrackRecipeAdder { FluidStack[] actOutput = new FluidStack[num]; name = inputFluid.getFluid().getName().replaceAll(" ", ""); - GT_Values.RA.addCrackingRecipe( - 1, - inputFluid, - cracker, - FluidRegistry.getFluidStack("lightlycracked" + name, 1000), - (int) (Duration * 0.8), - EUt); - GT_Values.RA.addCrackingRecipe( - 2, - inputFluid, - cracker, - FluidRegistry.getFluidStack("moderatelycracked" + name, 1000), - Duration, - EUt); - GT_Values.RA.addCrackingRecipe( - 3, - inputFluid, - cracker, - FluidRegistry.getFluidStack("heavilycracked" + name, 1000), - (int) (Duration * 1.2), - EUt); + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(1)).fluidInputs(inputFluid, cracker) + .fluidOutputs(FluidRegistry.getFluidStack("lightlycracked" + name, 1000)) + .duration(Math.max((long) (Duration * 0.8), 1L) * TICKS).eut(EUt).addTo(crackingRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(2)).fluidInputs(inputFluid, cracker) + .fluidOutputs(FluidRegistry.getFluidStack("moderatelycracked" + name, 1000)) + .duration(Math.max((long) (Duration), 1L) * TICKS).eut(EUt).addTo(crackingRecipes); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(3)).fluidInputs(inputFluid, cracker) + .fluidOutputs(FluidRegistry.getFluidStack("heavilycracked" + name, 1000)) + .duration(Math.max((long) (Duration * 1.2), 1L) * TICKS).eut(EUt).addTo(crackingRecipes); for (int i = num - 1, j = 0; i >= 0; i--, j++) { Fluid tmp1 = outputFluids[i].getFluid(); @@ -57,7 +60,7 @@ public class CrackRecipeAdder { actOutput[j] = new FluidStack(tmp1, tmp2); } - GT_Values.RA.addUniversalDistillationRecipe( + addUniversalDistillationRecipe( FluidRegistry.getFluidStack("lightlycracked" + name, 1000), actOutput, outputItem, @@ -70,7 +73,7 @@ public class CrackRecipeAdder { actOutput[j] = new FluidStack(tmp1, tmp2); } - GT_Values.RA.addUniversalDistillationRecipe( + addUniversalDistillationRecipe( FluidRegistry.getFluidStack("moderatelycracked" + name, 1000), actOutput, outputItem, @@ -83,7 +86,7 @@ public class CrackRecipeAdder { actOutput[j] = new FluidStack(tmp1, tmp2); } - GT_Values.RA.addUniversalDistillationRecipe( + addUniversalDistillationRecipe( FluidRegistry.getFluidStack("heavilycracked" + name, 1000), actOutput, outputItem, @@ -91,70 +94,55 @@ public class CrackRecipeAdder { EUt / 3); } - public static void addUniversalCircuitAssemblerRecipe(ItemStack[] inputs, ItemStack output, int solders, - int duration, int EUt, boolean isClean) { - GT_Values.RA.addCircuitAssemblerRecipe( - inputs, - Materials.SolderingAlloy.getMolten(solders), - output, - duration, - EUt, - isClean); - GT_Values.RA.addCircuitAssemblerRecipe( - inputs, - Materials.Tin.getMolten(solders * 2), - output, - duration, - EUt, - isClean); - GT_Values.RA.addCircuitAssemblerRecipe( - inputs, - Materials.Lead.getMolten(solders * 4), - output, - duration, - EUt, - isClean); - } - - public static void addUniversalAssemblerRecipe(ItemStack[] inputs, ItemStack output, int solders, int duration, - int EUt, boolean isClean) { - GT_Values.RA.addAssemblerRecipe( - inputs, - Materials.SolderingAlloy.getMolten(solders), - output, - duration, - EUt, - isClean); - GT_Values.RA.addAssemblerRecipe(inputs, Materials.Tin.getMolten(solders * 2), output, duration, EUt, isClean); - GT_Values.RA.addAssemblerRecipe(inputs, Materials.Lead.getMolten(solders * 4), output, duration, EUt, isClean); - } - public static void reAddBlastRecipe(Werkstoff material, int duration, int EUt, int level, boolean gas) { ItemStack input = material.get(OrePrefixes.dust, 1); ItemStack output = level > 1750 ? material.get(OrePrefixes.ingotHot, 1) : material.get(OrePrefixes.ingot, 1); if (gas) { - GT_Values.RA.addBlastRecipe( - input, - GT_Utility.getIntegratedCircuit(11), - Materials.Helium.getGas(1000), - null, - output, - null, - duration, - EUt, - level); + GT_Values.RA.stdBuilder().itemInputs(input, GT_Utility.getIntegratedCircuit(11)) + .fluidInputs(Materials.Helium.getGas(1000)).itemOutputs(output).duration(duration * TICKS).eut(EUt) + .metadata(COIL_HEAT, level).addTo(blastFurnaceRecipes); } else { - GT_Values.RA.addBlastRecipe( - input, - GT_Utility.getIntegratedCircuit(1), - null, - null, - output, - null, - duration, - EUt, - level); + GT_Values.RA.stdBuilder().itemInputs(input, GT_Utility.getIntegratedCircuit(1)).itemOutputs(output) + .duration(duration * TICKS).eut(EUt).metadata(COIL_HEAT, level).addTo(blastFurnaceRecipes); + } + } + + public static void addUniversalDistillationRecipewithCircuit(FluidStack aInput, ItemStack[] aCircuit, + FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, long aEUt) { + for (int i = 0; i < Math.min(aOutputs.length, 11); i++) { + GT_RecipeBuilder buildDistillation = GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(i + 1)); + if (aOutput2 != GT_Values.NI) { + buildDistillation.itemOutputs(aOutput2); + } + buildDistillation.fluidInputs(aInput).fluidOutputs(aOutputs[i]).duration(2 * aDuration).eut(aEUt / 4) + .addTo(distilleryRecipes); + } + GT_RecipeBuilder buildDT = GT_Values.RA.stdBuilder().itemInputs(aCircuit); + if (aOutput2 != GT_Values.NI) { + buildDT.itemOutputs(aOutput2); + } + buildDT.fluidInputs(aInput).fluidOutputs(aOutputs).duration(aDuration).eut(aEUt) + .addTo(distillationTowerRecipes); + } + + public static void addUniversalDistillationRecipe(FluidStack aInput, FluidStack[] aOutputs, ItemStack aOutput2, + int aDuration, long aEUt) { + for (int i = 0; i < Math.min(aOutputs.length, 11); i++) { + GT_RecipeBuilder buildDistillation = GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(i + 1)); + if (aOutput2 != GT_Values.NI) { + buildDistillation.itemOutputs(aOutput2); + } + buildDistillation.fluidInputs(aInput).fluidOutputs(aOutputs[i]).duration(2 * aDuration).eut(aEUt / 4) + .addTo(distilleryRecipes); + } + GT_RecipeBuilder buildDT = GT_Values.RA.stdBuilder(); + if (aOutput2 != GT_Values.NI) { + buildDT.itemOutputs(aOutput2); } + buildDT.fluidInputs(aInput).fluidOutputs(aOutputs).duration(aDuration).eut(aEUt) + .addTo(distillationTowerRecipes); } public static FluidStack copyFluidWithAmount(FluidStack fluid, int amount) { @@ -220,66 +208,43 @@ public class CrackRecipeAdder { flow * 4, temp, gas).getStackForm(1L)); - GT_Values.RA.addExtruderRecipe( - material.get(OrePrefixes.ingot, 1), - ItemList.Shape_Extruder_Pipe_Tiny.get(0), - material.get(OrePrefixes.pipeTiny, 2), - (int) material.getStats().getMass(), - 120); - GT_Values.RA.addExtruderRecipe( - material.get(OrePrefixes.ingot, 1), - ItemList.Shape_Extruder_Pipe_Small.get(0), - material.get(OrePrefixes.pipeSmall, 1), - (int) material.getStats().getMass() * 2, - 120); - GT_Values.RA.addExtruderRecipe( - material.get(OrePrefixes.ingot, 3), - ItemList.Shape_Extruder_Pipe_Medium.get(0), - material.get(OrePrefixes.pipeMedium, 1), - (int) material.getStats().getMass() * 6, - 120); - GT_Values.RA.addExtruderRecipe( - material.get(OrePrefixes.ingot, 6), - ItemList.Shape_Extruder_Pipe_Large.get(0), - material.get(OrePrefixes.pipeLarge, 1), - (int) material.getStats().getMass() * 12, - 120); - GT_Values.RA.addExtruderRecipe( - material.get(OrePrefixes.ingot, 12), - ItemList.Shape_Extruder_Pipe_Huge.get(0), - material.get(OrePrefixes.pipeHuge, 1), - (int) material.getStats().getMass() * 24, - 120); - GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Pipe_Tiny.get(0), - material.getMolten(72), - material.get(OrePrefixes.pipeTiny, 1), - (int) material.getStats().getMass(), - 30); - GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Pipe_Small.get(0), - material.getMolten(144), - material.get(OrePrefixes.pipeSmall, 1), - (int) material.getStats().getMass() * 2, - 30); - GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Pipe_Medium.get(0), - material.getMolten(432), - material.get(OrePrefixes.pipeMedium, 1), - (int) material.getStats().getMass() * 6, - 30); - GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Pipe_Large.get(0), - material.getMolten(864), - material.get(OrePrefixes.pipeLarge, 1), - (int) material.getStats().getMass() * 12, - 30); - GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Pipe_Huge.get(0), - material.getMolten(1728), - material.get(OrePrefixes.pipeHuge, 1), - (int) material.getStats().getMass() * 24, - 30); + GT_Values.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Pipe_Tiny.get(0)) + .itemOutputs(material.get(OrePrefixes.pipeTiny, 2)).duration(material.getStats().getMass() * TICKS) + .eut(TierEU.RECIPE_MV).addTo(extruderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Pipe_Small.get(0)) + .itemOutputs(material.get(OrePrefixes.pipeSmall, 1)).duration(material.getStats().getMass() * 2 * TICKS) + .eut(TierEU.RECIPE_MV).addTo(extruderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.ingot, 3), ItemList.Shape_Extruder_Pipe_Medium.get(0)) + .itemOutputs(material.get(OrePrefixes.pipeMedium, 1)) + .duration(material.getStats().getMass() * 6 * TICKS).eut(TierEU.RECIPE_MV).addTo(extruderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.ingot, 6), ItemList.Shape_Extruder_Pipe_Large.get(0)) + .itemOutputs(material.get(OrePrefixes.pipeLarge, 1)) + .duration(material.getStats().getMass() * 12 * TICKS).eut(TierEU.RECIPE_MV).addTo(extruderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(material.get(OrePrefixes.ingot, 12), ItemList.Shape_Extruder_Pipe_Huge.get(0)) + .itemOutputs(material.get(OrePrefixes.pipeHuge, 1)).duration(material.getStats().getMass() * 24 * TICKS) + .eut(TierEU.RECIPE_MV).addTo(extruderRecipes); + GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Pipe_Tiny.get(0)).fluidInputs(material.getMolten(72)) + .itemOutputs(material.get(OrePrefixes.pipeTiny, 1)).duration(material.getStats().getMass() * TICKS) + .eut(TierEU.RECIPE_LV).addTo(fluidSolidifierRecipes); + GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Pipe_Small.get(0)).fluidInputs(material.getMolten(144)) + .itemOutputs(material.get(OrePrefixes.pipeSmall, 1)).duration(material.getStats().getMass() * 2 * TICKS) + .eut(TierEU.RECIPE_LV).addTo(fluidSolidifierRecipes); + GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Pipe_Medium.get(0)) + .fluidInputs(material.getMolten(432)).itemOutputs(material.get(OrePrefixes.pipeMedium, 1)) + .duration(material.getStats().getMass() * 6 * TICKS).eut(TierEU.RECIPE_LV) + .addTo(fluidSolidifierRecipes); + GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Pipe_Large.get(0)).fluidInputs(material.getMolten(864)) + .itemOutputs(material.get(OrePrefixes.pipeLarge, 1)) + .duration(material.getStats().getMass() * 12 * TICKS).eut(TierEU.RECIPE_LV) + .addTo(fluidSolidifierRecipes); + GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Pipe_Huge.get(0)).fluidInputs(material.getMolten(1728)) + .itemOutputs(material.get(OrePrefixes.pipeHuge, 1)).duration(material.getStats().getMass() * 24 * TICKS) + .eut(TierEU.RECIPE_LV).addTo(fluidSolidifierRecipes); } public static void registerWire(int ID, Werkstoff material, int aAmperage, int aVoltage, int aLoss, boolean cover) { @@ -460,101 +425,50 @@ public class CrackRecipeAdder { true, false).getStackForm(1L)); } - GT_Values.RA.addWiremillRecipe( - material.get(OrePrefixes.ingot, 1), - GT_Utility.getIntegratedCircuit(1), - material.get(OrePrefixes.wireGt01, 2), - 100, - 4); - GT_Values.RA.addWiremillRecipe( - material.get(OrePrefixes.ingot, 1), - GT_Utility.getIntegratedCircuit(2), - material.get(OrePrefixes.wireGt02, 1), - 150, - 4); - GT_Values.RA.addWiremillRecipe( - material.get(OrePrefixes.ingot, 2), - GT_Utility.getIntegratedCircuit(4), - material.get(OrePrefixes.wireGt04, 1), - 200, - 4); - GT_Values.RA.addWiremillRecipe( - material.get(OrePrefixes.ingot, 4), - GT_Utility.getIntegratedCircuit(8), - material.get(OrePrefixes.wireGt08, 1), - 250, - 4); - GT_Values.RA.addWiremillRecipe( - material.get(OrePrefixes.ingot, 6), - GT_Utility.getIntegratedCircuit(12), - material.get(OrePrefixes.wireGt12, 1), - 300, - 4); - GT_Values.RA.addWiremillRecipe( - material.get(OrePrefixes.ingot, 8), - GT_Utility.getIntegratedCircuit(16), - material.get(OrePrefixes.wireGt16, 1), - 350, - 4); - GT_Values.RA.addWiremillRecipe( - material.get(OrePrefixes.stick, 1), - GT_Utility.getIntegratedCircuit(1), - material.get(OrePrefixes.wireGt01, 1), - 50, - 4); - GT_Values.RA.addWiremillRecipe( - material.get(OrePrefixes.stick, 2), - GT_Utility.getIntegratedCircuit(2), - material.get(OrePrefixes.wireGt02, 1), - 100, - 4); - GT_Values.RA.addWiremillRecipe( - material.get(OrePrefixes.stick, 4), - GT_Utility.getIntegratedCircuit(4), - material.get(OrePrefixes.wireGt04, 1), - 150, - 4); - GT_Values.RA.addWiremillRecipe( - material.get(OrePrefixes.stick, 8), - GT_Utility.getIntegratedCircuit(8), - material.get(OrePrefixes.wireGt08, 1), - 200, - 4); - GT_Values.RA.addWiremillRecipe( - material.get(OrePrefixes.stick, 12), - GT_Utility.getIntegratedCircuit(12), - material.get(OrePrefixes.wireGt12, 1), - 250, - 4); - GT_Values.RA.addWiremillRecipe( - material.get(OrePrefixes.stick, 16), - GT_Utility.getIntegratedCircuit(16), - material.get(OrePrefixes.wireGt16, 1), - 300, - 4); - GT_Values.RA.addWiremillRecipe( - material.get(OrePrefixes.ingot, 1), - GT_Utility.getIntegratedCircuit(3), - material.get(OrePrefixes.wireFine, 8), - 100, - 4); - GT_Values.RA.addWiremillRecipe( - material.get(OrePrefixes.stick, 1), - GT_Utility.getIntegratedCircuit(3), - material.get(OrePrefixes.wireFine, 4), - 50, - 4); - GT_Values.RA.addWiremillRecipe( - material.get(OrePrefixes.wireGt01, 1), - GT_Utility.getIntegratedCircuit(1), - material.get(OrePrefixes.wireFine, 4), - 200, - 8); - GT_Values.RA.addExtruderRecipe( - material.get(OrePrefixes.ingot, 1), - ItemList.Shape_Extruder_Wire.get(0), - material.get(OrePrefixes.wireGt01, 2), - (int) material.getStats().getMass() * 8, - 480); + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.ingot, 1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(material.get(OrePrefixes.wireGt01, 2)).duration(5 * SECONDS).eut(4).addTo(wiremillRecipes); + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.ingot, 1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(material.get(OrePrefixes.wireGt02, 1)).duration(7 * SECONDS + 10 * TICKS).eut(4) + .addTo(wiremillRecipes); + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.ingot, 2), GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(material.get(OrePrefixes.wireGt04, 1)).duration(10 * SECONDS).eut(4) + .addTo(wiremillRecipes); + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.ingot, 4), GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(material.get(OrePrefixes.wireGt08, 1)).duration(12 * SECONDS + 10 * TICKS).eut(4) + .addTo(wiremillRecipes); + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.ingot, 6), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(material.get(OrePrefixes.wireGt12, 1)).duration(15 * SECONDS).eut(4) + .addTo(wiremillRecipes); + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.ingot, 8), GT_Utility.getIntegratedCircuit(16)) + .itemOutputs(material.get(OrePrefixes.wireGt16, 1)).duration(17 * SECONDS + 10 * TICKS).eut(4) + .addTo(wiremillRecipes); + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.stick, 1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(material.get(OrePrefixes.wireGt01, 1)).duration(2 * SECONDS + 10 * TICKS).eut(4) + .addTo(wiremillRecipes); + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.stick, 2), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(material.get(OrePrefixes.wireGt02, 1)).duration(5 * SECONDS).eut(4).addTo(wiremillRecipes); + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.stick, 4), GT_Utility.getIntegratedCircuit(4)) + .itemOutputs(material.get(OrePrefixes.wireGt04, 1)).duration(7 * SECONDS + 10 * TICKS).eut(4) + .addTo(wiremillRecipes); + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.stick, 8), GT_Utility.getIntegratedCircuit(8)) + .itemOutputs(material.get(OrePrefixes.wireGt08, 1)).duration(10 * SECONDS).eut(4) + .addTo(wiremillRecipes); + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.stick, 12), GT_Utility.getIntegratedCircuit(12)) + .itemOutputs(material.get(OrePrefixes.wireGt12, 1)).duration(12 * SECONDS + 10 * TICKS).eut(4) + .addTo(wiremillRecipes); + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.stick, 16), GT_Utility.getIntegratedCircuit(16)) + .itemOutputs(material.get(OrePrefixes.wireGt16, 1)).duration(15 * SECONDS).eut(4) + .addTo(wiremillRecipes); + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.ingot, 1), GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(material.get(OrePrefixes.wireFine, 8)).duration(5 * SECONDS).eut(4).addTo(wiremillRecipes); + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.stick, 1), GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(material.get(OrePrefixes.wireFine, 4)).duration(2 * SECONDS + 10 * TICKS).eut(4) + .addTo(wiremillRecipes); + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.wireGt01, 1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(material.get(OrePrefixes.wireFine, 4)).duration(10 * SECONDS).eut(8) + .addTo(wiremillRecipes); + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.ingot, 1), ItemList.Shape_Extruder_Wire.get(0)) + .itemOutputs(material.get(OrePrefixes.wireGt01, 2)).duration(material.getStats().getMass() * 8 * TICKS) + .eut(TierEU.RECIPE_HV).addTo(extruderRecipes); } } diff --git a/src/main/java/goodgenerator/util/MaterialFix.java b/src/main/java/goodgenerator/util/MaterialFix.java index d3a0548aca..615e959a30 100644 --- a/src/main/java/goodgenerator/util/MaterialFix.java +++ b/src/main/java/goodgenerator/util/MaterialFix.java @@ -1,11 +1,19 @@ package goodgenerator.util; +import static gregtech.api.recipe.RecipeMaps.benderRecipes; +import static gregtech.api.recipe.RecipeMaps.fluidExtractionRecipes; +import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes; +import static gregtech.api.recipe.RecipeMaps.hammerRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GT_RecipeBuilder.TICKS; + import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; @@ -14,87 +22,106 @@ public class MaterialFix { public static void MaterialFluidExtractionFix(Werkstoff material) { if (material.hasItemType(OrePrefixes.ingot)) { - GT_Values.RA - .addFluidExtractionRecipe(material.get(OrePrefixes.ingot), null, material.getMolten(144), 0, 32, 8); - GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Ingot.get(0), - material.getMolten(144), - material.get(OrePrefixes.ingot), - 32, - 48); + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.ingot)).fluidOutputs(material.getMolten(144)) + .duration(1 * SECONDS + 12 * TICKS).eut(8).addTo(fluidExtractionRecipes); + GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Ingot.get(0)).fluidInputs(material.getMolten(144)) + .itemOutputs(material.get(OrePrefixes.ingot)).duration(1 * SECONDS + 12 * TICKS) + .eut(TierEU.RECIPE_MV / 2).addTo(fluidSolidifierRecipes); } if (material.hasItemType(OrePrefixes.plate)) { - GT_Values.RA - .addFluidExtractionRecipe(material.get(OrePrefixes.plate), null, material.getMolten(144), 0, 32, 8); - GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Plate.get(0), - material.getMolten(144), - material.get(OrePrefixes.plate), - 32, - 48); - } - if (material.hasItemType(OrePrefixes.gearGtSmall)) GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.gearGtSmall), - null, - material.getMolten(144), - 0, - 32, - 8); - if (material.hasItemType(OrePrefixes.stickLong)) GT_Values.RA - .addFluidExtractionRecipe(material.get(OrePrefixes.stickLong), null, material.getMolten(144), 0, 32, 8); - if (material.hasItemType(OrePrefixes.spring)) GT_Values.RA - .addFluidExtractionRecipe(material.get(OrePrefixes.spring), null, material.getMolten(144), 0, 32, 8); - if (material.hasItemType(OrePrefixes.stick)) GT_Values.RA - .addFluidExtractionRecipe(material.get(OrePrefixes.stick), null, material.getMolten(72), 0, 16, 8); - if (material.hasItemType(OrePrefixes.itemCasing)) GT_Values.RA - .addFluidExtractionRecipe(material.get(OrePrefixes.itemCasing), null, material.getMolten(72), 0, 16, 8); - if (material.hasItemType(OrePrefixes.wireGt01)) GT_Values.RA - .addFluidExtractionRecipe(material.get(OrePrefixes.wireGt01), null, material.getMolten(72), 0, 16, 8); - if (material.hasItemType(OrePrefixes.cableGt01)) GT_Values.RA.addFluidExtractionRecipe( - material.get(OrePrefixes.cableGt01), - GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Ash, 2), - material.getMolten(72), - 10000, - 16, - 8); - if (material.hasItemType(OrePrefixes.foil)) GT_Values.RA - .addFluidExtractionRecipe(material.get(OrePrefixes.foil), null, material.getMolten(36), 0, 8, 8); - if (material.hasItemType(OrePrefixes.springSmall)) GT_Values.RA - .addFluidExtractionRecipe(material.get(OrePrefixes.springSmall), null, material.getMolten(36), 0, 8, 8); - if (material.hasItemType(OrePrefixes.ring)) GT_Values.RA - .addFluidExtractionRecipe(material.get(OrePrefixes.ring), null, material.getMolten(36), 0, 8, 8); - if (material.hasItemType(OrePrefixes.bolt)) GT_Values.RA - .addFluidExtractionRecipe(material.get(OrePrefixes.bolt), null, material.getMolten(18), 0, 4, 8); - if (material.hasItemType(OrePrefixes.wireFine)) GT_Values.RA - .addFluidExtractionRecipe(material.get(OrePrefixes.wireFine), null, material.getMolten(18), 0, 4, 8); - if (material.hasItemType(OrePrefixes.round)) GT_Values.RA - .addFluidExtractionRecipe(material.get(OrePrefixes.round), null, material.getMolten(16), 0, 4, 8); - if (material.hasItemType(OrePrefixes.screw)) GT_Values.RA - .addFluidExtractionRecipe(material.get(OrePrefixes.screw), null, material.getMolten(16), 0, 4, 8); - if (material.hasItemType(OrePrefixes.nugget)) GT_Values.RA - .addFluidExtractionRecipe(material.get(OrePrefixes.nugget), null, material.getMolten(16), 0, 4, 8); - if (material.hasItemType(OrePrefixes.rotor)) GT_Values.RA - .addFluidExtractionRecipe(material.get(OrePrefixes.rotor), null, material.getMolten(612), 0, 136, 8); - if (material.hasItemType(OrePrefixes.gearGt)) GT_Values.RA - .addFluidExtractionRecipe(material.get(OrePrefixes.gearGt), null, material.getMolten(576), 0, 128, 8); + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.plate)).fluidOutputs(material.getMolten(144)) + .duration(1 * SECONDS + 12 * TICKS).eut(8).addTo(fluidExtractionRecipes); + GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Plate.get(0)).fluidInputs(material.getMolten(144)) + .itemOutputs(material.get(OrePrefixes.plate)).duration(1 * SECONDS + 12 * TICKS) + .eut(TierEU.RECIPE_MV / 2).addTo(fluidSolidifierRecipes); + } + if (material.hasItemType(OrePrefixes.gearGtSmall)) { + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.gearGtSmall)) + .fluidOutputs(material.getMolten(144)).duration(1 * SECONDS + 12 * TICKS).eut(8) + .addTo(fluidExtractionRecipes); + } + if (material.hasItemType(OrePrefixes.stickLong)) { + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.stickLong)) + .fluidOutputs(material.getMolten(144)).duration(1 * SECONDS + 12 * TICKS).eut(8) + .addTo(fluidExtractionRecipes); + } + if (material.hasItemType(OrePrefixes.spring)) { + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.spring)).fluidOutputs(material.getMolten(144)) + .duration(1 * SECONDS + 12 * TICKS).eut(8).addTo(fluidExtractionRecipes); + } + if (material.hasItemType(OrePrefixes.stick)) { + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.stick)).fluidOutputs(material.getMolten(72)) + .duration(16 * TICKS).eut(8).addTo(fluidExtractionRecipes); + } + if (material.hasItemType(OrePrefixes.itemCasing)) { + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.itemCasing)) + .fluidOutputs(material.getMolten(72)).duration(16 * TICKS).eut(8).addTo(fluidExtractionRecipes); + } + if (material.hasItemType(OrePrefixes.wireGt01)) { + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.wireGt01)) + .fluidOutputs(material.getMolten(72)).duration(16 * TICKS).eut(8).addTo(fluidExtractionRecipes); + } + if (material.hasItemType(OrePrefixes.cableGt01)) { + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.cableGt01)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dustSmall, Materials.Ash, 2)) + .fluidOutputs(material.getMolten(72)).duration(16 * TICKS).eut(8).addTo(fluidExtractionRecipes); + } + if (material.hasItemType(OrePrefixes.foil)) { + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.foil)).fluidOutputs(material.getMolten(36)) + .duration(8 * TICKS).eut(8).addTo(fluidExtractionRecipes); + } + if (material.hasItemType(OrePrefixes.springSmall)) { + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.springSmall)) + .fluidOutputs(material.getMolten(36)).duration(8 * TICKS).eut(8).addTo(fluidExtractionRecipes); + } + if (material.hasItemType(OrePrefixes.ring)) { + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.ring)).fluidOutputs(material.getMolten(36)) + .duration(8 * TICKS).eut(8).addTo(fluidExtractionRecipes); + } + if (material.hasItemType(OrePrefixes.bolt)) { + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.bolt)).fluidOutputs(material.getMolten(18)) + .duration(4 * TICKS).eut(8).addTo(fluidExtractionRecipes); + } + if (material.hasItemType(OrePrefixes.wireFine)) { + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.wireFine)) + .fluidOutputs(material.getMolten(18)).duration(4 * TICKS).eut(8).addTo(fluidExtractionRecipes); + } + if (material.hasItemType(OrePrefixes.round)) { + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.round)).fluidOutputs(material.getMolten(16)) + .duration(4 * TICKS).eut(8).addTo(fluidExtractionRecipes); + } + if (material.hasItemType(OrePrefixes.screw)) { + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.screw)).fluidOutputs(material.getMolten(16)) + .duration(4 * TICKS).eut(8).addTo(fluidExtractionRecipes); + } + if (material.hasItemType(OrePrefixes.nugget)) { + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.nugget)).fluidOutputs(material.getMolten(16)) + .duration(4 * TICKS).eut(8).addTo(fluidExtractionRecipes); + } + if (material.hasItemType(OrePrefixes.rotor)) { + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.rotor)).fluidOutputs(material.getMolten(612)) + .duration(136 * TICKS).eut(8).addTo(fluidExtractionRecipes); + } + if (material.hasItemType(OrePrefixes.gearGt)) { + GT_Values.RA.stdBuilder().itemInputs(material.get(OrePrefixes.gearGt)).fluidOutputs(material.getMolten(576)) + .duration(128 * TICKS).eut(8).addTo(fluidExtractionRecipes); + } } public static void addRecipeForMultiItems() { for (Werkstoff tMaterial : Werkstoff.werkstoffHashSet) { if (tMaterial == null) continue; if (tMaterial.hasItemType(OrePrefixes.plateDouble) && tMaterial.hasItemType(OrePrefixes.ingotDouble)) { - GT_Values.RA.addBenderRecipe( - tMaterial.get(OrePrefixes.plate, 2), - GT_Utility.getIntegratedCircuit(2), - tMaterial.get(OrePrefixes.plateDouble, 1), - (int) Math.max(tMaterial.getStats().getMass() * 2, 1L), - 60); - GT_Values.RA.addBenderRecipe( - tMaterial.get(OrePrefixes.ingotDouble, 1), - GT_Utility.getIntegratedCircuit(1), - tMaterial.get(OrePrefixes.plateDouble, 1), - (int) Math.max(tMaterial.getStats().getMass(), 1L), - 60); + GT_Values.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.plate, 2), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(tMaterial.get(OrePrefixes.plateDouble, 1)) + .duration(Math.max(tMaterial.getStats().getMass() * 2, 1L) * TICKS).eut(TierEU.RECIPE_MV / 2) + .addTo(benderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.ingotDouble, 1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(tMaterial.get(OrePrefixes.plateDouble, 1)) + .duration(Math.max(tMaterial.getStats().getMass(), 1L) * TICKS).eut(TierEU.RECIPE_MV / 2) + .addTo(benderRecipes); GT_ModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.plateDouble, 1), new Object[] { "P", "P", "h", 'P', tMaterial.get(OrePrefixes.plate, 1) }); @@ -103,24 +130,21 @@ public class MaterialFix { new Object[] { "P", "P", "h", 'P', tMaterial.get(OrePrefixes.ingot, 1) }); } if (tMaterial.hasItemType(OrePrefixes.plateTriple) && tMaterial.hasItemType(OrePrefixes.ingotTriple)) { - GT_Values.RA.addBenderRecipe( - tMaterial.get(OrePrefixes.plate, 3), - GT_Utility.getIntegratedCircuit(3), - tMaterial.get(OrePrefixes.plateTriple, 1), - (int) Math.max(tMaterial.getStats().getMass() * 3, 1L), - 60); - GT_Values.RA.addBenderRecipe( - tMaterial.get(OrePrefixes.ingot, 3), - GT_Utility.getIntegratedCircuit(3), - tMaterial.get(OrePrefixes.plateTriple, 1), - (int) Math.max(tMaterial.getStats().getMass() * 3, 1L), - 60); - GT_Values.RA.addBenderRecipe( - tMaterial.get(OrePrefixes.ingotTriple, 1), - GT_Utility.getIntegratedCircuit(1), - tMaterial.get(OrePrefixes.plateTriple, 1), - (int) Math.max(tMaterial.getStats().getMass(), 1L), - 60); + GT_Values.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.plate, 3), GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(tMaterial.get(OrePrefixes.plateTriple, 1)) + .duration(Math.max(tMaterial.getStats().getMass() * 3, 1L) * TICKS).eut(TierEU.RECIPE_MV / 2) + .addTo(benderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.ingot, 3), GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(tMaterial.get(OrePrefixes.plateTriple, 1)) + .duration(Math.max(tMaterial.getStats().getMass() * 3, 1L) * TICKS).eut(TierEU.RECIPE_MV / 2) + .addTo(benderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.ingotTriple, 1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(tMaterial.get(OrePrefixes.plateTriple, 1)) + .duration(Math.max(tMaterial.getStats().getMass(), 1L) * TICKS).eut(TierEU.RECIPE_MV / 2) + .addTo(benderRecipes); GT_ModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.plateTriple, 1), new Object[] { "B", "P", "h", 'P', tMaterial.get(OrePrefixes.plate, 1), 'B', @@ -131,91 +155,79 @@ public class MaterialFix { tMaterial.get(OrePrefixes.ingotDouble, 1) }); } if (tMaterial.hasItemType(OrePrefixes.plateDense)) { - GT_Values.RA.addBenderRecipe( - tMaterial.get(OrePrefixes.plate, 9), - GT_Utility.getIntegratedCircuit(9), - tMaterial.get(OrePrefixes.plateDense, 1), - (int) Math.max(tMaterial.getStats().getMass() * 9, 1L), - 60); - GT_Values.RA.addBenderRecipe( - tMaterial.get(OrePrefixes.ingot, 9), - GT_Utility.getIntegratedCircuit(9), - tMaterial.get(OrePrefixes.plateDense, 1), - (int) Math.max(tMaterial.getStats().getMass() * 9, 1L), - 60); + GT_Values.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.plate, 9), GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(tMaterial.get(OrePrefixes.plateDense, 1)) + .duration(Math.max(tMaterial.getStats().getMass() * 9, 1L) * TICKS).eut(TierEU.RECIPE_MV / 2) + .addTo(benderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.ingot, 9), GT_Utility.getIntegratedCircuit(9)) + .itemOutputs(tMaterial.get(OrePrefixes.plateDense, 1)) + .duration(Math.max(tMaterial.getStats().getMass() * 9, 1L) * TICKS).eut(TierEU.RECIPE_MV / 2) + .addTo(benderRecipes); + if (tMaterial.hasItemType(OrePrefixes.plateTriple) && tMaterial.hasItemType(OrePrefixes.ingotTriple)) { - GT_Values.RA.addBenderRecipe( - tMaterial.get(OrePrefixes.plateTriple, 3), - GT_Utility.getIntegratedCircuit(3), - tMaterial.get(OrePrefixes.plateDense, 1), - (int) Math.max(tMaterial.getStats().getMass() * 3, 1L), - 60); - GT_Values.RA.addBenderRecipe( - tMaterial.get(OrePrefixes.ingotTriple, 3), - GT_Utility.getIntegratedCircuit(3), - tMaterial.get(OrePrefixes.plateDense, 1), - (int) Math.max(tMaterial.getStats().getMass() * 3, 1L), - 60); + GT_Values.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.plateTriple, 3), GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(tMaterial.get(OrePrefixes.plateDense, 1)) + .duration(Math.max(tMaterial.getStats().getMass() * 3, 1L) * TICKS) + .eut(TierEU.RECIPE_MV / 2).addTo(benderRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.ingotTriple, 3), GT_Utility.getIntegratedCircuit(3)) + .itemOutputs(tMaterial.get(OrePrefixes.plateDense, 1)) + .duration(Math.max(tMaterial.getStats().getMass() * 3, 1L) * TICKS) + .eut(TierEU.RECIPE_MV / 2).addTo(benderRecipes); } } if (tMaterial.hasItemType(OrePrefixes.stick)) { if (tMaterial.hasItemType(OrePrefixes.cellMolten)) { - GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Rod.get(0), - tMaterial.getMolten(72), - tMaterial.get(OrePrefixes.stick, 1), - (int) Math.max(tMaterial.getStats().getMass() >> 1, 1L), - 480); + GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Rod.get(0)) + .fluidInputs(tMaterial.getMolten(72)).itemOutputs(tMaterial.get(OrePrefixes.stick, 1)) + .duration(Math.max(tMaterial.getStats().getMass() >> 1, 1L) * TICKS).eut(TierEU.RECIPE_HV) + .addTo(fluidSolidifierRecipes); } } if (tMaterial.hasItemType(OrePrefixes.stickLong)) { if (tMaterial.hasItemType(OrePrefixes.cellMolten)) { - GT_Values.RA.addFluidSolidifierRecipe( - ItemList.Shape_Mold_Rod_Long.get(0), - tMaterial.getMolten(144), - tMaterial.get(OrePrefixes.stickLong, 1), - (int) Math.max(tMaterial.getStats().getMass(), 1L), - 480); + GT_Values.RA.stdBuilder().itemInputs(ItemList.Shape_Mold_Rod_Long.get(0)) + .fluidInputs(tMaterial.getMolten(144)).itemOutputs(tMaterial.get(OrePrefixes.stickLong, 1)) + .duration(Math.max(tMaterial.getStats().getMass(), 1L) * TICKS).eut(TierEU.RECIPE_HV) + .addTo(fluidSolidifierRecipes); } if (tMaterial.hasItemType(OrePrefixes.stick)) { GT_ModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.stickLong, 1), new Object[] { "PhP", 'P', tMaterial.get(OrePrefixes.stick, 1) }); - GT_Values.RA.addForgeHammerRecipe( - tMaterial.get(OrePrefixes.stick, 2), - tMaterial.get(OrePrefixes.stickLong, 1), - (int) Math.max(tMaterial.getStats().getMass(), 1L), - 16); + GT_Values.RA.stdBuilder().itemInputs(tMaterial.get(OrePrefixes.stick, 2)) + .itemOutputs(tMaterial.get(OrePrefixes.stickLong, 1)) + .duration(Math.max(tMaterial.getStats().getMass(), 1L) * TICKS).eut(TierEU.RECIPE_LV / 2) + .addTo(hammerRecipes); } } if (tMaterial.hasItemType(OrePrefixes.spring)) { GT_ModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.spring, 1), new Object[] { " s ", "fPx", " P ", 'P', tMaterial.get(OrePrefixes.stickLong, 1) }); - GT_Values.RA.addBenderRecipe( - tMaterial.get(OrePrefixes.stickLong, 1), - GT_Utility.getIntegratedCircuit(1), - tMaterial.get(OrePrefixes.spring, 1), - (int) Math.max(tMaterial.getStats().getMass() * 2, 1L), - 16); + GT_Values.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.stickLong, 1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(tMaterial.get(OrePrefixes.spring, 1)) + .duration(Math.max(tMaterial.getStats().getMass() * 2, 1L) * TICKS).eut(TierEU.RECIPE_LV / 2) + .addTo(benderRecipes); } if (tMaterial.hasItemType(OrePrefixes.springSmall)) { GT_ModHandler.addCraftingRecipe( tMaterial.get(OrePrefixes.springSmall, 1), new Object[] { " s ", "fPx", 'P', tMaterial.get(OrePrefixes.stick, 1) }); - GT_Values.RA.addBenderRecipe( - tMaterial.get(OrePrefixes.stick, 1), - GT_Utility.getIntegratedCircuit(1), - tMaterial.get(OrePrefixes.springSmall, 2), - (int) Math.max(tMaterial.getStats().getMass(), 1L), - 16); + GT_Values.RA.stdBuilder() + .itemInputs(tMaterial.get(OrePrefixes.stick, 1), GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(tMaterial.get(OrePrefixes.springSmall, 1)) + .duration(Math.max(tMaterial.getStats().getMass(), 1L) * TICKS).eut(TierEU.RECIPE_LV / 2) + .addTo(benderRecipes); } } Materials tUHV = Materials.Longasssuperconductornameforuhvwire; - GT_Values.RA.addForgeHammerRecipe( - GT_OreDictUnificator.get(OrePrefixes.stick, tUHV, 2), - GT_OreDictUnificator.get(OrePrefixes.stickLong, tUHV, 1), - (int) Math.max(tUHV.getMass(), 1L), - 16); + GT_Values.RA.stdBuilder().itemInputs(GT_OreDictUnificator.get(OrePrefixes.stick, tUHV, 2)) + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.stickLong, tUHV, 1)) + .duration(Math.max(tUHV.getMass(), 1L) * TICKS).eut(TierEU.RECIPE_LV / 2).addTo(hammerRecipes); } } -- cgit