Merge remote-tracking branch 'remotes/JohannesGaessler/SteamProductionImprovement' into unstable

63 files changed, 493 insertions, 173 deletions

diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
index b078f558f7..3d855a18d0 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
@@ -24,6 +24,10 @@ public class GT_MetaTileEntity_ChestBuffer
     public GT_MetaTileEntity_ChestBuffer(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {

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

     }

+    

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

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

+    }

 

     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

         return new GT_MetaTileEntity_ChestBuffer(this.mName, this.mTier, this.mInventory.length, this.mDescription, this.mTextures);

diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java
index 4180484ad5..f9844242a5 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Filter.java
@@ -25,6 +25,10 @@ public class GT_MetaTileEntity_Filter
     public GT_MetaTileEntity_Filter(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {

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

     }

+    

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

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

+    }

 

     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

         return new GT_MetaTileEntity_Filter(this.mName, this.mTier, this.mInventory.length, this.mDescription, this.mTextures);

diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java
index d5d04315f2..07358b878e 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_Regulator.java
@@ -27,6 +27,10 @@ public class GT_MetaTileEntity_Regulator
     public GT_MetaTileEntity_Regulator(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {

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

     }

+    

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

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

+    }

 

     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

         return new GT_MetaTileEntity_Regulator(this.mName, this.mTier, this.mInventory.length, this.mDescription, this.mTextures);

diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java
index 212c354fba..843eeed5d4 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java
@@ -18,6 +18,10 @@ public class GT_MetaTileEntity_SuperBuffer
     public GT_MetaTileEntity_SuperBuffer(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {

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

     }

+    

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

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

+    }

 

     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

         return new GT_MetaTileEntity_SuperBuffer(this.mName, this.mTier, this.mInventory.length, this.mDescription, this.mTextures);

diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
index 287647975b..dff70c2445 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
@@ -31,6 +31,10 @@ public class GT_MetaTileEntity_TypeFilter
         super(aName, aTier, aInvSlotCount, aDescription, aTextures);

     }

 

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

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

+    }

+

     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

         return new GT_MetaTileEntity_TypeFilter(this.mName, this.mTier, this.mInventory.length, this.mDescription, this.mTextures);

     }

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..7357b23154 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,12 +22,18 @@ 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"}, new ITexture[0]);
     }
 
     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][];
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..adede98dd9 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"}, new ITexture[0]);

     }

 

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

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 1fa7723a1a..bb87a09c1b 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
@@ -18,12 +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"}, 

+        		new ITexture[0]);

     }

 

     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][];

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 c5ad432ad7..76128df204 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
@@ -22,13 +22,20 @@ 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]);

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

+        		"Faster than the Bronze Boiler", 

+        		"Produces 300L of Steam per second",

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

     }

 

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

diff --git a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
index e2103c02bf..47a0cbd95c 100644
--- a/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
+++ b/src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_DieselGenerator.java
@@ -18,10 +18,15 @@ import net.minecraft.item.ItemStack;
 public class GT_MetaTileEntity_DieselGenerator

         extends GT_MetaTileEntity_BasicGenerator {

 

+	public static final int BASE_POLLUTION = 2;

+	

     public int mEfficiency;

 

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

-        super(aID, aName, aNameRegional, aTier, "Requires liquid Fuel", new ITexture[0]);

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

+        		"Requires liquid Fuel",