Reformat code

5 files changed, 679 insertions, 858 deletions

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 64b452e60c..f9dd1ccf73 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
@@ -7,324 +7,264 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
 import gregtech.api.objects.GT_ItemStack;
-import gregtech.api.util.GT_CoverBehavior;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
-import java.util.Map;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidHandler;
 
 public abstract class GT_MetaTileEntity_Boiler
-  extends GT_MetaTileEntity_BasicTank
-{
-  public int mTemperature = 20;
-  public int mProcessingEnergy = 0;
-  public int mLossTimer = 0;
-  public FluidStack mSteam = null;
-  public boolean mHadNoWater = false;
-  
-  public GT_MetaTileEntity_Boiler(int aID, String aName, String aNameRegional, String aDescription, ITexture... aTextures)
-  {
-    super(aID, aName, aNameRegional, 0, 4, aDescription, aTextures);
-  }
-  
-  public GT_MetaTileEntity_Boiler(String aName, int aTier, String aDescription, ITexture[][][] aTextures)
-  {
-    super(aName, aTier, 4, aDescription, aTextures);
-  }
-  
-  public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone)
-  {
-	  ITexture[] tmp = mTextures[aSide >= 2 ? aSide != aFacing ? 2 : ((byte)(aActive ? 4 : 3)) : aSide][aColorIndex + 1];
-			  //mTextures[(aSide==aFacing?(aActive?4:3):aSide==GT_Utility.getOppositeSide(aFacing)?2:aSide==0?0:aSide==1?1:2)][aColorIndex+1];
-	  if(aSide!=aFacing&&tmp.length==2){
-			  tmp = new ITexture[]{tmp[0]};
-	  }
-	  return tmp;
-  }
-  
-  public boolean isElectric()
-  {
-    return false;
-  }
-  
-  public boolean isPneumatic()
-  {
-    return false;
-  }
-  
-  public boolean isSteampowered()
-  {
-    return false;
-  }
-  
-  public boolean isSimpleMachine()
-  {
-    return false;
-  }
-  
-  public boolean isFacingValid(byte aFacing)
-  {
-    return aFacing > 1;
-  }
-  
-  public boolean isAccessAllowed(EntityPlayer aPlayer)
-  {
-    return true;
-  }
-  
-  public boolean isValidSlot(int aIndex)
-  {
-    return true;
-  }
-  
-  public int getProgresstime()
-  {
-    return this.mTemperature;
-  }
-  
-  public int maxProgresstime()
-  {
-    return 500;
-  }
-  
-  public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer)
-  {
-    if (aBaseMetaTileEntity.isClientSide()) {
-      return true;
+        extends GT_MetaTileEntity_BasicTank {
+    public int mTemperature = 20;
+    public int mProcessingEnergy = 0;
+    public int mLossTimer = 0;
+    public FluidStack mSteam = null;
+    public boolean mHadNoWater = false;
+
+    public GT_MetaTileEntity_Boiler(int aID, String aName, String aNameRegional, String aDescription, ITexture... aTextures) {
+        super(aID, aName, aNameRegional, 0, 4, aDescription, aTextures);
     }
-    if (aPlayer != null) {
-      if (GT_Utility.areStacksEqual(aPlayer.getCurrentEquippedItem(), new ItemStack(Items.water_bucket, 1)))
-      {
-        fill(Materials.Water.getFluid(1000 * aPlayer.getCurrentEquippedItem().stackSize), true);
-        aPlayer.getCurrentEquippedItem().func_150996_a(Items.bucket);
-      }
-      else
-      {
-        aBaseMetaTileEntity.openGUI(aPlayer);
-      }
+
+    public GT_MetaTileEntity_Boiler(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+        super(aName, aTier, 4, aDescription, aTextures);
     }
-    return true;
-  }
-  
-  public boolean doesFillContainers()
-  {
-    return true;
-  }
-  
-  public boolean doesEmptyContainers()
-  {
-    return true;
-  }
-  
-  public boolean canTankBeFilled()
-  {
-    return true;
-  }
-  
-  public boolean canTankBeEmptied()
-  {
-    return true;
-  }
-  
-  public boolean displaysItemStack()
-  {
-    return false;
-  }
-  
-  public boolean displaysStackSize()
-  {
-    return false;
-  }
-  
-  public boolean isFluidInputAllowed(FluidStack aFluid)
-  {
-    return GT_ModHandler.isWater(aFluid);
-  }
-  
-  public FluidStack getDrainableStack()
-  {
-    return this.mSteam;
-  }
-  
-  public FluidStack setDrainableStack(FluidStack aFluid)
-  {
-    this.mSteam = aFluid;return this.mSteam;
-  }
-  
-  public boolean allowCoverOnSide(byte aSide, GT_ItemStack aCover)
-  {
-    return GregTech_API.getCoverBehavior(aCover.toStack()).isSimpleCover();
-  }
-  
-  public void saveNBTData(NBTTagCompound aNBT)
-  {
-    super.saveNBTData(aNBT);
-    aNBT.setInteger("mLossTimer", this.mLossTimer);
-    aNBT.setInteger("mTemperature", this.mTemperature);
-    aNBT.setInteger("mProcessingEnergy", this.mProcessingEnergy);
-    if (this.mSteam != null) {
-      try
-      {
-        aNBT.setTag("mSteam", this.mSteam.writeToNBT(new NBTTagCompound()));
-      }
-      catch (Throwable e) {}
+
+    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+        ITexture[] tmp = mTextures[aSide >= 2 ? aSide != aFacing ? 2 : ((byte) (aActive ? 4 : 3)) : aSide][aColorIndex + 1];
+        //mTextures[(aSide==aFacing?(aActive?4:3):aSide==GT_Utility.getOppositeSide(aFacing)?2:aSide==0?0:aSide==1?1:2)][aColorIndex+1];
+        if (aSide != aFacing && tmp.length == 2) {
+            tmp = new ITexture[]{tmp[0]};
+        }
+        return tmp;
     }
-  }
-  
-  public void loadNBTData(NBTTagCompound aNBT)
-  {
-    super.loadNBTData(aNBT);
-    this.mLossTimer = aNBT.getInteger("mLossTimer");
-    this.mTemperature = aNBT.getInteger("mTemperature");
-    this.mProcessingEnergy = aNBT.getInteger("mProcessingEnergy");
-    this.mSteam = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mSteam"));
-  }
-  
-  public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick)
-  {
-    if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L))
-    {
-      if (this.mTemperature <= 20)
-      {
-        this.mTemperature = 20;
-        this.mLossTimer = 0;
-      }
-      if (++this.mLossTimer > 40)
-      {
-        this.mTemperature -= 1;
-        this.mLossTimer = 0;
-      }
-      for (byte i = 1; (this.mSteam != null) && (i < 6); i = (byte)(i + 1)) {
-        if (i != aBaseMetaTileEntity.getFrontFacing())
-        {
-          IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i);
-          if (tTileEntity != null)
-          {
-            FluidStack tDrained = aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false);
-            if (tDrained != null)
-            {
-              int tFilledAmount = tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), tDrained, false);
-              if (tFilledAmount > 0) {
-                tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), tFilledAmount, true), true);
-              }
-            }
-          }
+
+    public boolean isElectric() {
+        return false;
+    }
+
+    public boolean isPneumatic() {
+        return false;
+    }
+
+    public boolean isSteampowered() {
+        return false;
+    }
+
+    public boolean isSimpleMachine() {
+        return false;
+    }
+
+    public boolean isFacingValid(byte aFacing) {
+        return aFacing > 1;
+    }
+
+    public boolean isAccessAllowed(EntityPlayer aPlayer) {
+        return true;
+    }
+
+    public boolean isValidSlot(int aIndex) {
+        return true;
+    }
+
+    public int getProgresstime() {
+        return this.mTemperature;
+    }
+
+    public int maxProgresstime() {
+        return 500;
+    }
+
+    public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
+        if (aBaseMetaTileEntity.isClientSide()) {
+            return true;
         }
-      }
-      if (aTick % 10L == 0L) {
-        if (this.mTemperature > 100)
-        {
-          if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0))
-          {
-            this.mHadNoWater = true;
-          }
-          else
-          {
-            if (this.mHadNoWater)
-            {
-              aBaseMetaTileEntity.doExplosion(2048L);
-              return;
-            }
-            this.mFluid.amount -= 1;
-            if (this.mSteam == null) {
-              this.mSteam = GT_ModHandler.getSteam(150L);
-            } else if (GT_ModHandler.isSteam(this.mSteam)) {
-              this.mSteam.amount += 150;
+        if (aPlayer != null) {
+            if (GT_Utility.areStacksEqual(aPlayer.getCurrentEquippedItem(), new ItemStack(Items.water_bucket, 1))) {
+                fill(Materials.Water.getFluid(1000 * aPlayer.getCurrentEquippedItem().stackSize), true);
+                aPlayer.getCurrentEquippedItem().func_150996_a(Items.bucket);
             } else {
-              this.mSteam = GT_ModHandler.getSteam(150L);
+                aBaseMetaTileEntity.openGUI(aPlayer);
             }
-          }
-        }
-        else {
-          this.mHadNoWater = false;
-        }
-      }
-      if ((this.mSteam != null) && 
-        (this.mSteam.amount > 32000))
-      {
-        sendSound((byte)1);
-        this.mSteam.amount = 24000;
-      }
-      if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && 
-        (this.mInventory[2] != null)) {
-        if ((GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Coal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Coal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Coal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Coal))))
-        {
-          this.mProcessingEnergy += 160;
-          aBaseMetaTileEntity.decrStackSize(2, 1);
-          if (aBaseMetaTileEntity.getRandomNumber(3) == 0) {
-            aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
-          }
         }
-        else if (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Charcoal)))
-        {
-          this.mProcessingEnergy += 160;
-          aBaseMetaTileEntity.decrStackSize(2, 1);
-          if (aBaseMetaTileEntity.getRandomNumber(3) == 0) {
-            aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));
-          }
+        return true;
+    }
+
+    public boolean doesFillContainers() {
+        return true;
+    }
+
+    public boolean doesEmptyContainers() {
+        return true;
+    }
+
+    public boolean canTankBeFilled() {
+        return true;
+    }
+
+    public boolean canTankBeEmptied() {
+        return true;
+    }
+
+    public boolean displaysItemStack() {
+        return false;
+    }
+
+    public boolean displaysStackSize() {
+        return false;
+    }
+
+    public boolean isFluidInputAllowed(FluidStack aFluid) {
+        return GT_ModHandler.isWater(aFluid);
+    }
+
+    public FluidStack getDrainableStack() {
+        return this.mSteam;
+    }
+
+    public FluidStack setDrainableStack(FluidStack aFluid) {
+        this.mSteam = aFluid;
+        return this.mSteam;
+    }
+
+    public boolean allowCoverOnSide(byte aSide, GT_ItemStack aCover) {
+        return GregTech_API.getCoverBehavior(aCover.toStack()).isSimpleCover();
+    }
+
+    public void saveNBTData(NBTTagCompound aNBT) {
+        super.saveNBTData(aNBT);
+        aNBT.setInteger("mLossTimer", this.mLossTimer);
+        aNBT.setInteger("mTemperature", this.mTemperature);
+        aNBT.setInteger("mProcessingEnergy", this.mProcessingEnergy);
+        if (this.mSteam != null) {
+            try {
+                aNBT.setTag("mSteam", this.mSteam.writeToNBT(new NBTTagCompound()));
+            } catch (Throwable e) {
+            }
         }
-        else if (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelCoke"))
-        {
-          this.mProcessingEnergy += 640;
-          aBaseMetaTileEntity.decrStackSize(2, 1);
-          if (aBaseMetaTileEntity.getRandomNumber(2) == 0) {
-            aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));
-          }
+    }
+
+    public void loadNBTData(NBTTagCompound aNBT) {
+        super.loadNBTData(aNBT);
+        this.mLossTimer = aNBT.getInteger("mLossTimer");
+        this.mTemperature = aNBT.getInteger("mTemperature");
+        this.mProcessingEnergy = aNBT.getInteger("mProcessingEnergy");
+        this.mSteam = FluidStack.loadFluidStackFromNBT(aNBT.getCompoundTag("mSteam"));
+    }
+
+    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+        if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L)) {
+            if (this.mTemperature <= 20) {
+                this.mTemperature = 20;
+                this.mLossTimer = 0;
+            }
+            if (++this.mLossTimer > 40) {
+                this.mTemperature -= 1;
+                this.mLossTimer = 0;
+            }
+            for (byte i = 1; (this.mSteam != null) && (i < 6); i = (byte) (i + 1)) {
+                if (i != aBaseMetaTileEntity.getFrontFacing()) {
+                    IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i);
+                    if (tTileEntity != null) {
+                        FluidStack tDrained = aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false);
+                        if (tDrained != null) {
+                            int tFilledAmount = tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), tDrained, false);
+                            if (tFilledAmount > 0) {
+                                tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), tFilledAmount, true), true);
+                            }
+                        }
+                    }
+                }
+            }
+            if (aTick % 10L == 0L) {
+                if (this.mTemperature > 100) {
+                    if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) {
+                        this.mHadNoWater = true;
+                    } else {
+                        if (this.mHadNoWater) {
+                            aBaseMetaTileEntity.doExplosion(2048L);
+                            return;
+                        }
+                        this.mFluid.amount -= 1;
+                        if (this.mSteam == null) {
+                            this.mSteam = GT_ModHandler.getSteam(150L);
+                        } else if (GT_ModHandler.isSteam(this.mSteam)) {
+                            this.mSteam.amount += 150;
+                        } else {
+                            this.mSteam = GT_ModHandler.getSteam(150L);
+                        }
+                    }
+                } else {
+                    this.mHadNoWater = false;
+                }
+            }
+            if ((this.mSteam != null) &&
+                    (this.mSteam.amount > 32000)) {
+                sendSound((byte) 1);
+                this.mSteam.amount = 24000;
+            }
+            if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) &&
+                    (this.mInventory[2] != null)) {
+                if ((GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Coal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Coal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Coal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Coal)))) {
+                    this.mProcessingEnergy += 160;
+                    aBaseMetaTileEntity.decrStackSize(2, 1);
+                    if (aBaseMetaTileEntity.getRandomNumber(3) == 0) {
+                        aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
+                    }
+                } else if (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Charcoal))) {
+                    this.mProcessingEnergy += 160;
+                    aBaseMetaTileEntity.decrStackSize(2, 1);
+                    if (aBaseMetaTileEntity.getRandomNumber(3) == 0) {
+                        aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));
+                    }
+                } else if (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelCoke")) {
+                    this.mProcessingEnergy += 640;
+                    aBaseMetaTileEntity.decrStackSize(2, 1);
+                    if (aBaseMetaTileEntity.getRandomNumber(2) == 0) {
+                        aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));
+                    }
+                } else if ((GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Lignite))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Lignite))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Lignite))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Lignite)))) {
+                    this.mProcessingEnergy += 40;
+                    aBaseMetaTileEntity.decrStackSize(2, 1);
+                    if (aBaseMetaTileEntity.getRandomNumber(8) == 0) {
+                        aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
+                    }
+                }
+            }
+            if ((this.mTemperature < 1000) && (this.mProcessingEnergy > 0) && (aTick % 12L == 0L)) {
+                this.mProcessingEnergy -= 2;
+                this.mTemperature += 1;
+            }
+            aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);
         }
-        else if ((GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Lignite))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Lignite))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Lignite))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Lignite))))
-        {
-          this.mProcessingEnergy += 40;
-          aBaseMetaTileEntity.decrStackSize(2, 1);
-          if (aBaseMetaTileEntity.getRandomNumber(8) == 0) {
-            aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
-          }
+    }
+
+    public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+        return (aIndex == 1) || (aIndex == 3);
+    }
+
+    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+        return aIndex == 2;
+    }
+
+    public void doSound(byte aIndex, double aX, double aY, double aZ) {
+        if (aIndex == 1) {
+            GT_Utility.doSoundAtClient((String) GregTech_API.sSoundList.get(Integer.valueOf(4)), 2, 1.0F, aX, aY, aZ);
+            for (int l = 0; l < 8; l++) {
+                getBaseMetaTileEntity().getWorld().spawnParticle("largesmoke", aX - 0.5D + Math.random(), aY, aZ - 0.5D + Math.random(), 0.0D, 0.0D, 0.0D);
+            }
         }
-      }
-      if ((this.mTemperature < 1000) && (this.mProcessingEnergy > 0) && (aTick % 12L == 0L))
-      {
-        this.mProcessingEnergy -= 2;
-        this.mTemperature += 1;
-      }
-      aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);
     }
-  }
-  
-  public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)
-  {
-    return (aIndex == 1) || (aIndex == 3);
-  }
-  
-  public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack)
-  {
-    return aIndex == 2;
-  }
-  
-  public void doSound(byte aIndex, double aX, double aY, double aZ)
-  {
-    if (aIndex == 1)
-    {
-      GT_Utility.doSoundAtClient((String)GregTech_API.sSoundList.get(Integer.valueOf(4)), 2, 1.0F, aX, aY, aZ);
-      for (int l = 0; l < 8; l++) {
-        getBaseMetaTileEntity().getWorld().spawnParticle("largesmoke", aX - 0.5D + Math.random(), aY, aZ - 0.5D + Math.random(), 0.0D, 0.0D, 0.0D);
-      }
+
+    public int getCapacity() {
+        return 16000;
+    }
+
+    public int getTankPressure() {
+        return 100;
     }
-  }
-  
-  public int getCapacity()
-  {
-    return 16000;
-  }
-  
-  public int getTankPressure()
-  {
-    return 100;
-  }
 }
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 e683eb09aa..1a68147f51 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
@@ -4,7 +4,6 @@ import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.Textures;
-import gregtech.api.enums.Textures.BlockIcons;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
@@ -19,158 +18,127 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidHandler;
 
 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, "An early way to get Steam Power", new ITexture[0]);
-  }
-  
-  public GT_MetaTileEntity_Boiler_Bronze(String aName, int aTier, String aDescription, ITexture[][][] aTextures)
-  {
-    super(aName, aTier, aDescription, aTextures);
-  }
-  
-  public ITexture[][][] getTextureSet(ITexture[] aTextures)
-  {
-    ITexture[][][] rTextures = new ITexture[5][17][];
-    for (byte i = -1; i < 16; i++)
-    {
-      rTextures[0][(i + 1)] = new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa)) };
-      rTextures[1][(i + 1)] = new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) };
-      rTextures[2][(i + 1)] = new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) };
-      rTextures[3][(i + 1)] = new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) };
-      rTextures[4][(i + 1)] = new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE) };
+        extends GT_MetaTileEntity_Boiler {
+    public GT_MetaTileEntity_Boiler_Bronze(int aID, String aName, String aNameRegional) {
+        super(aID, aName, aNameRegional, "An early way to get Steam Power", new ITexture[0]);
     }
-    return rTextures;
-  }
-  
-  public int maxProgresstime()
-  {
-    return 500;
-  }
-  
-  public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity)
-  {
-    return new GT_Container_Boiler(aPlayerInventory, aBaseMetaTileEntity, 16000);
-  }
-  
-  public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity)
-  {
-    return new GT_GUIContainer_Boiler(aPlayerInventory, aBaseMetaTileEntity, "BronzeBoiler.png", 16000);
-  }
-  
-  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)
-  {
-    return new GT_MetaTileEntity_Boiler_Bronze(this.mName, this.mTier, this.mDescription, this.mTextures);
-  }
-  
-  public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick)
-  {
-    if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L))
-    {
-      if (this.mTemperature <= 20)
-      {
-        this.mTemperature = 20;
-        this.mLossTimer = 0;
-      }
-      if (++this.mLossTimer > 45)
-      {
-        this.mTemperature -= 1;
-        this.mLossTimer = 0;
-      }
-      for (byte i = 1; (this.mSteam != null) && (i < 6); i = (byte)(i + 1)) {
-        if (i != aBaseMetaTileEntity.getFrontFacing())
-        {
-          IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i);
-          if (tTileEntity != null)
-          {
-            FluidStack tDrained = aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false);
-            if (tDrained != null)
-            {
-              int tFilledAmount = tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), tDrained, false);
-              if (tFilledAmount > 0) {
-                tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), tFilledAmount, true), true);
-              }
-            }
-          }
+
+    public GT_MetaTileEntity_Boiler_Bronze(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+        super(aName, aTier, aDescription, aTextures);
+    }
+
+    public ITexture[][][] getTextureSet(ITexture[] aTextures) {
+        ITexture[][][] rTextures = new ITexture[5][17][];
+        for (byte i = -1; i < 16; i++) {
+            rTextures[0][(i + 1)] = new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa))};
+            rTextures[1][(i + 1)] = new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)};
+            rTextures[2][(i + 1)] = new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)};
+            rTextures[3][(i + 1)] = new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT)};
+            rTextures[4][(i + 1)] = new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE)};
         }
-      }
-      if (aTick % 25L == 0L) {
-        if (this.mTemperature > 100)
-        {
-          if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0))
-          {
-            this.mHadNoWater = true;
-          }
-          else
-          {
-            if (this.mHadNoWater)
-            {
-              aBaseMetaTileEntity.doExplosion(2048L);
-              return;
+        return rTextures;
+    }
+
+    public int maxProgresstime() {
+        return 500;
+    }
+
+    public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+        return new GT_Container_Boiler(aPlayerInventory, aBaseMetaTileEntity, 16000);
+    }
+
+    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
+        return new GT_GUIContainer_Boiler(aPlayerInventory, aBaseMetaTileEntity, "BronzeBoiler.png", 16000);
+    }
+
+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_Boiler_Bronze(this.mName, this.mTier, this.mDescription, this.mTextures);
+    }
+
+    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+        if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L)) {
+            if (this.mTemperature <= 20) {
+                this.mTemperature = 20;
+                this.mLossTimer = 0;
             }
-            this.mFluid.amount -= 1;
-            if (this.mSteam == null) {
-              this.mSteam = GT_ModHandler.getSteam(150L);
-            } else if (GT_ModHandler.isSteam(this.mSteam)) {
-              this.mSteam.amount += 150;
-            } else {
-              this.mSteam = GT_ModHandler.getSteam(150L);
+            if (++this.mLossTimer > 45) {
+                this.mTemperature -= 1;
+                this.mLossTimer = 0;
             }
-          }
-        }
-        else {
-          this.mHadNoWater = false;
-        }
-      }
-      if ((this.mSteam != null) && 
-        (this.mSteam.amount > 16000))
-      {
-        sendSound((byte)1);
-        this.mSteam.amount = 12000;
-      }
-      if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && 
-        (this.mInventory[2] != null)) {
-        if ((GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Coal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Coal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Coal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Coal))))
-        {
-          this.mProcessingEnergy += 160;
-          aBaseMetaTileEntity.decrStackSize(2, 1);
-          if (aBaseMetaTileEntity.getRandomNumber(3) == 0) {
-            aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
-          }
-        }
-        else if ((GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Charcoal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Charcoal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Charcoal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Charcoal))))
-        {
-          this.mProcessingEnergy += 160;
-          aBaseMetaTileEntity.decrStackSize(2, 1);
-          if (aBaseMetaTileEntity.getRandomNumber(3) == 0) {
-            aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));
-          }
-        }
-        else if (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelCoke"))
-        {
-          this.mProcessingEnergy += 640;
-          aBaseMetaTileEntity.decrStackSize(2, 1);
-          if (aBaseMetaTileEntity.getRandomNumber(2) == 0) {
-            aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));
-          }
-        }
-        else if ((GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Lignite))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Lignite))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Lignite))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Lignite))))
-        {
-          this.mProcessingEnergy += 40;
-          aBaseMetaTileEntity.decrStackSize(2, 1);
-          if (aBaseMetaTileEntity.getRandomNumber(8) == 0) {
-            aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
-          }
+            for (byte i = 1; (this.mSteam != null) && (i < 6); i = (byte) (i + 1)) {
+                if (i != aBaseMetaTileEntity.getFrontFacing()) {
+                    IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i);
+                    if (tTileEntity != null) {
+                        FluidStack tDrained = aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false);
+                        if (tDrained != null) {
+                            int tFilledAmount = tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), tDrained, false);
+                            if (tFilledAmount > 0) {
+                                tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), tFilledAmount, true), true);
+                            }
+                        }
+                    }
+                }
+            }
+            if (aTick % 25L == 0L) {
+                if (this.mTemperature > 100) {
+                    if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) {
+                        this.mHadNoWater = true;
+                    } else {
+                        if (this.mHadNoWater) {
+                            aBaseMetaTileEntity.doExplosion(2048L);
+                            return;
+                        }
+                        this.mFluid.amount -= 1;
+                        if (this.mSteam == null) {
+                            this.mSteam = GT_ModHandler.getSteam(150L);
+                        } else if (GT_ModHandler.isSteam(this.mSteam)) {
+                            this.mSteam.amount += 150;
+                        } else {
+                            this.mSteam = GT_ModHandler.getSteam(150L);
+                        }
+                    }
+                } else {
+                    this.mHadNoWater = false;
+                }
+            }
+            if ((this.mSteam != null) &&
+                    (this.mSteam.amount > 16000)) {
+                sendSound((byte) 1);
+                this.mSteam.amount = 12000;
+            }
+            if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) &&
+                    (this.mInventory[2] != null)) {
+                if ((GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Coal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Coal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Coal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Coal)))) {
+                    this.mProcessingEnergy += 160;
+                    aBaseMetaTileEntity.decrStackSize(2, 1);
+                    if (aBaseMetaTileEntity.getRandomNumber(3) == 0) {
+                        aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
+                    }
+                } else if ((GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Charcoal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Charcoal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Charcoal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Charcoal)))) {
+                    this.mProcessingEnergy += 160;
+                    aBaseMetaTileEntity.decrStackSize(2, 1);
+                    if (aBaseMetaTileEntity.getRandomNumber(3) == 0) {
+                        aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));
+                    }
+                } else if (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelCoke")) {
+                    this.mProcessingEnergy += 640;
+                    aBaseMetaTileEntity.decrStackSize(2, 1);
+                    if (aBaseMetaTileEntity.getRandomNumber(2) == 0) {
+                        aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));
+                    }
+                } else if ((GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Lignite))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Lignite))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Lignite))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Lignite)))) {
+                    this.mProcessingEnergy += 40;
+                    aBaseMetaTileEntity.decrStackSize(2, 1);
+                    if (aBaseMetaTileEntity.getRandomNumber(8) == 0) {
+                        aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
+                    }
+                }
+            }
+            if ((this.mTemperature < 500) && (this.mProcessingEnergy > 0) && (aTick % 12L == 0L)) {
+                this.mProcessingEnergy -= 1;
+                this.mTemperature += 1;
+            }
+            aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);
         }
-      }
-      if ((this.mTemperature < 500) && (this.mProcessingEnergy > 0) && (aTick % 12L == 0L))
-      {
-        this.mProcessingEnergy -= 1;
-        this.mTemperature += 1;
-      }
-      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 be715de602..0adff0b9ed 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
@@ -4,7 +4,6 @@ import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Materials;

 import gregtech.api.enums.OrePrefixes;

 import gregtech.api.enums.Textures;

-import gregtech.api.enums.Textures.BlockIcons;

 import gregtech.api.interfaces.ITexture;

 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

 import gregtech.api.metatileentity.MetaTileEntity;

@@ -19,142 +18,116 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidHandler;

 

 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, "A Boiler running off Lava", new ITexture[0]);

-  }

-  

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

-  {

-    super(aName, aTier, aDescription, aTextures);

-  }

-  

-  public ITexture[][][] getTextureSet(ITexture[] aTextures)

-  {

-    ITexture[][][] rTextures = new ITexture[5][17][];

-    for (byte i = -1; i < 16; i++){

-      rTextures[0][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa)) };

-      rTextures[1][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) };

-      rTextures[2][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) };

-      rTextures[3][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT) };

-      rTextures[4][(i + 1)] = new ITexture [] { new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT_ACTIVE) };

+        extends GT_MetaTileEntity_Boiler {

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

+        super(aID, aName, aNameRegional, "A Boiler running off Lava", new ITexture[0]);

     }

-    return rTextures;

-  }

-  

-  public int maxProgresstime()

-  {

-    return 1000;

-  }

-  

-  public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity)

-  {

-    return new GT_Container_Boiler(aPlayerInventory, aBaseMetaTileEntity, 32000);

-  }

-  

-  public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity)

-  {

-    return new GT_GUIContainer_Boiler(aPlayerInventory, aBaseMetaTileEntity, "SteelBoiler.png", 32000);

-  }

-  

-  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)

-  {

-    return new GT_MetaTileEntity_Boiler_Lava(this.mName, this.mTier, this.mDescription, this.mTextures);

-  }

-  

-  public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick)

-  {

-    if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L))

-    {

-      if (this.mTemperature <= 20)

-      {

-        this.mTemperature = 20;

-        this.mLossTimer = 0;

-      }

-      if (++this.mLossTimer > 20)

-      {

-        this.mTemperature -= 1;

-        this.mLossTimer = 0;

-      }

-      for (byte i = 1; (this.mSteam != null) && (i < 6); i = (byte)(i + 1)) {

-        if (i != aBaseMetaTileEntity.getFrontFacing())

-        {

-          IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i);

-          if (tTileEntity != null)

-          {

-            FluidStack tDrained = aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false);

-            if (tDrained != null)

-            {

-              int tFilledAmount = tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), tDrained, false);

-              if (tFilledAmount > 0) {

-                tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), tFilledAmount, true), true);

-              }

-            }

-          }

+

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

+        super(aName, aTier, aDescription, aTextures);

+    }

+

+    public ITexture[][][] getTextureSet(ITexture[] aTextures) {

+        ITexture[][][] rTextures = new ITexture[5][17][];

+        for (byte i = -1; i < 16; i++) {

+            rTextures[0][(i + 1)] = new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa))};

+            rTextures[1][(i + 1)] = new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)};

+            rTextures[2][(i + 1)] = new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)};

+            rTextures[3][(i + 1)] = new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT)};

+            rTextures[4][(i + 1)] = new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_LAVA_FRONT_ACTIVE)};

         }

-      }

-      if (aTick % 10L == 0L) {

-        if (this.mTemperature > 100)

-        {

-          if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0))

-          {

-            this.mHadNoWater = true;

-          }

-          else

-          {

-            if (this.mHadNoWater)

-            {

-              aBaseMetaTileEntity.doExplosion(2048L);

-              return;

+        return rTextures;

+    }

+

+    public int maxProgresstime() {

+        return 1000;

+    }

+

+    public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {

+        return new GT_Container_Boiler(aPlayerInventory, aBaseMetaTileEntity, 32000);

+    }

+

+    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {

+        return new GT_GUIContainer_Boiler(aPlayerInventory, aBaseMetaTileEntity, "SteelBoiler.png", 32000);

+    }

+

+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

+        return new GT_MetaTileEntity_Boiler_Lava(this.mName, this.mTier, this.mDescription, this.mTextures);

+    }

+

+    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {

+        if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L)) {

+            if (this.mTemperature <= 20) {

+                this.mTemperature = 20;

+                this.mLossTimer = 0;

             }

-            this.mFluid.amount -= 1;

-            if (this.mSteam == null) {

-              this.mSteam = GT_ModHandler.getSteam(300L);

-            } else if (GT_ModHandler.isSteam(this.mSteam)) {

-              this.mSteam.amount += 300;

-            } else {

-              this.mSteam = GT_ModHandler.getSteam(300L);

+            if (++this.mLossTimer > 20) {

+                this.mTemperature -= 1;

+                this.mLossTimer = 0;

             }

-          }

-        }

-        else {

-          this.mHadNoWater = false;

+            for (byte i = 1; (this.mSteam != null) && (i < 6); i = (byte) (i + 1)) {

+                if (i != aBaseMetaTileEntity.getFrontFacing()) {

+                    IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i);

+                    if (tTileEntity != null) {

+                        FluidStack tDrained = aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false);

+                        if (tDrained != null) {

+                            int tFilledAmount = tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), tDrained, false);

+                            if (tFilledAmount > 0) {

+                                tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), tFilledAmount, true), true);

+                            }

+                        }

+                    }

+                }

+            }

+            if (aTick % 10L == 0L) {

+                if (this.mTemperature > 100) {

+                    if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) {

+                        this.mHadNoWater = true;

+                    } else {

+                        if (this.mHadNoWater) {

+                            aBaseMetaTileEntity.doExplosion(2048L);

+                            return;

+                        }

+                        this.mFluid.amount -= 1;

+                        if (this.mSteam == null) {

+                            this.mSteam = GT_ModHandler.getSteam(300L);

+                        } else if (GT_ModHandler.isSteam(this.mSteam)) {

+                            this.mSteam.amount += 300;

+                        } else {

+                            this.mSteam = GT_ModHandler.getSteam(300L);

+                        }

+                    }

+                } else {

+                    this.mHadNoWater = false;

+                }

+            }

+            if ((this.mSteam != null) &&

+                    (this.mSteam.amount > 32000)) {

+                sendSound((byte) 1);

+                this.mSteam.amount = 24000;

+            }

+            if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) &&

+                    (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.bucket.get(Materials.Lava)))) {

+                this.mProcessingEnergy += 1000;

+                aBaseMetaTileEntity.decrStackSize(2, 1);

+                aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Empty, 1L));

+            }

+            if ((this.mTemperature < 1000) && (this.mProcessingEnergy > 0) && (aTick % 8L == 0L)) {

+                this.mProcessingEnergy -= 3;

+                this.mTemperature += 1;

+            }

+            aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);

         }

-      }

-      if ((this.mSteam != null) && 

-        (this.mSteam.amount > 32000))

-      {

-        sendSound((byte)1);

-        this.mSteam.amount = 24000;

-      }

-      if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && 

-        (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.bucket.get(Materials.Lava))))

-      {

-        this.mProcessingEnergy += 1000;

-        aBaseMetaTileEntity.decrStackSize(2, 1);

-        aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.bucket, Materials.Empty, 1L));

-      }

-      if ((this.mTemperature < 1000) && (this.mProcessingEnergy > 0) && (aTick % 8L == 0L))

-      {

-        this.mProcessingEnergy -= 3;

-        this.mTemperature += 1;

-      }

-      aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);

     }

-  }

-  

-  public final int fill(FluidStack aFluid, boolean doFill)

-  {

-    if ((GT_ModHandler.isLava(aFluid)) && (this.mProcessingEnergy < 50))

-    {

-      int tFilledAmount = Math.min(50, aFluid.amount);

-      if (doFill) {

-        this.mProcessingEnergy += tFilledAmount;

-      }

-      return tFilledAmount;

+

+    public final int fill(FluidStack aFluid, boolean doFill) {

+        if ((GT_ModHandler.isLava(aFluid)) && (this.mProcessingEnergy < 50)) {

+            int tFilledAmount = Math.min(50, aFluid.amount);

+            if (doFill) {

+                this.mProcessingEnergy += tFilledAmount;

+            }

+            return tFilledAmount;

+        }

+        return super.fill(aFluid, doFill);

     }

-    return super.fill(aFluid, doFill);

-  }

 }

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 346b451147..c013f87a36 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
@@ -2,151 +2,122 @@ package gregtech.common.tileentities.boilers;
 

 import gregtech.api.enums.Dyes;

 import gregtech.api.enums.Textures;

-import gregtech.api.enums.Textures.BlockIcons;

 import gregtech.api.interfaces.ITexture;

 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

 import gregtech.api.metatileentity.MetaTileEntity;

 import gregtech.api.objects.GT_RenderedTexture;

 import gregtech.api.util.GT_ModHandler;

-import gregtech.api.util.GT_Utility;

 import gregtech.common.gui.GT_Container_Boiler;

 import gregtech.common.gui.GT_GUIContainer_Boiler;

 import net.minecraft.entity.player.InventoryPlayer;

-import net.minecraft.world.World;

-import net.minecraft.world.biome.BiomeGenBase;

 import net.minecraftforge.common.util.ForgeDirection;

 import net.minecraftforge.fluids.FluidStack;

 import net.minecraftforge.fluids.IFluidHandler;

 

 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, "Steam Power by the Sun", new ITexture[0]);

-  }

-  

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

-  {

-    super(aName, aTier, aDescription, aTextures);

-  }

-  

-  public ITexture[][][] getTextureSet(ITexture[] aTextures)

-  {

-    ITexture[][][] rTextures = new ITexture[4][17][];

-    for (byte i = -1; i < 16; i = (byte)(i + 1))

-    {ITexture[] tmp0 ={ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa)) };

-      rTextures[0][(i + 1)] = tmp0;

-      ITexture[] tmp1 ={ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_SOLAR) };

-					rTextures[1][(i + 1)] = tmp1;

-      ITexture[] tmp2 ={ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)) };

-					rTextures[2][(i + 1)] = tmp2;

-      ITexture[] tmp3 ={ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) };

-					rTextures[3][(i + 1)] = tmp3;

+        extends GT_MetaTileEntity_Boiler {

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

+        super(aID, aName, aNameRegional, "Steam Power by the Sun", new ITexture[0]);

     }

-    return rTextures;

-  }

-  

-  public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone)

-  {

-					return mTextures[aSide >= 2 ? ((byte)(aSide != aFacing ? 2 : 3)) : aSide][aColorIndex + 1];

-  }

-  

-  public int maxProgresstime()

-  {

-    return 500;

-  }

-  

-  public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity)

-  {

-    return new GT_Container_Boiler(aPlayerInventory, aBaseMetaTileEntity, 16000);

-  }

-  

-  public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity)

-  {

-    return new GT_GUIContainer_Boiler(aPlayerInventory, aBaseMetaTileEntity, "SolarBoiler.png", 16000);

-  }

-  

-  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)

-  {

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

-  }

-  

-  public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick)

-  {

-    if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L))

-    {

-      if (this.mTemperature <= 20)

-      {

-        this.mTemperature = 20;

-        this.mLossTimer = 0;

-      }

-      if (++this.mLossTimer > 45)

-      {

-        this.mTemperature -= 1;

-        this.mLossTimer = 0;

-      }

-      if (this.mSteam != null)

-      {

-        byte i = aBaseMetaTileEntity.getFrontFacing();

-        IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i);

-        if (tTileEntity != null)

-        {

-          FluidStack tDrained = aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false);

-          if (tDrained != null)

-          {

-            int tFilledAmount = tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), tDrained, false);

-            if (tFilledAmount > 0) {

-              tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), tFilledAmount, true), true);

-            }

-          }

+

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

+        super(aName, aTier, aDescription, aTextures);

+    }

+

+    public ITexture[][][] getTextureSet(ITexture[] aTextures) {

+        ITexture[][][] rTextures = new ITexture[4][17][];

+        for (byte i = -1; i < 16; i = (byte) (i + 1)) {

+            ITexture[] tmp0 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa))};

+            rTextures[0][(i + 1)] = tmp0;

+            ITexture[] tmp1 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_SOLAR)};

+            rTextures[1][(i + 1)] = tmp1;

+            ITexture[] tmp2 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa))};

+            rTextures[2][(i + 1)] = tmp2;

+            ITexture[] tmp3 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_BRONZEBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)};

+            rTextures[3][(i + 1)] = tmp3;

         }

-      }

-      if (aTick % 25L == 0L) {

-        if (this.mTemperature > 100)

-        {

-          if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0))

-          {

-            this.mHadNoWater = true;

-          }

-          else

-          {

-            if (this.mHadNoWater)

-            {

-              aBaseMetaTileEntity.doExplosion(2048L);

-              return;

+        return rTextures;

+    }

+

+    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {

+        return mTextures[aSide >= 2 ? ((byte) (aSide != aFacing ? 2 : 3)) : aSide][aColorIndex + 1];

+    }

+

+    public int maxProgresstime() {

+        return 500;

+    }

+

+    public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {

+        return new GT_Container_Boiler(aPlayerInventory, aBaseMetaTileEntity, 16000);

+    }

+

+    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {

+        return new GT_GUIContainer_Boiler(aPlayerInventory, aBaseMetaTileEntity, "SolarBoiler.png", 16000);

+    }

+

+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

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

+    }

+

+    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {

+        if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L)) {

+            if (this.mTemperature <= 20) {

+                this.mTemperature = 20;

+                this.mLossTimer = 0;

             }

-            this.mFluid.amount -= 1;

-            if (this.mSteam == null) {

-              this.mSteam = GT_ModHandler.getSteam(150L);

-            } else if (GT_ModHandler.isSteam(this.mSteam)) {

-              this.mSteam.amount += 150;

-            } else {

-              this.mSteam = GT_ModHandler.getSteam(150L);

+            if (++this.mLossTimer > 45) {

+                this.mTemperature -= 1;

+                this.mLossTimer = 0;

             }

-          }

-        }

-        else {

-          this.mHadNoWater = false;

+            if (this.mSteam != null) {

+                byte i = aBaseMetaTileEntity.getFrontFacing();

+                IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i);

+                if (tTileEntity != null) {

+                    FluidStack tDrained = aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false);

+                    if (tDrained != null) {

+                        int tFilledAmount = tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), tDrained, false);

+                        if (tFilledAmount > 0) {

+                            tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), tFilledAmount, true), true);

+                        }

+                    }

+                }

+            }

+            if (aTick % 25L == 0L) {

+                if (this.mTemperature > 100) {

+                    if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) {

+                        this.mHadNoWater = true;

+                    } else {

+                        if (this.mHadNoWater) {

+                            aBaseMetaTileEntity.doExplosion(2048L);

+                            return;

+                        }

+                        this.mFluid.amount -= 1;

+                        if (this.mSteam == null) {

+                            this.mSteam = GT_ModHandler.getSteam(150L);

+                        } else if (GT_ModHandler.isSteam(this.mSteam)) {

+                            this.mSteam.amount += 150;

+                        } else {

+                            this.mSteam = GT_ModHandler.getSteam(150L);

+                        }

+                    }

+                } else {

+                    this.mHadNoWater = false;

+                }

+            }

+            if ((this.mSteam != null) &&

+                    (this.mSteam.amount > 16000)) {

+                sendSound((byte) 1);

+                this.mSteam.amount = 12000;

+            }

+            if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && (aTick % 256L == 0L) && (!aBaseMetaTileEntity.getWorld().isThundering())) {

+                boolean bRain = aBaseMetaTileEntity.getWorld().isRaining() && aBaseMetaTileEntity.getBiome().rainfall > 0.0F;

+                mProcessingEnergy += bRain && aBaseMetaTileEntity.getWorld().skylightSubtracted >= 4 || !aBaseMetaTileEntity.getSkyAtSide((byte) 1) ? 0 : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1;

+            }

+            if ((this.mTemperature < 500) && (this.mProcessingEnergy > 0) && (aTick % 12L == 0L)) {

+                this.mProcessingEnergy -= 1;

+                this.mTemperature += 1;

+            }

+            aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);

         }

-      }

-      if ((this.mSteam != null) && 

-        (this.mSteam.amount > 16000))

-      {

-        sendSound((byte)1);

-        this.mSteam.amount = 12000;

-      }

-      if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && (aTick % 256L == 0L) && (!aBaseMetaTileEntity.getWorld().isThundering()))

-      {

-          boolean bRain = aBaseMetaTileEntity.getWorld().isRaining() && aBaseMetaTileEntity.getBiome().rainfall > 0.0F;

-          mProcessingEnergy += bRain && aBaseMetaTileEntity.getWorld().skylightSubtracted >= 4 || !aBaseMetaTileEntity.getSkyAtSide((byte)1) ? 0 : !bRain && aBaseMetaTileEntity.getWorld().isDaytime() ? 8 : 1;

-      }

-      if ((this.mTemperature < 500) && (this.mProcessingEnergy > 0) && (aTick % 12L == 0L))

-      {

-        this.mProcessingEnergy -= 1;

-        this.mTemperature += 1;

-      }

-      aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);

     }

-  }

 }

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 e6e3f9181e..d46b876773 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
@@ -4,7 +4,6 @@ import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Materials;

 import gregtech.api.enums.OrePrefixes;

 import gregtech.api.enums.Textures;

-import gregtech.api.enums.Textures.BlockIcons;

 import gregtech.api.interfaces.ITexture;

 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;

 import gregtech.api.metatileentity.MetaTileEntity;

@@ -19,162 +18,132 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidHandler;

 

 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, "Faster than the Bronze Boiler", new ITexture[0]);

-  }

-  

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

-  {

-    super(aName, aTier, aDescription, aTextures);

-  }

-  

-  public ITexture[][][] getTextureSet(ITexture[] aTextures)

-  {

-    ITexture[][][] rTextures = new ITexture[5][17][];

-    for (byte i = -1; i < 16; i = (byte)(i + 1))

-    {ITexture[] tmp0 ={ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa)) };

-      rTextures[0][(i + 1)] = tmp0;

-      ITexture[] tmp1 ={ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) };

-rTextures[1][(i + 1)] = tmp1;

-      ITexture[] tmp2 ={ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE) };

-rTextures[2][(i + 1)] = tmp2;

-      ITexture[] tmp4 ={ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT) };

-rTextures[3][(i + 1)] = tmp4;

-     ITexture[] tmp5 ={ new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE) };

-rTextures[4][(i + 1)] = tmp5;

+        extends GT_MetaTileEntity_Boiler {

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

+        super(aID, aName, aNameRegional, "Faster than the Bronze Boiler", new ITexture[0]);

     }

-    return rTextures;

-  }

-  

-  public int maxProgresstime()

-  {

-    return 1000;

-  }

-  

-  public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity)

-  {

-    return new GT_Container_Boiler(aPlayerInventory, aBaseMetaTileEntity, 32000);

-  }

-  

-  public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity)

-  {

-    return new GT_GUIContainer_Boiler(aPlayerInventory, aBaseMetaTileEntity, "SteelBoiler.png", 32000);

-  }

-  

-  public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity)

-  {

-    return new GT_MetaTileEntity_Boiler_Steel(this.mName, this.mTier, this.mDescription, this.mTextures);

-  }

-  

-  public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick)

-  {

-    if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L))

-    {

-      if (this.mTemperature <= 20)

-      {

-        this.mTemperature = 20;

-        this.mLossTimer = 0;

-      }

-      if (++this.mLossTimer > 40)

-      {

-        this.mTemperature -= 1;

-        this.mLossTimer = 0;

-      }

-      for (byte i = 1; (this.mSteam != null) && (i < 6); i = (byte)(i + 1)) {

-        if (i != aBaseMetaTileEntity.getFrontFacing())

-        {

-          IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i);

-          if (tTileEntity != null)

-          {

-            FluidStack tDrained = aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false);

-            if (tDrained != null)

-            {

-              int tFilledAmount = tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), tDrained, false);

-              if (tFilledAmount > 0) {

-                tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), tFilledAmount, true), true);

-              }

-            }

-          }

+

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

+        super(aName, aTier, aDescription, aTextures);

+    }

+

+    public ITexture[][][] getTextureSet(ITexture[] aTextures) {

+        ITexture[][][] rTextures = new ITexture[5][17][];

+        for (byte i = -1; i < 16; i = (byte) (i + 1)) {

+            ITexture[] tmp0 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa))};

+            rTextures[0][(i + 1)] = tmp0;

+            ITexture[] tmp1 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)};

+            rTextures[1][(i + 1)] = tmp1;

+            ITexture[] tmp2 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)};

+            rTextures[2][(i + 1)] = tmp2;

+            ITexture[] tmp4 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT)};

+            rTextures[3][(i + 1)] = tmp4;

+            ITexture[] tmp5 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE)};

+            rTextures[4][(i + 1)] = tmp5;

         }

-      }

-      if (aTick % 10L == 0L) {

-        if (this.mTemperature > 100)

-        {

-          if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0))

-          {

-            this.mHadNoWater = true;

-          }

-          else

-          {

-            if (this.mHadNoWater)

-            {

-              aBaseMetaTileEntity.doExplosion(2048L);

-              return;

+        return rTextures;

+    }

+

+    public int maxProgresstime() {

+        return 1000;

+    }

+

+    public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {

+        return new GT_Container_Boiler(aPlayerInventory, aBaseMetaTileEntity, 32000);

+    }

+

+    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {

+        return new GT_GUIContainer_Boiler(aPlayerInventory, aBaseMetaTileEntity, "SteelBoiler.png", 32000);

+    }

+

+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

+        return new GT_MetaTileEntity_Boiler_Steel(this.mName, this.mTier, this.mDescription, this.mTextures);

+    }

+

+    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {

+        if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L)) {

+            if (this.mTemperature <= 20) {

+                this.mTemperature = 20;

+                this.mLossTimer = 0;

             }

-            this.mFluid.amount -= 1;

-            if (this.mSteam == null) {

-              this.mSteam = GT_ModHandler.getSteam(150L);

-            } else if (GT_ModHandler.isSteam(this.mSteam)) {

-              this.mSteam.amount += 150;

-            } else {

-              this.mSteam = GT_ModHandler.getSteam(150L);

+            if (++this.mLossTimer > 40) {

+                this.mTemperature -= 1;

+                this.mLossTimer = 0;

             }

-          }

-        }

-        else {

-          this.mHadNoWater = false;

-        }

-      }

-      if ((this.mSteam != null) && 

-        (this.mSteam.amount > 32000))

-      {

-        sendSound((byte)1);

-        this.mSteam.amount = 24000;

-      }

-      if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) && 

-        (this.mInventory[2] != null)) {

-        if ((GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Coal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Coal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Coal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Coal))))

-        {

-          this.mProcessingEnergy += 160;

-          aBaseMetaTileEntity.decrStackSize(2, 1);

-          if (aBaseMetaTileEntity.getRandomNumber(3) == 0) {

-            aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));

-          }

-        }

-        else if ((GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Charcoal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Charcoal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Charcoal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Charcoal))))

-        {

-          this.mProcessingEnergy += 160;

-          aBaseMetaTileEntity.decrStackSize(2, 1);

-          if (aBaseMetaTileEntity.getRandomNumber(3) == 0) {

-            aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));

-          }

-        }

-        else if (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelCoke"))

-        {

-          this.mProcessingEnergy += 640;

-          aBaseMetaTileEntity.decrStackSize(2, 1);

-          if (aBaseMetaTileEntity.getRandomNumber(2) == 0) {

-            aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));

-          }

-        }

-        else if ((GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Lignite))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Lignite))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Lignite))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Lignite))))

-        {

-          this.mProcessingEnergy += 40;

-          aBaseMetaTileEntity.decrStackSize(2, 1);

-          if (aBaseMetaTileEntity.getRandomNumber(8) == 0) {

-            aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));

-          }

+            for (byte i = 1; (this.mSteam != null) && (i < 6); i = (byte) (i + 1)) {

+                if (i != aBaseMetaTileEntity.getFrontFacing()) {

+                    IFluidHandler tTileEntity = aBaseMetaTileEntity.getITankContainerAtSide(i);

+                    if (tTileEntity != null) {

+                        FluidStack tDrained = aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), Math.max(1, this.mSteam.amount / 2), false);

+                        if (tDrained != null) {

+                            int tFilledAmount = tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), tDrained, false);

+                            if (tFilledAmount > 0) {

+                                tTileEntity.fill(ForgeDirection.getOrientation(i).getOpposite(), aBaseMetaTileEntity.drain(ForgeDirection.getOrientation(i), tFilledAmount, true), true);

+                            }

+                        }

+                    }

+                }

+            }

+            if (aTick % 10L == 0L) {

+                if (this.mTemperature > 100) {

+                    if ((this.mFluid == null) || (!GT_ModHandler.isWater(this.mFluid)) || (this.mFluid.amount <= 0)) {

+                        this.mHadNoWater = true;

+                    } else {

+                        if (this.mHadNoWater) {

+                            aBaseMetaTileEntity.doExplosion(2048L);

+                            return;

+                        }

+                        this.mFluid.amount -= 1;

+                        if (this.mSteam == null) {

+                            this.mSteam = GT_ModHandler.getSteam(150L);

+                        } else if (GT_ModHandler.isSteam(this.mSteam)) {

+                            this.mSteam.amount += 150;

+                        } else {

+                            this.mSteam = GT_ModHandler.getSteam(150L);

+                        }

+                    }

+                } else {

+                    this.mHadNoWater = false;

+                }

+            }

+            if ((this.mSteam != null) &&

+                    (this.mSteam.amount > 32000)) {

+                sendSound((byte) 1);

+                this.mSteam.amount = 24000;

+            }

+            if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) &&

+                    (this.mInventory[2] != null)) {

+                if ((GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Coal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Coal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Coal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Coal)))) {

+                    this.mProcessingEnergy += 160;

+                    aBaseMetaTileEntity.decrStackSize(2, 1);

+                    if (aBaseMetaTileEntity.getRandomNumber(3) == 0) {

+                        aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));

+                    }

+                } else if ((GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Charcoal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Charcoal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Charcoal))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Charcoal)))) {

+                    this.mProcessingEnergy += 160;

+                    aBaseMetaTileEntity.decrStackSize(2, 1);

+                    if (aBaseMetaTileEntity.getRandomNumber(3) == 0) {

+                        aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));

+                    }

+                } else if (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelCoke")) {

+                    this.mProcessingEnergy += 640;

+                    aBaseMetaTileEntity.decrStackSize(2, 1);

+                    if (aBaseMetaTileEntity.getRandomNumber(2) == 0) {

+                        aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));

+                    }

+                } else if ((GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.gem.get(Materials.Lignite))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dust.get(Materials.Lignite))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.dustImpure.get(Materials.Lignite))) || (GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], OrePrefixes.crushed.get(Materials.Lignite)))) {

+                    this.mProcessingEnergy += 40;

+                    aBaseMetaTileEntity.decrStackSize(2, 1);

+                    if (aBaseMetaTileEntity.getRandomNumber(8) == 0) {

+                        aBaseMetaTileEntity.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));

+                    }

+                }

+            }

+            if ((this.mTemperature < 1000) && (this.mProcessingEnergy > 0) && (aTick % 12L == 0L)) {

+                this.mProcessingEnergy -= 2;

+                this.mTemperature += 1;

+            }

+            aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);

         }

-      }

-      if ((this.mTemperature < 1000) && (this.mProcessingEnergy > 0) && (aTick % 12L == 0L))

-      {

-        this.mProcessingEnergy -= 2;

-        this.mTemperature += 1;

-      }

-      aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);

     }

-  }

 }