aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java111
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java33
2 files changed, 77 insertions, 67 deletions
diff --git a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java
index d246a464f2..b7b2afb821 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/BreweryRecipes.java
@@ -11,7 +11,9 @@ 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;
@@ -88,25 +90,23 @@ public class BreweryRecipes implements Runnable {
// water based recipe input
{
- String[] waterArray;
+ Fluid[] 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 String[] { FluidRegistry.WATER.getUnlocalizedName(),
- GT_ModHandler.getDistilledWater(1L)
- .getFluid()
- .getUnlocalizedName() };
+ waterArray = new Fluid[] { FluidRegistry.WATER, GT_ModHandler.getDistilledWater(1L)
+ .getFluid() };
} else {
- waterArray = new String[] { FluidRegistry.WATER.getUnlocalizedName(), };
+ waterArray = new Fluid[] { FluidRegistry.WATER };
}
- for (String fluid : waterArray) {
+ for (Fluid tFluid : waterArray) {
GT_Values.RA.stdBuilder()
.itemInputs(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Milk, 1L))
.noItemOutputs()
- .fluidInputs(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(fluid, 750))
+ .fluidInputs(new FluidStack(tFluid, 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(getFluidStack(FluidRegistry.WATER.getUnlocalizedName(), 750))
+ .fluidInputs(GT_ModHandler.getWater(750L))
.fluidOutputs(getFluidStack("biomass", 750))
.duration(6 * SECONDS + 8 * TICKS)
.eut(4)
@@ -529,12 +529,7 @@ public class BreweryRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(getModItem(Forestry.ID, "mulch", 16L, 0))
.noItemOutputs()
- .fluidInputs(
- getFluidStack(
- GT_ModHandler.getDistilledWater(750L)
- .getFluid()
- .getUnlocalizedName(),
- 750))
+ .fluidInputs(GT_ModHandler.getDistilledWater(750L))
.fluidOutputs(getFluidStack("biomass", 750))
.duration(6 * SECONDS + 8 * TICKS)
.eut(4)
@@ -600,24 +595,28 @@ public class BreweryRecipes implements Runnable {
.addTo(sBrewingRecipes);
// strong
- 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);
+ 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);
+ }
// long
- 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);
+ 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);
+ }
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 28f66b8179..da333eab87 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/CropProcessingRecipes.java
@@ -15,6 +15,7 @@ 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 {
@@ -130,17 +131,27 @@ public class CropProcessingRecipes implements Runnable {
FluidStack fluidOutputChemReactor = aMaterialOut.mOreByProducts.isEmpty() ? null
: aMaterialOut.mOreByProducts.get(0)
.getMolten(144);
-
- 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))
- .fluidOutputs(fluidOutputChemReactor)
- .duration(4 * SECONDS + 16 * TICKS)
- .eut(24)
- .addTo(UniversalChemical);
+ GT_RecipeBuilder buildChemRecipe = 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)
+ .eut(24)
+ .addTo(UniversalChemical);
GT_Values.RA.stdBuilder()
.itemInputs(
generated by cgit (git 2.46.0) at 2025-03-04 14:38:38 +0000