diff options
| author | Technus <daniel112092@gmail.com> | 2016-09-04 23:27:27 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2016-09-04 23:27:27 +0200 |
| commit | 5cc999c3f2b2d717bbdef523334d52ea9788eb18 (patch) | |
| tree | d4cbd9d79dfc842f37b167ad371cc1a771150b59 | |
| parent | 4c4c26043fd8b9175388db053ad6367a1b79d74b (diff) | |
| download | GT5-Unofficial-5cc999c3f2b2d717bbdef523334d52ea9788eb18.tar.gz GT5-Unofficial-5cc999c3f2b2d717bbdef523334d52ea9788eb18.tar.bz2 GT5-Unofficial-5cc999c3f2b2d717bbdef523334d52ea9788eb18.zip | |
Revert "Update GT_RecipeAdder.java"
This reverts commit 4c4c26043fd8b9175388db053ad6367a1b79d74b.
| -rw-r--r-- | src/main/java/gregtech/common/GT_RecipeAdder.java | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index 4ee9e64099..2030d12c94 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -516,10 +516,7 @@ public class GT_RecipeAdder return true; } - //Non tierable AF public boolean addFluidCannerRecipe(ItemStack aInput, ItemStack aOutput, FluidStack aFluidInput, FluidStack aFluidOutput) { - int aDuration= aFluidOutput == null ? aFluidInput.amount / 62 : aFluidOutput.amount / 62; - if ((aInput != null) && (aOutput != null)) { if ((aFluidInput == null ? 1 : 0) != (aFluidOutput == null ? 1 : 0)) { } @@ -529,28 +526,7 @@ public class GT_RecipeAdder if (!GregTech_API.sRecipeFile.get("fluidcanner", aOutput, true)) { return false; } - if ((aDuration = GregTech_API.sRecipeFile.get("fluidcanner", aInput, aDuration)) <= 0) { - return false; - } - GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes.addRecipe(true, new ItemStack[]{aInput}, new ItemStack[]{aOutput}, null, new FluidStack[]{aFluidInput == null ? null : aFluidInput}, new FluidStack[]{aFluidOutput == null ? null : aFluidOutput}, aDuration, 1, 0); - return true; - } - - //Tierable AF - public boolean addFluidCannerRecipe(ItemStack aInput, ItemStack aOutput, FluidStack aFluidInput, FluidStack aFluidOutput, int aDuration, int aEUt) { - if ((aInput != null) && (aOutput != null)) { - if ((aFluidInput == null ? 1 : 0) != (aFluidOutput == null ? 1 : 0)) { - } - } else { - return false; - } - if (!GregTech_API.sRecipeFile.get("fluidcanner", aOutput, true)) { - return false; - } - if ((aDuration = GregTech_API.sRecipeFile.get("fluidcanner", aInput, aDuration)) <= 0) { - return false; - } - GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes.addRecipe(true, new ItemStack[]{aInput}, new ItemStack[]{aOutput}, null, new FluidStack[]{aFluidInput == null ? null : aFluidInput}, new FluidStack[]{aFluidOutput == null ? null : aFluidOutput}, aDuration, aEUt, 0); + GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes.addRecipe(true, new ItemStack[]{aInput}, new ItemStack[]{aOutput}, null, new FluidStack[]{aFluidInput == null ? null : aFluidInput}, new FluidStack[]{aFluidOutput == null ? null : aFluidOutput}, aFluidOutput == null ? aFluidInput.amount / 62 : aFluidOutput.amount / 62, 1, 0); return true; } |