Bring in experimental branch

2 files changed, 42 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 ce72d93374..3395786037 100644
--- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
+++ b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
@@ -92,6 +92,17 @@ public interface IGT_RecipeAdder {
 	public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, 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
+	 * @param aEUtick must be > 0
+	 */
+	public boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUtick);
+	
+	
+	/**
 	 * Adds a Blast Furnace Recipe
 	 * @param aInput1 must be != null
 	 * @param aInput2 can be null
@@ -253,7 +264,7 @@ public interface IGT_RecipeAdder {
 	public boolean addPlasmaArcFurnaceRecipe(ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt);
 	
 	public boolean addPlasmaArcFurnaceRecipe(ItemStack aInput, FluidStack aFluidInput, ItemStack[] aOutputs,FluidStack aFluidPutput, int[] aChances, int aDuration, int aEUt);
-	
+ 	
 	
 	
 	
@@ -402,6 +413,35 @@ public interface IGT_RecipeAdder {
 	public boolean addPulveriserRecipe(ItemStack aInput, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt);
 	
 	/**
+	 * Adds a Distillation Tower Recipe
+	 * Every Fluid also gets seperate distillation recipes
+	 * @param aInput1 must be != null
+	 * @param aOutputs must be != null 1-5 Fluids
+	 * @param aOutput2 can be null
+	 */
+	public boolean addUniversalDistillationRecipe(FluidStack aInput, FluidStack[] aOutputs, ItemStack aOutput2, int aDuration, int aEUt);
+	
+	/**
+	 * Adds Pyrolyse Recipe
+	 * @param aInput
+	 * @param intCircuit
+	 * @param aOutput
+	 * @param aFluidOutput
+	 * @param aDuration
+	 * @param aEUt
+	 */
+	public boolean addPyrolyseRecipe(ItemStack aInput, FluidStack aFluidInput,int intCircuit, ItemStack aOutput, FluidStack aFluidOutput, int aDuration, int aEUt);
+	
+	/**
+	 * Adds Oil Cracking Recipe
+	 * @param aInput
+	 * @param aOutput
+	 * @param aDuration
+	 * @param aEUt
+	 */
+	public boolean addCrackingRecipe(FluidStack aInput, FluidStack aOutput, int aDuration, int aEUt);
+	
+	/**
 	 * Adds a Sound to the Sonictron9001
 	 * you should NOT call this in the preInit-Phase!
 	 * @param aItemStack = The Item you want to display for this Sound
diff --git a/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java b/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java
index 0b48d43db9..8ce0ac56da 100644
--- a/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java
+++ b/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java
@@ -39,5 +39,5 @@ public interface IThaumcraftCompat {
 	public boolean registerThaumcraftAspectsToItem(ItemStack aStack, List<TC_AspectStack> aAspects, String aOreDict);
 	public Object addCrucibleRecipe(String aResearch, Object aInput, ItemStack aOutput, List<TC_AspectStack> aAspects);
 	public Object addInfusionRecipe(String aResearch, ItemStack aMainInput,ItemStack[] aSideInputs, ItemStack aOutput,int aInstability, List<TC_Aspects.TC_AspectStack> aAspects);
-	public Object addResearch(String aResearch, String aName, String aText, String[] aParentResearches, String aCategory, ItemStack aIcon, int aComplexity, int aType, int aX, int aY, List<TC_AspectStack> aAspects, ItemStack[] aResearchTriggers, Object[] aPages);
+ 	public Object addResearch(String aResearch, String aName, String aText, String[] aParentResearches, String aCategory, ItemStack aIcon, int aComplexity, int aType, int aX, int aY, List<TC_AspectStack> aAspects, ItemStack[] aResearchTriggers, Object[] aPages);
 }
\ No newline at end of file