Boiler: removing explosion logic

1 files changed, 9 insertions, 25 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
index fa1f358f6c..36351cf752 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_Base.java
@@ -1,12 +1,6 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
 
 import cpw.mods.fml.common.registry.GameRegistry;
-
-import gregtech.api.enums.GT_Values;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntityFurnace;
-
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.enums.Textures;
@@ -15,15 +9,15 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import gregtech.api.util.GT_Utility;
 import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler;
-
-import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.api.gui.CONTAINER_AdvancedBoiler;
 import gtPlusPlus.xmod.gregtech.api.gui.GUI_AdvancedBoiler;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntityFurnace;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidTankInfo;
 
@@ -51,7 +45,8 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
 				this.mDescription,
 				"Produces " + getPollution() + " pollution/sec",
 				"Consumes fuel only when temperature is less than 100C",
-				"Fuel with burn time greater than 500 is more efficient."
+				"Fuel with burn time greater than 500 is more efficient.",
+				"Doesn't explode if there's no water"
 		};
 	}
 
@@ -260,15 +255,7 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
 
 	@Override
 	protected void onDangerousWaterLack(IGregTechTileEntity tile, long ticks) {
-		if(mTemperature > getMaxTemperature()) {
-			super.onDangerousWaterLack(tile, ticks);
-		} else {
-			if (this.mProcessingEnergy > 0 && ticks % getHeatUpRate() == 0) {
-				this.mProcessingEnergy -= getEnergyConsumption();
-				this.mTemperature += getHeatUpAmount();
-			}
-			tile.setActive(this.mProcessingEnergy > 0);
-		}
+		// Smart boilers don't explode!
 	}
 
 	/**
@@ -291,12 +278,9 @@ public class GT_MetaTileEntity_Boiler_Base extends GT_MetaTileEntity_Boiler {
 		if (tile.getRandomNumber(3) == 0) {
 			if (fuel.getDisplayName().toLowerCase().contains("charcoal")
 					|| fuel.getDisplayName().toLowerCase().contains("coke")) {
-				tile.addStackToSlot(3,
-						GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));
-			}
-			else {
-				tile.addStackToSlot(3,
-						GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
+				tile.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.Ash, 1L));
+			} else {
+				tile.addStackToSlot(3, GT_OreDictUnificator.get(OrePrefixes.dustTiny, Materials.DarkAsh, 1L));
 			}
 		}
 	}