From de864236f83dc31c53ca77a6939357a0959bca75 Mon Sep 17 00:00:00 2001 From: boubou19 Date: Fri, 21 Apr 2023 20:29:38 +0200 Subject: Recipes ra2 (#1872) * Recipes RA2 fixes * Use \uXXXX for non-ASCII characters * Misc cleanup (#1888) * migrate away from addThermalCentrifugeRecipe * split recipes of GT_Block_Stones_Abstract * migrate away from addForgeHammerRecipe * migrate away from addChemicalBathRecipe * remove "DisableOldChemicalRecipes" and its usage, as it's disabled by default in NH and it increases recipe complexity for nothing * Remove underground biomes ore classes, as it's not present in NH * migrate away from addFluidCannerRecipe * migrate away from addFluidExtractionRecipe * migrate away from addChemicalRecipe * migrate away from addMultiblockChemicalRecipe * deprecate addChemicalRecipeForBasicMachineOnly * migrate away from addCentrifugeRecipe * spotlessApply * fixing wrong merge conflict solving * Add Tengam materials (#1891) * Add Tengam materials * Change new recipes to consume 15/16 Amp * Remove now redundant `break` statements * fix comb chances? * fix centrifuge code not working --------- Co-authored-by: glowredman <35727266+glowredman@users.noreply.github.com> Co-authored-by: Martin Robertz --- .../gregtech/loaders/postload/GT_PostLoad.java | 4 +- .../postload/chains/GT_BauxiteRefineChain.java | 505 +++++++++++---------- .../postload/recipes/AssemblyLineRecipes.java | 2 +- .../loaders/postload/recipes/BreweryRecipes.java | 111 ++--- .../postload/recipes/CropProcessingRecipes.java | 14 +- .../recipes/ElectromagneticSeparatorRecipes.java | 15 +- .../postload/recipes/FluidExtractorRecipes.java | 47 +- .../loaders/postload/recipes/RecipeRemover.java | 18 +- .../recipes/TranscendentPlasmaMixerRecipes.java | 18 - 9 files changed, 382 insertions(+), 352 deletions(-) (limited to 'src/main/java/gregtech/loaders/postload') diff --git a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java index 24229bd852..b0c6392de4 100644 --- a/src/main/java/gregtech/loaders/postload/GT_PostLoad.java +++ b/src/main/java/gregtech/loaders/postload/GT_PostLoad.java @@ -46,6 +46,7 @@ import gregtech.common.tileentities.machines.basic.GT_MetaTileEntity_Massfabrica import ic2.api.recipe.IRecipeInput; import ic2.api.recipe.RecipeOutput; +@SuppressWarnings("deprecation") public class GT_PostLoad { public static void activateOreDictHandler() { @@ -426,7 +427,6 @@ public class GT_PostLoad { .collect(Collectors.toSet()) : new HashSet<>(Arrays.asList(Materials.values())); - @SuppressWarnings("deprecation") // stable API for MC 1.7.10 ProgressManager.ProgressBar progressBar = ProgressManager .push("Register materials", replaceVanillaItemsSet.size()); if (GT_Values.cls_enabled) { @@ -442,7 +442,6 @@ public class GT_PostLoad { doActualRegistration(m); }); } - // noinspection deprecation// stable API for MC 1.7.10 ProgressManager.pop(progressBar); // noinspection UnstableApiUsage// stable enough for project GT_Mod.GT_FML_LOGGER.info("Replaced Vanilla Materials (" + stopwatch.stop() + "). Have a Cake."); @@ -472,7 +471,6 @@ public class GT_PostLoad { return ItemList.Circuit_Integrated.getItem(); } - @SuppressWarnings("unchecked") // Overrides legacy method with raw types @Override public void displayAllReleventItems(List aList) { diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java b/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java index ab9162dcd7..b9ccba1cec 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java @@ -1,6 +1,12 @@ package gregtech.loaders.postload.chains; -import net.minecraft.item.ItemStack; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes; +import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes; +import static gregtech.api.util.GT_RecipeBuilder.SECONDS; +import static gregtech.api.util.GT_RecipeBuilder.TICKS; + import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.*; @@ -12,27 +18,31 @@ public class GT_BauxiteRefineChain { public static void run() { - GT_Values.RA.addMixerRecipe( - GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Bauxite, 32), - Materials.SodiumHydroxide.getDust(9), - Materials.Quicklime.getDust(4), - GT_Utility.getIntegratedCircuit(8), - Materials.Water.getFluid(5000), - MaterialsOreAlum.BauxiteSlurry.getFluid(8000), - GT_Values.NI, - 200, - 120); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Bauxite, 32), + Materials.SodiumHydroxide.getDust(9), + Materials.Quicklime.getDust(4), + GT_Utility.getIntegratedCircuit(8)) + .noItemOutputs() + .fluidInputs(Materials.Water.getFluid(5000)) + .fluidOutputs(MaterialsOreAlum.BauxiteSlurry.getFluid(8000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sMixerRecipes); - GT_Values.RA.addMixerRecipe( - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Bauxite, 32), - Materials.SodiumHydroxide.getDust(9), - Materials.Quicklime.getDust(4), - GT_Utility.getIntegratedCircuit(8), - Materials.Water.getFluid(5000), - MaterialsOreAlum.BauxiteSlurry.getFluid(8000), - GT_Values.NI, - 200, - 120); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Bauxite, 32), + Materials.SodiumHydroxide.getDust(9), + Materials.Quicklime.getDust(4), + GT_Utility.getIntegratedCircuit(8)) + .noItemOutputs() + .fluidInputs(Materials.Water.getFluid(5000)) + .fluidOutputs(MaterialsOreAlum.BauxiteSlurry.getFluid(8000)) + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sMixerRecipes); GT_Values.RA.addCrackingRecipe( 1, @@ -42,240 +52,265 @@ public class GT_BauxiteRefineChain { 160, 400); - GT_Values.RA.addMultiblockChemicalRecipe( - new ItemStack[] { Materials.Aluminiumhydroxide.getDust(1), }, - new FluidStack[] { Materials.CarbonDioxide.getGas(5000), - MaterialsOreAlum.HeatedBauxiteSlurry.getFluid(8000) }, - new FluidStack[] { MaterialsOreAlum.SluiceJuice.getFluid(5000), }, - new ItemStack[] { Materials.Aluminiumoxide.getDust(64), Materials.Aluminiumoxide.getDust(16), - Materials.SodiumCarbonate.getDust(9), Materials.Calcite.getDust(10), - MaterialsOreAlum.BauxiteSlag.getDust(16) }, - 300, - 480); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Aluminiumhydroxide.getDust(1)) + .itemOutputs( + Materials.Aluminiumoxide.getDust(64), + Materials.Aluminiumoxide.getDust(16), + Materials.SodiumCarbonate.getDust(9), + Materials.Calcite.getDust(10), + MaterialsOreAlum.BauxiteSlag.getDust(16)) + .fluidInputs(Materials.CarbonDioxide.getGas(5000), MaterialsOreAlum.HeatedBauxiteSlurry.getFluid(8000)) + .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(5000)) + .duration(15 * SECONDS) + .eut(TierEU.RECIPE_HV) + .addTo(sMultiblockChemicalRecipes); - GT_Values.RA.addCentrifugeRecipe( - MaterialsOreAlum.BauxiteSlag.getDust(1), - GT_Values.NI, - GT_Values.NF, - GT_Values.NF, - Materials.Rutile.getDust(1), - Materials.Gallium.getDust(1), - Materials.Quicklime.getDust(1), - Materials.SiliconDioxide.getDust(1), - Materials.Iron.getDust(1), - GT_Values.NI, - new int[] { 8000, 6000, 2000, 9000, 8000 }, - 40, - 120); + GT_Values.RA.stdBuilder() + .itemInputs(MaterialsOreAlum.BauxiteSlag.getDust(1)) + .itemOutputs( + Materials.Rutile.getDust(1), + Materials.Gallium.getDust(1), + Materials.Quicklime.getDust(1), + Materials.SiliconDioxide.getDust(1), + Materials.Iron.getDust(1)) + .outputChances(8000, 6000, 2000, 9000, 8000) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sCentrifugeRecipes); - GT_Values.RA.addChemicalBathRecipe( - GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Ilmenite, 1), - Materials.SulfuricAcid.getFluid(1000), - new FluidStack(ItemList.sGreenVitriol, 2000), - Materials.Rutile.getDust(1), - MaterialsOreAlum.IlmeniteSlag.getDust(1), - GT_Values.NI, - new int[] { 8500, 3000 }, - 420, - 1000); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, Materials.Ilmenite, 1)) + .itemOutputs(Materials.Rutile.getDust(1), MaterialsOreAlum.IlmeniteSlag.getDust(1)) + .outputChances(8500, 3000) + .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) + .fluidOutputs(new FluidStack(ItemList.sGreenVitriol, 2000)) + .duration(21 * SECONDS) + .eut(1000) + .addTo(sChemicalBathRecipes); - GT_Values.RA.addChemicalBathRecipe( - GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Ilmenite, 1), - Materials.SulfuricAcid.getFluid(1000), - new FluidStack(ItemList.sGreenVitriol, 2000), - Materials.Rutile.getDust(1), - MaterialsOreAlum.IlmeniteSlag.getDust(1), - GT_Values.NI, - new int[] { 8500, 6000 }, - 420, - 1000); + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Ilmenite, 1)) + .itemOutputs(Materials.Rutile.getDust(1), MaterialsOreAlum.IlmeniteSlag.getDust(1)) + .outputChances(8500, 6000) + .fluidInputs(Materials.SulfuricAcid.getFluid(1000)) + .fluidOutputs(new FluidStack(ItemList.sGreenVitriol, 2000)) + .duration(21 * SECONDS) + .eut(1000) + .addTo(sChemicalBathRecipes); - GT_Values.RA.addCentrifugeRecipe( - MaterialsOreAlum.IlmeniteSlag.getDust(1), - GT_Values.NI, - GT_Values.NF, - GT_Values.NF, - Materials.Iron.getDust(1), - Materials.Niobium.getDust(1), - Materials.Tantalum.getDust(1), - Materials.Manganese.getDust(1), - Materials.Magnesium.getDust(1), - GT_Values.NI, - new int[] { 8000, 1000, 2000, 5000, 6000 }, - 40, - 120); + GT_Values.RA.stdBuilder() + .itemInputs(MaterialsOreAlum.IlmeniteSlag.getDust(1)) + .itemOutputs( + Materials.Iron.getDust(1), + Materials.Niobium.getDust(1), + Materials.Tantalum.getDust(1), + Materials.Manganese.getDust(1), + Materials.Magnesium.getDust(1)) + .outputChances(8000, 1000, 2000, 5000, 6000) + .noFluidInputs() + .noFluidOutputs() + .duration(2 * SECONDS) + .eut(TierEU.RECIPE_MV) + .addTo(sCentrifugeRecipes); OrePrefixes[] washable = new OrePrefixes[] { OrePrefixes.crushed, OrePrefixes.crushedPurified, OrePrefixes.dustImpure, OrePrefixes.dustPure }; for (OrePrefixes ore : washable) { - GT_Values.RA.addMixerRecipe( - GT_OreDictUnificator.get(ore, Materials.Sapphire, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.SodiumHydroxide, 1), - GT_Utility.getIntegratedCircuit(1), - null, - Materials.HydrochloricAcid.getFluid(1000), - MaterialsOreAlum.SapphireJuice.getFluid(1000), - null, - 40, - 100); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(ore, Materials.Sapphire, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.SodiumHydroxide, 1), + GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) + .fluidOutputs(MaterialsOreAlum.SapphireJuice.getFluid(1000)) + .duration(2 * SECONDS) + .eut(100) + .addTo(sMixerRecipes); - GT_Values.RA.addMixerRecipe( - GT_OreDictUnificator.get(ore, Materials.GreenSapphire, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.SodiumHydroxide, 1), - GT_Utility.getIntegratedCircuit(1), - null, - Materials.HydrochloricAcid.getFluid(1000), - MaterialsOreAlum.GreenSapphireJuice.getFluid(1000), - null, - 40, - 100); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(ore, Materials.GreenSapphire, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.SodiumHydroxide, 1), + GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) + .fluidOutputs(MaterialsOreAlum.GreenSapphireJuice.getFluid(1000)) + .duration(2 * SECONDS) + .eut(100) + .addTo(sMixerRecipes); - GT_Values.RA.addMixerRecipe( - GT_OreDictUnificator.get(ore, Materials.Ruby, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.SodiumHydroxide, 1), - GT_Utility.getIntegratedCircuit(1), - null, - Materials.HydrochloricAcid.getFluid(1000), - MaterialsOreAlum.RubyJuice.getFluid(1000), - null, - 40, - 100); + GT_Values.RA.stdBuilder() + .itemInputs( + GT_OreDictUnificator.get(ore, Materials.Ruby, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.SodiumHydroxide, 1), + GT_Utility.getIntegratedCircuit(1)) + .noItemOutputs() + .fluidInputs(Materials.HydrochloricAcid.getFluid(1000)) + .fluidOutputs(MaterialsOreAlum.RubyJuice.getFluid(1000)) + .duration(2 * SECONDS) + .eut(100) + .addTo(sMixerRecipes); } - GT_Values.RA.addCentrifugeRecipe( - GT_Utility.getIntegratedCircuit(1), - null, - MaterialsOreAlum.SapphireJuice.getFluid(1000), - Materials.HydrochloricAcid.getFluid(1000), - Materials.Aluminiumhydroxide.getDust(3), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Vanadium, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Magnesium, 1), - null, - null, - new int[] { 10000, 2000, 2000, 2000 }, - 45, - 100); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + Materials.Aluminiumhydroxide.getDust(3), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Vanadium, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Magnesium, 1)) + .outputChances(10000, 2000, 2000, 2000) + .fluidInputs(MaterialsOreAlum.SapphireJuice.getFluid(1000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) + .duration(2 * SECONDS + 5 * TICKS) + .eut(100) + .addTo(sCentrifugeRecipes); + + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + Materials.Aluminiumhydroxide.getDust(3), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Vanadium, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Manganese, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Beryllium, 1)) + .outputChances(10000, 2000, 2000, 2000, 2000) + .fluidInputs(MaterialsOreAlum.GreenSapphireJuice.getFluid(1000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) + .duration(2 * SECONDS + 5 * TICKS) + .eut(100) + .addTo(sCentrifugeRecipes); - GT_Values.RA.addCentrifugeRecipe( - GT_Utility.getIntegratedCircuit(1), - null, - MaterialsOreAlum.GreenSapphireJuice.getFluid(1000), - Materials.HydrochloricAcid.getFluid(1000), - Materials.Aluminiumhydroxide.getDust(3), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Vanadium, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Manganese, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Beryllium, 1), - null, - new int[] { 10000, 2000, 2000, 2000, 2000 }, - 45, - 100); + GT_Values.RA.stdBuilder() + .itemInputs(GT_Utility.getIntegratedCircuit(1)) + .itemOutputs( + Materials.Aluminiumhydroxide.getDust(3), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Vanadium, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Magnesium, 1)) + .outputChances(10000, 10000, 2000, 2000, 2000) + .fluidInputs(MaterialsOreAlum.RubyJuice.getFluid(1000)) + .fluidOutputs(Materials.HydrochloricAcid.getFluid(1000)) + .duration(2 * SECONDS + 5 * TICKS) + .eut(100) + .addTo(sCentrifugeRecipes); - GT_Values.RA.addCentrifugeRecipe( - GT_Utility.getIntegratedCircuit(1), - null, - MaterialsOreAlum.RubyJuice.getFluid(1000), - Materials.HydrochloricAcid.getFluid(1000), - Materials.Aluminiumhydroxide.getDust(3), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Vanadium, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Magnesium, 1), - null, - new int[] { 10000, 10000, 2000, 2000, 2000 }, - 45, - 100); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Pyrope.getDust(1)) + .itemOutputs( + Materials.Aluminiumoxide.getDust(1), + Materials.Magnesia.getDust(1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Silver, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Calcite, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Vanadium, 1)) + .outputChances(5000, 4000, 2000, 2000, 2000, 2000) + .fluidInputs(Materials.NitricAcid.getFluid(10)) + .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(10)) + .duration(2 * SECONDS + 5 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sCentrifugeRecipes); - GT_Values.RA.addCentrifugeRecipe( - Materials.Pyrope.getDust(1), - null, - Materials.NitricAcid.getFluid(10), - MaterialsOreAlum.SluiceJuice.getFluid(10), - Materials.Aluminiumoxide.getDust(1), - Materials.Magnesia.getDust(1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Silver, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Calcite, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Vanadium, 1), - new int[] { 5000, 4000, 2000, 2000, 2000, 2000 }, - 45, - 120); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Almandine.getDust(1)) + .itemOutputs( + Materials.Aluminiumoxide.getDust(1), + Materials.Iron.getDust(1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Chrome, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Calcite, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Vanadium, 1)) + .outputChances(5000, 4000, 2000, 2000, 2000, 2000) + .fluidInputs(Materials.NitricAcid.getFluid(10)) + .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(10)) + .duration(2 * SECONDS + 5 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sCentrifugeRecipes); - GT_Values.RA.addCentrifugeRecipe( - Materials.Almandine.getDust(1), - null, - Materials.NitricAcid.getFluid(10), - MaterialsOreAlum.SluiceJuice.getFluid(10), - Materials.Aluminiumoxide.getDust(1), - Materials.Iron.getDust(1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Chrome, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Calcite, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Vanadium, 1), - new int[] { 5000, 4000, 2000, 2000, 2000, 2000 }, - 45, - 120); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Spessartine.getDust(1)) + .itemOutputs( + Materials.Aluminiumoxide.getDust(1), + Materials.Pyrolusite.getDust(1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tantalum, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Calcite, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Magnesium, 1)) + .outputChances(5000, 4000, 2000, 2000, 2000, 2000) + .fluidInputs(Materials.NitricAcid.getFluid(10)) + .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(10)) + .duration(2 * SECONDS + 5 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sCentrifugeRecipes); - GT_Values.RA.addCentrifugeRecipe( - Materials.Spessartine.getDust(1), - null, - Materials.NitricAcid.getFluid(10), - MaterialsOreAlum.SluiceJuice.getFluid(10), - Materials.Aluminiumoxide.getDust(1), - Materials.Pyrolusite.getDust(1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Tantalum, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Calcite, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Magnesium, 1), - new int[] { 5000, 4000, 2000, 2000, 2000, 2000 }, - 45, - 120); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Andradite.getDust(1)) + .itemOutputs( + Materials.Quicklime.getDust(1), + Materials.Iron.getDust(1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Rutile, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Aluminiumoxide, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Vanadium, 1)) + .outputChances(5000, 4000, 2000, 2000, 2000, 2000) + .fluidInputs(Materials.NitricAcid.getFluid(10)) + .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(10)) + .duration(2 * SECONDS + 5 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sCentrifugeRecipes); - GT_Values.RA.addCentrifugeRecipe( - Materials.Andradite.getDust(1), - null, - Materials.NitricAcid.getFluid(10), - MaterialsOreAlum.SluiceJuice.getFluid(10), - Materials.Quicklime.getDust(1), - Materials.Iron.getDust(1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Rutile, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Aluminiumoxide, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Vanadium, 1), - new int[] { 5000, 4000, 2000, 2000, 2000, 2000 }, - 45, - 120); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Uvarovite.getDust(1)) + .itemOutputs( + Materials.Quicklime.getDust(1), + Materials.Chrome.getDust(1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Silver, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Aluminiumoxide, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Manganese, 1)) + .outputChances(5000, 1000, 2000, 2000, 2000, 2000) + .fluidInputs(Materials.NitricAcid.getFluid(10)) + .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(10)) + .duration(2 * SECONDS + 5 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sCentrifugeRecipes); - GT_Values.RA.addCentrifugeRecipe( - Materials.Uvarovite.getDust(1), - null, - Materials.NitricAcid.getFluid(10), - MaterialsOreAlum.SluiceJuice.getFluid(10), - Materials.Quicklime.getDust(1), - Materials.Chrome.getDust(1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Silver, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Aluminiumoxide, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Manganese, 1), - new int[] { 5000, 1000, 2000, 2000, 2000, 2000 }, - 45, - 120); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Uvarovite.getDust(1)) + .itemOutputs( + Materials.Quicklime.getDust(1), + Materials.Chrome.getDust(1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Silver, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Aluminiumoxide, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Manganese, 1)) + .outputChances(5000, 1000, 2000, 2000, 2000, 2000) + .fluidInputs(Materials.NitricAcid.getFluid(10)) + .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(10)) + .duration(2 * SECONDS + 5 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sCentrifugeRecipes); - GT_Values.RA.addCentrifugeRecipe( - Materials.Grossular.getDust(1), - null, - Materials.NitricAcid.getFluid(10), - MaterialsOreAlum.SluiceJuice.getFluid(10), - Materials.Quicklime.getDust(1), - Materials.Aluminiumoxide.getDust(1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Calcite, 1), - GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Vanadium, 1), - new int[] { 5000, 4000, 2000, 2000, 2000, 2000 }, - 45, - 120); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.Grossular.getDust(1)) + .itemOutputs( + Materials.Quicklime.getDust(1), + Materials.Aluminiumoxide.getDust(1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Gold, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Iron, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Calcite, 1), + GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Vanadium, 1)) + .outputChances(5000, 4000, 2000, 2000, 2000, 2000) + .fluidInputs(Materials.NitricAcid.getFluid(10)) + .fluidOutputs(MaterialsOreAlum.SluiceJuice.getFluid(10)) + .duration(2 * SECONDS + 5 * TICKS) + .eut(TierEU.RECIPE_MV) + .addTo(sCentrifugeRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java index ece7692865..aaa46ccd3b 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java @@ -57,7 +57,7 @@ public class AssemblyLineRecipes implements Runnable { .noFluidOutputs() .itemOutputs(ItemList.Electric_Motor_LuV.get(1)) .eut(TierEU.RECIPE_IV) - .duration(600) + .duration(30 * SECONDS) .addTo(AssemblyLine); // ZPM motor diff --git a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java index 3724af440d..05e1d76fdb 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java @@ -11,9 +11,7 @@ import static net.minecraftforge.fluids.FluidRegistry.getFluidStack; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; @@ -90,23 +88,25 @@ public class BreweryRecipes implements Runnable { // water based recipe input { - Fluid[] waterArray; + String[] waterArray; /* * if IC2 isn't loaded, getDistilledWater returns the base minecraft water, so no need to do the recipe * loading twice. */ if (IndustrialCraft2.isModLoaded()) { - waterArray = new Fluid[] { FluidRegistry.WATER, GT_ModHandler.getDistilledWater(1L) - .getFluid() }; + waterArray = new String[] { FluidRegistry.WATER.getUnlocalizedName(), + GT_ModHandler.getDistilledWater(1L) + .getFluid() + .getUnlocalizedName() }; } else { - waterArray = new Fluid[] { FluidRegistry.WATER }; + waterArray = new String[] { FluidRegistry.WATER.getUnlocalizedName(), }; } - for (Fluid tFluid : waterArray) { + for (String fluid : waterArray) { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Milk, 1L)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("milk", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -115,7 +115,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Wheat, 1L)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.wheatyjuice", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -124,7 +124,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1L)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.mineralwater", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -133,7 +133,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.mineralwater", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -142,7 +142,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.mineralwater", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -151,7 +151,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 1L)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.mineralwater", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -160,7 +160,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.thick", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -169,7 +169,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.mundane", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -178,7 +178,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sugar, 1L)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.mundane", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -187,7 +187,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Blaze, 1L)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.mundane", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -196,7 +196,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.magma_cream, 1, 0)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.mundane", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -205,7 +205,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.fermented_spider_eye, 1, 0)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.mundane", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -214,7 +214,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.spider_eye, 1, 0)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.mundane", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -223,7 +223,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.speckled_melon, 1, 0)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.mundane", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -232,7 +232,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.ghast_tear, 1, 0)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.mundane", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -241,7 +241,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.nether_wart, 1, 0)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.awkward", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -250,7 +250,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Blocks.red_mushroom, 1, 0)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.poison", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -259,7 +259,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.fish, 1, 3)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.poison.strong", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -269,7 +269,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.IC2_Grin_Powder.get(1L)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.poison.strong", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -278,7 +278,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.reeds, 1, 0)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.reedwater", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -287,7 +287,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.apple, 1, 0)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.applejuice", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -296,7 +296,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.golden_apple, 1, 0)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.goldenapplejuice", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -306,7 +306,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(new ItemStack(Items.golden_apple, 1, 1)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.idunsapplejuice", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -316,7 +316,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(ItemList.IC2_Hops.get(1L)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.hopsjuice", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -325,7 +325,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coffee, 1L)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.darkcoffee", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -334,7 +334,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chili, 1L)) .noItemOutputs() - .fluidInputs(new FluidStack(tFluid, 750)) + .fluidInputs(getFluidStack(fluid, 750)) .fluidOutputs(getFluidStack("potion.chillysauce", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -520,7 +520,7 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(getModItem(Forestry.ID, "fertilizerBio", 4L, 0)) .noItemOutputs() - .fluidInputs(GT_ModHandler.getWater(750L)) + .fluidInputs(getFluidStack(FluidRegistry.WATER.getUnlocalizedName(), 750)) .fluidOutputs(getFluidStack("biomass", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -529,7 +529,12 @@ public class BreweryRecipes implements Runnable { GT_Values.RA.stdBuilder() .itemInputs(getModItem(Forestry.ID, "mulch", 16L, 0)) .noItemOutputs() - .fluidInputs(GT_ModHandler.getDistilledWater(750L)) + .fluidInputs( + getFluidStack( + GT_ModHandler.getDistilledWater(750L) + .getFluid() + .getUnlocalizedName(), + 750)) .fluidOutputs(getFluidStack("biomass", 750)) .duration(6 * SECONDS + 8 * TICKS) .eut(4) @@ -595,28 +600,24 @@ public class BreweryRecipes implements Runnable { .addTo(sBrewingRecipes); // strong - if (aName == "regen" || aName == "speed" || aName == "health" || aName == "strength" || aName == "poison") { - GT_Values.RA.stdBuilder() - .itemInputs(aItem) - .noItemOutputs() - .fluidInputs(getFluidStack("potion.thick", 750)) - .fluidOutputs(getFluidStack("potion." + aName + ".strong", 750)) - .duration(6 * SECONDS + 8 * TICKS) - .eut(4) - .addTo(sBrewingRecipes); - } + GT_Values.RA.stdBuilder() + .itemInputs(aItem) + .noItemOutputs() + .fluidInputs(getFluidStack("potion.thick", 750)) + .fluidOutputs(getFluidStack("potion." + aName + ".strong", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); // long - if (aName != "health") { - GT_Values.RA.stdBuilder() - .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L)) - .noItemOutputs() - .fluidInputs(getFluidStack("potion." + aName, 750)) - .fluidOutputs(getFluidStack("potion." + aName + ".long", 750)) - .duration(6 * SECONDS + 8 * TICKS) - .eut(4) - .addTo(sBrewingRecipes); - } + GT_Values.RA.stdBuilder() + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L)) + .noItemOutputs() + .fluidInputs(getFluidStack("potion." + aName, 750)) + .fluidOutputs(getFluidStack("potion." + aName + ".long", 750)) + .duration(6 * SECONDS + 8 * TICKS) + .eut(4) + .addTo(sBrewingRecipes); MixerRecipes.addMixerPotionRecipes(aName); } diff --git a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java index ff2f6521bd..a4dda50738 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java @@ -15,7 +15,6 @@ import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_RecipeBuilder; import gregtech.api.util.GT_Utility; public class CropProcessingRecipes implements Runnable { @@ -131,18 +130,15 @@ public class CropProcessingRecipes implements Runnable { FluidStack fluidOutputChemReactor = aMaterialOut.mOreByProducts.isEmpty() ? null : aMaterialOut.mOreByProducts.get(0) .getMolten(144); - GT_RecipeBuilder buildChemRecipe = GT_Values.RA.stdBuilder() + + GT_Values.RA.stdBuilder() .itemInputs( GT_Utility.copyAmount(9, tCrop), GT_OreDictUnificator.get(OrePrefixes.crushed, aMaterial, 1)) .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.crushedPurified, aMaterial, 4)) - .fluidInputs(Materials.Water.getFluid(1000)); - if (fluidOutputChemReactor == null) { - buildChemRecipe.noFluidOutputs(); - } else { - buildChemRecipe.fluidOutputs(fluidOutputChemReactor); - } - buildChemRecipe.duration(4 * SECONDS + 16 * TICKS) + .fluidInputs(Materials.Water.getFluid(1000)) + .fluidOutputs(fluidOutputChemReactor) + .duration(4 * SECONDS + 16 * TICKS) .eut(24) .addTo(UniversalChemical); diff --git a/src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java index 28f2d349b8..2c7f7aee72 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java @@ -6,6 +6,7 @@ import static gregtech.api.util.GT_RecipeBuilder.SECONDS; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsOreAlum; +import gregtech.api.enums.TierEU; public class ElectromagneticSeparatorRecipes implements Runnable { @@ -18,8 +19,20 @@ public class ElectromagneticSeparatorRecipes implements Runnable { .noFluidInputs() .noFluidOutputs() .duration(10 * SECONDS) - .eut(240) + .eut(TierEU.RECIPE_HV / 2) .addTo(sElectroMagneticSeparatorRecipes); + GT_Values.RA.stdBuilder() + .itemInputs(Materials.TengamRaw.getDust(1)) + .itemOutputs( + Materials.TengamPurified.getDust(1), + Materials.NeodymiumMagnetic.getDust(1), + Materials.SamariumMagnetic.getDust(1)) + .outputChances(10000, 1000, 1000) + .noFluidInputs() + .noFluidOutputs() + .duration(10 * SECONDS) + .eut(TierEU.RECIPE_UHV) + .addTo(sElectroMagneticSeparatorRecipes); } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java index 603f1ef115..2d50d3e945 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java @@ -617,29 +617,34 @@ public class FluidExtractorRecipes implements Runnable { // Beecombs fluid extractor recipes if (BartWorks.isModLoaded()) { // xenon - GT_Values.RA.addFluidExtractionRecipe( - getModItem(GregTech.ID, "gt.comb", 1L, 134), - null, - getFluidStack("xenon", 250), - 100 * 100, - 50, - 8192); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 134)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(getFluidStack("xenon", 250)) + .duration(2 * SECONDS + 10 * TICKS) + .eut(TierEU.RECIPE_IV) + .addTo(sFluidExtractionRecipes); + // neon - GT_Values.RA.addFluidExtractionRecipe( - getModItem(GregTech.ID, "gt.comb", 1L, 135), - null, - getFluidStack("neon", 250), - 100 * 100, - 15, - 8192); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 135)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(getFluidStack("neon", 250)) + .duration(15 * TICKS) + .eut(TierEU.RECIPE_IV) + .addTo(sFluidExtractionRecipes); + // krpton - GT_Values.RA.addFluidExtractionRecipe( - getModItem(GregTech.ID, "gt.comb", 1L, 136), - null, - getFluidStack("krypton", 250), - 100 * 100, - 25, - 8192); + GT_Values.RA.stdBuilder() + .itemInputs(getModItem(GregTech.ID, "gt.comb", 1L, 136)) + .noItemOutputs() + .noFluidInputs() + .fluidOutputs(getFluidStack("krypton", 250)) + .duration(1 * SECONDS + 5 * TICKS) + .eut(TierEU.RECIPE_IV) + .addTo(sFluidExtractionRecipes); } } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java b/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java index 708ffa4cec..8dd51d8272 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java +++ b/src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java @@ -42,34 +42,34 @@ public class RecipeRemover implements Runnable { try { GT_Utility.removeSimpleIC2MachineRecipe( GT_Values.NI, - ic2.api.recipe.Recipes.metalformerExtruding.getRecipes(), + Recipes.metalformerExtruding.getRecipes(), ItemList.Cell_Empty.get(3L)); GT_Utility.removeSimpleIC2MachineRecipe( ItemList.IC2_Energium_Dust.get(1L), - ic2.api.recipe.Recipes.compressor.getRecipes(), + Recipes.compressor.getRecipes(), GT_Values.NI); GT_Utility.removeSimpleIC2MachineRecipe( new ItemStack(Items.gunpowder), - ic2.api.recipe.Recipes.extractor.getRecipes(), + Recipes.extractor.getRecipes(), GT_Values.NI); GT_Utility.removeSimpleIC2MachineRecipe( new ItemStack(Blocks.wool, 1, 32767), - ic2.api.recipe.Recipes.extractor.getRecipes(), + Recipes.extractor.getRecipes(), GT_Values.NI); GT_Utility.removeSimpleIC2MachineRecipe( new ItemStack(Blocks.gravel), - ic2.api.recipe.Recipes.oreWashing.getRecipes(), + Recipes.oreWashing.getRecipes(), GT_Values.NI); } catch (Throwable ignored) {} GT_Utility.removeIC2BottleRecipe( GT_ModHandler.getIC2Item("fuelRod", 1), GT_ModHandler.getIC2Item("UranFuel", 1), - ic2.api.recipe.Recipes.cannerBottle.getRecipes(), + Recipes.cannerBottle.getRecipes(), GT_ModHandler.getIC2Item("reactorUraniumSimple", 1, 1)); GT_Utility.removeIC2BottleRecipe( GT_ModHandler.getIC2Item("fuelRod", 1), GT_ModHandler.getIC2Item("MOXFuel", 1), - ic2.api.recipe.Recipes.cannerBottle.getRecipes(), + Recipes.cannerBottle.getRecipes(), GT_ModHandler.getIC2Item("reactorMOXSimple", 1, 1)); GT_Utility.removeSimpleIC2MachineRecipe( @@ -117,7 +117,7 @@ public class RecipeRemover implements Runnable { if (!GregTech_API.mIC2Classic) { try { - Map tLiqExchange = ic2.api.recipe.Recipes.liquidCooldownManager + Map tLiqExchange = Recipes.liquidCooldownManager .getHeatExchangeProperties(); Iterator> tIterator = tLiqExchange .entrySet() @@ -135,7 +135,7 @@ public class RecipeRemover implements Runnable { } try { - Map tLiqExchange = ic2.api.recipe.Recipes.liquidHeatupManager + Map tLiqExchange = Recipes.liquidHeatupManager .getHeatExchangeProperties(); Iterator> tIterator = tLiqExchange .entrySet() diff --git a/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java index 3c53b565ce..a5ce4e3871 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java @@ -2,9 +2,6 @@ package gregtech.loaders.postload.recipes; import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sTranscendentPlasmaMixerRecipes; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; - import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.MaterialsUEVplus; @@ -18,21 +15,6 @@ public class TranscendentPlasmaMixerRecipes implements Runnable { private static final int EXOTIC_EU_PER_L = 1_073_007_393; private static final int STELLAR_EU_PER_HALF_L = 2_138_383_760; - @Deprecated - private static void addTranscendentPlasmaMixerRecipe(final FluidStack fluidOutput, final int circuitNumber, - final FluidStack[] fluidInput, final int EUPerL) { - sTranscendentPlasmaMixerRecipes.addRecipe( - false, - new ItemStack[] { GT_Utility.getIntegratedCircuit(circuitNumber) }, - null, - null, - fluidInput, - new FluidStack[] { fluidOutput }, - 100, - EUPerL, // NOT EU/T, I am simply using the field for this purpose. - 0); - } - @Override public void run() { -- cgit