Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable

12 files changed, 445 insertions, 393 deletions

diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
index db9e13ad83..b16986fffd 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
@@ -23,14 +23,15 @@ public class GT_MetaTileEntity_Boiler_Bronze
         extends GT_MetaTileEntity_Boiler {
     public GT_MetaTileEntity_Boiler_Bronze(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional, new String[]{
-        		"An early way to get Steam Power", 
-        		"Produces 120L of Steam per second",
-        		"Causes 20 Pollution per second"}, new ITexture[0]);
+                "An early way to get Steam Power",
+                "Produces 120L of Steam per second",
+                "Causes 20 Pollution per second"});
     }
 
     public GT_MetaTileEntity_Boiler_Bronze(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
+
     public GT_MetaTileEntity_Boiler_Bronze(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {
         super(aName, aTier, aDescription, aTextures);
     }
@@ -146,8 +147,8 @@ public class GT_MetaTileEntity_Boiler_Bronze
                 this.mProcessingEnergy -= 1;
                 this.mTemperature += 1;
             }
-            if(this.mProcessingEnergy>0 && (aTick % 20L == 0L)){
-            	GT_Pollution.addPollution(this.getBaseMetaTileEntity().getWorld(), new ChunkPosition(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()), 20);
+            if (this.mProcessingEnergy > 0 && (aTick % 20L == 0L)) {
+                GT_Pollution.addPollution(this.getBaseMetaTileEntity().getWorld(), new ChunkPosition(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()), 20);
             }
             aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);
         }
diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
index 8e044c7c2a..3e5afedba2 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Lava.java
@@ -23,9 +23,9 @@ public class GT_MetaTileEntity_Boiler_Lava
         extends GT_MetaTileEntity_Boiler {

     public GT_MetaTileEntity_Boiler_Lava(int aID, String aName, String aNameRegional) {

         super(aID, aName, aNameRegional, new String[]{

-        		"A Boiler running off Lava", 

-        		"Produces 600L of Steam per second",

-        		"Causes 20 Pollution per second"}, new ITexture[0]);

+                "A Boiler running off Lava",

+                "Produces 600L of Steam per second",

+                "Causes 20 Pollution per second"});

     }

 

     public GT_MetaTileEntity_Boiler_Lava(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {

@@ -126,8 +126,8 @@ public class GT_MetaTileEntity_Boiler_Lava
                 this.mTemperature += 1;

             }

 

-            if(this.mProcessingEnergy>0 && (aTick % 20L == 0L)){

-            	GT_Pollution.addPollution(this.getBaseMetaTileEntity().getWorld(), new ChunkPosition(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()), 20);

+            if (this.mProcessingEnergy > 0 && (aTick % 20L == 0L)) {

+                GT_Pollution.addPollution(this.getBaseMetaTileEntity().getWorld(), new ChunkPosition(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()), 20);

             }

             aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);

         }

diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java
index 1edfaca5a0..e8b4ed1e8f 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java
@@ -19,17 +19,16 @@ public class GT_MetaTileEntity_Boiler_Solar
         extends GT_MetaTileEntity_Boiler {

     public GT_MetaTileEntity_Boiler_Solar(int aID, String aName, String aNameRegional) {

         super(aID, aName, aNameRegional, new String[]{

-        		"Steam Power by the Sun", 

-        		"Produces 120L of Steam per second", 

-        		"Calcifies over time, reducing Steam output to 40L/s", 

-        		"Break and replace to decalcify"}, 

-        		new ITexture[0]);

+                "Steam Power by the Sun",

+                "Produces 120L of Steam per second",

+                "Calcifies over time, reducing Steam output to 40L/s",

+                "Break and replace to decalcify"});

     }

 

     public GT_MetaTileEntity_Boiler_Solar(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {

         super(aName, aTier, aDescription, aTextures);

     }

-    

+

     public GT_MetaTileEntity_Boiler_Solar(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {

         super(aName, aTier, aDescription, aTextures);

     }

@@ -68,9 +67,9 @@ public class GT_MetaTileEntity_Boiler_Solar
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

         return new GT_MetaTileEntity_Boiler_Solar(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);

     }

-    

+

     private int mRunTime = 0;

-    

+

     @Override

     public void saveNBTData(NBTTagCompound aNBT) {

         super.saveNBTData(aNBT);

@@ -118,8 +117,8 @@ public class GT_MetaTileEntity_Boiler_Solar
                         this.mFluid.amount -= 1;

                         mRunTime += 1;

                         int tOutput = 150;

-                        if(mRunTime > 10000){

-                        	tOutput = Math.max(50, 150 - ((mRunTime-10000)/100));

+                        if (mRunTime > 10000) {

+                            tOutput = Math.max(50, 150 - ((mRunTime - 10000) / 100));

                         }

                         if (this.mSteam == null) {

                             this.mSteam = GT_ModHandler.getSteam(tOutput);

diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
index 1e82f7efab..5d7ec97401 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
@@ -23,9 +23,9 @@ public class GT_MetaTileEntity_Boiler_Steel
         extends GT_MetaTileEntity_Boiler {

     public GT_MetaTileEntity_Boiler_Steel(int aID, String aName, String aNameRegional) {

         super(aID, aName, aNameRegional, new String[]{

-        		"Faster than the Bronze Boiler", 

-        		"Produces 300L of Steam per second",

-        		"Causes 20 Pollution per second"}, new ITexture[0]);

+                "Faster than the Bronze Boiler",

+                "Produces 300L of Steam per second",

+                "Causes 20 Pollution per second"});

     }

 

     public GT_MetaTileEntity_Boiler_Steel(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {

@@ -152,8 +152,8 @@ public class GT_MetaTileEntity_Boiler_Steel
                 this.mProcessingEnergy -= 2;

                 this.mTemperature += 1;

             }

-            if(this.mProcessingEnergy>0 && (aTick % 20L == 0L)){

-            	GT_Pollution.addPollution(this.getBaseMetaTileEntity().getWorld(), new ChunkPosition(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()), 20);

+            if (this.mProcessingEnergy > 0 && (aTick % 20L == 0L)) {

+                GT_Pollution.addPollution(this.getBaseMetaTileEntity().getWorld(), new ChunkPosition(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()), 20);

             }

             aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);

         }

diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
index 7b1487b3c3..503a1f7efb 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
@@ -18,15 +18,14 @@ import net.minecraft.item.ItemStack;
 public class GT_MetaTileEntity_DieselGenerator

         extends GT_MetaTileEntity_BasicGenerator {

 

-	public static final int BASE_POLLUTION = 2;

-	

+    public static final int BASE_POLLUTION = 2;

+

     public int mEfficiency;

 

     public GT_MetaTileEntity_DieselGenerator(int aID, String aName, String aNameRegional, int aTier) {

         super(aID, aName, aNameRegional, aTier, new String[]{

-        		"Requires liquid Fuel",

-        		"Causes " + (int) (20 * BASE_POLLUTION * Math.pow(2, aTier - 1)) + " Pollution per second"},

-        		new ITexture[0]);

+                "Requires liquid Fuel",

+                "Causes " + (int) (20 * BASE_POLLUTION * Math.pow(2, aTier - 1)) + " Pollution per second"});

         onConfigLoad();

     }

 

@@ -34,7 +33,7 @@ public class GT_MetaTileEntity_DieselGenerator
         super(aName, aTier, aDescription, aTextures);

         onConfigLoad();

     }

-    

+

     public GT_MetaTileEntity_DieselGenerator(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {

         super(aName, aTier, aDescription, aTextures);

         onConfigLoad();

@@ -65,7 +64,7 @@ public class GT_MetaTileEntity_DieselGenerator
     }

 

     public int getFuelValue(ItemStack aStack) {

-    	 if (GT_Utility.isStackInvalid(aStack) || getRecipes() == null) return 0;

+        if (GT_Utility.isStackInvalid(aStack) || getRecipes() == null) return 0;

         int rValue = Math.max(GT_ModHandler.getFuelCanValue(aStack) * 6 / 5, super.getFuelValue(aStack));

         if (ItemList.Fuel_Can_Plastic_Filled.isStackEqual(aStack, false, true)) {

             rValue = Math.max(rValue, GameRegistry.getFuelValue(aStack) * 3);

@@ -113,8 +112,8 @@ public class GT_MetaTileEntity_DieselGenerator
         return new ITexture[]{super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.DIESEL_GENERATOR_SIDE_ACTIVE)};

     }

 

-	@Override

-	public int getPollution() {

-		return (int) (GT_MetaTileEntity_DieselGenerator.BASE_POLLUTION * Math.pow(2, mTier - 1));

-	}

+    @Override

+    public int getPollution() {

+        return (int) (GT_MetaTileEntity_DieselGenerator.BASE_POLLUTION * Math.pow(2, mTier - 1));

+    }

 }

diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java
index 14f1eb2643..293669094b 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java
@@ -13,15 +13,15 @@ import gregtech.api.util.GT_Recipe;
 public class GT_MetaTileEntity_GasTurbine

         extends GT_MetaTileEntity_BasicGenerator {

 

-	public static final int BASE_POLLUTION = 1;

-	

+    public static final int BASE_POLLUTION = 1;

+

     public int mEfficiency;

 

-    

+

     public GT_MetaTileEntity_GasTurbine(int aID, String aName, String aNameRegional, int aTier) {

         super(aID, aName, aNameRegional, aTier, new String[]{

-        		"Requires flammable Gasses", 

-        		"Causes " + (int) (20 * BASE_POLLUTION * Math.pow(2, aTier - 1)) + " Pollution per second"});

+                "Requires flammable Gasses",

+                "Causes " + (int) (20 * BASE_POLLUTION * Math.pow(2, aTier - 1)) + " Pollution per second"});

         onConfigLoad();

     }

 

@@ -29,7 +29,7 @@ public class GT_MetaTileEntity_GasTurbine
         super(aName, aTier, aDescription, aTextures);

         onConfigLoad();

     }

-    

+

     public GT_MetaTileEntity_GasTurbine(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) {

         super(aName, aTier, aDescription, aTextures);

         onConfigLoad();

@@ -100,8 +100,8 @@ public class GT_MetaTileEntity_GasTurbine
         return new ITexture[]{super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.GAS_TURBINE_SIDE_ACTIVE)};

     }

 

-	@Override

-	public int getPollution() {

-		return (int) (GT_MetaTileEntity_GasTurbine.BASE_POLLUTION * Math.pow(2, mTier - 1));

-	}

+    @Override

+    public int getPollution() {

+        return (int) (GT_MetaTileEntity_GasTurbine.BASE_POLLUTION * Math.pow(2, mTier - 1));

+    }

 }

diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
index 8850f824be..e63fbe0579 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_SteamTurbine.java
@@ -18,8 +18,8 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener
 

     public GT_MetaTileEntity_SteamTurbine(int aID, String aName, String aNameRegional, int aTier) {

         super(aID, aName, aNameRegional, aTier, new String[]{

-        		"Converts Steam into EU", 

-        		"Base rate: 2L of Steam -> 1 EU"}, new ITexture[0]);

+                "Converts Steam into EU",

+                "Base rate: 2L of Steam -> 1 EU"});

         onConfigLoad();

     }

 

@@ -47,12 +47,12 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener
 

     @Override

     public String[] getDescription() {

-    	String[] desc = new String[mDescriptionArray.length + 2];

-    	System.arraycopy(mDescriptionArray, 0, desc, 0, mDescriptionArray.length);

-    	desc[mDescriptionArray.length] = "Fuel Efficiency: " + (600 / getEfficiency()) + "%";

-    	desc[mDescriptionArray.length + 1] = String.format("Consumes up to %sL of Steam per second", 

-    			(int) (4000 * (8 * Math.pow(4, mTier) + Math.pow(2, mTier)) / (600 / getEfficiency())));

-    	return desc;

+        String[] desc = new String[mDescriptionArray.length + 2];

+        System.arraycopy(mDescriptionArray, 0, desc, 0, mDescriptionArray.length);

+        desc[mDescriptionArray.length] = "Fuel Efficiency: " + (600 / getEfficiency()) + "%";

+        desc[mDescriptionArray.length + 1] = String.format("Consumes up to %sL of Steam per second",

+                (int) (4000 * (8 * Math.pow(4, mTier) + Math.pow(2, mTier)) / (600 / getEfficiency())));

+        return desc;

     }

 

     public int getCapacity() {

@@ -68,8 +68,8 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener
     }

 

     public int getFuelValue(FluidStack aLiquid) {

-    	if(aLiquid==null)return 0;

-    	String fluidName = aLiquid.getFluid().getUnlocalizedName(aLiquid);

+        if (aLiquid == null) return 0;

+        String fluidName = aLiquid.getFluid().getUnlocalizedName(aLiquid);

         return GT_ModHandler.isSteam(aLiquid) || fluidName.equals("fluid.steam") || fluidName.equals("ic2.fluidSteam") || fluidName.equals("fluid.mfr.steam.still.name") ? 3 : 0;

     }

 

@@ -119,18 +119,18 @@ public class GT_MetaTileEntity_SteamTurbine extends GT_MetaTileEntity_BasicGener
         return new ITexture[]{super.getSidesActive(aColor)[0], new GT_RenderedTexture(Textures.BlockIcons.STEAM_TURBINE_SIDE_ACTIVE)};

     }

 

-	@Override

-	public int getPollution() {

-		return 0;

-	}

-	

+    @Override

+    public int getPollution() {

+        return 0;

+    }

+

     @Override

     public boolean isFluidInputAllowed(FluidStack aFluid) {

-    		if(aFluid.getFluid().getUnlocalizedName(aFluid).equals("ic2.fluidSuperheatedSteam")){

-                aFluid.amount=0;

-                aFluid = null;

-                return false;

-            }

+        if (aFluid.getFluid().getUnlocalizedName(aFluid).equals("ic2.fluidSuperheatedSteam")) {

+            aFluid.amount = 0;

+            aFluid = null;

+            return false;

+        }

         return super.isFluidInputAllowed(aFluid);

     }

 }

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 88558b53cc..c3ab282906 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
@@ -67,58 +67,61 @@ public class GT_MetaTileEntity_AssemblyLine
     }
 
     public boolean checkRecipe(ItemStack aStack) {
-    	 if(!GT_Utility.isStackValid(mInventory[1]) && !ItemList.Tool_DataStick.isStackEqual(mInventory[1], false, true))return false;
-    	NBTTagCompound tTag = mInventory[1].getTagCompound();
-    	if(tTag==null)return false;
-    	ItemStack tStack[] = new ItemStack[15];
-    	for(int i = 0;i<15;i++){
-    		if(tTag.hasKey(""+i)){
-    		tStack[i] = GT_Utility.loadItem(tTag, ""+i);
-    		if(tStack[i]!=null){
-    			if(mInputBusses.get(i)==null)return false;
-    			if(GT_Utility.areStacksEqual(tStack[i],mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0),true) && tStack[i].stackSize <= mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0).stackSize){
-    			}else{return false;}
-    		}}
-    	}
-    	FluidStack[] tFluids = new FluidStack[4];
-    	for(int i = 0;i<4;i++){
-    		if(tTag.hasKey("f"+i)){
-    			tFluids[i] = GT_Utility.loadFluid(tTag, "f"+i);
-    			if(tFluids[i]!=null){
-    				if(mInputHatches.get(i)==null)return false;
-    				if(mInputHatches.get(i).mFluid!=null && GT_Utility.areFluidsEqual(mInputHatches.get(i).mFluid, tFluids[i], true) && mInputHatches.get(i).mFluid.amount>=tFluids[i].amount){
-    				}else{return false;}
-    			}
-    		}
-    	}
-    	if(tTag.hasKey("output")){
-    		mOutputItems = new ItemStack[]{GT_Utility.loadItem(tTag, "output")};
-    		if(mOutputItems==null||mOutputItems[0]==null||!GT_Utility.isStackValid(mOutputItems[0]))return false;
-    	}else{return false;}
-    	if(tTag.hasKey("time")){
-    		mMaxProgresstime = tTag.getInteger("time");
-    		if(mMaxProgresstime<=0)return false;
-    	}else{return false;}
-    	if(tTag.hasKey("eu")){
-    		mEUt = tTag.getInteger("eu");
-    	}else{return false;}
-    	for(int i = 0;i<15;i++){
-    		if(tStack[i]!=null){
-    			mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0).stackSize -= tStack[i].stackSize;
-    			if(mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0).stackSize <= 0){
-    			}
-    		}
-    	}
-    	
-    	for(int i = 0;i<4;i++){
-    		if(tFluids[i]!=null){
-    			mInputHatches.get(i).mFluid.amount -= tFluids[i].amount;
-    			if(mInputHatches.get(i).mFluid.amount<=0){
-    				mInputHatches.get(i).mFluid = null;
-    			}
-    		}
-    	}
-    	byte tTier = (byte) Math.max(1, GT_Utility.getTier(getMaxInputVoltage()));
+        if (!GT_Utility.isStackValid(mInventory[1]) || !ItemList.Tool_DataStick.isStackEqual(mInventory[1], false, true))
+            return false;
+
+        NBTTagCompound tTag = mInventory[1].getTagCompound();
+        if (tTag == null) return false;
+        ItemStack tStack[] = new ItemStack[15];
+        for (int i = 0; i < 15; i++) {
+            if (!tTag.hasKey("" + i)) continue;
+            if (mInputBusses.get(i) == null) return false;
+            tStack[i] = GT_Utility.loadItem(tTag, "" + i);
+            if (tStack[i] == null) continue;
+            ItemStack stackInSlot = mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0);
+            if (!GT_Utility.areStacksEqual(tStack[i], stackInSlot, true) || tStack[i].stackSize > stackInSlot.stackSize) {
+                return false;
+            }
+        }
+
+        FluidStack[] tFluids = new FluidStack[4];
+        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 (mInputHatches.get(i) == null) return false;
+            FluidStack fluidInHatch = mInputHatches.get(i).mFluid;
+            if (fluidInHatch == null || !GT_Utility.areFluidsEqual(fluidInHatch, tFluids[i], true) || fluidInHatch.amount < tFluids[i].amount) {
+                return false;
+            }
+        }
+
+        if (!tTag.hasKey("output")) return false;
+        mOutputItems = new ItemStack[]{GT_Utility.loadItem(tTag, "output")};
+        if (mOutputItems[0] == null || !GT_Utility.isStackValid(mOutputItems[0]))
+            return false;
+
+        if (!tTag.hasKey("time")) return false;
+        mMaxProgresstime = tTag.getInteger("time");
+        if (mMaxProgresstime <= 0) return false;
+
+        if (!tTag.hasKey("eu")) return false;
+        mEUt = tTag.getInteger("eu");
+        for (int i = 0; i < 15; i++) {
+            if (tStack[i] == null) continue;
+            ItemStack stackInSlot = mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0);
+            stackInSlot.stackSize -= tStack[i].stackSize;
+        }
+
+        for (int i = 0; i < 4; i++) {
+            if (tFluids[i] == null) continue;
+            mInputHatches.get(i).mFluid.amount -= tFluids[i].amount;
+            if (mInputHatches.get(i).mFluid.amount <= 0) {
+                mInputHatches.get(i).mFluid = null;
+            }
+        }
+
+        byte tTier = (byte) Math.max(1, GT_Utility.getTier(getMaxInputVoltage()));
         this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
         this.mEfficiencyIncrease = 10000;
         if (mEUt <= 16) {
@@ -130,6 +133,9 @@ public class GT_MetaTileEntity_AssemblyLine
                 this.mMaxProgresstime /= 2;
             }
         }
+        if (this.mEUt > 0) {
+            this.mEUt = -this.mEUt;
+        }
         this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
         updateSlots();
         return true;
@@ -138,7 +144,7 @@ public class GT_MetaTileEntity_AssemblyLine
     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {
         super.startSoundLoop(aIndex, aX, aY, aZ);
         if (aIndex == 20) {
-            GT_Utility.doSoundAtClient((String) GregTech_API.sSoundList.get(212), 10, 1.0F, aX, aY, aZ);
+            GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(212), 10, 1.0F, aX, aY, aZ);
         }
     }
 
@@ -146,71 +152,117 @@ public class GT_MetaTileEntity_AssemblyLine
         int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
         int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
         if (xDir != 0) {
-            for(int r = 0; r <= 16; r++){
-                int i = r*xDir;
+            for (int r = 0; r <= 16; r++) {
+                int i = r * xDir;
 
-                if(i!=0&& !(aBaseMetaTileEntity.getBlockOffset(0, 0, i)==GregTech_API.sBlockCasings3&&aBaseMetaTileEntity.getMetaIDOffset(0, 0, i)==10)){return false;}
-                if(!aBaseMetaTileEntity.getBlockOffset(0, -1, i).getUnlocalizedName().equals("blockAlloyGlass")){return false;}
+                if (i != 0 && !(aBaseMetaTileEntity.getBlockOffset(0, 0, i) == GregTech_API.sBlockCasings3 && aBaseMetaTileEntity.getMetaIDOffset(0, 0, i) == 10)) {
+                    return false;
+                }
+                if (!aBaseMetaTileEntity.getBlockOffset(0, -1, i).getUnlocalizedName().equals("blockAlloyGlass")) {
+                    return false;
+                }
                 IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(0, -2, i);
-                if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))){
-                    if (aBaseMetaTileEntity.getBlockOffset(0, -2, i) != GregTech_API.sBlockCasings2) {return false;}
-                    if (aBaseMetaTileEntity.getMetaIDOffset(0, -2, i) != 0) {return false;}
+                if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))) {
+                    if (aBaseMetaTileEntity.getBlockOffset(0, -2, i) != GregTech_API.sBlockCasings2) {
+                        return false;
+                    }
+                    if (aBaseMetaTileEntity.getMetaIDOffset(0, -2, i) != 0) {
+                        return false;
+                    }
                 }
 
                 tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 1, i);
-                if (!addEnergyInputToMachineList(tTileEntity, 16)){
-                    if (aBaseMetaTileEntity.getBlockOffset(xDir, 1, i) != GregTech_API.sBlockCasings2) {return false;}
-                    if (aBaseMetaTileEntity.getMetaIDOffset(xDir, 1, i) != 0) {return false;}
+                if (!addEnergyInputToMachineList(tTileEntity, 16)) {
+                    if (aBaseMetaTileEntity.getBlockOffset(xDir, 1, i) != GregTech_API.sBlockCasings2) {
+                        return false;
+                    }
+                    if (aBaseMetaTileEntity.getMetaIDOffset(xDir, 1, i) != 0) {
+                        return false;
+                    }
+                }
+                if (i != 0 && !(aBaseMetaTileEntity.getBlockOffset(xDir, 0, i) == GregTech_API.sBlockCasings2 && aBaseMetaTileEntity.getMetaIDOffset(xDir, 0, i) == 9)) {
+                    return false;
+                }
+                if (i != 0 && !(aBaseMetaTileEntity.getBlockOffset(xDir, -1, i) == GregTech_API.sBlockCasings2 && aBaseMetaTileEntity.getMetaIDOffset(xDir, -1, i) == 5)) {
+                    return false;
                 }
-                if(i!=0&& !(aBaseMetaTileEntity.getBlockOffset(xDir, 0, i)==GregTech_API.sBlockCasings2&&aBaseMetaTileEntity.getMetaIDOffset(xDir, 0, i)==9)){return false;}
-                if(i!=0&& !(aBaseMetaTileEntity.getBlockOffset(xDir,-1, i)==GregTech_API.sBlockCasings2&&aBaseMetaTileEntity.getMetaIDOffset(xDir,-1, i)==5)){return false;}
 
 
-                if(!(aBaseMetaTileEntity.getBlockOffset(xDir*2, 0, i)==GregTech_API.sBlockCasings3&&aBaseMetaTileEntity.getMetaIDOffset(xDir*2, 0, i)==10)){return false;}
-                if(!aBaseMetaTileEntity.getBlockOffset(xDir*2, -1, i).getUnlocalizedName().equals("blockAlloyGlass")){return false;}
-                tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir*2, -2, i);
-                if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))){
-                    if (aBaseMetaTileEntity.getBlockOffset(xDir*2, -2, i) != GregTech_API.sBlockCasings2) {return false;}
-                    if (aBaseMetaTileEntity.getMetaIDOffset(xDir*2, -2, i) != 0) {return false;}
+                if (!(aBaseMetaTileEntity.getBlockOffset(xDir * 2, 0, i) == GregTech_API.sBlockCasings3 && aBaseMetaTileEntity.getMetaIDOffset(xDir * 2, 0, i) == 10)) {
+                    return false;
+                }
+                if (!aBaseMetaTileEntity.getBlockOffset(xDir * 2, -1, i).getUnlocalizedName().equals("blockAlloyGlass")) {
+                    return false;
+                }
+                tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir * 2, -2, i);
+                if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))) {
+                    if (aBaseMetaTileEntity.getBlockOffset(xDir * 2, -2, i) != GregTech_API.sBlockCasings2) {
+                        return false;
+                    }
+                    if (aBaseMetaTileEntity.getMetaIDOffset(xDir * 2, -2, i) != 0) {
+                        return false;
+                    }
                 }
                 tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, -2, i);
-                if (!addInputToMachineList(tTileEntity, 16)){
-                    if (!addOutputToMachineList(tTileEntity, 16)){
-                    }else{if(r>0){return mEnergyHatches.size()>0;}else{return false;}}
+                if (!addInputToMachineList(tTileEntity, 16) && addOutputToMachineList(tTileEntity, 16)) {
+                    return r > 0 && mEnergyHatches.size() > 0;
                 }
             }
-        }else{
-            for(int r = 0; r <= 16; r++){
-                int i = r*-zDir;
+        } else {
+            for (int r = 0; r <= 16; r++) {
+                int i = r * -zDir;
 
-                if(i!=0 && !(aBaseMetaTileEntity.getBlockOffset(i, 0, 0)==GregTech_API.sBlockCasings3&&aBaseMetaTileEntity.getMetaIDOffset(i, 0, 0)==10)){return false;}
-                if(!aBaseMetaTileEntity.getBlockOffset(i, -1, 0).getUnlocalizedName().equals("blockAlloyGlass")){return false;}
+                if (i != 0 && !(aBaseMetaTileEntity.getBlockOffset(i, 0, 0) == GregTech_API.sBlockCasings3 && aBaseMetaTileEntity.getMetaIDOffset(i, 0, 0) == 10)) {
+                    return false;
+                }
+                if (!aBaseMetaTileEntity.getBlockOffset(i, -1, 0).getUnlocalizedName().equals("blockAlloyGlass")) {
+                    return false;
+                }
                 IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, -2, 0);
-                if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))){
-                    if (aBaseMetaTileEntity.getBlockOffset(i, -2, 0) != GregTech_API.sBlockCasings2) {return false;}
-                    if (aBaseMetaTileEntity.getMetaIDOffset(i, -2, 0) != 0) {return false;}
+                if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))) {
+                    if (aBaseMetaTileEntity.getBlockOffset(i, -2, 0) != GregTech_API.sBlockCasings2) {
+                        return false;
+                    }
+                    if (aBaseMetaTileEntity.getMetaIDOffset(i, -2, 0) != 0) {
+                        return false;
+                    }
                 }
 
                 tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, 1, zDir);
-                if (!addEnergyInputToMachineList(tTileEntity, 16)){
-                    if (aBaseMetaTileEntity.getBlockOffset(i, 1, zDir) != GregTech_API.sBlockCasings2) {return false;}
-                    if (aBaseMetaTileEntity.getMetaIDOffset(i, 1, zDir) != 0) {return false;}
+                if (!addEnergyInputToMachineList(tTileEntity, 16)) {
+                    if (aBaseMetaTileEntity.getBlockOffset(i, 1, zDir) != GregTech_API.sBlockCasings2) {
+                        return false;
+                    }
+                    if (aBaseMetaTileEntity.getMetaIDOffset(i, 1, zDir) != 0) {
+                        return false;
+                    }
+                }
+                if (i != 0 && !(aBaseMetaTileEntity.getBlockOffset(i, 0, zDir) == GregTech_API.sBlockCasings2 && aBaseMetaTileEntity.getMetaIDOffset(i, 0, zDir) == 9)) {
+                    return false;
+                }
+                if (i != 0 && !(aBaseMetaTileEntity.getBlockOffset(i, -1, zDir) == GregTech_API.sBlockCasings2 && aBaseMetaTileEntity.getMetaIDOffset(i, -1, zDir) == 5)) {
+                    return false;
                 }
-                if(i!=0&& !(aBaseMetaTileEntity.getBlockOffset(i, 0, zDir)==GregTech_API.sBlockCasings2&&aBaseMetaTileEntity.getMetaIDOffset(i, 0, zDir)==9)){return false;}
-                if(i!=0&& !(aBaseMetaTileEntity.getBlockOffset(i,-1, zDir)==GregTech_API.sBlockCasings2&&aBaseMetaTileEntity.getMetaIDOffset(i,-1, zDir)==5)){return false;}
 
 
-                if(!(aBaseMetaTileEntity.getBlockOffset(i, 0, zDir*2)==GregTech_API.sBlockCasings3&&aBaseMetaTileEntity.getMetaIDOffset(i, 0, zDir*2)==10)){return false;}
-                if(!aBaseMetaTileEntity.getBlockOffset(i, -1, zDir*2).getUnlocalizedName().equals("blockAlloyGlass")){return false;}
-                tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, -2, zDir*2);
-                if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))){
-                    if (aBaseMetaTileEntity.getBlockOffset(i, -2, zDir*2) != GregTech_API.sBlockCasings2) {return false;}
-                    if (aBaseMetaTileEntity.getMetaIDOffset(i, -2, zDir*2) != 0) {return false;}
+                if (!(aBaseMetaTileEntity.getBlockOffset(i, 0, zDir * 2) == GregTech_API.sBlockCasings3 && aBaseMetaTileEntity.getMetaIDOffset(i, 0, zDir * 2) == 10)) {
+                    return false;
+                }
+                if (!aBaseMetaTileEntity.getBlockOffset(i, -1, zDir * 2).getUnlocalizedName().equals("blockAlloyGlass")) {
+                    return false;
+                }
+                tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, -2, zDir * 2);
+                if ((!addMaintenanceToMachineList(tTileEntity, 16)) && (!addInputToMachineList(tTileEntity, 16))) {
+                    if (aBaseMetaTileEntity.getBlockOffset(i, -2, zDir * 2) != GregTech_API.sBlockCasings2) {
+                        return false;
+                    }
+                    if (aBaseMetaTileEntity.getMetaIDOffset(i, -2, zDir * 2) != 0) {
+                        return false;
+                    }
                 }
                 tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, -2, zDir);
-                if (!addInputToMachineList(tTileEntity, 16)){