$ 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.

7 files changed, 338 insertions, 90 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);
             }
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 17cfa1cc65..09b83cc46c 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
@@ -6,11 +6,10 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.common.gui.GT_Container_Boiler;
+import gregtech.api.util.*;
 import gregtech.common.tileentities.boilers.GT_MetaTileEntity_Boiler;
 import gtPlusPlus.core.util.Utils;
+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;
@@ -21,39 +20,116 @@ import net.minecraftforge.fluids.IFluidHandler;
 public class GT_MetaTileEntity_Boiler_Base
 extends GT_MetaTileEntity_Boiler {
 
-	private int mSteamPerSecond = 0;
-	private int mPollutionPerSecond = 20;
-	private int mBoilerTier = 0;
+	final private int mSteamPerSecond;
+	final private int mPollutionPerSecond;
+	final private int mBoilerTier;
 
 	public GT_MetaTileEntity_Boiler_Base(int aID, String aNameRegional, int aBoilerTier) {
 		super(aID, "electricboiler."+aBoilerTier+".tier.single", aNameRegional, "Produces "+(750+(250*aBoilerTier))+"L of Steam per second");
-		mSteamPerSecond = (750+(250*aBoilerTier));
-		mPollutionPerSecond = 20+(15*aBoilerTier);
-		mBoilerTier = aBoilerTier;
+		this.mSteamPerSecond = (750+(250*aBoilerTier));
+		this.mPollutionPerSecond = 20+(15*aBoilerTier);
+		this.mBoilerTier = aBoilerTier;
 	}
 
 	public GT_MetaTileEntity_Boiler_Base(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
 		super(aName, aTier, aDescription, aTextures);
+		this.mSteamPerSecond = (750+(250*aTier));
+		this.mPollutionPerSecond = 20+(15*aTier);
+		this.mBoilerTier = aTier;
 	}
 
+	public ITexture getOverlayIcon() {
+		return new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT);
+	}
+	
 	@Override
-	public ITexture[][][] getTextureSet(ITexture[] aTextures) {
-		ITexture[][][] rTextures = new ITexture[5][17][];
-		for (byte i = -1; i < 16; i = (byte) (i + 1)) {
-			ITexture[] tmp0 = {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(i + 1)]};
-			rTextures[0][(i + 1)] = tmp0;
-			ITexture[] tmp1 = {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(i + 1)], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)};
-			rTextures[1][(i + 1)] = tmp1;
-			ITexture[] tmp2 = {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(i + 1)], new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)};
-			rTextures[2][(i + 1)] = tmp2;
-			ITexture[] tmp4 = {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(i + 1)], new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT)};
-			rTextures[3][(i + 1)] = tmp4;
-			ITexture[] tmp5 = {Textures.BlockIcons.MACHINE_CASINGS[this.mTier][(i + 1)], new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE)};
-			rTextures[4][(i + 1)] = tmp5;
+	public ITexture[][][] getTextureSet(final ITexture[] aTextures) {
+		final ITexture[][][] rTextures = new ITexture[10][17][];
+		for (byte i = -1; i < 16; i++) {
+			rTextures[0][i + 1] = this.getFront(i);
+			rTextures[1][i + 1] = this.getBack(i);
+			rTextures[2][i + 1] = this.getBottom(i);
+			rTextures[3][i + 1] = this.getTop(i);
+			rTextures[4][i + 1] = this.getSides(i);
+			rTextures[5][i + 1] = this.getFrontActive(i);
+			rTextures[6][i + 1] = this.getBackActive(i);
+			rTextures[7][i + 1] = this.getBottomActive(i);
+			rTextures[8][i + 1] = this.getTopActive(i);
+			rTextures[9][i + 1] = this.getSidesActive(i);
 		}
 		return rTextures;
 	}
 
+	protected GT_RenderedTexture getCasingTexture(){
+		if (this.mBoilerTier == 1){
+			return  new GT_RenderedTexture(Textures.BlockIcons.MACHINE_LV_SIDE);
+		}
+		else if (this.mBoilerTier == 2){
+
+			return  new GT_RenderedTexture(Textures.BlockIcons.MACHINE_MV_SIDE);
+		}
+		else{
+
+			return  new GT_RenderedTexture(Textures.BlockIcons.MACHINE_HV_SIDE);
+		}
+		//return  new GT_RenderedTexture(TexturesGtBlock.Casing_Machine_Simple_Top);
+	}
+	
+	@Override
+	public ITexture[] getTexture(final IGregTechTileEntity aBaseMetaTileEntity, final byte aSide, final byte aFacing, final byte aColorIndex, final boolean aActive, final boolean aRedstone) {
+		return this.mTextures[(aActive ? 5 : 0) + (aSide == aFacing ? 0 : aSide == GT_Utility.getOppositeSide(aFacing) ? 1 : aSide == 0 ? 2 : aSide == 1 ? 3 : 4)][aColorIndex + 1];
+	}
+	
+	public ITexture[] getFront(final byte aColor) {
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mBoilerTier][aColor + 1], this.getCasingTexture()};
+	}
+
+	public ITexture[] getBack(final byte aColor) {
+		return this.getSides(aColor);
+	}
+
+	public ITexture[] getBottom(final byte aColor) {
+		return this.getSides(aColor);
+	}
+
+	public ITexture[] getTop(final byte aColor) {
+		return this.getSides(aColor);
+	}
+
+	public ITexture[] getSides(final byte aColor) {
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[this.mBoilerTier][aColor + 1], this.getCasingTexture()};
+	}
+
+	public ITexture[] getFrontActive(final byte aColor) {
+		return this.getFront(aColor);
+	}
+
+	public ITexture[] getBackActive(final byte aColor) {
+		return this.getSides(aColor);
+	}
+
+	public ITexture[] getBottomActive(final byte aColor) {
+		return this.getBottom(aColor);
+	}
+
+	public ITexture[] getTopActive(final byte aColor) {
+		return this.getTop(aColor);
+	}
+
+	public ITexture[] getSidesActive(final byte aColor) {
+		return this.getSides(aColor);
+	}
+	
+	@Override
+	public boolean isOutputFacing(final byte aSide) {
+		return aSide != this.getBaseMetaTileEntity().getFrontFacing();
+	}
+	
+	@Override
+	public boolean isFacingValid(final byte aSide) {
+		return aSide > 1;
+	}
+
 	//Please find out what I do.
 	//I do stuff within the GUI. 
 	//this.mTemperature = Math.min(54, Math.max(0, this.mTemperature * 54 / (((GT_MetaTileEntity_Boiler) this.mTileEntity.getMetaTileEntity()).maxProgresstime() - 10)));
@@ -65,7 +141,7 @@ extends GT_MetaTileEntity_Boiler {
 	//Electric boiler? Okay.
 	@Override
 	public boolean isElectric(){
-		return true;
+		return false;
 	}
 
 	//Hold more Steam
@@ -88,7 +164,7 @@ extends GT_MetaTileEntity_Boiler {
 
 	@Override
 	public Object getServerGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-		return new GT_Container_Boiler(aPlayerInventory, aBaseMetaTileEntity, getCapacity());
+		return new CONTAINER_AdvancedBoiler(aPlayerInventory, aBaseMetaTileEntity, getCapacity());
 	}
 
 	@Override
@@ -98,12 +174,22 @@ extends GT_MetaTileEntity_Boiler {
 
 	@Override
 	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-		return new GT_MetaTileEntity_Boiler_Base(this.mName, this.mTier, this.mDescription, this.mTextures);
+		return new GT_MetaTileEntity_Boiler_Base(this.mName, mBoilerTier, this.mDescription, this.mTextures);
 	}
 
 	@Override
 	public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
 		if ((aBaseMetaTileEntity.isServerSide()) && (aTick > 20L)) {
+			//Utils.LOG_INFO("Ticking Boiler");
+			
+			if (aTick % 60L == 0L) {
+				//Utils.LOG_INFO("Temp:"+this.mTemperature);
+				//Utils.LOG_INFO("getCapacity():"+this.getCapacity());
+				//Utils.LOG_INFO("maxProgresstime():"+this.maxProgresstime());
+				//Utils.LOG_INFO("mSteamPerSecond:"+this.mSteamPerSecond);
+				//Utils.LOG_INFO("mProcessingEnergy:"+this.mProcessingEnergy);
+			}
+			
 			if (this.mTemperature <= 20) {
 				this.mTemperature = 20;
 				this.mLossTimer = 0;
@@ -135,13 +221,14 @@ extends GT_MetaTileEntity_Boiler {
 							aBaseMetaTileEntity.doExplosion(4096L);
 							return;
 						}
-						this.mFluid.amount -= 1;
+						this.mFluid.amount -= (10*this.mBoilerTier);
+						//Utils.LOG_INFO("Draining "+(10*this.mBoilerTier)+"L of water. There is "+this.mFluid.amount+"L left.");
 						if (this.mSteam == null) {
-							this.mSteam = GT_ModHandler.getSteam((this.mSteamPerSecond/2));
+							this.mSteam = GT_ModHandler.getSteam((this.mSteamPerSecond));
 						} else if (GT_ModHandler.isSteam(this.mSteam)) {
-							this.mSteam.amount += (this.mSteamPerSecond/2);
+							this.mSteam.amount += (this.mSteamPerSecond);
 						} else {
-							this.mSteam = GT_ModHandler.getSteam((this.mSteamPerSecond/2));
+							this.mSteam = GT_ModHandler.getSteam((this.mSteamPerSecond));
 						}
 					}
 				} else {
@@ -154,24 +241,27 @@ extends GT_MetaTileEntity_Boiler {
 				this.mSteam.amount = (getCapacity()+(getCapacity()/2));
 			}
 			ItemStack fuelSlot = this.mInventory[2];
-			if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) &&
-					(fuelSlot != null)) {
+			if ((this.mProcessingEnergy <= 0) && (aBaseMetaTileEntity.isAllowedToWork()) &&	(fuelSlot != null)) {
 
-				if (isInputFuelItem(fuelSlot)){
+				if (isInputFuelItem(fuelSlot) && (this.mTemperature < (maxProgresstime()-250))){
+					Utils.LOG_INFO("Current Heat:"+this.mTemperature+"/"+(maxProgresstime()-250)+" Burning fuel because not yet at a suitable temp.");
 					useInputFuelItem(aBaseMetaTileEntity, fuelSlot);
 				}
 
+			}
 
-				if ((this.mTemperature < maxProgresstime()) && (this.mProcessingEnergy > 0) && (aTick % 12L == 0L)) {
+				if ((this.mTemperature < maxProgresstime()) && (this.mProcessingEnergy > 0) && (aTick % 10L == 0L)) {
+					//Utils.LOG_INFO("Adding +1 Temp.");
 					this.mProcessingEnergy -= 2;
 					this.mTemperature += 1;
 				}
 				if (this.mProcessingEnergy > 0 && (aTick % 20L == 0L)) {
+					//Utils.LOG_INFO("Current Temp is at: "+this.mTemperature+"C");
 					//GT_Pollution.addPollution(getBaseMetaTileEntity(), this.mPollutionPerSecond);
 				}
 				aBaseMetaTileEntity.setActive(this.mProcessingEnergy > 0);
 			}
-		}
+		
 	}
 
 	public boolean isInputFuelItem(ItemStack inputItem){
@@ -189,6 +279,9 @@ extends GT_MetaTileEntity_Boiler {
 		vCurrentBurnTime = GameRegistry.getFuelValue(inputItem);
 		if (vCurrentBurnTime > 0){
 			this.mProcessingEnergy += (vCurrentBurnTime/10);
+			if ((vCurrentBurnTime/500) > 0){
+				this.mTemperature += (vCurrentBurnTime/500);				
+			}
 			aBaseMetaTileEntity.decrStackSize(2, 1);
 			if (aBaseMetaTileEntity.getRandomNumber(3) == 0) {
 				if (inputItem.getDisplayName().toLowerCase().contains("charcoal") || inputItem.getDisplayName().toLowerCase().contains("coke")){
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java
index 5e8c7d1bf7..b02d1adb03 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_HV.java
@@ -1,8 +1,11 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
 
+import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.objects.GT_RenderedTexture;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 public class GT_MetaTileEntity_Boiler_HV
         extends GT_MetaTileEntity_Boiler_Base {
@@ -17,8 +20,35 @@ public class GT_MetaTileEntity_Boiler_HV
 
     @Override
 	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boiler_HV(this.mName, this.mTier, this.mDescription, this.mTextures);
+        return new GT_MetaTileEntity_Boiler_HV(this.mName, 3, this.mDescription, this.mTextures);
     }
+       
+    
+    @Override
+	protected GT_RenderedTexture getCasingTexture(){
+		return  new GT_RenderedTexture(Textures.BlockIcons.MACHINE_HV_SIDE);
+	}
+    
+    
+    @Override
+	public ITexture[] getFront(final byte aColor) {
+		return new ITexture[]{super.getFront(aColor)[0], this.getCasingTexture(),  new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT)};
+	}
+
+	@Override
+	public ITexture[] getTop(final byte aColor) {
+		return new ITexture[]{super.getTop(aColor)[0], this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Talonite)};
+	}
+
+	@Override
+	public ITexture[] getFrontActive(final byte aColor) {
+		return new ITexture[]{super.getFrontActive(aColor)[0], this.getCasingTexture(),  new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE)};
+	}
+
+	@Override
+	public ITexture[] getTopActive(final byte aColor) {
+		return getTop(aColor);
+	}
     
     
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java
index 5e8f2237fe..1820c302f7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_LV.java
@@ -1,44 +1,51 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
 
-import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 public class GT_MetaTileEntity_Boiler_LV
-        extends GT_MetaTileEntity_Boiler_Base {
-			
-    public GT_MetaTileEntity_Boiler_LV(int aID, String aNameRegional, int aBoilerTier) {
-        super(aID, aNameRegional, aBoilerTier);               
-    }
-    
-    public GT_MetaTileEntity_Boiler_LV(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
-        super(aName, aTier, aDescription, aTextures);
-    }
-
-    @Override
-	public ITexture[][][] getTextureSet(ITexture[] aTextures) {
-        ITexture[][][] rTextures = new ITexture[5][17][];
-        for (byte i = -1; i < 16; i = (byte) (i + 1)) {
-            ITexture[] tmp0 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_BOTTOM, Dyes.getModulation(i, Dyes._NULL.mRGBa))};
-            rTextures[0][(i + 1)] = tmp0;
-            ITexture[] tmp1 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_TOP, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)};
-            rTextures[1][(i + 1)] = tmp1;
-            ITexture[] tmp2 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_PIPE)};
-            rTextures[2][(i + 1)] = tmp2;
-            ITexture[] tmp4 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT)};
-            rTextures[3][(i + 1)] = tmp4;
-            ITexture[] tmp5 = {new GT_RenderedTexture(Textures.BlockIcons.MACHINE_STEELBRICKS_SIDE, Dyes.getModulation(i, Dyes._NULL.mRGBa)), new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE)};
-            rTextures[4][(i + 1)] = tmp5;
-        }
-        return rTextures;
-    }
-
-    @Override
+extends GT_MetaTileEntity_Boiler_Base {
+
+	public GT_MetaTileEntity_Boiler_LV(int aID, String aNameRegional, int aBoilerTier) {
+		super(aID, aNameRegional, aBoilerTier);               
+	}
+
+	public GT_MetaTileEntity_Boiler_LV(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+		super(aName, aTier, aDescription, aTextures);
+	}
+
+	@Override
 	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boiler_LV(this.mName, this.mTier, this.mDescription, this.mTextures);
-    }
+		return new GT_MetaTileEntity_Boiler_LV(this.mName, 1, this.mDescription, this.mTextures);
+	}   
+
+
+	@Override
+	protected GT_RenderedTexture getCasingTexture(){
+		return  new GT_RenderedTexture(Textures.BlockIcons.MACHINE_LV_SIDE);
+	}    
+
+	@Override
+	public ITexture[] getFront(final byte aColor) {
+		return new ITexture[]{super.getFront(aColor)[0], this.getCasingTexture(),  new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT)};
+	}
+
+	@Override
+	public ITexture[] getTop(final byte aColor) {
+		return new ITexture[]{super.getTop(aColor)[0], this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Potin)};
+	}
+
+	@Override
+	public ITexture[] getFrontActive(final byte aColor) {
+		return new ITexture[]{super.getFrontActive(aColor)[0], this.getCasingTexture(),  new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE)};
+	}
 
+	@Override
+	public ITexture[] getTopActive(final byte aColor) {
+		return getTop(aColor);
+	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java
index 52c7b46983..1aa7e0d700 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/generators/GT_MetaTileEntity_Boiler_MV.java
@@ -1,23 +1,51 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.generators;
 
+import gregtech.api.enums.Textures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.objects.GT_RenderedTexture;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 public class GT_MetaTileEntity_Boiler_MV
-        extends GT_MetaTileEntity_Boiler_Base {
-			
-    public GT_MetaTileEntity_Boiler_MV(int aID, String aNameRegional, int aBoilerTier) {
-        super(aID, aNameRegional, aBoilerTier);               
-    }
-    
-    public GT_MetaTileEntity_Boiler_MV(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
-        super(aName, aTier, aDescription, aTextures);
-    }
-
-    @Override
+extends GT_MetaTileEntity_Boiler_Base {
+
+	public GT_MetaTileEntity_Boiler_MV(int aID, String aNameRegional, int aBoilerTier) {
+		super(aID, aNameRegional, aBoilerTier);               
+	}
+
+	public GT_MetaTileEntity_Boiler_MV(String aName, int aTier, String aDescription, ITexture[][][] aTextures) {
+		super(aName, aTier, aDescription, aTextures);
+	}
+
+	@Override
 	public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
-        return new GT_MetaTileEntity_Boiler_MV(this.mName, this.mTier, this.mDescription, this.mTextures);
-    }
+		return new GT_MetaTileEntity_Boiler_MV(this.mName, 2, this.mDescription, this.mTextures);
+	}    
+
+	@Override
+	protected GT_RenderedTexture getCasingTexture(){
+		return  new GT_RenderedTexture(Textures.BlockIcons.MACHINE_MV_SIDE);
+	}
+
+	@Override
+	public ITexture[] getFront(final byte aColor) {
+		return new ITexture[]{super.getFront(aColor)[0], this.getCasingTexture(),  new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT)};
+	}
+
+	@Override
+	public ITexture[] getTop(final byte aColor) {
+		return new ITexture[]{super.getTop(aColor)[0], this.getCasingTexture(), new GT_RenderedTexture(TexturesGtBlock.Casing_Material_Tumbaga)};
+	}
+
+	@Override
+	public ITexture[] getFrontActive(final byte aColor) {
+		return new ITexture[]{super.getFrontActive(aColor)[0], this.getCasingTexture(),  new GT_RenderedTexture(Textures.BlockIcons.BOILER_FRONT_ACTIVE)};
+	}
+
+	@Override
+	public ITexture[] getTopActive(final byte aColor) {
+		return getTop(aColor);
+	}
 
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
index 15f9bc11e2..1724b7fe77 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechAdvancedBoilers.java
@@ -27,9 +27,9 @@ public class GregtechAdvancedBoilers {
 		GregtechItemList.Boiler_Advanced_HV.set(new GT_MetaTileEntity_Boiler_HV(758, "Advanced Boiler [HV]", 3).getStackForm(1L));
 		
 		
-		ItemStack chassisT1 = ItemUtils.getItemStack("miscutils:itemBoilerChassis", 1);
-		ItemStack chassisT2 = ItemUtils.getItemStack("miscutils:itemBoilerChassis:1", 1);
-		ItemStack chassisT3 = ItemUtils.getItemStack("miscutils:itemBoilerChassis:2", 1);
+		ItemStack chassisT1 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 0, 1);
+		ItemStack chassisT2 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 1, 1);
+		ItemStack chassisT3 = ItemUtils.getItemStackWithMeta(true, "miscutils:itemBoilerChassis", "Boiler_Chassis_T1", 2, 1);
 
 
 		//Make the Coil in each following recipe a hammer and a Screwdriver.