Fix secondary description not written to language file (#987)

* Fix secondary description not written to language file

* Extract ISecondaryDescribable interface

* Recover isDisplaySecondaryDescription in MetaTileEntity

2 files changed, 27 insertions, 16 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
index 31b008095c..0e27e66f6d 100644
--- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
@@ -111,6 +111,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity {
      * This method will only be called on client side
      * @return whether the secondary description should be display. default is false
      */
+    @Deprecated
     public boolean isDisplaySecondaryDescription() {
         return false;
     }
@@ -941,7 +942,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity {
     public void onCreated(ItemStack aStack, World aWorld, EntityPlayer aPlayer) {
         //
     }
-    
+
     @Override
     public boolean allowGeneralRedstoneOutput(){
     	return false;
@@ -951,12 +952,12 @@ public abstract class MetaTileEntity implements IMetaTileEntity {
     public String trans(String aKey, String aEnglish){
     	return GT_Utility.trans(aKey, aEnglish);
     }
-    
+
     @Override
     public boolean hasAlternativeModeText(){
     	return false;
     }
-    
+
     @Override
     public String getAlternativeModeText(){
     	return "";
@@ -964,7 +965,7 @@ public abstract class MetaTileEntity implements IMetaTileEntity {
 
     @Override
     public boolean shouldJoinIc2Enet() { return false; }
-    
+
     public boolean shouldTriggerBlockUpdate() { return false; }
 
     @Optional.Method(modid = "appliedenergistics2")
@@ -979,15 +980,15 @@ public abstract class MetaTileEntity implements IMetaTileEntity {
 
     @Optional.Method(modid = "appliedenergistics2")
     public void gridChanged() {}
-    
+
     @Override
     public void getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor, IWailaConfigHandler config) {
         currenttip.add(String.format("Facing: %s", ForgeDirection.getOrientation(mBaseMetaTileEntity.getFrontFacing()).name()));
     }
-    
+
     @Override
     public void getWailaNBTData(EntityPlayerMP player, TileEntity tile, NBTTagCompound tag, World world, int x, int y, int z) {
-        /* Empty */        
+        /* Empty */
     }
 
 }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
index a2de864f41..e2574e60dd 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_EnhancedMultiBlockBase.java
@@ -11,6 +11,7 @@ import com.gtnewhorizon.structurelib.alignment.enumerable.Rotation;
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import cpw.mods.fml.common.network.NetworkRegistry;
 import gregtech.api.GregTech_API;
+import gregtech.api.interfaces.ISecondaryDescribable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import net.minecraft.entity.player.EntityPlayer;
@@ -29,7 +30,7 @@ import java.util.concurrent.atomic.AtomicReferenceArray;
  *
  * @param <T> type of this
  */
-public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_MetaTileEntity_EnhancedMultiBlockBase<T>> extends GT_MetaTileEntity_MultiBlockBase implements IAlignment, IConstructable {
+public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_MetaTileEntity_EnhancedMultiBlockBase<T>> extends GT_MetaTileEntity_MultiBlockBase implements IAlignment, IConstructable, ISecondaryDescribable {
 	private static final AtomicReferenceArray<GT_Multiblock_Tooltip_Builder> tooltips = new AtomicReferenceArray<>(GregTech_API.METATILEENTITIES.length);
 	private ExtendedFacing mExtendedFacing = ExtendedFacing.DEFAULT;
 	private IAlignmentLimits mLimits = getInitialAlignmentLimits();
@@ -109,14 +110,23 @@ public abstract class GT_MetaTileEntity_EnhancedMultiBlockBase<T extends GT_Meta
 
 	protected abstract GT_Multiblock_Tooltip_Builder createTooltip();
 
-	@Override
-	public String[] getDescription() {
-		if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
-			return getTooltip().getStructureInformation();
-		} else {
-			return getTooltip().getInformation();
-		}
-	}
+    @Override
+    public String[] getDescription() {
+        return getCurrentDescription();
+    }
+
+    @Override
+    public boolean isDisplaySecondaryDescription() {
+        return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT);
+    }
+
+    public String[] getPrimaryDescription() {
+        return getTooltip().getInformation();
+    }
+
+    public String[] getSecondaryDescription() {
+        return getTooltip().getStructureInformation();
+    }
 
 	protected GT_Multiblock_Tooltip_Builder getTooltip() {
 		int tId = getBaseMetaTileEntity().getMetaTileID();