diff options
| author | Dream-Master <dream-master@gmx.net> | 2017-04-30 15:27:09 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2017-04-30 15:27:09 +0200 |
| commit | 0bfb05c7f7a98c641f7935ed07c4718201abddf4 (patch) | |
| tree | a2138d6cf2b3d6629131470633ea91109aa40492 /src/main | |
| parent | da11b91d565244750ae274033fb89be466bbd39f (diff) | |
| download | GT5-Unofficial-0bfb05c7f7a98c641f7935ed07c4718201abddf4.tar.gz GT5-Unofficial-0bfb05c7f7a98c641f7935ed07c4718201abddf4.tar.bz2 GT5-Unofficial-0bfb05c7f7a98c641f7935ed07c4718201abddf4.zip | |
This should work
Diffstat (limited to 'src/main')
| -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 | 2 |
2 files changed, 2 insertions, 2 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 6e0f61e6d1..c8ac1ba135 100644 --- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java +++ b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java @@ -198,7 +198,7 @@ public interface IGT_RecipeAdder { public boolean addAssemblerRecipe(ItemStack aInput1, Object aOreDict, int aAmount, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt); - public boolean addAssemblerRecipe(ItemStack aInput1, Object aOreDict, int aAmount, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt, boolean aCleanroom); + public boolean addAssemblerRecipe(ItemStack aInput1, ItemStack aInput2, 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 8c034262bc..efd6fe965c 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -245,7 +245,7 @@ public class GT_RecipeAdder implements IGT_RecipeAdder { if ((aDuration = GregTech_API.sRecipeFile.get("assembling", aOutput1, aDuration)) <= 0) { return 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, new ItemStack[]{aInput1, (aInput2 == null ? aInput1 : aInput2)}, new ItemStack[]{aOutput1}, null, new FluidStack[]{aFluidInput == null ? null : aFluidInput}, null, aDuration, aEUt, aCleanroom ? -200 : 0); return true; } |