diff options
| author | chochem <40274384+chochem@users.noreply.github.com> | 2023-09-22 07:58:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-22 08:58:35 +0200 |
| commit | 5e918fa2738af7eaab3e2ffdfb007208a6d89294 (patch) | |
| tree | 26f2c933b295bc36938bb3e6fbf04258d14d63b4 /src/main/java/gtPlusPlus/core/item | |
| parent | 1925c00f24f04900d630129d9e337748fe3dc557 (diff) | |
| download | GT5-Unofficial-5e918fa2738af7eaab3e2ffdfb007208a6d89294.tar.gz GT5-Unofficial-5e918fa2738af7eaab3e2ffdfb007208a6d89294.tar.bz2 GT5-Unofficial-5e918fa2738af7eaab3e2ffdfb007208a6d89294.zip | |
Some more RA2 conversions (#752)
* remove deprecated methods
* laser engraving
* fluid utils cleanup
* more deprecations
* biorecipes
* RA2 rocketfuel
* rare earth
* typo
* more rareearth cleanup
* nuclear fuel processing
* Update RecipeLoader_NuclearFuelProcessing.java
---------
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus/core/item')
7 files changed, 66 insertions, 89 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index 63e0bebe89..d6f8e5b972 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -703,9 +703,8 @@ public final class ModItems { temp1, null, true); - GT_Values.RA.stdBuilder().itemInputs(temp2).noItemOutputs().noFluidInputs() - .fluidOutputs(new FluidStack(fluidFertBasic, 36)).duration(5 * TICKS).eut(16) - .addTo(sFluidExtractionRecipes); + GT_Values.RA.stdBuilder().itemInputs(temp2).fluidOutputs(new FluidStack(fluidFertBasic, 36)) + .duration(5 * TICKS).eut(16).addTo(sFluidExtractionRecipes); } fluidFertUN32 = FluidUtils.generateFluidNonMolten( "UN32Fertiliser", diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java index 94a84ed27d..99fef5e19e 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java +++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngotHot.java @@ -55,7 +55,7 @@ public class BaseItemIngotHot extends BaseItemIngot { private void generateRecipe() { Logger.WARNING("Adding Vacuum Freezer recipe for a Hot Ingot of " + this.materialName + "."); GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(this)).itemOutputs(this.outputIngot.copy()) - .noFluidInputs().noFluidOutputs().duration(Math.max(this.componentMaterial.getMass() * 3L, 1L) * TICKS) + .duration(Math.max(this.componentMaterial.getMass() * 3L, 1L) * TICKS) .eut(this.componentMaterial.vVoltageMultiplier).addTo(sVacuumRecipes); } diff --git a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java index dcb9738fd4..3679121ed5 100644 --- a/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java +++ b/src/main/java/gtPlusPlus/core/item/base/ingots/BaseItemIngot_OLD.java @@ -80,8 +80,8 @@ public class BaseItemIngot_OLD extends Item { if ((temp != null) && !temp.equals("")) { tempOutput = ItemUtils.getItemStackOfAmountFromOreDict(temp, 1); if (tempOutput != null) { - GT_Values.RA.stdBuilder().itemInputs(tempStack).itemOutputs(tempOutput).noFluidInputs() - .noFluidOutputs().duration(15 * SECONDS).eut(2).addTo(sCompressorRecipes); + GT_Values.RA.stdBuilder().itemInputs(tempStack).itemOutputs(tempOutput).duration(15 * SECONDS) + .eut(2).addTo(sCompressorRecipes); } } } else if (this.unlocalName.contains("itemHotIngot")) { diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java index 1da1fb6bfc..2dcb726171 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/AgriculturalChem.java @@ -467,13 +467,13 @@ public class AgriculturalChem extends ItemPackage { for (ItemStack aMeatStack : mList_Master_Meats) { aMeat = ItemUtils.getSimpleStack(aMeatStack, 5); GT_Values.RA.stdBuilder().itemInputs(aPeat, aMeat).itemOutputs(aOutputDust).fluidInputs(aInputFluid) - .noFluidOutputs().duration(20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + .duration(20 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); } aPeat = ItemUtils.getSimpleStack(aPeatStack, 2); for (ItemStack aMeatStack : mList_Master_FruitVege) { aMeat = ItemUtils.getSimpleStack(aMeatStack, 9); GT_Values.RA.stdBuilder().itemInputs(aPeat, aMeat).itemOutputs(aOutputDust).fluidInputs(aInputFluid) - .noFluidOutputs().duration(10 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); + .duration(10 * SECONDS).eut(TierEU.RECIPE_MV).addTo(UniversalChemical); } } } @@ -488,13 +488,13 @@ public class AgriculturalChem extends ItemPackage { for (ItemStack aMeatStack : mList_Master_Meats) { aMeat = ItemUtils.getSimpleStack(aMeatStack, 7); GT_Values.RA.stdBuilder().itemInputs(aPeat, aMeat).itemOutputs(aOutputDust).fluidInputs(aInputFluid) - .noFluidOutputs().duration(10 * SECONDS).eut(140).addTo(UniversalChemical); + .duration(10 * SECONDS).eut(140).addTo(UniversalChemical); } aPeat = ItemUtils.getSimpleStack(aPeatStack, 3); for (ItemStack aMeatStack : mList_Master_FruitVege) { aMeat = ItemUtils.getSimpleStack(aMeatStack, 12); GT_Values.RA.stdBuilder().itemInputs(aPeat, aMeat).itemOutputs(aOutputDust).fluidInputs(aInputFluid) - .noFluidOutputs().duration(5 * SECONDS).eut(140).addTo(UniversalChemical); + .duration(5 * SECONDS).eut(140).addTo(UniversalChemical); } } } @@ -556,8 +556,8 @@ public class AgriculturalChem extends ItemPackage { // Dirt Production GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getSimpleStack(dustDirt, 9)) - .itemOutputs(ItemUtils.getSimpleStack(Blocks.dirt)).noFluidInputs().noFluidOutputs() - .duration(2 * SECONDS).eut(8).addTo(sCompressorRecipes); + .itemOutputs(ItemUtils.getSimpleStack(Blocks.dirt)).duration(2 * SECONDS).eut(8) + .addTo(sCompressorRecipes); // Centrifuge Byproducts diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java index ea4c664260..f37cb14ec5 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java @@ -447,7 +447,7 @@ public class GenericChem extends ItemPackage { .itemInputs( ItemUtils.getItemStackOfAmountFromOreDict("fuelCoke", 8), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sulfur, 16L)) - .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1L)).noFluidInputs() + .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.DarkAsh, 1L)) .fluidOutputs(FluidUtils.getFluidStack(Carbon_Disulfide, 4000)).duration(10 * MINUTES) .eut(TierEU.RECIPE_LV).metadata(COIL_HEAT, 1500).addTo(sBlastRecipes); @@ -485,8 +485,7 @@ public class GenericChem extends ItemPackage { // Gas Fuels GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellNitrobenzene", 1)) - .noItemOutputs().noFluidInputs().noFluidOutputs().metadata(FUEL_VALUE, 1600).metadata(FUEL_TYPE, 1) - .duration(0).eut(0).addTo(GT_RecipeConstants.Fuel); + .metadata(FUEL_VALUE, 1600).metadata(FUEL_TYPE, 1).duration(0).eut(0).addTo(GT_RecipeConstants.Fuel); } private void recipeGrindingBallAlumina() { @@ -495,7 +494,7 @@ public class GenericChem extends ItemPackage { ItemUtils.getSimpleStack(AgriculturalChem.mAlumina, 64), GT_Utility.getIntegratedCircuit(10)) .itemOutputs(ItemUtils.getSimpleStack(mMillingBallAlumina, 8)) - .fluidInputs(FluidUtils.getFluidStack(GenericChem.Aniline, 4000)).noFluidOutputs().duration(3 * MINUTES) + .fluidInputs(FluidUtils.getFluidStack(GenericChem.Aniline, 4000)).duration(3 * MINUTES) .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); } @@ -505,8 +504,8 @@ public class GenericChem extends ItemPackage { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Soapstone, 32L), GT_Utility.getIntegratedCircuit(10)) .itemOutputs(ItemUtils.getSimpleStack(mMillingBallSoapstone, 8)) - .fluidInputs(FluidUtils.getFluidStack(AgrichemFluids.mLiquidResin, 2500)).noFluidOutputs() - .duration(2 * MINUTES).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .fluidInputs(FluidUtils.getFluidStack(AgrichemFluids.mLiquidResin, 2500)).duration(2 * MINUTES) + .eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); } private void recipeCyclohexane() { @@ -554,8 +553,8 @@ public class GenericChem extends ItemPackage { CI.getEmptyCatalyst(10), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Copper, 2L)) - .itemOutputs(ItemUtils.getSimpleStack(mRedCatalyst, 10)).noFluidInputs().noFluidOutputs() - .duration(20 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.getSimpleStack(mRedCatalyst, 10)).duration(20 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); } private void recipeCatalystYellow() { @@ -566,8 +565,8 @@ public class GenericChem extends ItemPackage { CI.getEmptyCatalyst(10), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tungsten, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4L)) - .itemOutputs(ItemUtils.getSimpleStack(mYellowCatalyst, 10)).noFluidInputs().noFluidOutputs() - .duration(1 * MINUTES).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.getSimpleStack(mYellowCatalyst, 10)).duration(1 * MINUTES).eut(TierEU.RECIPE_EV) + .addTo(sAssemblerRecipes); } private void recipeCatalystBlue() { @@ -578,8 +577,8 @@ public class GenericChem extends ItemPackage { CI.getEmptyCatalyst(10), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Cobalt, 3L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 3L)) - .itemOutputs(ItemUtils.getSimpleStack(mBlueCatalyst, 10)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.getSimpleStack(mBlueCatalyst, 10)).duration(40 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); } private void recipeCatalystOrange() { @@ -590,8 +589,8 @@ public class GenericChem extends ItemPackage { CI.getEmptyCatalyst(10), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 5L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Palladium, 5L)) - .itemOutputs(ItemUtils.getSimpleStack(mOrangeCatalyst, 10)).noFluidInputs().noFluidOutputs() - .duration(40 * SECONDS).eut(TierEU.RECIPE_HV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.getSimpleStack(mOrangeCatalyst, 10)).duration(40 * SECONDS).eut(TierEU.RECIPE_HV) + .addTo(sAssemblerRecipes); } private void recipeCatalystPurple() { @@ -602,8 +601,8 @@ public class GenericChem extends ItemPackage { CI.getEmptyCatalyst(10), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iridium, 6L), ELEMENT.getInstance().RUTHENIUM.getDust(6)) - .itemOutputs(ItemUtils.getSimpleStack(mPurpleCatalyst, 10)).noFluidInputs().noFluidOutputs() - .duration(2 * MINUTES).eut(TierEU.RECIPE_IV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.getSimpleStack(mPurpleCatalyst, 10)).duration(2 * MINUTES).eut(TierEU.RECIPE_IV) + .addTo(sAssemblerRecipes); } private void recipeCatalystBrown() { @@ -614,8 +613,8 @@ public class GenericChem extends ItemPackage { CI.getEmptyCatalyst(10), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nickel, 4L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminium, 4L)) - .itemOutputs(ItemUtils.getSimpleStack(mBrownCatalyst, 10)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.getSimpleStack(mBrownCatalyst, 10)).duration(15 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); } private void recipeCatalystPink() { @@ -626,8 +625,8 @@ public class GenericChem extends ItemPackage { CI.getEmptyCatalyst(10), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 4L), ELEMENT.getInstance().RHODIUM.getDust(4)) - .itemOutputs(ItemUtils.getSimpleStack(mFormaldehydeCatalyst, 4)).noFluidInputs().noFluidOutputs() - .duration(30 * SECONDS).eut(TierEU.RECIPE_HV / 2).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.getSimpleStack(mFormaldehydeCatalyst, 4)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_HV / 2).addTo(sAssemblerRecipes); } private void recipeCatalystFormaldehyde() { @@ -637,8 +636,8 @@ public class GenericChem extends ItemPackage { getTierThreeChip(), CI.getEmptyCatalyst(4), ItemUtils.getSimpleStack(RocketFuels.Formaldehyde_Catalyst_Dust, 8)) - .itemOutputs(ItemUtils.getSimpleStack(mBrownCatalyst, 10)).noFluidInputs().noFluidOutputs() - .duration(15 * SECONDS).eut(TierEU.RECIPE_LV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.getSimpleStack(mBrownCatalyst, 10)).duration(15 * SECONDS).eut(TierEU.RECIPE_LV) + .addTo(sAssemblerRecipes); } private void recipeCatalystSolidAcid() { @@ -649,8 +648,8 @@ public class GenericChem extends ItemPackage { CI.getEmptyCatalyst(5), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lapis, 2L)) .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mSolidAcidCatalyst, 5)) - .fluidInputs(MISC_MATERIALS.SOLID_ACID_MIXTURE.getFluidStack(1000)).noFluidOutputs() - .duration(30 * SECONDS).eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); + .fluidInputs(MISC_MATERIALS.SOLID_ACID_MIXTURE.getFluidStack(1000)).duration(30 * SECONDS) + .eut(TierEU.RECIPE_EV).addTo(sAssemblerRecipes); } private void recipeCatalystInfiniteMutation() { @@ -661,8 +660,8 @@ public class GenericChem extends ItemPackage { CI.getEmptyCatalyst(5), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Infinity, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 10L)) - .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mInfiniteMutationCatalyst, 5)).noFluidInputs() - .noFluidOutputs().duration(5 * SECONDS).eut(TierEU.RECIPE_UHV).addTo(sAssemblerRecipes); + .itemOutputs(ItemUtils.getSimpleStack(GenericChem.mInfiniteMutationCatalyst, 5)).duration(5 * SECONDS) + .eut(TierEU.RECIPE_UHV).addTo(sAssemblerRecipes); } private void recipeCadaverineAndPutrescine() { @@ -775,12 +774,6 @@ public class GenericChem extends ItemPackage { 240, 1); - /* - * CORE.RA.addChemicalRecipe( ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 7), - * ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 1), 20, - * FluidUtils.getFluidStack("fluid.cellhydrogenperoxide", 50), null, - * ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroperoxide", 14), CI.emptyCells(1), 20*30, 240); - */ } private void recipeHydrogenPeroxide() { @@ -810,13 +803,6 @@ public class GenericChem extends ItemPackage { 240, 1); - /* - * CORE.RA.addChemicalRecipe( GT_ModHandler.getAirCell(15), - * ItemUtils.getItemStackOfAmountFromOreDict("cell2Ethylanthrahydroquinone", 5), 20, - * FluidUtils.getFluidStack("fluid.anthracene", 50), FluidUtils.getFluidStack("fluid.2ethylanthrahydroquinone", - * 4450), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenPeroxide", 2), CI.emptyCells(18), 20*30, 240); - */ - } private static final ItemStack getTierOneChip() { diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java index 1a2bc6bd24..09838c6bac 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/NuclearChem.java @@ -94,7 +94,7 @@ public class NuclearChem extends ItemPackage { .itemInputs( GT_OreDictUnificator.get(OrePrefixes.gem, Materials.NetherStar, 2), GT_Utility.getIntegratedCircuit(20)) - .noItemOutputs().fluidInputs(FluidUtils.getMobEssence(5000)) + .fluidInputs(FluidUtils.getMobEssence(5000)) .fluidOutputs(FluidUtils.getFluidStack(GeneticMutagen, 8000)).duration(30 * SECONDS) .eut(TierEU.RECIPE_HV).addTo(UniversalChemical); } diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java index f5f18c84fa..d50a59b8e5 100644 --- a/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java +++ b/src/main/java/gtPlusPlus/core/item/chemistry/RocketFuels.java @@ -1,5 +1,10 @@ package gtPlusPlus.core.item.chemistry; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sDistilleryRecipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sVacuumRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; + import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; @@ -12,7 +17,11 @@ import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GTPP_Recipe; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; import gtPlusPlus.api.objects.minecraft.ItemPackage; import gtPlusPlus.core.item.base.BaseItemComponent; import gtPlusPlus.core.lib.CORE; @@ -61,37 +70,23 @@ public class RocketFuels extends ItemPackage { FluidStack fuelB = FluidUtils.getFluidStack("fuel", 3000); if (fuelA != null) { - // GT_Values.RA.addDistilleryRecipe(23, fuelA, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false); - GT_Values.RA.addDistilleryRecipe( - CI.getNumberedCircuit(23), - fuelA, - FluidUtils.getFluidStack(Kerosene, 1800), - 200, - 64, - false); + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(23)).fluidInputs(fuelA) + .fluidOutputs(FluidUtils.getFluidStack(Kerosene, 1800)).duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV / 2).addTo(sDistilleryRecipes); } if (fuelA == null && fuelB != null) { - // GT_Values.RA.addDistilleryRecipe(23, fuelB, FluidUtils.getFluidStack(Kerosene, 50), 200, 64, false); - GT_Values.RA.addDistilleryRecipe( - CI.getNumberedCircuit(23), - fuelB, - FluidUtils.getFluidStack(Kerosene, 1800), - 200, - 64, - false); + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(23)).fluidInputs(fuelB) + .fluidOutputs(FluidUtils.getFluidStack(Kerosene, 1800)).duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV / 2).addTo(sDistilleryRecipes); } } public static void createRP1() { FluidStack fuelA = FluidUtils.getFluidStack(Kerosene, 1000); if (fuelA != null) { - GT_Values.RA.addDistilleryRecipe( - CI.getNumberedCircuit(23), - fuelA, - FluidUtils.getFluidStack(RP1, 750), - 20 * 40, - 120, - false); + GT_Values.RA.stdBuilder().itemInputs(GT_Utility.getIntegratedCircuit(23)).fluidInputs(fuelA) + .fluidOutputs(FluidUtils.getFluidStack(RP1, 750)).duration(40 * SECONDS).eut(TierEU.RECIPE_MV) + .addTo(sDistilleryRecipes); } } @@ -139,10 +134,10 @@ public class RocketFuels extends ItemPackage { } private static void createLOH() { - GT_Values.RA.addVacuumFreezerRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1), - ItemUtils.getItemStackOfAmountFromOreDict("cellLiquidHydrogen", 1), - 20 * 16); + GT_Values.RA.stdBuilder().itemInputs(ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogen", 1)) + .itemOutputs(ItemUtils.getItemStackOfAmountFromOreDict("cellLiquidHydrogen", 1)).duration(16 * SECONDS) + .eut(TierEU.RECIPE_MV).addTo(sVacuumRecipes); + CORE.RA.addAdvancedFreezerRecipe( new ItemStack[] {}, new FluidStack[] { FluidUtils.getFluidStack("hydrogen", 300) }, @@ -195,16 +190,13 @@ public class RocketFuels extends ItemPackage { } private static void createFormaldehydeCatalyst() { - GT_Values.RA.addMixerRecipe( - ItemUtils.getItemStackOfAmountFromOreDict("dustIron", 16), - ItemUtils.getItemStackOfAmountFromOreDict("dustVanadium", 1), - CI.getNumberedCircuit(18), - null, - null, - null, - ItemUtils.getSimpleStack(Formaldehyde_Catalyst_Dust, 4), - 160, - 30); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 16L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 1L), + GT_Utility.getIntegratedCircuit(18)) + .itemOutputs(ItemUtils.getSimpleStack(Formaldehyde_Catalyst_Dust, 4)).duration(8 * SECONDS) + .eut(TierEU.RECIPE_LV).addTo(sMixerRecipes); } private static void createUnsymmetricalDimethylhydrazine() { |
