From 2cf05c4deaf3a26626853431f725d0ca375ffec3 Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Fri, 26 Oct 2018 15:46:55 +0100
Subject: + Added 4 new High-Tier Alloys. Lafium, Cinobite, Pikyonite &
 Abyssal. + Added missing Germanium Dust. + Added compatibility for Witchery.
 - Removed portability of Tanks for GTNH, tanks are still portable otherwise.
 $ Fixed calculations for automatic recipe generation, EBF and ABS recipe
 requirements for GT++ Alloys are now significantly increased. $ Fixed missing
 Control Core textures. % Cleaned up some recipe generation. % Improved
 Material.java.

---
 .../storage/GT_MetaTileEntity_TieredTank.java      | 37 ++++++++++++----------
 1 file changed, 21 insertions(+), 16 deletions(-)

(limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/tileentities')

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 9c67f0f84f..81559db1a5 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
@@ -13,6 +13,7 @@ import gregtech.api.objects.GT_RenderedTexture;
 
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.preloader.asm.AsmConfig;
 
 public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank {
 
@@ -27,11 +28,14 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank {
 	@Override
 	public String[] getDescription() {
 		String[] aTip;
+
+		String aTankPortableness = CORE.GTNH ? "non-portable" : "portable";
+
 		if (this.mFluid == null) {
-			aTip = new String[] {this.mDescription, "A portable tank.", CORE.GT_Tooltip};
+			aTip = new String[] {this.mDescription, "A "+aTankPortableness+" tank.", CORE.GT_Tooltip};
 		}
 		else {
-			aTip = new String[] {this.mDescription, "A portable tank.", "Fluid: "+mFluid.getLocalizedName()+" "+mFluid.amount+"L", CORE.GT_Tooltip};
+			aTip = new String[] {this.mDescription, "A "+aTankPortableness+" tank.", "Fluid: "+mFluid.getLocalizedName()+" "+mFluid.amount+"L", CORE.GT_Tooltip};
 		}		
 		return aTip;
 	}
@@ -129,27 +133,28 @@ public class GT_MetaTileEntity_TieredTank extends GT_MetaTileEntity_BasicTank {
 		aBaseMetaTileEntity.openGUI(aPlayer); 	
 		return true; 	
 	}
-	
+
 	@Override
 	public boolean displaysItemStack() { 	
 		return true; 	
 	} 	
- 	
+
 	@Override 	
 	public boolean displaysStackSize() { 	
 		return false; 	
 	}
-	
-	@Override
-    public void setItemNBT(NBTTagCompound aNBT) {
-        super.setItemNBT(aNBT);
-        if (mFluid != null){
-    		Logger.INFO("Setting item fluid nbt");
-        	aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound()));
-        	if (aNBT.hasKey("mFluid")) {
-        		Logger.INFO("Set mFluid to NBT.");        		
-        	}
-        }        
-    }
+
+	@Override
+	public void setItemNBT(NBTTagCompound aNBT) {
+		if (CORE.NBT_PERSISTENCY_PATCH_APPLIED) {		
+			if (mFluid != null){
+				Logger.INFO("Setting item fluid nbt");
+				aNBT.setTag("mFluid", mFluid.writeToNBT(new NBTTagCompound()));
+				if (aNBT.hasKey("mFluid")) {
+					Logger.INFO("Set mFluid to NBT.");        		
+				}
+			}     
+		}
+	}
 
 }
\ No newline at end of file
-- 
cgit