$ Fixed the Base Multiblock class not utilizing the cached Tooltip.

2 files changed, 9 insertions, 3 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java
index 9b730c84a3..5fef0f1088 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_DynamoBuffer.java
@@ -34,14 +34,17 @@ public class GT_MetaTileEntity_Hatch_DynamoBuffer extends GT_MetaTileEntity_Hatc
 		return new ITexture[]{aBaseTexture, TexturesGtBlock.OVERLAYS_ENERGY_OUT_MULTI_BUFFER[this.mTier]};
 	}
 
+	@Override
 	public long getMinimumStoredEU() {
 		return 0L;
 	}
 
+	@Override
 	public long maxEUStore() {
 		return 512L + GT_Values.V[this.mTier + 1] * 2048L;
 	}
 
+	@Override
 	public MetaTileEntity newMetaEntity(final IGregTechTileEntity aTileEntity) {
 		return (MetaTileEntity) new GT_MetaTileEntity_Hatch_DynamoBuffer(this.mName, this.mTier, this.mDescription, this.mTextures);
 	}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index c16f62866f..3b8597c5eb 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -329,7 +329,7 @@ GT_MetaTileEntity_MultiBlockBase {
 		}*/
 
 		String aRequiresMuffler = "1x Muffler Hatch";
-		String aRequiresCoreModule = "1x Core Module";
+		//String aRequiresCoreModule = "1x Core Module";
 		String aRequiresMaint = "1x Maintanence Hatch";
 
 		String[] x = getTooltip();
@@ -396,8 +396,11 @@ GT_MetaTileEntity_MultiBlockBase {
 		String[] aToolTip = new String[(a2 + a3)];
 		aToolTip = ArrayUtils.addAll(aToolTip, x);
 		aToolTip = ArrayUtils.addAll(aToolTip, z);
-		aCachedToolTip = aToolTip;
-		return aToolTip;
+		
+		if (aCachedToolTip == null || aCachedToolTip.length <= 0) {
+			aCachedToolTip = aToolTip;			
+		}		
+		return aCachedToolTip;
 	}
 
 	public abstract String[] getTooltip();