+ Added a power cost of 32eu/action for the Tree Farmer. (Will eventually get a config option).

% Moved the internal power buffer variable out of the cut method into the class.

% Massive project tidy up, lots of old unused code removed or tidied up.
$ Fixed lots of String comparisons that used == instead of .equals().
$ Fixed Double/Triple/Quad null checks in certain places.
$ Fixed returns that set values at the same time.
$ Swapped 3.14 and 1.57 to Math.PI and Math.PI/2.
$ Fixed possible cases where a NPE may be thrown, by calling logging outside of null checks.

+ Added PI to CORE.java, since it's a double and MC uses it as a float in each instance.
- Stripped 95% of the useless code out of Meta_GT_Proxy.java

3 files changed, 81 insertions, 83 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java
index d4412ca3f5..2620f9b275 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_DeluxeTank.java
@@ -19,8 +19,6 @@ import cpw.mods.fml.relauncher.SideOnly;
  */
 public class CONTAINER_DeluxeTank extends GT_Container_BasicTank {
 
-    public int mContent = 0;
-
     public CONTAINER_DeluxeTank(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
         super(aInventoryPlayer, aTileEntity);
     }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java
index 3feea9d2df..8d15fa030a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_SteamCondenser.java
@@ -14,84 +14,84 @@ import cpw.mods.fml.relauncher.SideOnly;
 
 public class CONTAINER_SteamCondenser extends GT_ContainerMetaTile_Machine
 {
-  public CONTAINER_SteamCondenser(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;
-  }
-  
-  public int mWaterAmount = 0;
-  public int mSteamAmount = 0;
-  public int mProcessingEnergy = 0;
-  public int mTemperature = 2;
-  private final int mSteamCapacity;
-  public long mTickingTime = ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).RI;
-  
-  @Override
-public void detectAndSendChanges()
-  {
-    super.detectAndSendChanges();
-    if ((this.mTileEntity.isClientSide()) || (this.mTileEntity.getMetaTileEntity() == null)) {
-      return;
-    }
-    this.mTemperature = ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mTemperature;
-    this.mProcessingEnergy = ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mProcessingEnergy;
-    this.mSteamAmount = (((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mSteam == null ? 0 : ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mSteam.amount);
-    this.mWaterAmount = (((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mFluid == null ? 0 : ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mFluid.amount);
-    this.mTickingTime = ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).RI;
-    
-    this.mTemperature = Math.min(54, Math.max(0, this.mTemperature * 54 / (((GregtechMetaBoilerBase)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 / 15900));
-    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;
-    }
-  }
+	public CONTAINER_SteamCondenser(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;
+	}
+
+	public int mWaterAmount = 0;
+	public int mSteamAmount = 0;
+	public int mProcessingEnergy = 0;
+	public int mTemperature = 2;
+	private final int mSteamCapacity;
+	public long mTickingTime = ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).RI;
+
+	@Override
+	public void detectAndSendChanges()
+	{
+		super.detectAndSendChanges();
+		if ((this.mTileEntity.isClientSide()) || (this.mTileEntity.getMetaTileEntity() == null)) {
+			return;
+		}
+		this.mTemperature = ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mTemperature;
+		this.mProcessingEnergy = ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mProcessingEnergy;
+		this.mSteamAmount = (((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mSteam == null ? 0 : ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mSteam.amount);
+		this.mWaterAmount = (((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mFluid == null ? 0 : ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).mFluid.amount);
+		this.mTickingTime = ((GregtechMetaBoilerBase)this.mTileEntity.getMetaTileEntity()).RI;
+
+		this.mTemperature = Math.min(54, Math.max(0, this.mTemperature * 54 / (((GregtechMetaBoilerBase)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 / 15900));
+		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;
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java
index 1ce7bdea68..9d1a05e68d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/GUI_IronBlastFurnace.java
@@ -24,7 +24,7 @@ public class GUI_IronBlastFurnace
         drawTexturedModalRect(x, y, 0, 0, this.xSize, this.ySize);
         if ((this.mContainer != null) &&
                 (this.mContainer.mProgressTime > 0)) {
-            drawTexturedModalRect(x + 58, y + 28, 176, 0, Math.max(0, Math.min(20, (this.mContainer.mProgressTime > 0 ? 1 : 0) + this.mContainer.mProgressTime * 20 / (this.mContainer.mMaxProgressTime < 1 ? 1 : this.mContainer.mMaxProgressTime))), 11);
+            drawTexturedModalRect(x + 58, y + 28, 176, 0, Math.max(0, Math.min(20, 1 + this.mContainer.mProgressTime * 20 / (this.mContainer.mMaxProgressTime < 1 ? 1 : this.mContainer.mMaxProgressTime))), 11);
         }
     }
 }