WTF!!!

3 files changed, 30 insertions, 15 deletions

diff --git a/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_High.java b/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_High.java
index 65650d616f..28327439fd 100644
--- a/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_High.java
+++ b/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_High.java
@@ -29,6 +29,11 @@ public class Detrav_MetaTileEntity_Boiler_Solar_High extends GT_MetaTileEntity_B
         super(aName, aTier, aDescription, aTextures);
     }
 
+    @Override
+    public String[] getDescription() {
+        return new String[]{mDescription, "This machine can not explode!"};
+    }
+
     public ITexture[][][] getTextureSet(ITexture[] aTextures) {
         ITexture[][][] rTextures = new ITexture[4][17][];
         for (byte i = -1; i < 16; i = (byte) (i + 1)) {
@@ -49,7 +54,7 @@ public class Detrav_MetaTileEntity_Boiler_Solar_High extends GT_MetaTileEntity_B
     }
 
     public int maxProgresstime() {
-        return 500;
+        return 200;
     }
 
     public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
@@ -85,7 +90,7 @@ public class Detrav_MetaTileEntity_Boiler_Solar_High extends GT_MetaTileEntity_B
                 this.mLossTimer = 0;
             }
             if (++this.mLossTimer > 45) {
-                this.mTemperature -= 1;
+                this.mTemperature -= 5;
                 this.mLossTimer = 0;
             }
             if (this.mSteam != null) {
@@ -107,7 +112,7 @@ public class Detrav_MetaTileEntity_Boiler_Solar_High extends GT_MetaTileEntity_B
                         this.mHadNoWater = true;
                     } else {
                         if (this.mHadNoWater) {
-                            aBaseMetaTileEntity.doExplosion(2048L);
+                            //aBaseMetaTileEntity.doExplosion(2048L);
                             return;
                         }
                         this.mFluid.amount -= 1;
@@ -137,9 +142,9 @@ public class Detrav_MetaTileEntity_Boiler_Solar_High extends GT_MetaTileEntity_B
                 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)) {
+            if ((this.mTemperature < 200) && (this.mProcessingEnergy > 0) && (aTick % 12L == 0L)) {
                 this.mProcessingEnergy -= 1;
-                this.mTemperature += 1;
+                this.mTemperature += 5;
             }
             aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);
         }
diff --git a/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_Low.java b/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_Low.java
index 6d1cfc0ca4..742f008dce 100644
--- a/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_Low.java
+++ b/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_Low.java
@@ -29,6 +29,11 @@ public class Detrav_MetaTileEntity_Boiler_Solar_Low extends GT_MetaTileEntity_Bo
         super(aName, aTier, aDescription, aTextures);
     }
 
+    @Override
+    public String[] getDescription() {
+        return new String[]{mDescription, "This machine can not explode!"};
+    }
+
     public ITexture[][][] getTextureSet(ITexture[] aTextures) {
         ITexture[][][] rTextures = new ITexture[4][17][];
         for (byte i = -1; i < 16; i = (byte) (i + 1)) {
@@ -49,7 +54,7 @@ public class Detrav_MetaTileEntity_Boiler_Solar_Low extends GT_MetaTileEntity_Bo
     }
 
     public int maxProgresstime() {
-        return 500;
+        return 200;
     }
 
     public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
@@ -85,7 +90,7 @@ public class Detrav_MetaTileEntity_Boiler_Solar_Low extends GT_MetaTileEntity_Bo
                 this.mLossTimer = 0;
             }
             if (++this.mLossTimer > 45) {
-                this.mTemperature -= 1;
+                this.mTemperature -= 5;
                 this.mLossTimer = 0;
             }
             if (this.mSteam != null) {
@@ -107,7 +112,7 @@ public class Detrav_MetaTileEntity_Boiler_Solar_Low extends GT_MetaTileEntity_Bo
                         this.mHadNoWater = true;
                     } else {
                         if (this.mHadNoWater) {
-                            aBaseMetaTileEntity.doExplosion(2048L);
+                            //aBaseMetaTileEntity.doExplosion(2048L);
                             return;
                         }
                         this.mFluid.amount -= 1;
@@ -137,9 +142,9 @@ public class Detrav_MetaTileEntity_Boiler_Solar_Low extends GT_MetaTileEntity_Bo
                 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)) {
+            if ((this.mTemperature < 200) && (this.mProcessingEnergy > 0) && (aTick % 12L == 0L)) {
                 this.mProcessingEnergy -= 1;
-                this.mTemperature += 1;
+                this.mTemperature += 5;
             }
             aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);
         }
diff --git a/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_Medium.java b/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_Medium.java
index 0d04ded00f..f538586447 100644
--- a/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_Medium.java
+++ b/src/main/java/com/detrav/tileentities/Detrav_MetaTileEntity_Boiler_Solar_Medium.java
@@ -29,6 +29,11 @@ public class Detrav_MetaTileEntity_Boiler_Solar_Medium extends GT_MetaTileEntity
         super(aName, aTier, aDescription, aTextures);
     }
 
+    @Override
+    public String[] getDescription() {
+        return new String[]{mDescription, "This machine can not explode!"};
+    }
+
     public ITexture[][][] getTextureSet(ITexture[] aTextures) {
         ITexture[][][] rTextures = new ITexture[4][17][];
         for (byte i = -1; i < 16; i = (byte) (i + 1)) {
@@ -49,7 +54,7 @@ public class Detrav_MetaTileEntity_Boiler_Solar_Medium extends GT_MetaTileEntity
     }
 
     public int maxProgresstime() {
-        return 500;
+        return 200;
     }
 
     public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
@@ -85,7 +90,7 @@ public class Detrav_MetaTileEntity_Boiler_Solar_Medium extends GT_MetaTileEntity
                 this.mLossTimer = 0;
             }
             if (++this.mLossTimer > 45) {
-                this.mTemperature -= 1;
+                this.mTemperature -= 5;
                 this.mLossTimer = 0;
             }
             if (this.mSteam != null) {
@@ -107,7 +112,7 @@ public class Detrav_MetaTileEntity_Boiler_Solar_Medium extends GT_MetaTileEntity
                         this.mHadNoWater = true;
                     } else {
                         if (this.mHadNoWater) {
-                            aBaseMetaTileEntity.doExplosion(2048L);
+                            //aBaseMetaTileEntity.doExplosion(2048L);
                             return;
                         }
                         this.mFluid.amount -= 1;
@@ -137,9 +142,9 @@ public class Detrav_MetaTileEntity_Boiler_Solar_Medium extends GT_MetaTileEntity
                 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)) {
+            if ((this.mTemperature < 200) && (this.mProcessingEnergy > 0) && (aTick % 12L == 0L)) {
                 this.mProcessingEnergy -= 1;
-                this.mTemperature += 1;
+                this.mTemperature += 5;
             }
             aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);
         }