Merge branch 'unstable' into mergeGTNH

# Conflicts:
#	src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicGenerator.java
#	src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java
#	src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Maintenance.java
#	src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java
#	src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
#	src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_TieredMachineBlock.java
#	src/main/java/gregtech/api/util/GT_Recipe.java
#	src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
#	src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java
#	src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java
#	src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Solar.java
#	src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Steel.java
#	src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_GasTurbine.java
#	src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Bronze.java
#	src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_BronzeBricks.java
#	src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_Steel.java
#	src/main/java/gregtech/common/tileentities/machines/GT_MetaTileEntity_BasicHull_SteelBricks.java
#	src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
#	src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java
#	src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_RockBreaker.java
#	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
#	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java
#	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeBoiler.java
#	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
#	src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_PyrolyseOven.java
#	src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Bronze.java
#	src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_AlloySmelter_Steel.java
#	src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Bronze.java
#	src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_ForgeHammer_Steel.java
#	src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Bronze.java
#	src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Furnace_Steel.java
#	src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java

5 files changed, 74 insertions, 20 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 bdfad2408b..021c5c736c 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
@@ -31,9 +31,17 @@ public abstract class GT_MetaTileEntity_Boiler
         super(aID, aName, aNameRegional, 0, 4, aDescription, aTextures);
     }
 
+    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 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];
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 5c6fdeeb33..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
@@ -22,13 +22,20 @@ 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]);
+        super(aID, aName, aNameRegional, new String[]{
+                "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);
+    }
+
     public ITexture[][][] getTextureSet(ITexture[] aTextures) {
         ITexture[][][] rTextures = new ITexture[5][17][];
         for (byte i = -1; i < 16; i++) {
@@ -54,7 +61,7 @@ public class GT_MetaTileEntity_Boiler_Bronze
     }
 
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boiler_Bronze(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_Boiler_Bronze(this.mName, this.mTier, this.mDescriptionArray, this.mTextures);
     }
 
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
@@ -140,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 2806cbc943..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
@@ -22,13 +22,20 @@ 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]);

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

+                "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) {

         super(aName, aTier, aDescription, aTextures);

     }

 

+    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++) {

@@ -54,7 +61,7 @@ public class GT_MetaTileEntity_Boiler_Lava
     }

 

     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

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

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

     }

 

     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {

@@ -119,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 4cd5047c9f..a7633b630c 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
@@ -10,6 +10,7 @@ import gregtech.api.util.GT_ModHandler;
 import gregtech.common.gui.GT_Container_Boiler;
 import gregtech.common.gui.GT_GUIContainer_Boiler;
 import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidHandler;
@@ -17,13 +18,21 @@ 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]);
+        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"});
     }
 
     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);
+    }
+
     public ITexture[][][] getTextureSet(ITexture[] aTextures) {
         ITexture[][][] rTextures = new ITexture[4][17][];
         for (byte i = -1; i < 16; i = (byte) (i + 1)) {
@@ -56,7 +65,21 @@ public class GT_MetaTileEntity_Boiler_Solar
     }
 
     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boiler_Solar(this.mName, this.mTier, this.mDescription, this.mTextures);
+        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);
+        aNBT.setInteger("mRunTime", this.mRunTime);
+    }
+
+    @Override
+    public void loadNBTData(NBTTagCompound aNBT) {
+        super.loadNBTData(aNBT);
+        this.mRunTime = aNBT.getInteger("mRunTime");
     }
 
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
@@ -92,12 +115,17 @@ public class GT_MetaTileEntity_Boiler_Solar
                             return;
                         }
                         this.mFluid.amount -= 1;
+                        mRunTime += 1;
+                        int tOutput = 150;
+                        if (mRunTime > 10000) {
+                            tOutput = Math.max(50, 150 - ((mRunTime - 10000) / 100));
+                        }
                         if (this.mSteam == null) {
-                            this.mSteam = GT_ModHandler.getSteam(150L);
+                            this.mSteam = GT_ModHandler.getSteam(tOutput);
                         } else if (GT_ModHandler.isSteam(this.mSteam)) {
-                            this.mSteam.amount += 150;
+                            this.mSteam.amount += tOutput;
                         } else {
-                            this.mSteam = GT_ModHandler.getSteam(150L);
+                            this.mSteam = GT_ModHandler.getSteam(tOutput);
                         }
                     }
                 } else {
@@ -121,5 +149,3 @@ public class GT_MetaTileEntity_Boiler_Solar
         }
     }
 }
-
-
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 0528733e17..0e03cc73dc 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
@@ -20,15 +20,21 @@ import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.IFluidHandler;

 

 public class GT_MetaTileEntity_Boiler_Steel

-        extends GT_MetaTileEntity_Boiler {

+        extends GT_MetaTileEntity_Boiler {//TODO CHECK POLLUTION VALUES AND DESCRIPTIONS FOR POLLUTION SPOILERS

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

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

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

+                "Faster than the Bronze Boiler",

+                "Produces 300L of Steam per second"});

     }

 

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

         super(aName, aTier, aDescription, aTextures);

     }

 

+    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)) {

@@ -59,7 +65,7 @@ public class GT_MetaTileEntity_Boiler_Steel
     }

 

     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

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

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

     }

 

     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {

@@ -145,8 +151,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()), 40);

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

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

             }

             aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);

         }