diff options
author | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-18 00:17:03 +0200 |
---|---|---|
committer | Johannes Gäßler <updrn@student.kit.edu> | 2017-06-18 00:17:03 +0200 |
commit | 337b6fc66d25361095ad4eddd86992d92668be03 (patch) | |
tree | 6c7cf46a3730bf37f78f17e8252583267fec675c /src/main/java/gregtech/api/interfaces | |
parent | edc857c8a95d39d78bf2e4c325bd2f8d21334469 (diff) | |
parent | 34474480f73ca5ab1c711d73bdb4bd809673e063 (diff) | |
download | GT5-Unofficial-337b6fc66d25361095ad4eddd86992d92668be03.tar.gz GT5-Unofficial-337b6fc66d25361095ad4eddd86992d92668be03.tar.bz2 GT5-Unofficial-337b6fc66d25361095ad4eddd86992d92668be03.zip |
Merge branch 'ChemistryUpdate' into unstable
Conflicts:
src/main/java/gregtech/api/enums/ItemList.java
src/main/java/gregtech/api/enums/Textures.java
src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
Diffstat (limited to 'src/main/java/gregtech/api/interfaces')
-rw-r--r-- | src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java | 32 |
1 files changed, 32 insertions, 0 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 6aff060bfa..dc7c0ce2f6 100644 --- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java +++ b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java @@ -113,11 +113,41 @@ public interface IGT_RecipeAdder { * @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 Recipes for creating a radically polymerized polymer from a base Material (for example Ethylene -> Polyethylene) + * @param aBasicMaterial The basic Material + * @param aPolymer The polymer + */ + public void addDefaultPolymerizationRecipes(Fluid aBasicMaterial, Fluid aPolymer); + + /** + * Adds a Chemical Recipe + * + * @param aInput1 must be != null + * @param aInput2 must be != null + * @param aOutput1 must be != null * @param aDuration must be > 0 * @param aEUtick must be > 0 */ public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUtick); + /** + * 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 + * @param aEUtick must be > 0 + */ + public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, int aEUtick); + /** * Adds a Blast Furnace Recipe @@ -422,6 +452,8 @@ public interface IGT_RecipeAdder { */ public boolean addDistilleryRecipe(ItemStack aCircuit, FluidStack aInput, FluidStack aOutput, int aDuration, int aEUt, boolean aHidden); + public boolean addDistilleryRecipe(int aCircuit, FluidStack aInput, FluidStack aOutput, int aDuration, int aEUt, boolean aHidden); + /** * Adds a Recipe for the Fluid Solidifier */ |