diff options
author | Martin Robertz <dream-master@gmx.net> | 2021-02-01 21:45:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-01 21:45:34 +0100 |
commit | 8d2b13f7e466165b5aeaed2198a8573ef67131c3 (patch) | |
tree | 350ef932e7485a633ff742a8ed4b0dde667841b9 /src/main/java/gregtech/common | |
parent | 00cd69a4f5523630882c8fae0e0ed43279f9cb81 (diff) | |
parent | d0fd780d7be32c705d334484b6ac87442345fb6f (diff) | |
download | GT5-Unofficial-8d2b13f7e466165b5aeaed2198a8573ef67131c3.tar.gz GT5-Unofficial-8d2b13f7e466165b5aeaed2198a8573ef67131c3.tar.bz2 GT5-Unofficial-8d2b13f7e466165b5aeaed2198a8573ef67131c3.zip |
Merge pull request #429 from GTNewHorizons/autoclave-fluid-out
allow autoclave to have fluid out in recipe
Diffstat (limited to 'src/main/java/gregtech/common')
-rw-r--r-- | src/main/java/gregtech/common/GT_RecipeAdder.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index d313cb613f..6563b3d368 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -944,8 +944,12 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return addAutoclaveRecipe(aInput, aCircuit, aFluid, aOutput, aChance, aDuration, aEUt, false); } - public boolean addAutoclaveRecipe(ItemStack aInput, ItemStack aCircuit, FluidStack aFluid, ItemStack aOutput, int aChance, int aDuration, int aEUt, boolean aCleanroom) { - if ((aInput == null) || (aFluid == null) || (aOutput == null)) { + public boolean addAutoclaveRecipe(ItemStack aInput, ItemStack aCircuit, FluidStack aFluidIn, ItemStack aOutput, int aChance, int aDuration, int aEUt, boolean aCleanroom) { + return addAutoclaveRecipe(aInput, aCircuit, aFluidIn, null, aOutput, aChance, aDuration, aEUt,aCleanroom); + } + + public boolean addAutoclaveRecipe(ItemStack aInput, ItemStack aCircuit, FluidStack aFluidIn, FluidStack aFluidOut, ItemStack aOutput, int aChance, int aDuration, int aEUt, boolean aCleanroom) { + if ((aInput == null) || (aFluidIn == null) || (aOutput == null)) { return false; } if ((aDuration = GregTech_API.sRecipeFile.get("autoclave", aInput, aDuration)) <= 0) { @@ -954,7 +958,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if (!GT_Mod.gregtechproxy.mEnableCleanroom){ aCleanroom = false; } - GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes.addRecipe(true, new ItemStack[]{aInput, aCircuit}, new ItemStack[]{aOutput}, null, new int[]{aChance}, new FluidStack[]{aFluid}, null, aDuration, aEUt, aCleanroom ? -200 : 0); + GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes.addRecipe(true, new ItemStack[]{aInput, aCircuit}, new ItemStack[]{aOutput}, null, new int[]{aChance}, new FluidStack[]{aFluidIn}, new FluidStack[]{aFluidOut}, aDuration, aEUt, aCleanroom ? -200 : 0); return true; } |