$ More Boiler Logic Fixes.

> Now they won't burn fuel once they're at 80% temp, so it's not wasted.
$ Fixed all Advanced Boilers using the Tier 1 Boiler Chassis.
% Tweaked Advanced Boiler Textures.

2 files changed, 97 insertions, 7 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java
new file mode 100644
index 0000000000..d3ec2b024b
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java
@@ -0,0 +1,91 @@
+package gtPlusPlus.xmod.gregtech.api.gui;
+
+import java.util.Iterator;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.gui.GT_ContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gtPlusPlus.xmod.gregtech.common.tileentities.generators.GT_MetaTileEntity_Boiler_Base;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.inventory.Slot;
+
+public class CONTAINER_AdvancedBoiler
+        extends GT_ContainerMetaTile_Machine {
+    private int mSteamCapacity = 0;//FB: UR - UR_UNINIT_READ_CALLED_FROM_SUPER_CONSTRUCTOR
+    public int mWaterAmount = 0;
+    public int mSteamAmount = 0;
+    public int mProcessingEnergy = 0;
+    public int mTemperature = 2;
+    
+    public int maxStorage = 0;
+    public CONTAINER_AdvancedBoiler(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, int aSteamCapacity) {
+        super(aInventoryPlayer, aTileEntity);
+        this.mSteamCapacity = aSteamCapacity;
+    }
+
+    @Override
+	public void addSlots(InventoryPlayer aInventoryPlayer) {
+        addSlotToContainer(new Slot(this.mTileEntity, 2, 116, 62));
+        addSlotToContainer(new Slot(this.mTileEntity, 0, 44, 26));
+        addSlotToContainer(new Slot(this.mTileEntity, 1, 44, 62));
+        addSlotToContainer(new Slot(this.mTileEntity, 3, 116, 26));
+    }
+
+    @Override
+	public int getSlotCount() {
+        return 4;
+    }
+
+    @Override
+	public int getShiftClickSlotCount() {
+        return 1;
+    }
+
+    @Override
+	public void detectAndSendChanges() {
+        super.detectAndSendChanges();
+        if ((this.mTileEntity.isClientSide()) || (this.mTileEntity.getMetaTileEntity() == null)) {
+            return;
+        }
+        this.maxStorage = ((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).getCapacity();
+        this.mTemperature = ((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).mTemperature;
+        this.mProcessingEnergy = ((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).mProcessingEnergy;
+        this.mSteamAmount = (((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).mSteam == null ? 0 : ((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).mSteam.amount);
+        this.mWaterAmount = (((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).mFluid == null ? 0 : ((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).mFluid.amount);
+
+        this.mTemperature = Math.min(54, Math.max(0, this.mTemperature * 54 / (((GT_MetaTileEntity_Boiler_Base) this.mTileEntity.getMetaTileEntity()).maxProgresstime() - 10)));
+        this.mSteamAmount = Math.min(54, Math.max(0, this.mSteamAmount * 54 / (this.mSteamCapacity - 100)));
+        this.mWaterAmount = Math.min(54, Math.max(0, this.mWaterAmount * 54 / (this.maxStorage-100)));
+        this.mProcessingEnergy = Math.min(14, Math.max(this.mProcessingEnergy > 0 ? 1 : 0, this.mProcessingEnergy * 14 / 1000));
+
+        Iterator var2 = this.crafters.iterator();
+        while (var2.hasNext()) {
+            ICrafting var1 = (ICrafting) var2.next();
+            var1.sendProgressBarUpdate(this, 100, this.mTemperature);
+            var1.sendProgressBarUpdate(this, 101, this.mProcessingEnergy);
+            var1.sendProgressBarUpdate(this, 102, this.mSteamAmount);
+            var1.sendProgressBarUpdate(this, 103, this.mWaterAmount);
+        }
+    }
+
+    @Override
+	@SideOnly(Side.CLIENT)
+    public void updateProgressBar(int par1, int par2) {
+        super.updateProgressBar(par1, par2);
+        switch (par1) {
+            case 100:
+                this.mTemperature = par2;
+                break;
+            case 101:
+                this.mProcessingEnergy = par2;
+                break;
+            case 102:
+                this.mSteamAmount = par2;
+                break;
+            case 103:
+                this.mWaterAmount = par2;
+        }
+    }
+}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedBoiler.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedBoiler.java
index 2d00f98d40..fd3cf76c83 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedBoiler.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_AdvancedBoiler.java
@@ -2,18 +2,17 @@ package gtPlusPlus.xmod.gregtech.api.gui;
 
 import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.common.gui.GT_Container_Boiler;
 import net.minecraft.entity.player.InventoryPlayer;
 
 public class GUI_AdvancedBoiler
         extends GT_GUIContainerMetaTile_Machine {
     public GUI_AdvancedBoiler(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aTextureName, int aSteamCapacity) {
-        super(new GT_Container_Boiler(aInventoryPlayer, aTileEntity, aSteamCapacity), "miscutils:textures/gui/" + aTextureName);
+        super(new CONTAINER_AdvancedBoiler(aInventoryPlayer, aTileEntity, aSteamCapacity), "miscutils:textures/gui/" + aTextureName);
     }
 
     @Override
 	protected void drawGuiContainerForegroundLayer(int par1, int par2) {
-        this.fontRendererObj.drawString("Boiler", 8, 4, 4210752);
+        this.fontRendererObj.drawString("Advanced Boiler", 8, 4, 4210752);
     }
 
     @Override
@@ -23,19 +22,19 @@ public class GUI_AdvancedBoiler
         int y = (this.height - this.ySize) / 2;
         drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
         if (this.mContainer != null) {
-            int tScale = ((GT_Container_Boiler) this.mContainer).mSteamAmount;
+            int tScale = ((CONTAINER_AdvancedBoiler) this.mContainer).mSteamAmount;
             if (tScale > 0) {
                 drawTexturedModalRect(x + 70, y + 25 + 54 - tScale, 194, 54 - tScale, 10, tScale);
             }
-            tScale = ((GT_Container_Boiler) this.mContainer).mWaterAmount;
+            tScale = ((CONTAINER_AdvancedBoiler) this.mContainer).mWaterAmount;
             if (tScale > 0) {
                 drawTexturedModalRect(x + 83, y + 25 + 54 - tScale, 204, 54 - tScale, 10, tScale);
             }
-            tScale = ((GT_Container_Boiler) this.mContainer).mTemperature;
+            tScale = ((CONTAINER_AdvancedBoiler) this.mContainer).mTemperature;
             if (tScale > 0) {
                 drawTexturedModalRect(x + 96, y + 25 + 54 - tScale, 214, 54 - tScale, 10, tScale);
             }
-            tScale = ((GT_Container_Boiler) this.mContainer).mProcessingEnergy;
+            tScale = ((CONTAINER_AdvancedBoiler) this.mContainer).mProcessingEnergy;
             if (tScale > 0) {
                 drawTexturedModalRect(x + 117, y + 44 + 14 - tScale, 177, 14 - tScale, 15, tScale + 1);
             }