aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAntifluxfield <lyj_299792458@163.com>2017-07-03 04:27:06 +0800
committerGitHub <noreply@github.com>2017-07-03 04:27:06 +0800
commit8f440195180cd35f0c5ef41bf4d8522b2aee9f32 (patch)
treefb8bb176aced515f33015c0f40f5176096accc68 /src
parent9fc84fc1e74bdf81b33ff84d008a1614115a69f1 (diff)
downloadGT5-Unofficial-8f440195180cd35f0c5ef41bf4d8522b2aee9f32.tar.gz
GT5-Unofficial-8f440195180cd35f0c5ef41bf4d8522b2aee9f32.tar.bz2
GT5-Unofficial-8f440195180cd35f0c5ef41bf4d8522b2aee9f32.zip
Update IGT_RecipeAdder.java
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java28
1 files changed, 4 insertions, 24 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 874dafc92a..653c929ff3 100644
--- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
+++ b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
@@ -99,17 +99,6 @@ public interface IGT_RecipeAdder {
public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput, int aDuration);
/**
-
- * Adds a Chemical Recipe
- *
- * @param aInput1 must be != null
- * @param aInput2 must be != null
- * @param aOutput1 must be != null
- * @param aDuration must be > 0
- */
- public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput, int aDuration, boolean aBasicOnly);
-
- /**
* Adds a Chemical Recipe
*
* @param aInput1 must be != null
@@ -125,23 +114,14 @@ public interface IGT_RecipeAdder {
* @param aInput1 must be != null
* @param aInput2 must be != null
* @param aOutput1 must be != null
- * @param aDuration must be > 0
- */
- public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, boolean aBasicOnly);
-
- /**
- * Adds a Chemical Recipe
- *
- * @param aInput1 must be != null
- * @param aInput2 must be != null
- * @param aOutput1 must be != null
* @param aOutput2 must be != null
* @param aDuration must be > 0
*/
public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration);
-
+
/**
* Adds a Chemical Recipe
+ * Only use this when the recipe conflicts in MultiBlock!
*
* @param aInput1 must be != null
* @param aInput2 must be != null
@@ -149,8 +129,8 @@ public interface IGT_RecipeAdder {
* @param aOutput2 must be != null
* @param aDuration must be > 0
*/
- public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, boolean aBasicOnly);
-
+ public boolean addChemicalRecipeForBasicMachineOnly(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, int aEUtick);
+
/**
* Adds Recipes for creating a radically polymerized polymer from a base Material (for example Ethylene -> Polyethylene)
* @param aBasicMaterial The basic Material