+ 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

1 files changed, 1 insertions, 4 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
index eb25909920..6cd65437cb 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/storage/GT_MetaTileEntity_TieredTank.java
@@ -62,6 +62,7 @@ extends GT_MetaTileEntity_BasicTank {
 					Utils.LOG_WARNING("mFluid was not null, Saving TileEntity NBT data.");
 					gtCraftingComponentsTag.setInteger("xAmount", mFluid.amount);
 					gtCraftingComponentsTag.setString("xFluid", mFluid.getFluid().getName());
+					mFluidName = mFluid.getFluid().getName();
 
 					//Backup the current tag
 					//gtCraftingComponentsTag.setTag("backupTag", internalCraftingComponentsTag);
@@ -347,13 +348,9 @@ extends GT_MetaTileEntity_BasicTank {
 		}
 
 		//Internal Tag was not valid.
-		try{
 		if (internalCraftingComponentsTag == null){
 			Utils.LOG_WARNING("Internal NBT data tag was null.");
 			return;
-		}	
-		} catch (NullPointerException x){
-			Utils.LOG_WARNING("Caught null NBT.");
 		}
 		/*if (internalCraftingComponentsTag.hasNoTags()){
 			Utils.LOG_WARNING("Internal NBT data tag was not valid.");