diff options
| author | Dream-Master <dream-master@gmx.net> | 2017-08-15 20:45:14 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-08-15 20:45:14 +0200 |
| commit | 71c0baf7194d888c16f449079a3279229a2e4786 (patch) | |
| tree | fa721cd61293a764789f5f26f7af79e5b02cc07c /src | |
| parent | 58a5c1b07881fe9fca558c25cd5dcf2911729602 (diff) | |
| download | GT5-Unofficial-71c0baf7194d888c16f449079a3279229a2e4786.tar.gz GT5-Unofficial-71c0baf7194d888c16f449079a3279229a2e4786.tar.bz2 GT5-Unofficial-71c0baf7194d888c16f449079a3279229a2e4786.zip | |
Change the cleanroom option to work with 6 inputs too
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/common/GT_RecipeAdder.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java index 6ad1a9ecc0..036a2e4da0 100644 --- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java +++ b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java @@ -294,7 +294,7 @@ public interface IGT_RecipeAdder { public boolean addAssemblerRecipe(ItemStack[] aInputs, Object aOreDict, int aAmount, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt); - public boolean addAssemblerRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt, boolean aCleanroom); + public boolean addAssemblerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt, boolean aCleanroom); /** diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index 525d15e8b0..8a09238bdc 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -385,8 +385,8 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { return true; } - public boolean addAssemblerRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt, boolean aCleanroom) { - if ((aInput1 == null) || (aOutput1 == null)) { + public boolean addAssemblerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt, boolean aCleanroom) { + if (areItemsAndFluidsBothNull(aInputs, new FluidStack[]{aFluidInput})) { return false; } if ((aDuration = GregTech_API.sRecipeFile.get("assembling", aOutput1, aDuration)) <= 0) { @@ -395,7 +395,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if (!GT_Mod.gregtechproxy.mEnableCleanroom){ aCleanroom = false; } - GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.addRecipe(true, new ItemStack[]{aInput1, (aInput2 == null ? aInput1 : aInput2)}, new ItemStack[]{aOutput1}, null, new FluidStack[]{aFluidInput == null ? null : aFluidInput}, null, aDuration, aEUt, aCleanroom ? -200 : 0); + GT_Recipe.GT_Recipe_Map.sAssemblerRecipes.addRecipe(true, aInputs, new ItemStack[]{aOutput1}, null, new FluidStack[]{aFluidInput}, null, aDuration, aEUt, aCleanroom ? -200 : 0); return true; } |