From 56b498e1733d03a65965633cd03a447ca4a7fcbd Mon Sep 17 00:00:00 2001 From: boubou19 Date: Wed, 6 Sep 2023 21:14:27 +0200 Subject: migrate recipes to RA2 (#349) * deprecate getMachineVoltageFromTier * migrate assembler recipes * migrate mixer recipes * migrate implosion compressor recipes * migrate forming press recipes * forgot an assembling recipe * migrate blast furnace recipes * migrate universal chemical reactor recipes * migrate fluid extractor recipes * migrate bending machine recipes * migrate assembling line recipes * migrate autoclave recipes * migrate chemical bath recipes * get rid of BW_Util.getMachineVoltageFromTier(3) * get rid of BW_Util.getMachineVoltageFromTier(1) * get rid of BW_Util.getMachineVoltageFromTier(2) * get rid of BW_Util.getMachineVoltageFromTier(4) * get rid of BW_Util.getMachineVoltageFromTier(5) * get rid of BW_Util.getMachineVoltageFromTier(6) * get rid of BW_Util.getMachineVoltageFromTier(7) * get rid of BW_Util.getMachineVoltageFromTier(8) * get rid of BW_Util.getMachineVoltageFromTier(9) * get rid of BW_Util.getMachineVoltageFromTier(10) * get rid of BW_Util.getMachineVoltageFromTier(11) * get rid of BW_Util.getMachineVoltageFromTier(12) * migrate fluid solidifier recipes * migrate forge hammer recipes * migrate pulveriser recipes (1/3) * migrate electrolyser recipes * migrate electromagnetic separator recipes * migrate extruder recipes * migrate packager recipes * migrate primitive blast furnace recipes * migrate vacuum freezer recipes * migrate wiremill recipes * migrate cutting machine recipes * migrate lathe recipes * migrate laser engraver recipes * migrate fluid canner recipes * migrate pulverizer recipes (2/3) * migrate extractor recipes * migrate arc furnace recipes * migrate sifter recipes * migrate compressor recipes * fix duration * migrate fluid extractor recipes * migrate centrifuge recipes * migrate autoclave recipes * spotless apply * resolved build issues related to output chances of recycling "aHTGR_Materials" * resolved build issues related to output chances of recycling "Burned out TRISO pebble (Uranium)" * spotless * migrate fluid heater recipes * bump GT version * fix time and eu/t of centrifuge recipes * fix time and eu/t of centrifuge recipes * spotlessApply (#356) Co-authored-by: GitHub GTNH Actions <> * add a todo for chem rebalance issues in electrolyser recipes * fix typo --------- Co-authored-by: Kyium Co-authored-by: chochem <40274384+chochem@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Former-commit-id: cf3cb4bc6838158ed55daca3cf6a052ea02ac0a0 --- .../bartworks/API/BioObjectAdder.java | 31 +- .../common/loaders/ArtificialMicaLine.java | 254 +++---- .../bartworks/common/loaders/BioRecipeLoader.java | 29 +- .../bartworks/common/loaders/FluidLoader.java | 22 +- .../common/loaders/StaticRecipeChangeLoaders.java | 3 +- .../common/loaders/recipes/Assembler.java | 314 +++++---- .../common/loaders/recipes/AssemblyLine.java | 74 +- .../common/loaders/recipes/Autoclave.java | 31 +- .../common/loaders/recipes/Centrifuge.java | 212 ++---- .../common/loaders/recipes/ChemicalBath.java | 104 ++- .../common/loaders/recipes/ChemicalReactor.java | 20 +- .../common/loaders/recipes/Electrolyzer.java | 265 +++---- .../common/loaders/recipes/Extractor.java | 22 +- .../common/loaders/recipes/FluidHeater.java | 16 +- .../common/loaders/recipes/FluidSolidifier.java | 118 ++-- .../common/loaders/recipes/FormingPress.java | 79 ++- .../common/loaders/recipes/LaserEngraver.java | 17 +- .../bartworks/common/loaders/recipes/Mixer.java | 50 +- .../common/loaders/recipes/Pulverizer.java | 113 ++- .../common/loaders/recipes/PyrolyseOven.java | 4 +- .../tileentities/multis/GT_TileEntity_HTGR.java | 4 +- .../tileentities/multis/GT_TileEntity_THTR.java | 4 +- .../system/material/BW_MetaGeneratedFrames.java | 16 +- .../material/CircuitGeneration/BW_Meta_Items.java | 20 +- .../CircuitGeneration/CircuitPartLoader.java | 15 +- .../GT_Enhancement/GTMetaItemEnhancer.java | 35 +- .../GT_Enhancement/PlatinumSludgeOverHaul.java | 765 +++++++++------------ .../material/processingLoaders/AddSomeRecipes.java | 105 ++- .../processingLoaders/AdditionalRecipes.java | 116 ++-- .../werkstoff_loaders/recipe/BlockLoader.java | 34 +- .../werkstoff_loaders/recipe/CasingLoader.java | 28 +- .../werkstoff_loaders/recipe/CellLoader.java | 55 +- .../recipe/CraftingMaterialLoader.java | 211 +++--- .../werkstoff_loaders/recipe/CrushedLoader.java | 202 +++--- .../werkstoff_loaders/recipe/DustLoader.java | 156 +++-- .../werkstoff_loaders/recipe/GemLoader.java | 175 +++-- .../werkstoff_loaders/recipe/MetalLoader.java | 19 +- .../werkstoff_loaders/recipe/MoltenCellLoader.java | 294 ++++---- .../recipe/MultipleMetalLoader.java | 12 +- .../werkstoff_loaders/recipe/OreLoader.java | 12 +- .../recipe/SimpleMetalLoader.java | 126 ++-- .../werkstoff_loaders/recipe/ToolLoader.java | 137 ++-- .../bartimaeusnek/bartworks/util/BW_Util.java | 1 + 43 files changed, 2015 insertions(+), 2305 deletions(-) (limited to 'src/main/java/com') diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java index fb1e8c085f..bd336c265f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/API/BioObjectAdder.java @@ -14,6 +14,8 @@ package com.github.bartimaeusnek.bartworks.API; import static gregtech.api.enums.Mods.Gendustry; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import java.awt.*; @@ -28,18 +30,13 @@ import com.github.bartimaeusnek.bartworks.util.BioPlasmid; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; +import gregtech.api.enums.TierEU; import gregtech.api.objects.GT_Fluid; import gregtech.api.util.GT_Utility; @SuppressWarnings("ALL") public final class BioObjectAdder { - // @Deprecated - // public static BioCulture createAndRegisterBioCulture(Color color, String name, long ID, BioPlasmid plasmid, - // BioDNA dna, EnumRarity rarity){ - // return BioCulture.createAndRegisterBioCulture(color,name,ID,plasmid,dna,rarity); - // } - /** * @param color the color of the Culture * @param name the name of the Culture @@ -176,22 +173,14 @@ public final class BioObjectAdder { "molten.autogenerated", new short[] { (short) B.getColor().getRed(), (short) B.getColor().getBlue(), (short) B.getColor().getGreen() })); - if (!FluidRegistry.registerFluid(B.getFluid())) + + if (!FluidRegistry.registerFluid(B.getFluid())) { new Exception("FAILED TO REGISTER FLUID FOR: " + B.getName()).printStackTrace(); - GT_Values.RA.addCentrifugeRecipe( - GT_Utility.getIntegratedCircuit(10), - GT_Values.NI, - new FluidStack(B.getFluid(), 1000), - dnaFluid, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - null, - 500, - 120); + } + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(10)).noItemOutputs() + .fluidInputs(new FluidStack(B.getFluid(), 1000)).fluidOutputs(dnaFluid).duration(25 * SECONDS) + .eut(TierEU.RECIPE_MV).addTo(sCentrifugeRecipes); } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java index afc306280f..0754d514b2 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/ArtificialMicaLine.java @@ -1,6 +1,14 @@ package com.github.bartimaeusnek.bartworks.common.loaders; import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBenderRecipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sBlastRecipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sFluidExtractionRecipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes; +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 static gregtech.api.util.GT_RecipeConstants.UniversalChemical; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -12,6 +20,7 @@ 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_Recipe; import gregtech.api.util.GT_Utility; @@ -20,157 +29,106 @@ public class ArtificialMicaLine { public static void runArtificialMicaRecipe() { // Mg + O = MgO - GT_Values.RA.addChemicalRecipe( - Materials.Magnesium.getDust(1), - null, - Materials.Oxygen.getGas(1000), - null, - Materials.Magnesia.getDust(2), - 40, - 8); + + GT_Values.RA.stdBuilder().itemInputs(Materials.Magnesium.getDust(1)).itemOutputs(Materials.Magnesia.getDust(2)) + .fluidInputs(Materials.Oxygen.getGas(1000)).noFluidOutputs().duration(2 * SECONDS).eut(8) + .addTo(UniversalChemical); // Si + 6HF = H2SiF6 + 4H - GT_Values.RA.addChemicalRecipe( - Materials.Silicon.getDust(1), - Materials.Empty.getCells(4), - Materials.HydrofluoricAcid.getFluid(6000), - WerkstoffLoader.HexafluorosilicicAcid.getFluidOrGas(1000), - Materials.Hydrogen.getCells(4), - 400, - 120); + + GT_Values.RA.stdBuilder().itemInputs(Materials.Silicon.getDust(1), Materials.Empty.getCells(4)) + .itemOutputs(Materials.Hydrogen.getCells(4)).fluidInputs(Materials.HydrofluoricAcid.getFluid(6000)) + .fluidOutputs(WerkstoffLoader.HexafluorosilicicAcid.getFluidOrGas(1000)).duration(20 * SECONDS) + .eut(TierEU.RECIPE_MV).addTo(UniversalChemical); // K + Cl = KCl - GT_Values.RA.addChemicalRecipe( - Materials.Potassium.getDust(1), - GT_Utility.getIntegratedCircuit(2), - Materials.Chlorine.getGas(1000), - null, - Materials.RockSalt.getDust(2), - 20, - 8); + + GT_Values.RA.stdBuilder().itemInputs(Materials.Potassium.getDust(1), GT_Utility.getIntegratedCircuit(2)) + .itemOutputs(Materials.RockSalt.getDust(2)).fluidInputs(Materials.Chlorine.getGas(1000)) + .noFluidOutputs().duration(20 * TICKS).eut(8).addTo(UniversalChemical); + // 2KCl + H2SiF6 = 2HCl + K2SiF6 - GT_Values.RA.addMixerRecipe( - Materials.RockSalt.getDust(4), - null, - null, - null, - WerkstoffLoader.HexafluorosilicicAcid.getFluidOrGas(1000), - Materials.HydrochloricAcid.getGas(2000), - WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 9), - 20, - 8); + GT_Values.RA.stdBuilder().itemInputs(Materials.RockSalt.getDust(4)) + .itemOutputs(WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 9)) + .fluidInputs(WerkstoffLoader.HexafluorosilicicAcid.getFluidOrGas(1000)) + .fluidOutputs(Materials.HydrochloricAcid.getGas(2000)).duration(1 * SECONDS).eut(8) + .addTo(sMixerRecipes); + // 2K + CO2 + O = K2CO3 - GT_Values.RA.addChemicalRecipe( - Materials.Potassium.getDust(2), - Materials.CarbonDioxide.getCells(1), - Materials.Oxygen.getGas(1000), - null, - WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 6), - Materials.Empty.getCells(1), - 40, - 8); + + GT_Values.RA.stdBuilder().itemInputs(Materials.Potassium.getDust(2), Materials.CarbonDioxide.getCells(1)) + .itemOutputs(WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 6), Materials.Empty.getCells(1)) + .fluidInputs(Materials.Oxygen.getGas(1000)).noFluidOutputs().duration(2 * SECONDS).eut(8) + .addTo(UniversalChemical); // K2O + CO2 = K2CO3 - GT_Values.RA.addChemicalRecipe( - Materials.Potash.getDust(3), - Materials.CarbonDioxide.getCells(1), - null, - null, - WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 6), - Materials.Empty.getCells(1), - 40, - 8); + + GT_Values.RA.stdBuilder().itemInputs(Materials.Potash.getDust(3), Materials.CarbonDioxide.getCells(1)) + .itemOutputs(WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 6), Materials.Empty.getCells(1)) + .noFluidInputs().noFluidOutputs().duration(2 * SECONDS).eut(8).addTo(UniversalChemical); + // 55Quartz Dust + 20K2SiF6 + 12Al2O3 + 4K2CO3 = 91Raw Fluorophlogopite Dust - GT_Values.RA.addMixerRecipe( - Materials.QuartzSand.getDust(55), - WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20), - WerkstoffLoader.Alumina.get(OrePrefixes.dust, 12), - WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4), - null, - GT_Utility.getIntegratedCircuit(4), - null, - null, - null, - null, - null, - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27), - null, - null, - 400, - 120); + GT_Values.RA.stdBuilder() + .itemInputs( + Materials.QuartzSand.getDust(55), + WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20), + WerkstoffLoader.Alumina.get(OrePrefixes.dust, 12), + WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs( + WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), + WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27)) + .noFluidInputs().noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes); + // 55Quartzite/Nether Quartz Dust + 20K2SiF6 + 57Al2O3 + 4K2CO3 = 136Raw Fluorophlogopite Dust - GT_Values.RA.addMixerRecipe( - Materials.Quartzite.getDust(55), - WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20), - WerkstoffLoader.Alumina.get(OrePrefixes.dust, 57), - WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4), - null, - GT_Utility.getIntegratedCircuit(4), - null, - null, - null, - null, - null, - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 8), - null, - 600, - 120); - GT_Values.RA.addMixerRecipe( - Materials.NetherQuartz.getDust(55), - WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20), - WerkstoffLoader.Alumina.get(OrePrefixes.dust, 57), - WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4), - null, - GT_Utility.getIntegratedCircuit(4), - null, - null, - null, - null, - null, - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 8), - null, - 600, - 120); + GT_Values.RA.stdBuilder() + .itemInputs( + Materials.Quartzite.getDust(55), + WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20), + WerkstoffLoader.Alumina.get(OrePrefixes.dust, 57), + WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs( + WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), + WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), + WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 8)) + .fluidInputs().fluidOutputs().duration(30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + Materials.NetherQuartz.getDust(55), + WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 20), + WerkstoffLoader.Alumina.get(OrePrefixes.dust, 57), + WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 4), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs( + WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), + WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), + WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 8)) + .noFluidInputs().noFluidOutputs().duration(30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes); + // 62Certus Quartz Dust + 10K2SiF6 + 12Al2O3 + 7K2CO3 = 91Raw Fluorophlogopite Dust - GT_Values.RA.addMixerRecipe( - Materials.CertusQuartz.getDust(62), - WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 10), - WerkstoffLoader.Alumina.get(OrePrefixes.dust, 12), - WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 7), - null, - GT_Utility.getIntegratedCircuit(4), - null, - null, - null, - null, - null, - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27), - null, - null, - 600, - 120); + GT_Values.RA.stdBuilder() + .itemInputs( + Materials.CertusQuartz.getDust(62), + WerkstoffLoader.Potassiumfluorosilicate.get(OrePrefixes.dust, 10), + WerkstoffLoader.Alumina.get(OrePrefixes.dust, 12), + WerkstoffLoader.PotassiumCarbonate.get(OrePrefixes.dust, 7), + GT_Utility.getIntegratedCircuit(4)) + .itemOutputs( + WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 64), + WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27)) + .noFluidInputs().noFluidOutputs().duration(30 * SECONDS).eut(TierEU.RECIPE_MV).addTo(sMixerRecipes); + // MgO(s) = MgO(l) - GT_Values.RA.addFluidExtractionRecipe( - Materials.Magnesia.getDust(1), - null, - Materials.Magnesia.getMolten(144), - 0, - 20, - 120); + + GT_Values.RA.stdBuilder().itemInputs(Materials.Magnesia.getDust(1)).noItemOutputs().noFluidInputs() + .fluidOutputs(Materials.Magnesia.getMolten(144)).duration(20 * TICKS).eut(TierEU.RECIPE_MV) + .addTo(sFluidExtractionRecipes); + // 27Raw Fluorophlogopite Dust + 720MgO(l) = 4608Fluorophlogopite(l) - GT_Values.RA.addBlastRecipe( - WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27), - null, - BW_GT_MaterialReference.Magnesia.getMolten(720), - WerkstoffLoader.HotFluorophlogopite.getFluidOrGas(4608), - Materials.Glass.getDust(1), - null, - 600, - 480, - 1700); + GT_Values.RA.stdBuilder().itemInputs(WerkstoffLoader.RawFluorophlogopite.get(OrePrefixes.dust, 27)) + .itemOutputs(Materials.Glass.getDust(1)).fluidInputs(BW_GT_MaterialReference.Magnesia.getMolten(720)) + .fluidOutputs(WerkstoffLoader.HotFluorophlogopite.getFluidOrGas(4608)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV).metadata(COIL_HEAT, 1700).addTo(sBlastRecipes); + // 144Fluorophlogopite(l) = Fluorophlogopite GT_Recipe.GT_Recipe_Map.sVacuumRecipes.addRecipe( new GT_Recipe( @@ -186,12 +144,14 @@ public class ArtificialMicaLine { 0)); // Fluorophlogopite = 4Insulator Foil if (NewHorizonsCoreMod.isModLoaded()) { - GT_Values.RA.addBenderRecipe( - WerkstoffLoader.Fluorophlogopite.get(OrePrefixes.plate, 1), - GT_Utility.getIntegratedCircuit(1), - GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 4), - 10, - 600); + + GT_Values.RA.stdBuilder() + .itemInputs( + WerkstoffLoader.Fluorophlogopite.get(OrePrefixes.plate, 1), + GT_Utility.getIntegratedCircuit(1)) + .itemOutputs(GT_ModHandler.getModItem(NewHorizonsCoreMod.ID, "item.MicaInsulatorFoil", 4)) + .noFluidInputs().noFluidOutputs().duration(10 * TICKS).eut(600).addTo(sBenderRecipes); + } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java index 54e0d4633e..c4589c3a3f 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/BioRecipeLoader.java @@ -27,6 +27,7 @@ import com.github.bartimaeusnek.bartworks.util.BW_Util; 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_OreDictUnificator; import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; @@ -49,7 +50,7 @@ public class BioRecipeLoader { new int[] { 3300 }, new FluidStack[] { fluidStack }, 500, - BW_Util.getMachineVoltageFromTier(3), + (int) TierEU.RECIPE_HV, BW_Util.STANDART); BWRecipes.instance.addBioLabRecipeIncubation( @@ -58,7 +59,7 @@ public class BioRecipeLoader { new int[] { 4500 }, new FluidStack[] { fluidStack }, 500, - BW_Util.getMachineVoltageFromTier(3), + (int) TierEU.RECIPE_HV, BW_Util.STANDART); BWRecipes.instance.addBioLabRecipeIncubation( @@ -67,7 +68,7 @@ public class BioRecipeLoader { new int[] { 7500 }, new FluidStack[] { fluidStack }, 500, - BW_Util.getMachineVoltageFromTier(3), + (int) TierEU.RECIPE_HV, BW_Util.STANDART); BWRecipes.instance.addBioLabRecipeIncubation( @@ -76,7 +77,7 @@ public class BioRecipeLoader { new int[] { 2500 }, new FluidStack[] { fluidStack }, 500, - BW_Util.getMachineVoltageFromTier(3), + (int) TierEU.RECIPE_HV, BW_Util.STANDART); BWRecipes.instance.addBioLabRecipeIncubation( @@ -85,7 +86,7 @@ public class BioRecipeLoader { new int[] { 3300 }, new FluidStack[] { fluidStack }, 500, - BW_Util.getMachineVoltageFromTier(3), + (int) TierEU.RECIPE_HV, BW_Util.STANDART); BWRecipes.instance.addBioLabRecipeIncubation( @@ -94,7 +95,7 @@ public class BioRecipeLoader { new int[] { 2500 }, new FluidStack[] { fluidStack }, 500, - BW_Util.getMachineVoltageFromTier(3), + (int) TierEU.RECIPE_HV, BW_Util.STANDART); BWRecipes.instance.addBioLabRecipeIncubation( @@ -103,7 +104,7 @@ public class BioRecipeLoader { new int[] { 3300 }, new FluidStack[] { fluidStack }, 500, - BW_Util.getMachineVoltageFromTier(3), + (int) TierEU.RECIPE_HV, BW_Util.STANDART); BWRecipes.instance.addBioLabRecipeIncubation( @@ -112,7 +113,7 @@ public class BioRecipeLoader { new int[] { 100 }, new FluidStack[] { fluidStack }, 1500, - BW_Util.getMachineVoltageFromTier(4), + (int) TierEU.RECIPE_EV, BW_Util.STANDART); } } @@ -128,7 +129,7 @@ public class BioRecipeLoader { BioCultureLoader.CommonYeast, new FluidStack[] { FluidRegistry.getFluidStack("potion.ghp", 1) }, 350, - BW_Util.getMachineVoltageFromTier(4)); + (int) TierEU.RECIPE_EV); } BWRecipes.instance.addBacterialVatRecipe( @@ -137,7 +138,7 @@ public class BioRecipeLoader { BioCultureLoader.WhineYeast, new FluidStack[] { FluidRegistry.getFluidStack("potion.wine", 12) }, 200, - BW_Util.getMachineVoltageFromTier(2)); + (int) TierEU.RECIPE_MV); BWRecipes.instance.addBacterialVatRecipe( new ItemStack[] { new ItemStack(Items.sugar, 4), ItemList.IC2_Hops.get(16L), @@ -146,7 +147,7 @@ public class BioRecipeLoader { BioCultureLoader.BeerYeast, new FluidStack[] { FluidRegistry.getFluidStack("potion.beer", 5) }, 600, - BW_Util.getMachineVoltageFromTier(1)); + (int) TierEU.RECIPE_LV); BWRecipes.instance.addBacterialVatRecipe( new ItemStack[] { ItemList.IC2_Hops.get(32L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 16L) }, @@ -154,7 +155,7 @@ public class BioRecipeLoader { BioCultureLoader.BeerYeast, new FluidStack[] { FluidRegistry.getFluidStack("potion.darkbeer", 10) }, 600, - BW_Util.getMachineVoltageFromTier(1)); + (int) TierEU.RECIPE_LV); } } @@ -167,7 +168,7 @@ public class BioRecipeLoader { BioCultureLoader.WhineYeast, new FluidStack[] { FluidRegistry.getFluidStack("potion.wine", 12) }, 400, - BW_Util.getMachineVoltageFromTier(1)); + (int) TierEU.RECIPE_LV); BWRecipes.instance.addBacterialVatRecipe( null, @@ -175,7 +176,7 @@ public class BioRecipeLoader { BioCultureLoader.anaerobicOil, new FluidStack[] { new FluidStack(FluidLoader.fulvicAcid, 1000) }, 2748, - BW_Util.getMachineVoltageFromTier(3)); + (int) TierEU.RECIPE_HV); } public static void runOnServerStarted() { diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java index 19d52696ff..017dba8358 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/FluidLoader.java @@ -14,6 +14,8 @@ package com.github.bartimaeusnek.bartworks.common.loaders; import static gregtech.api.enums.Mods.Gendustry; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import java.awt.*; import java.util.Arrays; @@ -36,6 +38,7 @@ import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.registry.GameRegistry; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; +import gregtech.api.enums.TierEU; import gregtech.api.objects.GT_Fluid; import gregtech.api.util.GT_LanguageManager; import gregtech.api.util.GT_Utility; @@ -93,20 +96,11 @@ public class FluidLoader { FluidRegistry.registerFluid(B.getFluid()); GT_LanguageManager .addStringLocalization(B.getFluid().getUnlocalizedName(), B.getLocalisedName() + " Fluid"); - GT_Values.RA.addCentrifugeRecipe( - GT_Utility.getIntegratedCircuit(10), - GT_Values.NI, - new FluidStack(B.getFluid(), 1000), - dnaFluid, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - GT_Values.NI, - null, - 500, - 120); + + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(10)).noItemOutputs() + .fluidInputs(new FluidStack(B.getFluid(), 1000)).fluidOutputs(dnaFluid).duration(25 * SECONDS) + .eut(TierEU.RECIPE_MV).addTo(sCentrifugeRecipes); + } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java index 6f482aaa48..3b145cad5e 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java @@ -58,6 +58,7 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.SubTag; +import gregtech.api.enums.TierEU; import gregtech.api.objects.GT_ItemStack; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -626,7 +627,7 @@ public class StaticRecipeChangeLoaders { null, null, 1, - BW_Util.getMachineVoltageFromTier(10), + (int) TierEU.RECIPE_UEV, 0)); // Custom EIC recipes. diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java index 7d803f154b..ed29a3a7f0 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Assembler.java @@ -1,23 +1,25 @@ package com.github.bartimaeusnek.bartworks.common.loaders.recipes; import static gregtech.api.enums.Mods.GregTech; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAssemblerRecipes; +import static gregtech.api.util.GT_RecipeBuilder.HOURS; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GT_RecipeBuilder.TICKS; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import com.github.bartimaeusnek.bartworks.util.BWRecipes; -import com.github.bartimaeusnek.bartworks.util.BW_Util; import gregtech.api.GregTech_API; 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_Recipe; import gregtech.api.util.GT_Utility; public class Assembler implements Runnable { @@ -37,86 +39,89 @@ public class Assembler implements Runnable { Materials.SuperconductorUV // UHV }; - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 0), Materials.Lapis.getPlates(9), + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 0), + Materials.Lapis.getPlates(9), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2L), - GT_Utility.getIntegratedCircuit(17) }, - FluidRegistry.getFluidStack("ic2coolant", 1000), - new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 1), - 100, - BW_Util.getMachineVoltageFromTier(3)); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 1), Materials.Lapis.getBlocks(8), - GT_Utility.getIntegratedCircuit(17) }, - GT_Values.NF, - new ItemStack(ItemRegistry.BW_BLOCKS[1]), - 100, - BW_Util.getMachineVoltageFromTier(3)); - - GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1000), - GT_Utility.getIntegratedCircuit(17), - Materials.SolderingAlloy.getMolten(9216), - ItemRegistry.megaMachines[0], - 72000, - BW_Util.getMachineVoltageFromTier(3)); - GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1002), - GT_Utility.getIntegratedCircuit(17), - Materials.SolderingAlloy.getMolten(9216), - ItemRegistry.megaMachines[1], - 72000, - BW_Util.getMachineVoltageFromTier(3)); - GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1126), - GT_Utility.getIntegratedCircuit(17), - Materials.SolderingAlloy.getMolten(9216), - ItemRegistry.megaMachines[2], - 72000, - BW_Util.getMachineVoltageFromTier(3)); - GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1169), - GT_Utility.getIntegratedCircuit(17), - Materials.SolderingAlloy.getMolten(9216), - ItemRegistry.megaMachines[3], - 72000, - BW_Util.getMachineVoltageFromTier(3)); - GT_Values.RA.addAssemblerRecipe( - GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1160), - GT_Utility.getIntegratedCircuit(17), - Materials.SolderingAlloy.getMolten(9216), - ItemRegistry.megaMachines[4], - 72000, - BW_Util.getMachineVoltageFromTier(3)); - - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 64L), - GT_Utility.getIntegratedCircuit(17) }, - Materials.Plastic.getMolten(1152L), - new ItemStack(ItemRegistry.BW_BLOCKS[2], 1, 1), - 20, - BW_Util.getMachineVoltageFromTier(3)); - - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L), - Materials.Aluminium.getPlates(1), ItemList.Circuit_Board_Plastic.get(1L), - ItemList.Battery_RE_LV_Lithium.get(1L) }, - Materials.SolderingAlloy.getMolten(288L), - new ItemStack(ItemRegistry.CIRCUIT_PROGRAMMER), - 600, - BW_Util.getMachineVoltageFromTier(2)); - - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { ItemList.Circuit_Parts_GlassFiber.get(32), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 1)) + .fluidInputs(FluidRegistry.getFluidStack("ic2coolant", 1000)).noFluidOutputs().duration(5 * SECONDS) + .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(ItemRegistry.BW_BLOCKS[0], 1, 1), + Materials.Lapis.getBlocks(8), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(new ItemStack(ItemRegistry.BW_BLOCKS[1])).noFluidInputs().noFluidOutputs() + .duration(5 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1000), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(ItemRegistry.megaMachines[0]).fluidInputs(Materials.SolderingAlloy.getMolten(9216)) + .noFluidOutputs().duration(1 * HOURS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1002), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(ItemRegistry.megaMachines[1]).fluidInputs(Materials.SolderingAlloy.getMolten(9216)) + .noFluidOutputs().duration(1 * HOURS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1126), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(ItemRegistry.megaMachines[2]).fluidInputs(Materials.SolderingAlloy.getMolten(9216)) + .noFluidOutputs().duration(1 * HOURS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1169), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(ItemRegistry.megaMachines[3]).fluidInputs(Materials.SolderingAlloy.getMolten(9216)) + .noFluidOutputs().duration(1 * HOURS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_ModHandler.getModItem(GregTech.ID, "gt.blockmachines", 64, 1160), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(ItemRegistry.megaMachines[4]).fluidInputs(Materials.SolderingAlloy.getMolten(9216)) + .noFluidOutputs().duration(1 * HOURS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.AnnealedCopper, 64L), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(new ItemStack(ItemRegistry.BW_BLOCKS[2], 1, 1)) + .fluidInputs(Materials.Plastic.getMolten(1152L)).noFluidOutputs().duration(1 * TICKS) + .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 1L), + Materials.Aluminium.getPlates(1), + ItemList.Circuit_Board_Plastic.get(1L), + ItemList.Battery_RE_LV_Lithium.get(1L)) + .itemOutputs(new ItemStack(ItemRegistry.CIRCUIT_PROGRAMMER)) + .fluidInputs(Materials.SolderingAlloy.getMolten(288L)).noFluidOutputs().duration(30 * SECONDS) + .eut(TierEU.RECIPE_MV).addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.Circuit_Parts_GlassFiber.get(32), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 8), - WerkstoffLoader.CubicZirconia.get(OrePrefixes.gemExquisite, 2) }, - Materials.Polytetrafluoroethylene.getMolten(72), - new ItemStack( - ItemRegistry.TecTechPipeEnergyLowPower.getItem(), - 1, - ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), - 200, - BW_Util.getMachineVoltageFromTier(4)); + WerkstoffLoader.CubicZirconia.get(OrePrefixes.gemExquisite, 2)) + .itemOutputs( + new ItemStack( + ItemRegistry.TecTechPipeEnergyLowPower.getItem(), + 1, + ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage())) + .fluidInputs(Materials.Polytetrafluoroethylene.getMolten(72)).noFluidOutputs().duration(10 * SECONDS) + .eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); ItemStack[][] converters = ItemRegistry.TecTechLaserAdditions[0]; ItemStack[][] input = ItemRegistry.TecTechLaserAdditions[1]; @@ -134,91 +139,98 @@ public class Assembler implements Runnable { ItemStack converter = converters[j][i]; ItemStack eInput = input[j][i]; ItemStack eDynamo = dynamo[j][i]; + long recipeConsumption; + switch (i) { + case 0: + recipeConsumption = TierEU.RECIPE_EV; + break; + case 1: + recipeConsumption = TierEU.RECIPE_IV; + break; + case 2: + recipeConsumption = TierEU.RECIPE_LuV; + break; + case 3: + recipeConsumption = TierEU.RECIPE_ZPM; + break; + default: + recipeConsumption = TierEU.RECIPE_EV; + break; + } int solderingAmount = Math.max(144 * i, 72) * (j + 1); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { - new ItemStack( - ItemRegistry.TecTechPipeEnergyLowPower.getItem(), - ((j + 1) * 16), - ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), - WerkstoffLoader.CubicZirconia.get(OrePrefixes.lens), - GT_OreDictUnificator.get(prefixes[j], cables[i + 4], 8), emitters[i].get(2 * (j + 1)), - sensors[i].get(2 * (j + 1)), ItemList.TRANSFORMERS[4 + i].get(2 * (j + 1)), }, - Materials.SolderingAlloy.getMolten(solderingAmount), - converter, - 200 * (j + 1), - BW_Util.getMachineVoltageFromTier(4 + i)); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { + + GT_Values.RA.stdBuilder().itemInputs( + + new ItemStack( + ItemRegistry.TecTechPipeEnergyLowPower.getItem(), + ((j + 1) * 16), + ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), + WerkstoffLoader.CubicZirconia.get(OrePrefixes.lens), + GT_OreDictUnificator.get(prefixes[j], cables[i + 4], 8), + emitters[i].get(2 * (j + 1)), + sensors[i].get(2 * (j + 1)), + ItemList.TRANSFORMERS[4 + i].get(2 * (j + 1))).itemOutputs(converter) + .fluidInputs(Materials.SolderingAlloy.getMolten(solderingAmount)).noFluidOutputs() + .duration((10 * (j + 1)) * SECONDS).eut(recipeConsumption).addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( new ItemStack( ItemRegistry.TecTechPipeEnergyLowPower.getItem(), ((j + 1) * 16), ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), WerkstoffLoader.CubicZirconia.get(OrePrefixes.lens), - GT_OreDictUnificator.get(prefixes[j], cables[i + 4], 8), sensors[i].get(2 * (j + 1)), - ItemList.HATCHES_ENERGY[4 + i].get(2 * (j + 1)), }, - Materials.SolderingAlloy.getMolten(solderingAmount), - eInput, - 200 * (j + 1), - BW_Util.getMachineVoltageFromTier(4 + i)); - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { + GT_OreDictUnificator.get(prefixes[j], cables[i + 4], 8), + sensors[i].get(2 * (j + 1)), + ItemList.HATCHES_ENERGY[4 + i].get(2 * (j + 1))) + .itemOutputs(eInput).fluidInputs(Materials.SolderingAlloy.getMolten(solderingAmount)) + .noFluidOutputs().duration((10 * (j + 1)) * SECONDS).eut(recipeConsumption) + .addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( new ItemStack( ItemRegistry.TecTechPipeEnergyLowPower.getItem(), ((j + 1) * 16), ItemRegistry.TecTechPipeEnergyLowPower.getItemDamage()), WerkstoffLoader.CubicZirconia.get(OrePrefixes.lens), - GT_OreDictUnificator.get(prefixes[j], cables[i + 4], 8), emitters[i].get(2 * (j + 1)), - ItemList.HATCHES_DYNAMO[4 + i].get(2 * (j + 1)), }, - Materials.SolderingAlloy.getMolten(solderingAmount), - eDynamo, - 200 * (j + 1), - BW_Util.getMachineVoltageFromTier(4 + i)); + GT_OreDictUnificator.get(prefixes[j], cables[i + 4], 8), + emitters[i].get(2 * (j + 1)), + ItemList.HATCHES_DYNAMO[4 + i].get(2 * (j + 1))) + .itemOutputs(eDynamo).fluidInputs(Materials.SolderingAlloy.getMolten(solderingAmount)) + .noFluidOutputs().duration((10 * (j + 1) * SECONDS)).eut(recipeConsumption) + .addTo(sAssemblerRecipes); } } - GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.add( - new BWRecipes.DynamicGTRecipe( - false, - new ItemStack[] { ItemList.Hatch_Input_HV.get(64), Materials.LiquidAir.getCells(1), - GT_Utility.getIntegratedCircuit(17) }, - new ItemStack[] { ItemRegistry.compressedHatch.copy() }, - null, - null, - null, - null, - 300, - BW_Util.getMachineVoltageFromTier(3), - 0)); - GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.add( - new BWRecipes.DynamicGTRecipe( - false, - new ItemStack[] { ItemList.Hatch_Output_HV.get(64), GT_Utility.getIntegratedCircuit(17) }, - new ItemStack[] { ItemRegistry.giantOutputHatch.copy() }, - null, - null, - null, - null, - 300, - BW_Util.getMachineVoltageFromTier(3), - 0)); - - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 6), - GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1) }, - Materials.Concrete.getMolten(1296), - new ItemStack(GregTech_API.sBlockCasings3, 1, 12), - 40, - BW_Util.getMachineVoltageFromTier(5)); - - GT_Values.RA.addAssemblerRecipe( - new ItemStack[] { new ItemStack(GregTech_API.sBlockCasings3, 1, 12), + GT_Values.RA.stdBuilder() + .itemInputs( + ItemList.Hatch_Input_HV.get(64), + Materials.LiquidAir.getCells(1), + GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(ItemRegistry.compressedHatch.copy()).noFluidInputs().noFluidOutputs() + .duration(15 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder().itemInputs(ItemList.Hatch_Output_HV.get(64), GT_Utility.getIntegratedCircuit(17)) + .itemOutputs(ItemRegistry.giantOutputHatch.copy()).noFluidInputs().noFluidOutputs() + .duration(15 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.plateDense, Materials.Lead, 6), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.TungstenSteel, 1)) + .itemOutputs(new ItemStack(GregTech_API.sBlockCasings3, 1, 12)) + .fluidInputs(Materials.Concrete.getMolten(1296)).noFluidOutputs().duration(2 * SECONDS) + .eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs( + new ItemStack(GregTech_API.sBlockCasings3, 1, 12), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Europium, 6), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Europium, 24) }, - Materials.Lead.getMolten(864), - new ItemStack(GregTech_API.sBlockCasings8, 1, 5), - 200, - BW_Util.getMachineVoltageFromTier(6)); + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Europium, 24)) + .itemOutputs(new ItemStack(GregTech_API.sBlockCasings8, 1, 5)) + .fluidInputs(Materials.Lead.getMolten(864)).noFluidOutputs().duration(10 * SECONDS) + .eut(TierEU.RECIPE_LuV).addTo(sAssemblerRecipes); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java index a8a879a3fc..860204d4a7 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/AssemblyLine.java @@ -1,16 +1,19 @@ package com.github.bartimaeusnek.bartworks.common.loaders.recipes; import static gregtech.api.enums.Mods.GalactiGreg; +import static gregtech.api.util.GT_RecipeBuilder.HOURS; import static gregtech.api.util.GT_RecipeBuilder.MINUTES; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GT_RecipeConstants.AssemblyLine; +import static gregtech.api.util.GT_RecipeConstants.RESEARCH_ITEM; +import static gregtech.api.util.GT_RecipeConstants.RESEARCH_TIME; -import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import com.github.bartimaeusnek.bartworks.util.BW_Util; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; @@ -26,47 +29,46 @@ public class AssemblyLine implements Runnable { Fluid solderIndalloy = FluidRegistry.getFluid("molten.indalloy140") != null ? FluidRegistry.getFluid("molten.indalloy140") : FluidRegistry.getFluid("molten.solderingalloy"); - - GT_Values.RA.addAssemblylineRecipe( - ItemList.Pump_IV.get(1L), - 72000, - new ItemStack[] { ItemList.Pump_IV.get(16), + GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Pump_IV.get(1L)).metadata(RESEARCH_TIME, 1 * HOURS) + .itemInputs( + ItemList.Pump_IV.get(16), GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.Ultimate, 32L), GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.HSSE, 16L), GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.HSSE, 16L), - ItemList.Field_Generator_LuV.get(8) }, - new FluidStack[] { new FluidStack(solderIndalloy, 32 * 144), - Materials.Polytetrafluoroethylene.getMolten(32 * 144) }, - ItemRegistry.dehp, - 5000, - BW_Util.getMachineVoltageFromTier(6)); + ItemList.Field_Generator_LuV.get(8)) + .fluidInputs( + new FluidStack(solderIndalloy, 32 * 144), + Materials.Polytetrafluoroethylene.getMolten(32 * 144)) + .noFluidOutputs().itemOutputs(ItemRegistry.dehp).eut(TierEU.RECIPE_LuV) + .duration(4 * MINUTES + 10 * SECONDS).addTo(AssemblyLine); if (GalactiGreg.isModLoaded()) { - GT_Values.RA.addAssemblylineRecipe( - ItemList.OreDrill4.get(1L), - (int) TierEU.RECIPE_LuV, - new Object[] { ItemList.OreDrill4.get(1L), + GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.OreDrill4.get(1L)) + .metadata(RESEARCH_TIME, 25 * MINUTES + 36 * SECONDS) + .itemInputs( + ItemList.OreDrill4.get(1L), GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.Tritanium, 9L), - Materials.Europium.getPlates(3), ItemList.Electric_Motor_LuV.get(9L), - ItemList.Sensor_LuV.get(9L), ItemList.Field_Generator_LuV.get(9L), - GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Europium, 36L) }, - new FluidStack[] { new FluidStack(solderIndalloy, 1440), - WerkstoffLoader.Neon.getFluidOrGas(20000), }, - ItemRegistry.voidminer[0].copy(), - 5 * MINUTES, - (int) TierEU.RECIPE_LuV); + Materials.Europium.getPlates(3), + ItemList.Electric_Motor_LuV.get(9L), + ItemList.Sensor_LuV.get(9L), + ItemList.Field_Generator_LuV.get(9L), + GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Europium, 36L)) + .fluidInputs(new FluidStack(solderIndalloy, 1440), WerkstoffLoader.Neon.getFluidOrGas(20000)) + .noFluidOutputs().itemOutputs(ItemRegistry.voidminer[0].copy()).eut(TierEU.RECIPE_LuV) + .duration(5 * MINUTES).addTo(AssemblyLine); } - GT_Values.RA.addAssemblylineRecipe( - ItemList.Machine_LuV_CircuitAssembler.get(1L), - 24000, - new ItemStack[] { ItemList.Machine_LuV_CircuitAssembler.get(1L), ItemList.Robot_Arm_LuV.get(4L), - ItemList.Electric_Motor_LuV.get(4L), ItemList.Field_Generator_LuV.get(1L), - ItemList.Emitter_LuV.get(1L), ItemList.Sensor_LuV.get(1L), - WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 8) }, - new FluidStack[] { new FluidStack(solderIndalloy, 1440) }, - ItemRegistry.cal.copy(), - 24000, - BW_Util.getMachineVoltageFromTier(6)); + GT_Values.RA.stdBuilder().metadata(RESEARCH_ITEM, ItemList.Machine_LuV_CircuitAssembler.get(1L)) + .metadata(RESEARCH_TIME, 20 * MINUTES) + .itemInputs( + ItemList.Machine_LuV_CircuitAssembler.get(1L), + ItemList.Robot_Arm_LuV.get(4L), + ItemList.Electric_Motor_LuV.get(4L), + ItemList.Field_Generator_LuV.get(1L), + ItemList.Emitter_LuV.get(1L), + ItemList.Sensor_LuV.get(1L), + WerkstoffLoader.LuVTierMaterial.get(OrePrefixes.plate, 8)) + .fluidInputs(new FluidStack(solderIndalloy, 1440)).noFluidOutputs().itemOutputs(ItemRegistry.cal.copy()) + .eut(TierEU.RECIPE_LuV).duration(20 * MINUTES).addTo(AssemblyLine); } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Autoclave.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Autoclave.java index 3771a261ae..7d32af49a6 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Autoclave.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Autoclave.java @@ -1,14 +1,17 @@ package com.github.bartimaeusnek.bartworks.common.loaders.recipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; + import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import com.github.bartimaeusnek.bartworks.common.loaders.BioItemList; -import com.github.bartimaeusnek.bartworks.util.BW_Util; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; +import gregtech.api.enums.TierEU; public class Autoclave implements Runnable { @@ -16,21 +19,17 @@ public class Autoclave implements Runnable { public void run() { Materials[] sterilizers = { Materials.Ammonia, Materials.Chlorine, Materials.Ethanol, Materials.Methanol }; for (Materials used : sterilizers) { - GT_Values.RA.addAutoclaveRecipe( - ItemList.Circuit_Parts_PetriDish.get(1L), - used.getGas(10L) != null ? used.getGas(8L) : used.getFluid(16L), - BioItemList.getPetriDish(null), - 10000, - 100, - BW_Util.getMachineVoltageFromTier(1)); - - GT_Values.RA.addAutoclaveRecipe( - new ItemStack(Items.glass_bottle), - used.getGas(10L) != null ? used.getGas(8L) : used.getFluid(16L), - BioItemList.getDNASampleFlask(null), - 10000, - 100, - BW_Util.getMachineVoltageFromTier(1)); + + GT_Values.RA.stdBuilder().itemInputs(ItemList.Circuit_Parts_PetriDish.get(1L)) + .itemOutputs(BioItemList.getPetriDish(null)) + .fluidInputs(used.getGas(10L) != null ? used.getGas(8L) : used.getFluid(16L)).noFluidOutputs() + .duration(5 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAutoclaveRecipes); + + GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.glass_bottle)) + .itemOutputs(BioItemList.getDNASampleFlask(null)) + .fluidInputs(used.getGas(10L) != null ? used.getGas(8L) : used.getFluid(16L)).noFluidOutputs() + .duration(5 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAutoclaveRecipes); + } } } diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java index c80c708b5e..776d6a1a2a 100644 --- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java +++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/recipes/Centrifuge.java @@ -2,6 +2,9 @@ package com.github.bartimaeusnek.bartworks.common.loaders.recipes; import static com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_HTGR.HTGRMaterials.MATERIALS_PER_FUEL; import static com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_HTGR.HTGRMaterials.sHTGR_Fuel; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes; +import static gregtech.api.util.GT_RecipeBuilder.MINUTES; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import java.util.Arrays; @@ -14,164 +17,99 @@ import com.github.bartimaeusnek.bartworks.common.loaders.FluidLoader; import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_HTGR; import com.github.bartimaeusnek.bartworks.common.tileentities.multis.GT_TileEntity_THTR; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import com.github.bartimaeusnek.bartworks.util.BW_Util; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_Recipe; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_Utility; public class Centrifuge implements Runnable { @Override public void run() { - - GT_Values.RA.addCentrifugeRecipe( - Materials.Thorium.g