Merge branch 'experimental' into reMerge

# Conflicts:
#	build.properties
#	src/main/java/gregtech/api/enums/ItemList.java
#	src/main/java/gregtech/api/gui/GT_GUIContainer_MultiMachine.java
#	src/main/java/gregtech/api/metatileentity/MetaPipeEntity.java
#	src/main/java/gregtech/common/GT_Proxy.java
#	src/main/java/gregtech/common/GT_RecipeAdder.java
#	src/main/java/gregtech/common/items/GT_MetaGenerated_Item_01.java
#	src/main/java/gregtech/common/items/GT_MetaGenerated_Item_03.java
#	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
#	src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
#	src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
#	src/main/java/gregtech/nei/GT_NEI_DefaultHandler.java
#	src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/90.png
#	src/main/resources/assets/gregtech/textures/items/gt.metaitem.03/96.png

1 files changed, 83 insertions, 9 deletions

diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java
index f35deb7ca9..8140a8d615 100644
--- a/src/main/java/gregtech/api/util/GT_Recipe.java
+++ b/src/main/java/gregtech/api/util/GT_Recipe.java
@@ -563,13 +563,13 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         public static final GT_Recipe_Map sVacuumRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(100), "gt.recipe.vacuumfreezer", "Vacuum Freezer", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 1, 0, 1, E, 1, E, true, true);
         public static final GT_Recipe_Map sChemicalRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(100), "gt.recipe.chemicalreactor", "Chemical Reactor", null, RES_PATH_GUI + "basicmachines/ChemicalReactor", 2, 2, 1, 0, 1, E, 1, E, true, true);
         public static final GT_Recipe_Map sMultiblockChemicalRecipes = new GT_Recipe_Map_LargeChemicalReactor();
-        public static final GT_Recipe_Map sDistillationRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(50), "gt.recipe.distillationtower", "Distillation Tower", null, RES_PATH_GUI + "basicmachines/Default", 2, 4, 0, 0, 1, E, 1, E, true, true);
-        public static final GT_Recipe_Map sCrakingRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(50), "gt.recipe.craker", "Oil Cracker", null, RES_PATH_GUI + "basicmachines/Default", 1, 1, 0, 1, 1, E, 1, E, true, true);
+        public static final GT_Recipe_Map sDistillationRecipes = new GT_Recipe_Map_DistillationTower();
+        public static final GT_Recipe_Map sCrakingRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(50), "gt.recipe.craker", "Oil Cracker", null, RES_PATH_GUI + "basicmachines/OilCracker", 1, 1, 1, 2, 1, E, 1, E, true, true);
         public static final GT_Recipe_Map sPyrolyseRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(50), "gt.recipe.pyro", "Pyrolyse Oven", null, RES_PATH_GUI + "basicmachines/Default", 2, 1, 1, 0, 1, E, 1, E, true, true);
         public static final GT_Recipe_Map sWiremillRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(50), "gt.recipe.wiremill", "Wiremill", null, RES_PATH_GUI + "basicmachines/Wiremill", 1, 1, 1, 0, 1, E, 1, E, true, true);
         public static final GT_Recipe_Map sBenderRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(400), "gt.recipe.metalbender", "Bending Machine", null, RES_PATH_GUI + "basicmachines/Bender", 2, 1, 2, 0, 1, E, 1, E, true, true);
         public static final GT_Recipe_Map sAlloySmelterRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(3000), "gt.recipe.alloysmelter", "Alloy Smelter", null, RES_PATH_GUI + "basicmachines/AlloySmelter", 2, 1, 2, 0, 1, E, 1, E, true, true);
-        public static final GT_Recipe_Map sAssemblerRecipes = new GT_Recipe_Map_Assembler(new HashSet<GT_Recipe>(300), "gt.recipe.assembler", "Assembling Machine", null, RES_PATH_GUI + "basicmachines/Assembler", 2, 1, 1, 0, 1, E, 1, E, true, true);
+        public static final GT_Recipe_Map sAssemblerRecipes = new GT_Recipe_Map_Assembler(new HashSet<GT_Recipe>(300), "gt.recipe.assembler", "Assembler", null, RES_PATH_GUI + "basicmachines/Assembler", 6, 1, 1, 0, 1, E, 1, E, true, true);
         public static final GT_Recipe_Map sCircuitAssemblerRecipes = new GT_Recipe_Map_Assembler(new HashSet<GT_Recipe>(300), "gt.recipe.circuitassembler", "Circuit Assembler", null, RES_PATH_GUI + "basicmachines/CircuitAssembler", 6, 1, 1, 0, 1, E, 1, E, true, true);
         public static final GT_Recipe_Map sCannerRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(300), "gt.recipe.canner", "Canning Machine", null, RES_PATH_GUI + "basicmachines/Canner", 2, 2, 1, 0, 1, E, 1, E, true, true);
         public static final GT_Recipe_Map sCNCRecipes = new GT_Recipe_Map(new HashSet<GT_Recipe>(100), "gt.recipe.cncmachine", "CNC Machine", null, RES_PATH_GUI + "basicmachines/Default", 2, 1, 2, 1, 1, E, 1, E, true, true);
@@ -1492,8 +1492,8 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
     public static class GT_Recipe_Map_LargeChemicalReactor extends GT_Recipe_Map{
     	private static int INPUT_COUNT = 2;
     	private static int OUTPUT_COUNT = 2;
-    	private static int FLUID_INPUT_COUNT = 3;
-    	private static int FLUID_OUTPUT_COUNT = 3;
+    	private static int FLUID_INPUT_COUNT = 4;
+    	private static int FLUID_OUTPUT_COUNT = 4;
     	
         public GT_Recipe_Map_LargeChemicalReactor() {
             super(new HashSet<GT_Recipe>(200), "gt.recipe.largechemicalreactor", "Large Chemical Reactor", null, RES_PATH_GUI + "basicmachines/Default", INPUT_COUNT, OUTPUT_COUNT, 0, 0, 1, E, 1, E, true, true);
@@ -1506,11 +1506,17 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         	ArrayList<ItemStack> adjustedOutputs = new ArrayList<ItemStack>();
         	ArrayList<FluidStack> adjustedFluidInputs = new ArrayList<FluidStack>();
         	ArrayList<FluidStack> adjustedFluidOutputs = new ArrayList<FluidStack>();
-        	
+
+            if (aInputs == null) {
+                aInputs = new ItemStack[0];
+            }
         	for (ItemStack input : aInputs) {
         		FluidStack inputFluidContent = FluidContainerRegistry.getFluidForFilledItem(input);
         		if (inputFluidContent != null) {
         			inputFluidContent.amount *= input.stackSize;
+                    if (inputFluidContent.getFluid().getName().equals("ic2steam")) {
+                        inputFluidContent = GT_ModHandler.getSteam(inputFluidContent.amount);
+                    }
         			adjustedFluidInputs.add(inputFluidContent);
         		} else {
         			ItemData itemData = GT_OreDictUnificator.getItemData(input);
@@ -1529,17 +1535,27 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         				}
         			}
         		}
+
+                if (aFluidInputs == null) {
+                    aFluidInputs = new FluidStack[0];
+                }
         	}
         	for (FluidStack fluidInput : aFluidInputs) {
         		adjustedFluidInputs.add(fluidInput);
         	}
         	aInputs = adjustedInputs.toArray(new ItemStack[adjustedInputs.size()]);
         	aFluidInputs = adjustedFluidInputs.toArray(new FluidStack[adjustedFluidInputs.size()]);
+            if (aOutputs == null) {
+                aOutputs = new ItemStack[0];
+            }
         	
         	for (ItemStack output : aOutputs) {
         		FluidStack outputFluidContent = FluidContainerRegistry.getFluidForFilledItem(output);
         		if (outputFluidContent != null) {
         			outputFluidContent.amount *= output.stackSize;
+                    if (outputFluidContent.getFluid().getName().equals("ic2steam")) {
+                        outputFluidContent = GT_ModHandler.getSteam(outputFluidContent.amount);
+                    }
         			adjustedFluidOutputs.add(outputFluidContent);
         		} else {
         			ItemData itemData = GT_OreDictUnificator.getItemData(output);
@@ -1550,6 +1566,9 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
         			}
         		}
         	}
+            if (aFluidOutputs == null) {
+                aFluidOutputs = new FluidStack[0];
+            }
         	for (FluidStack fluidOutput : aFluidOutputs) {
         		adjustedFluidOutputs.add(fluidOutput);
         	}
@@ -1572,11 +1591,15 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
 				ArrayList<PositionedStack> inputStacks = new ArrayList<PositionedStack>(itemLimit + fluidLimit);
 				
 				for (int i = 0; i < itemLimit; i++) {
-					inputStacks.add(new FixedPositionedStack(this.getRepresentativeInput(i), 48 - i * 18, 5));
+                    inputStacks.add(new FixedPositionedStack(this.mInputs[i].copy(), 48 - i * 18, 5));
 				}
 				
 				for (int i = 0; i < fluidLimit; i++) {
-					inputStacks.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(this.mFluidInputs[i], true), 48 - i * 18, 23));
+                    if (i < 3) {
+                        inputStacks.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(this.mFluidInputs[i], true), 48 - i * 18, 23));
+                    } else {
+                        inputStacks.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(this.mFluidInputs[i], true), 12, 5));
+                    }
 				}
 				
 				return inputStacks;
@@ -1589,7 +1612,7 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
 				ArrayList<PositionedStack> outputStacks = new ArrayList<PositionedStack>(itemLimit + fluidLimit);
 				
 				for (int i = 0; i < itemLimit; i++) {
-					outputStacks.add(new FixedPositionedStack(this.getOutput(i), 102 + i * 18, 5));
+                    outputStacks.add(new FixedPositionedStack(this.mOutputs[i].copy(), 102 + i * 18, 5));
 				}
 				
 				for (int i = 0; i < fluidLimit; i++) {
@@ -1602,4 +1625,55 @@ public class GT_Recipe implements Comparable<GT_Recipe> {
             
         }
     }
+    public static class GT_Recipe_Map_DistillationTower extends GT_Recipe_Map {
+   	private static final int FLUID_OUTPUT_COUNT = 11;
+   	private static final int ROW_SIZE = 3;
+
+   	public GT_Recipe_Map_DistillationTower() {
+        super(new HashSet<GT_Recipe>(50), "gt.recipe.distillationtower", "Distillation Tower", null, RES_PATH_GUI + "basicmachines/DistillationTower", 2, 4, 0, 0, 1, E, 1, E, true, true);
+    }
+
+    @Override
+    public GT_Recipe addRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial, int[] aOutputChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
+        return addRecipe(new GT_Recipe_DistillationTower(aOptimize, aInputs, aOutputs, aSpecial, aOutputChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue));
+    }
+
+        @Override
+        public GT_Recipe addRecipe(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecial, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
+            return addRecipe(aOptimize, aInputs, aOutputs, aSpecial, null, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue);
+              }
+
+              private static class GT_Recipe_DistillationTower extends GT_Recipe{
+                   protected GT_Recipe_DistillationTower(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) {
+                       super(aOptimize, aInputs, aOutputs, aSpecialItems, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue);
+                   }
+
+                   @Override
+                   public ArrayList<PositionedStack> getInputPositionedStacks() {
+                       ArrayList<PositionedStack> inputStacks = new ArrayList<PositionedStack>(1);
+
+                       if (this.mFluidInputs.length > 0 && this.mFluidInputs[0] != null) {
+                           inputStacks.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(this.mFluidInputs[0], true), 48, 52));
+                       }
+                       return inputStacks;
+                   }
+                  @Override
+                  public ArrayList<PositionedStack> getOutputPositionedStacks() {
+                      int fluidLimit = Math.min(mFluidOutputs.length, FLUID_OUTPUT_COUNT);
+                      ArrayList<PositionedStack> outputStacks = new ArrayList<PositionedStack>(1 + fluidLimit);
+
+                      if (this.mOutputs.length > 0 && this.mOutputs[0] != null) {
+                          outputStacks.add(new FixedPositionedStack(this.getOutput(0), 102, 52));
+                      }
+
+                      for (int i = 0; i < fluidLimit; i++) {
+                          int x = 102 + ((i + 1) % ROW_SIZE) * 18;
+                          int y =  52 - ((i + 1) / ROW_SIZE) * 18;
+                          outputStacks.add(new FixedPositionedStack(GT_Utility.getFluidDisplayStack(this.mFluidOutputs[i], true), x, y));
+                      }
+                      return outputStacks;
+                  }
+
+           	}
+    }
 }