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

4 files changed, 29 insertions, 29 deletions

diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
index 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);

         }