aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
authorTechnus <daniel112092@gmail.com>2017-08-19 09:51:26 +0200
committerTechnus <daniel112092@gmail.com>2017-08-19 09:51:26 +0200
commit7bc8ef7025686b72a4d47dadea0e5637280dc792 (patch)
treea247bbe21d648df35009d62a8867349889ffa9e5 /src/main/java
parentc385697287a407526115958d603aee5496710db1 (diff)
downloadGT5-Unofficial-7bc8ef7025686b72a4d47dadea0e5637280dc792.tar.gz
GT5-Unofficial-7bc8ef7025686b72a4d47dadea0e5637280dc792.tar.bz2
GT5-Unofficial-7bc8ef7025686b72a4d47dadea0e5637280dc792.zip
Restore api for assembler
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java3
-rw-r--r--src/main/java/gregtech/common/GT_RecipeAdder.java7
2 files changed, 8 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 036a2e4da0..8f657aeaf7 100644
--- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
+++ b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
@@ -1,6 +1,5 @@
package gregtech.api.interfaces.internal;
-import appeng.integration.abstraction.ITE;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
@@ -294,6 +293,8 @@ 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 8a09238bdc..e851f513b7 100644
--- a/src/main/java/gregtech/common/GT_RecipeAdder.java
+++ b/src/main/java/gregtech/common/GT_RecipeAdder.java
@@ -385,7 +385,12 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
return true;
}
- public boolean addAssemblerRecipe(ItemStack[] aInputs, 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) {
+ if(aInput2==null) return addAssemblerRecipe(new ItemStack[]{aInput1},aFluidInput,aOutput1,aDuration,aEUt,aCleanroom);
+ return addAssemblerRecipe(new ItemStack[]{aInput1,aInput2},aFluidInput,aOutput1,aDuration,aEUt,aCleanroom);
+ }
+
+ public boolean addAssemblerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt, boolean aCleanroom) {
if (areItemsAndFluidsBothNull(aInputs, new FluidStack[]{aFluidInput})) {
return false;
}