Merge branch 'GTNewHorizons:experimental' into experimental

21 files changed, 548 insertions, 345 deletions

diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
index 774639401a..480367095c 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
@@ -5,7 +5,6 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Buffer;
 import gregtech.api.render.TextureFactory;
-import gregtech.api.util.GT_Utility;
 import gregtech.common.gui.GT_Container_ChestBuffer;
 import gregtech.common.gui.GT_GUIContainer_ChestBuffer;
 import net.minecraft.entity.player.InventoryPlayer;
@@ -70,7 +69,7 @@ public class GT_MetaTileEntity_ChestBuffer extends GT_MetaTileEntity_Buffer {
     protected void moveItems(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) {
         if (aTimer % tickRate[mTier] > 0) return;
 
-        if(aBaseMetaTileEntity.hasInventoryBeenModified()) {
+        if(this.bSortStacks && aBaseMetaTileEntity.hasInventoryBeenModified()) {
             fillStacksIntoFirstSlots();
         }
         // mSuccess will be negative if the call is caused by the %200 aTimer, always try to push. Otherwise it will be positive.
diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java
index 4fb9deb5b4..96b991e767 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler.java
@@ -175,7 +175,7 @@ public abstract class GT_MetaTileEntity_Boiler extends GT_MetaTileEntity_BasicTa
 
     @Override
     public boolean allowCoverOnSide(byte aSide, GT_ItemStack aCover) {
-        return GregTech_API.getCoverBehavior(aCover.toStack()).isSimpleCover();
+        return GregTech_API.getCoverBehaviorNew(aCover.toStack()).isSimpleCover();
     }
 
     @Override
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java
index 4d7a6c4af5..6d4b160a86 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java
@@ -176,18 +176,21 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine {
                     moveOneDown(aBaseMetaTileEntity);
                 } else {
                     ChunkPosition oreBlockPos;
-                    Block block;
+                    int x = 0, y = 0, z = 0;
+                    Block oreBlock;
+                    int oreBlockMetadata = 0;
                     do {
                         oreBlockPos = oreBlockPositions.remove(0);
-                        block = aBaseMetaTileEntity.getBlockOffset(oreBlockPos.chunkPosX, oreBlockPos.chunkPosY, oreBlockPos.chunkPosZ);
+                        oreBlock = aBaseMetaTileEntity.getBlockOffset(oreBlockPos.chunkPosX, oreBlockPos.chunkPosY, oreBlockPos.chunkPosZ);
+                        x = aBaseMetaTileEntity.getXCoord() + oreBlockPos.chunkPosX;
+                        y = aBaseMetaTileEntity.getYCoord() + oreBlockPos.chunkPosY;
+                        z = aBaseMetaTileEntity.getZCoord() + oreBlockPos.chunkPosZ;
+                        oreBlockMetadata = getBaseMetaTileEntity().getWorld().getBlockMetadata(x, y, z);
                     } // someone else might have removed the block
-                    while (block == Blocks.air && !oreBlockPositions.isEmpty());
+                    while (!GT_Utility.isOre(oreBlock, oreBlockMetadata) && !oreBlockPositions.isEmpty());
 
-                    if (block != Blocks.air) {
-                        mineBlock(aBaseMetaTileEntity, block,
-                            aBaseMetaTileEntity.getXCoord() + oreBlockPos.chunkPosX,
-                            aBaseMetaTileEntity.getYCoord() + oreBlockPos.chunkPosY,
-                            aBaseMetaTileEntity.getZCoord() + oreBlockPos.chunkPosZ);
+                    if (GT_Utility.isOre(oreBlock, oreBlockMetadata)) {
+                        mineBlock(aBaseMetaTileEntity, oreBlock, x, y, z);
                     }
                 }
             }
@@ -265,7 +268,15 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine {
                 mOutputItems[0] = drops.get(0);
             if (drops.size() > 1)
                 mOutputItems[1] = drops.get(1);
-            aBaseMetaTileEntity.getWorld().setBlockToAir(x, y, z);
+
+            short metaData = 0;
+            TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntity(x, y, z);
+            if (tTileEntity instanceof GT_TileEntity_Ores) {
+                metaData = ((GT_TileEntity_Ores) tTileEntity).mMetaData;
+            }
+
+            ItemStack cobble = GT_Utility.getCobbleForOre(block, metaData);
+            aBaseMetaTileEntity.getWorld().setBlock(x, y, z, Block.getBlockFromItem(cobble.getItem()), cobble.getItemDamage(), 3);
             if (debugBlockMiner)
                 GT_Log.out.println("MINER: Mining GT ore block at " + x + " " + y + " " + z);
         }
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java
index 60056ec39d..79b363fac3 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java
@@ -144,16 +144,15 @@ public class GT_MetaTileEntity_PotionBrewer extends GT_MetaTileEntity_BasicMachi
     }
 
     private int setOutput(String aFluidName) {
+        if (getFillableStack().amount < 750) {
+            return 0;
+        }
+
         this.mOutputFluid = FluidRegistry.getFluidStack(aFluidName, 750);
         if (this.mOutputFluid == null) {
             this.mOutputFluid = FluidRegistry.getFluidStack("potion.mundane", getFillableStack().amount);
-            getInputAt(0).stackSize -= 1;
-            getFillableStack().amount = 0;
-            return 2;
-        }
-        if (getFillableStack().amount < 750) {
-            return 0;
         }
+        
         getInputAt(0).stackSize -= 1;
         getFillableStack().amount -= 750;
         return 2;
@@ -171,6 +170,6 @@ public class GT_MetaTileEntity_PotionBrewer extends GT_MetaTileEntity_BasicMachi
 
     @Override
     public int getCapacity() {
-        return 750;
+        return 6000;
     }
 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
index eba61ad1b1..1573c951eb 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
@@ -15,6 +15,7 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
 import gregtech.api.objects.ItemData;
 import gregtech.api.render.TextureFactory;
+import gregtech.api.util.GT_AssemblyLineUtils;
 import gregtech.api.util.GT_Assemblyline_Server;
 import gregtech.api.util.GT_Log;
 import gregtech.api.util.GT_ModHandler;
@@ -253,6 +254,7 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
                         if (failScanner) {
                             return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
                         }
+                        
 
                         String s = tRecipe.mOutput.getDisplayName();
                         if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
@@ -261,92 +263,19 @@ public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine {
                                 s = tRecipe.mOutput.getDisplayName();
                         }
                         this.mOutputItems[0] = GT_Utility.copyAmount(1L, getSpecialSlot());
-                        //remove possible old NBTTagCompound
-                        this.mOutputItems[0].setTagCompound(new NBTTagCompound());
-                        GT_Utility.ItemNBT.setBookTitle(this.mOutputItems[0], s + " Construction Data");
+                        
 
-                        NBTTagCompound tNBT = this.mOutputItems[0].getTagCompound();
-                        if (tNBT == null) {
-                            tNBT = new NBTTagCompound();
-                        }
-
-                        tNBT.setTag("output", tRecipe.mOutput.writeToNBT(new NBTTagCompound()));
-                        tNBT.setInteger("time", tRecipe.mDuration);
-                        tNBT.setInteger("eu", tRecipe.mEUt);
-                        for (int i = 0; i < tRecipe.mInputs.length; i++) {
-                            tNBT.setTag("" + i, tRecipe.mInputs[i].writeToNBT(new NBTTagCompound()));
-                        }
-                        for (int i = 0; i < tRecipe.mOreDictAlt.length; i++) {
-                            if (tRecipe.mOreDictAlt[i] != null && tRecipe.mOreDictAlt[i].length > 0) {
-                                tNBT.setInteger("a" + i, tRecipe.mOreDictAlt[i].length);
-                                for (int j = 0; j < tRecipe.mOreDictAlt[i].length; j++) {
-                                    tNBT.setTag("a" + i + ":" + j, tRecipe.mOreDictAlt[i][j].writeToNBT(new NBTTagCompound()));
-                                }
-                            }
-                        }
-                        for (int i = 0; i < tRecipe.mFluidInputs.length; i++) {
-                            tNBT.setTag("f" + i, tRecipe.mFluidInputs[i].writeToNBT(new NBTTagCompound()));
-                        }
-                        tNBT.setString("author", "Assembling Line Recipe Generator");
-                        NBTTagList tNBTList = new NBTTagList();
-                        s = tRecipe.mOutput.getDisplayName();
-                        if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
-                            s = GT_Assemblyline_Server.lServerNames.get(tRecipe.mOutput.getDisplayName());
-                            if (s == null)
-                                s = tRecipe.mOutput.getDisplayName();
-                        }
-                        tNBTList.appendTag(new NBTTagString("Construction plan for " + tRecipe.mOutput.stackSize + " " + s + ". Needed EU/t: " + tRecipe.mEUt + " Production time: " + (tRecipe.mDuration / 20)));
-                        for (int i = 0; i < tRecipe.mInputs.length; i++) {
-                            if (tRecipe.mOreDictAlt[i] != null) {
-                                int count = 0;
-                                StringBuilder tBuilder = new StringBuilder("Input Bus " + (i + 1) + ": ");
-                                for (ItemStack tStack : tRecipe.mOreDictAlt[i]) {
-                                    if (tStack != null) {
-                                        s = tStack.getDisplayName();
-                                        if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
-                                            s = GT_Assemblyline_Server.lServerNames.get(tStack.getDisplayName());
-                                            if (s == null)
-                                                s = tStack.getDisplayName();
-                                        }
-
-
-                                        tBuilder.append(count == 0 ? "" : "\nOr ").append(tStack.stackSize).append(" ").append(s);
-                                        count++;
-                                    }
-                                }
-                                if (count > 0) tNBTList.appendTag(new NBTTagString(tBuilder.toString()));
-                            } else if (tRecipe.mInputs[i] != null) {
-                                s = tRecipe.mInputs[i].getDisplayName();
-                                if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
-                                    s = GT_Assemblyline_Server.lServerNames.get(tRecipe.mInputs[i].getDisplayName());
-                                    if (s == null)
-                                        s = tRecipe.mInputs[i].getDisplayName();
-                                }
-                                tNBTList.appendTag(new NBTTagString("Input Bus " + (i + 1) + ": " + tRecipe.mInputs[i].stackSize + " " + s));
-                            }
-                        }
-                        for (int i = 0; i < tRecipe.mFluidInputs.length; i++) {
-                            if (tRecipe.mFluidInputs[i] != null) {
-                                s = tRecipe.mFluidInputs[i].getLocalizedName();
-                                if (FMLCommonHandler.instance().getEffectiveSide().isServer()) {
-                                    s = GT_Assemblyline_Server.lServerNames.get(tRecipe.mFluidInputs[i].getLocalizedName());
-                                    if (s == null)
-                                        s = tRecipe.mFluidInputs[i].getLocalizedName();
-                                }
-                                tNBTList.appendTag(new NBTTagString("Input Hatch " + (i + 1) + ": " + tRecipe.mFluidInputs[i].amount + "L " + s));
-                            }
+                        // Use Assline Utils
+                        if (GT_AssemblyLineUtils.setAssemblyLineRecipeOnDataStick(this.mOutputItems[0], tRecipe)) {
+                        	aStack.stackSize -= 1;
+                            calculateOverclockedNess(30, tRecipe.mResearchTime);
+                            //In case recipe is too OP for that machine
+                            if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1)
+                                return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
+                            getSpecialSlot().stackSize -= 1;
+                            return 2;
                         }
-                        tNBT.setTag("pages", tNBTList);
-
-                        this.mOutputItems[0].setTagCompound(tNBT);
-
-                        aStack.stackSize -= 1;
-                        calculateOverclockedNess(30, tRecipe.mResearchTime);
-                        //In case recipe is too OP for that machine
-                        if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1)
-                            return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
-                        getSpecialSlot().stackSize -= 1;
-                        return 2;
+                        
                     }
                 }
             }
diff --git a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java b/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java
index 64651a3fc4..14663f7d68 100644
--- a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java
@@ -46,6 +46,7 @@ import java.util.LinkedList;
 import java.util.Queue;
 
 public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_MetaTileEntity_BasicHull_NonElectric {
+    public static int minimalDistancePoints = 64;
     protected GT_MetaTileEntity_LongDistancePipelineBase mTarget = null, mSender = null;
     protected ChunkCoordinates mTargetPos = null;
     
@@ -77,6 +78,8 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta
                 aNBT.getInteger("target.y"),
                 aNBT.getInteger("target.z")
             );
+            if (getDistanceToSelf(mTargetPos) < minimalDistancePoints)
+                mTargetPos = null;
         }
     }
 
@@ -210,9 +213,13 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta
                             tGtTile.getFacingOffset((BaseMetaTileEntity)tTileEntity, ((BaseMetaTileEntity) tTileEntity).getFrontFacing())    
                         )) {
                             // If it's the same class, and we've scanned a wire in front of it (the input side), we've found our target
-                            mTarget = tGtTile;
-                            mTargetPos = tGtTile.getCoords();
-                            return;
+                            // still need to check if it's distant enough
+                            int distance = getDistanceToSelf(aCoords);
+                            if (distance > minimalDistancePoints) {
+                                mTarget = tGtTile;
+                                mTargetPos = tGtTile.getCoords();
+                                return;
+                            }
                         }
                         
                         // Remove this block from the visited because we might end up back here from another wire that IS connected to the
@@ -224,7 +231,13 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta
         }
         
     }
-    
+
+    protected int getDistanceToSelf(ChunkCoordinates aCoords) {
+        return Math.abs(getBaseMetaTileEntity().getXCoord() - aCoords.posX) +
+                Math.abs(getBaseMetaTileEntity().getYCoord() - aCoords.posY) /  2 +
+                Math.abs(getBaseMetaTileEntity().getZCoord() - aCoords.posZ);
+    }
+
     public ChunkCoordinates getFacingOffset(IGregTechTileEntity gt_tile, byte aSide) {
         return new ChunkCoordinates(
             gt_tile.getOffsetX(aSide, 1), gt_tile.getOffsetY(aSide, 1), gt_tile.getOffsetZ(aSide, 1)
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
index 0a19536bf1..c2460213c8 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
@@ -17,8 +17,10 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_DataAccess;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
 import gregtech.api.render.TextureFactory;
+import gregtech.api.util.GT_AssemblyLineUtils;
 import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Recipe.GT_Recipe_AssemblyLine;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
@@ -156,117 +158,111 @@ public class GT_MetaTileEntity_AssemblyLine extends GT_MetaTileEntity_EnhancedMu
 
     @Override
     public boolean checkRecipe(ItemStack aStack) {
-        if (GT_Values.D1)
-            GT_FML_LOGGER.info("Start ALine recipe check");
+        if (GT_Values.D1) {
+        	GT_FML_LOGGER.info("Start ALine recipe check");
+        }
         ArrayList<ItemStack> tDataStickList = getDataItems(2);
-        if (tDataStickList.isEmpty()) return false;
-        if (GT_Values.D1)
-            GT_FML_LOGGER.info("Stick accepted, " + tDataStickList.size() + " Data Sticks found");
+        if (tDataStickList.isEmpty()) {
+        	return false;
+        }
+        if (GT_Values.D1) {
+        	GT_FML_LOGGER.info("Stick accepted, " + tDataStickList.size() + " Data Sticks found");
+        }
 
-        ItemStack[] tStack = new ItemStack[15];
-        FluidStack[] tFluids = new FluidStack[4];
+        ItemStack[] tStack = null;
+        FluidStack[] tFluids = null;
         boolean findRecipe = false;
-        nextDS:
+        
+        nextDataStick:
         for (ItemStack tDataStick : tDataStickList) {
-            NBTTagCompound tTag = tDataStick.getTagCompound();
-            if (tTag == null)
-                continue;
+        	GT_Recipe_AssemblyLine aFoundRecipe = GT_AssemblyLineUtils.findAssemblyLineRecipeFromDataStick(tDataStick);        	
+
+        	// Check if the recipe on the data stick is the current recipe for it's given output, if not we update it and continue to next.
+        	if (!GT_AssemblyLineUtils.processDataStick(tDataStick)) {
+        		continue;
+        	}
+        	
+        	tStack = aFoundRecipe.mInputs;
+        	tFluids = aFoundRecipe.mFluidInputs;
+        	
+        	// So here we check against the recipe found on the data stick.
+        	// If we run into missing buses/hatches or bad inputs, we go to the next data stick.
+        	// This check only happens if we have a valid up to date data stick.
+        	
+        	// Check Inputs allign
+        	int aItemCount = aFoundRecipe.mInputs.length;
             for (int i = 0; i < 15; i++) {
-                int count = tTag.getInteger("a" + i);
-                if (!tTag.hasKey("" + i) && count <= 0)
-                    continue;
-                if (mInputBusses.get(i) == null) {
-                    continue nextDS;
-                }
-
-                ItemStack stackInSlot = mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0);
-                boolean flag = true;
-                if (count > 0) {
-                    for (int j = 0; j < count; j++) {
-                        tStack[i] = GT_Utility.loadItem(tTag, "a" + i + ":" + j);
-                        if (tStack[i] == null) continue;
-                        if (GT_Values.D1)
-                            GT_FML_LOGGER.info("Item " + i + " : " + tStack[i].getUnlocalizedName());
-                        if (GT_Utility.areStacksEqual(tStack[i], stackInSlot, true) && tStack[i].stackSize <= stackInSlot.stackSize) {
-                            flag = false;
-                            break;
-                        }
-                    }
-                }
-                if (flag) {
-                    tStack[i] = GT_Utility.loadItem(tTag, "" + i);
-                    if (tStack[i] == null) {
-                        flag = false;
-                        continue;
-                    }
-                    if (GT_Values.D1)
-                        GT_FML_LOGGER.info("Item " + i + " : " + tStack[i].getUnlocalizedName());
-                    if (GT_Utility.areStacksEqual(tStack[i], stackInSlot, true) && tStack[i].stackSize <= stackInSlot.stackSize) {
-                        flag = false;
+            	if (i >= aItemCount) {
+            		continue;
+            	}
+            	else {
+            		if (mInputBusses.get(i) == null) {
+                        continue nextDataStick;
                     }
-                }
-                if (GT_Values.D1)
-                    GT_FML_LOGGER.info(i + (flag ? " not accepted" : " accepted"));
-                if (flag)
-                    continue nextDS;
-            }
-
-            if (GT_Values.D1) GT_FML_LOGGER.info("All Items done, start fluid check");
-            for (int i = 0; i < 4; i++) {
-                if (!tTag.hasKey("f" + i)) continue;
-                tFluids[i] = GT_Utility.loadFluid(tTag, "f" + i);
-                if (tFluids[i] == null) continue;
-                if (GT_Values.D1)
-                    GT_FML_LOGGER.info("Fluid " + i + " " + tFluids[i].getUnlocalizedName());
-                if (mInputHatches.get(i) == null) {
-                    continue nextDS;
-                }
-                FluidStack fluidInHatch = mInputHatches.get(i).mFluid;
-                if (!GT_Utility.areFluidsEqual(fluidInHatch, tFluids[i], true) || fluidInHatch.amount < tFluids[i].amount) {
-                    if (GT_Values.D1)
-                        GT_FML_LOGGER.info(i + " not accepted");
-                    continue nextDS;
-                }
-                if (GT_Values.D1)
-                    GT_FML_LOGGER.info(i + " accepted");
+            		else {
+                        ItemStack stackInSlot = mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0);
+            			if (!GT_Utility.areStacksEqual(tStack[i], stackInSlot, true) || tStack[i].stackSize <= stackInSlot.stackSize) {   
+                            continue nextDataStick;
+                        }
+                        if (GT_Values.D1) {
+                        	GT_FML_LOGGER.info("Item: " + i + " accepted");
+                        }
+            		}
+            	}
             }
-
-            if (GT_Values.D1)
-                GT_FML_LOGGER.info("Input accepted, check other values");
-            if (!tTag.hasKey("output"))
-                continue;
-            mOutputItems = new ItemStack[]{GT_Utility.loadItem(tTag, "output")};
-            if (mOutputItems[0] == null || !GT_Utility.isStackValid(mOutputItems[0]))
-                continue;
-
-            if (!tTag.hasKey("time"))
-                continue;
-            int tMaxProgressTime = tTag.getInteger("time");
-            if (tMaxProgressTime <= 0)
-                continue;
-
-            if (!tTag.hasKey("eu"))
-                continue;
-
-            if (GT_Values.D1) GT_FML_LOGGER.info("Check overclock");
-
-            calculateOverclockedNessMulti(tTag.getInteger("eu"), tMaxProgressTime, 1, getMaxInputVoltage());
-            //In case recipe is too OP for that machine
-            if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) {
-                if (GT_Values.D1) GT_FML_LOGGER.info("Recipe too OP");
-                continue;
+            
+            // Check Fluid Inputs allign
+        	int aFluidCount = aFoundRecipe.mFluidInputs.length;
+            for (int i = 0; i < 4; i++){
+            	if (i >= aFluidCount) {
+            		continue;
+            	}
+            	else {
+            		if (mInputHatches.get(i) == null) {
+                        continue nextDataStick;
+                    }
+            		else {
+                        FluidStack fluidInHatch = mInputHatches.get(i).mFluid;
+                        if (!GT_Utility.areFluidsEqual(fluidInHatch, tFluids[i], true) || fluidInHatch.amount < tFluids[i].amount) {
+                            continue nextDataStick;
+                        }
+                        if (GT_Values.D1) {
+                        	GT_FML_LOGGER.info("Fluid:" + i + " accepted");
+                        }
+            		}
+            	}
             }
-
-            if (GT_Values.D1) GT_FML_LOGGER.info("Find avaiable recipe");
-            findRecipe = true;
-            break;
+        	
+        	if (GT_Values.D1) {
+        		GT_FML_LOGGER.info("Check overclock");
+        	}
+        	calculateOverclockedNessMulti(aFoundRecipe.mEUt, aFoundRecipe.mDuration, 1, getMaxInputVoltage());
+        	//In case recipe is too OP for that machine
+        	if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1) {
+        		if (GT_Values.D1) {
+        			GT_FML_LOGGER.info("Recipe too OP");
+        		}
+        		continue;
+        	}
+        	if (GT_Values.D1) {
+        		GT_FML_LOGGER.info("Find available recipe");             
+        	}
+        	findRecipe = true;        	
         }
-        if (!findRecipe) return false;
+        
+        // Best not to run this recipe.
+        if (!findRecipe || tStack == null || tStack.length <= 0 || tFluids == null || tFluids.length <= 0) {
+        	return false;
+        }
+        
 
-        if (GT_Values.D1) GT_FML_LOGGER.info("All checked start consuming inputs");
+        if (GT_Values.D1) {
+        	GT_FML_LOGGER.info("All checked start consuming inputs");
+        }
         for (int i = 0; i < 15; i++) {
-            if (tStack[i] == null)
-                continue;
+            if (tStack[i] == null) {
+            	continue;
+            }
             ItemStack stackInSlot = mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0);
             stackInSlot.stackSize -= tStack[i].stackSize;
         }
@@ -280,13 +276,15 @@ public class GT_MetaTileEntity_AssemblyLine extends GT_MetaTileEntity_EnhancedMu
             }
         }
 
-        if (this.mEUt > 0)
-            this.mEUt = -this.mEUt;
+        if (this.mEUt > 0) {
+        	this.mEUt = -this.mEUt;
+        }
         this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
         this.mEfficiencyIncrease = 10000;
         updateSlots();
-        if (GT_Values.D1)
-            GT_FML_LOGGER.info("Recipe sucessfull");
+        if (GT_Values.D1) {
+        	GT_FML_LOGGER.info("Recipe sucessfull");
+        }
         return true;
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
index 905cb7c2f1..e58ec25bd0 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
@@ -61,8 +61,9 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas
                 .addController("Top center")
                 .addCasingInfo("Plascrete", 20)
                 .addStructureInfo(GT_Values.cleanroomGlass + "% of the Plascrete can be replaced with Reinforced Glass")//check
+                .addStructureInfo("Other material can be used in place of Plascrete. See config for detail")//check
                 .addOtherStructurePart("Filter Machine Casing", "Top besides controller and edges")
-                .addEnergyHatch("LV or MV, any casing")//check
+                .addEnergyHatch("Any casing. Exactly one.")//check
                 .addMaintenanceHatch("Any casing")
                 .addStructureInfo("1x Reinforced Door (keep closed or efficiency will reduce)")
                 .addStructureInfo("Up to 10 Machine Hulls for Item & Energy transfer through walls")
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java b/src/main/j