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

54 files changed, 349 insertions, 341 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 3d855a18d0..540f9991df 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
@@ -30,7 +30,7 @@ public class GT_MetaTileEntity_ChestBuffer
     }

 

     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

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

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

     }

 

     public ITexture getOverlayIcon() {

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 f9844242a5..a0c752bdc0 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
@@ -31,7 +31,7 @@ public class GT_MetaTileEntity_Filter
     }

 

     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

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

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

     }

 

     public ITexture getOverlayIcon() {

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 07358b878e..9dde9094c0 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
@@ -33,7 +33,7 @@ public class GT_MetaTileEntity_Regulator
     }

 

     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

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

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

     }

 

     public ITexture getOverlayIcon() {

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 843eeed5d4..dfea774a2f 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
@@ -24,7 +24,7 @@ public class GT_MetaTileEntity_SuperBuffer
     }

 

     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

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

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

     }

 

     public ITexture getOverlayIcon() {

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 dff70c2445..2e4d0f5d81 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
@@ -36,7 +36,7 @@ public class GT_MetaTileEntity_TypeFilter
     }

 

     public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

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

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

     }

 

     public ITexture getOverlayIcon() {

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

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

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

-        		"A Boiler running off Lava", 

-        		"Produces 600L of Steam per second",

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

+                "A Boiler running off Lava",

+                "Produces 600L of Steam per second",

+                "Causes 20 Pollution per second"});

     }

 

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

@@ -61,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) {

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

             }

 

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

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

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

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

             }

             aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);

         }

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

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

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

-        		"Steam Power by the Sun", 

-        		"Produces 120L of Steam per second", 

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

-        		"Break and replace to decalcify"}, 

-        		new ITexture[0]);

+                "Steam Power by the Sun",

+                "Produces 120L of Steam per second",

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

+                "Break and replace to decalcify"});

     }

 

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

         super(aName, aTier, aDescription, aTextures);

     }

-    

+

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

         super(aName, aTier, aDescription, aTextures);

     }

@@ -66,11 +65,11 @@ 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);

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

                         mRunTime += 1;

                         int tOutput = 150;

-                        if(mRunTime > 10000){

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

+                        if (mRunTime > 10000) {

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

                         }

                         if (this.mSteam == null) {

                             this.mSteam = GT_ModHandler.getSteam(tOutput);

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

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

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

-        		"Faster than the Bronze Boiler", 

-        		"Produces 300L of Steam per second",

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

+                "Faster than the Bronze Boiler",

+                "Produces 300L of Steam per second",

+                "Causes 20 Pollution per second"});

     }

 

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

@@ -66,7 +66,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) {

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

                 this.mTemperature += 1;

             }

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

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

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

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

             }

             aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);

         }

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

         extends GT_MetaTileEntity_BasicGenerator {

 

-	public static final int BASE_POLLUTION = 2;

-	

+    public static final int BASE_POLLUTION = 2;

+

     public int mEfficiency;

 

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

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

-        		"Requires liquid Fuel",

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

-        		new ITexture[0]);

+                "Requires liquid Fuel",

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

         onConfigLoad();

     }

 

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

         onConfigLoad();

     }

-    

+

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

         super(aName, aTier, aDescription, aTextures);

         onConfigLoad();

@@ -45,7 +44,7 @@ public class GT_MetaTileEntity_DieselGenerator
     }

 

     public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {

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

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

     }

 

     public GT_Recipe.GT_Recipe_Map getRecipes() {

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

 

     public int getFuelValue(ItemStack aStack) {

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

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

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

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

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

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

     }

 

-	@Override

-	public in