Merge pull request #3 from GTNewHorizons/experimental

gregtech-5.09.35.00

6 files changed, 26 insertions, 23 deletions

diff --git a/src/main/java/gregtech/api/interfaces/internal/IBCTileEntity.java b/src/main/java/gregtech/api/interfaces/internal/IBCTileEntity.java
index 7eee5ce98f..dd73ffc1e7 100644
--- a/src/main/java/gregtech/api/interfaces/internal/IBCTileEntity.java
+++ b/src/main/java/gregtech/api/interfaces/internal/IBCTileEntity.java
@@ -5,4 +5,4 @@ package gregtech.api.interfaces.internal;
  */
 public interface IBCTileEntity /*extends IPowerReceptor*/ {
     //
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/interfaces/internal/IGT_Mod.java b/src/main/java/gregtech/api/interfaces/internal/IGT_Mod.java
index ff7b255f0e..22947b746d 100644
--- a/src/main/java/gregtech/api/interfaces/internal/IGT_Mod.java
+++ b/src/main/java/gregtech/api/interfaces/internal/IGT_Mod.java
@@ -43,4 +43,4 @@ public interface IGT_Mod {
      * Plays the Sonictron Sound for the ItemStack on the Client Side
      */
     void doSonictronSound(ItemStack aStack, World aWorld, double aX, double aY, double aZ);
-}
\ No newline at end of file
+}
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 c7288cc26e..e09c192bfa 100644
--- a/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
+++ b/src/main/java/gregtech/api/interfaces/internal/IGT_RecipeAdder.java
@@ -171,17 +171,17 @@ public interface IGT_RecipeAdder {
     boolean addChemicalRecipe(ItemStack aInput1, ItemStack aInput2, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, ItemStack aOutput2, int aDuration, int aEUtick);
 
     /**
-     * +     * Adds a Chemical Recipe that only exists in the Large Chemical Reactor
-     * +     *
-     * +     * @param aInputs   item inputs
-     * +     * @param aFluidInputs fluid inputs
-     * +     * @param aFluidOutputs fluid outputs
-     * +     * @param aOutputs  item outputs
-     * +     * @param aDuration must be > 0
-     * +     * @param aEUtick   must be > 0
-     * +     * aInputs and aFluidInputs must contain at least one valid input.
-     * +     * aOutputs and aFluidOutputs must contain at least one valid output.
-     * +
+     * Adds a Chemical Recipe that only exists in the Large Chemical Reactor
+     * 
+     * @param aInputs   item inputs
+     * @param aFluidInputs fluid inputs
+     * @param aFluidOutputs fluid outputs
+     * @param aOutputs  item outputs
+     * @param aDuration must be > 0
+     * @param aEUtick   must be > 0
+     * <br>aInputs and aFluidInputs must contain at least one valid input.
+     * <br>aOutputs and aFluidOutputs must contain at least one valid output.
+     * 
      */
 
     boolean addMultiblockChemicalRecipe(ItemStack[] aInputs, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, ItemStack[] aOutputs, int aDuration, int aEUtick);
@@ -275,13 +275,13 @@ public interface IGT_RecipeAdder {
     boolean addAssemblerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aOutput1, int aDuration, int aEUt);
 
     /**
-     * +     * Adds an Assembler Recipe
-     * +     *
-     * +     * @param aInputs   must be != null
-     * +     * @param aOutput1  must be != null
-     * +     * @param aDuration must be > 0
-     * +     * @param aEUt      should be > 0
-     * +
+     * Adds an Assembler Recipe
+     * 
+     * @param aInputs   must be != null
+     * @param aOutput1  must be != null
+     * @param aDuration must be > 0
+     * @param aEUt      should be > 0
+     * 
      */
     boolean addAssemblerRecipe(ItemStack[] aInputs, FluidStack aFluidInput, ItemStack aOutput1, int aDuration, int aEUt);
 
@@ -610,10 +610,13 @@ public interface IGT_RecipeAdder {
 
     boolean addAutoclaveRecipe(ItemStack aInput, ItemStack aCircuit, FluidStack aFluid, ItemStack aOutput, int aChance, int aDuration, int aEUt, boolean aCleanroom);
 
+    boolean addAutoclaveRecipe(ItemStack aInput, ItemStack aCircuit, FluidStack aFluidIn, FluidStack aFluidOut, ItemStack aOutput, int aChance, int aDuration, int aEUt, boolean aCleanroom);
+
     boolean addAutoclaveSpaceRecipe(ItemStack aInput, FluidStack aFluid, ItemStack aOutput, int aChance, int aDuration, int aEUt, boolean aCleanroom);
 
     boolean addAutoclaveSpaceRecipe(ItemStack aInput, ItemStack aCircuit, FluidStack aFluid, ItemStack aOutput, int aChance, int aDuration, int aEUt, boolean aCleanroom);
 
+
     /**
      * Adds a Recipe for the Mixer
      */
diff --git a/src/main/java/gregtech/api/interfaces/internal/IIC2TileEntity.java b/src/main/java/gregtech/api/interfaces/internal/IIC2TileEntity.java
index 05208d36a4..7592ffbe1a 100644
--- a/src/main/java/gregtech/api/interfaces/internal/IIC2TileEntity.java
+++ b/src/main/java/gregtech/api/interfaces/internal/IIC2TileEntity.java
@@ -10,4 +10,4 @@ import ic2.api.tile.IEnergyStorage;
  */
 public interface IIC2TileEntity extends IEnergyStorage, IEnergySink, IEnergySource, IHasWorldObjectAndCoords {
     //
-}
\ No newline at end of file
+}
diff --git a/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java b/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java
index c4f416c823..13a3aba523 100644
--- a/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java
+++ b/src/main/java/gregtech/api/interfaces/internal/IThaumcraftCompat.java
@@ -53,4 +53,4 @@ public interface IThaumcraftCompat {
     Object addInfusionRecipe(String aResearch, ItemStack aMainInput, ItemStack[] aSideInputs, ItemStack aOutput, int aInstability, List<TC_Aspects.TC_AspectStack> aAspects);
 
     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
+}
diff --git a/src/main/java/gregtech/api/interfaces/internal/IUETileEntity.java b/src/main/java/gregtech/api/interfaces/internal/IUETileEntity.java
index d183961a0d..b62740f610 100644
--- a/src/main/java/gregtech/api/interfaces/internal/IUETileEntity.java
+++ b/src/main/java/gregtech/api/interfaces/internal/IUETileEntity.java
@@ -3,4 +3,4 @@ package gregtech.api.interfaces.internal;
 
 public interface IUETileEntity /*extends IElectrical*/ {
     //
-}
\ No newline at end of file
+}