aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/postload
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2023-04-21 20:29:38 +0200
committerGitHub <noreply@github.com>2023-04-21 20:29:38 +0200
commitde864236f83dc31c53ca77a6939357a0959bca75 (patch)
treeef739fd9426e7c2525b1560386faaa5bb893e30d /src/main/java/gregtech/loaders/postload
parent285a75535d07f2037967b1208a5840fb81719514 (diff)
downloadGT5-Unofficial-de864236f83dc31c53ca77a6939357a0959bca75.tar.gz
GT5-Unofficial-de864236f83dc31c53ca77a6939357a0959bca75.tar.bz2
GT5-Unofficial-de864236f83dc31c53ca77a6939357a0959bca75.zip
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 <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gregtech/loaders/postload')
-rw-r--r--src/main/java/gregtech/loaders/postload/GT_PostLoad.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_BauxiteRefineChain.java505
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AssemblyLineRecipes.java2
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java111
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java14
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ElectromagneticSeparatorRecipes.java15
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FluidExtractorRecipes.java47
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/RecipeRemover.java18
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java18
9 files changed, 382 insertions, 352 deletions
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<ItemStack> 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))