Add locale code support for lang manager (#2511)

* Add locale code support for lang manager

* Deprecate a method with aWriteIntoLangFile

4 files changed, 30 insertions, 66 deletions

diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index 90c40a259d..4b2c227413 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -2368,8 +2368,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
                         aEvent.player,
                         GT_LanguageManager.addStringLocalization(
                             "Interaction_DESCRIPTION_Index_097",
-                            "It's dangerous to go alone! Take this.",
-                            false));
+                            "It's dangerous to go alone! Take this."));
                     aEvent.player.worldObj.spawnEntityInWorld(
                         new EntityItem(
                             aEvent.player.worldObj,
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
index eb4abc3aa7..059a3fda94 100644
--- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
+++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java
@@ -75,29 +75,22 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
                     && tTileEntity.getMetaTileEntity() instanceof ISecondaryDescribable) {
                     final String[] tSecondaryDescription = ((ISecondaryDescribable) tTileEntity.getMetaTileEntity())
                         .getSecondaryDescription();
-                    addDescription(null, tSecondaryDescription, tDamage, "_Secondary", true);
+                    addDescription(null, tSecondaryDescription, tDamage, "_Secondary");
                 }
                 {
                     final IMetaTileEntity tMetaTileEntity = tTileEntity.getMetaTileEntity();
                     final String tSuffix = (tMetaTileEntity instanceof ISecondaryDescribable
                         && ((ISecondaryDescribable) tMetaTileEntity).isDisplaySecondaryDescription()) ? "_Secondary"
                             : "";
-                    addDescription(
-                        aList,
-                        tTileEntity.getDescription(),
-                        tDamage,
-                        tSuffix,
-                        !GregTech_API.sPostloadFinished);
+                    addDescription(aList, tTileEntity.getDescription(), tDamage, tSuffix);
                     tMetaTileEntity.addAdditionalTooltipInformation(aStack, aList);
                 }
                 if (tTileEntity.getEUCapacity() > 0L) {
                     if (tTileEntity.getInputVoltage() > 0L) {
                         final byte inputTier = GT_Utility.getTier(tTileEntity.getInputVoltage());
                         aList.add(
-                            GT_LanguageManager.addStringLocalization(
-                                "TileEntity_EUp_IN",
-                                "Voltage IN: ",
-                                !GregTech_API.sPostloadFinished) + EnumChatFormatting.GREEN
+                            GT_LanguageManager.addStringLocalization("TileEntity_EUp_IN", "Voltage IN: ")
+                                + EnumChatFormatting.GREEN
                                 + GT_Utility.formatNumbers(tTileEntity.getInputVoltage())
                                 + " ("
                                 + GT_Utility.getColoredTierNameFromTier(inputTier)
@@ -108,10 +101,8 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
                     if (tTileEntity.getOutputVoltage() > 0L) {
                         final byte outputTier = GT_Utility.getTier(tTileEntity.getOutputVoltage());
                         aList.add(
-                            GT_LanguageManager.addStringLocalization(
-                                "TileEntity_EUp_OUT",
-                                "Voltage OUT: ",
-                                !GregTech_API.sPostloadFinished) + EnumChatFormatting.GREEN
+                            GT_LanguageManager.addStringLocalization("TileEntity_EUp_OUT", "Voltage OUT: ")
+                                + EnumChatFormatting.GREEN
                                 + GT_Utility.formatNumbers(tTileEntity.getOutputVoltage())
                                 + " ("
                                 + GT_Utility.getColoredTierNameFromTier(outputTier)
@@ -121,18 +112,14 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
                     }
                     if (tTileEntity.getOutputAmperage() > 1L) {
                         aList.add(
-                            GT_LanguageManager.addStringLocalization(
-                                "TileEntity_EUp_AMOUNT",
-                                "Amperage: ",
-                                !GregTech_API.sPostloadFinished) + EnumChatFormatting.YELLOW
+                            GT_LanguageManager.addStringLocalization("TileEntity_EUp_AMOUNT", "Amperage: ")
+                                + EnumChatFormatting.YELLOW
                                 + GT_Utility.formatNumbers(tTileEntity.getOutputAmperage())
                                 + EnumChatFormatting.GRAY);
                     }
                     aList.add(
-                        GT_LanguageManager.addStringLocalization(
-                            "TileEntity_EUp_STORE",
-                            "Capacity: ",
-                            !GregTech_API.sPostloadFinished) + EnumChatFormatting.BLUE
+                        GT_LanguageManager.addStringLocalization("TileEntity_EUp_STORE", "Capacity: ")
+                            + EnumChatFormatting.BLUE
                             + GT_Utility.formatNumbers(tTileEntity.getEUCapacity())
                             + EnumChatFormatting.GRAY
                             + " EU");
@@ -141,35 +128,24 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
             final NBTTagCompound aNBT = aStack.getTagCompound();
             if (aNBT != null) {
                 if (aNBT.getBoolean("mMuffler")) {
-                    aList.add(
-                        GT_LanguageManager.addStringLocalization(
-                            "GT_TileEntity_MUFFLER",
-                            "has Muffler Upgrade",
-                            !GregTech_API.sPostloadFinished));
+                    aList.add(GT_LanguageManager.addStringLocalization("GT_TileEntity_MUFFLER", "has Muffler Upgrade"));
                 }
                 if (aNBT.getBoolean("mSteamConverter")) {
                     aList.add(
-                        GT_LanguageManager.addStringLocalization(
-                            "GT_TileEntity_STEAMCONVERTER",
-                            "has Steam Upgrade",
-                            !GregTech_API.sPostloadFinished));
+                        GT_LanguageManager.addStringLocalization("GT_TileEntity_STEAMCONVERTER", "has Steam Upgrade"));
                 }
                 int tAmount = 0;
                 if ((tAmount = aNBT.getByte("mSteamTanks")) > 0) {
                     aList.add(
                         tAmount + " "
-                            + GT_LanguageManager.addStringLocalization(
-                                "GT_TileEntity_STEAMTANKS",
-                                "Steam Tank Upgrades",
-                                !GregTech_API.sPostloadFinished));
+                            + GT_LanguageManager
+                                .addStringLocalization("GT_TileEntity_STEAMTANKS", "Steam Tank Upgrades"));
                 }
 
                 CoverableTileEntity.addInstalledCoversInformation(aNBT, aList);
                 if (aNBT.hasKey("mColor") && aNBT.getByte("mColor") != -1) {
                     aList.add(
-                        GT_LanguageManager
-                            .addStringLocalization("GT_TileEntity_COLORED", "Colored", !GregTech_API.sPostloadFinished)
-                            + " ("
+                        GT_LanguageManager.addStringLocalization("GT_TileEntity_COLORED", "Colored") + " ("
                             + Dyes.get(aNBT.getByte("mColor") - 1).formatting
                             + Dyes.get(aNBT.getByte("mColor") - 1).mName
                             + EnumChatFormatting.GRAY
@@ -182,7 +158,7 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
     }
 
     private void addDescription(@Nullable List<String> aList, @Nullable String[] aDescription, int aDamage,
-        String aSuffix, boolean aWriteIntoLangFile) {
+        String aSuffix) {
         if (aDescription == null) return;
         for (int i = 0, tLength = aDescription.length; i < tLength; i++) {
             String tDescLine = aDescription[i];
@@ -198,12 +174,11 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
                     tBuffer.append("%s");
                     tRep[j / 2] = tSplitStrings[j];
                 }
-                final String tTranslated = String.format(
-                    GT_LanguageManager.addStringLocalization(tKey, tBuffer.toString(), aWriteIntoLangFile),
-                    (Object[]) tRep);
+                final String tTranslated = String
+                    .format(GT_LanguageManager.addStringLocalization(tKey, tBuffer.toString()), (Object[]) tRep);
                 if (aList != null) aList.add(tTranslated);
             } else {
-                String tTranslated = GT_LanguageManager.addStringLocalization(tKey, tDescLine, aWriteIntoLangFile);
+                String tTranslated = GT_LanguageManager.addStringLocalization(tKey, tDescLine);
                 if (aList != null) aList.add(tTranslated.equals("") ? tDescLine : tTranslated);
             }
         }
@@ -218,9 +193,9 @@ public class GT_Item_Machines extends ItemBlock implements IFluidContainerItem {
             if (tMetaTileEntity instanceof ISecondaryDescribable) {
                 final String[] tSecondaryDescription = ((ISecondaryDescribable) tMetaTileEntity)
                     .getSecondaryDescription();
-                addDescription(null, tSecondaryDescription, aDamage, "_Secondary", true);
+                addDescription(null, tSecondaryDescription, aDamage, "_Secondary");
             }
-            addDescription(null, tMetaTileEntity.getDescription(), aDamage, "", true);
+            addDescription(null, tMetaTileEntity.getDescription(), aDamage, "");
         }
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java
index 5f3ed20c07..fa4147f34c 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java
@@ -32,7 +32,6 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
 import appeng.util.item.AEItemStack;
 import appeng.util.item.ItemList;
-import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.gui.modularui.GT_UIInfos;
 import gregtech.api.gui.modularui.GT_UITextures;
@@ -98,17 +97,13 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
             final int tSize = stack.stackTagCompound.getInteger("mItemCount");
             if (tContents != null && tSize > 0) {
                 tooltip.add(
-                    GT_LanguageManager.addStringLocalization(
-                        "TileEntity_CHEST_INFO",
-                        "Contains Item: ",
-                        !GregTech_API.sPostloadFinished) + EnumChatFormatting.YELLOW
+                    GT_LanguageManager.addStringLocalization("TileEntity_CHEST_INFO", "Contains Item: ")
+                        + EnumChatFormatting.YELLOW
                         + tContents.getDisplayName()
                         + EnumChatFormatting.GRAY);
                 tooltip.add(
-                    GT_LanguageManager.addStringLocalization(
-                        "TileEntity_CHEST_AMOUNT",
-                        "Item Amount: ",
-                        !GregTech_API.sPostloadFinished) + EnumChatFormatting.GREEN
+                    GT_LanguageManager.addStringLocalization("TileEntity_CHEST_AMOUNT", "Item Amount: ")
+                        + EnumChatFormatting.GREEN
                         + GT_Utility.formatNumbers(tSize)
                         + EnumChatFormatting.GRAY);
             }
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java
index ec14109cd1..0c640d9ace 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java
@@ -35,7 +35,6 @@ import com.gtnewhorizons.modularui.common.widget.FluidSlotWidget;
 import com.gtnewhorizons.modularui.common.widget.SlotWidget;
 import com.gtnewhorizons.modularui.common.widget.TextWidget;
 
-import gregtech.api.GregTech_API;
 import gregtech.api.gui.modularui.GT_UIInfos;
 import gregtech.api.gui.modularui.GT_UITextures;
 import gregtech.api.interfaces.ITexture;
@@ -125,17 +124,13 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
                 .loadFluidStackFromNBT(stack.stackTagCompound.getCompoundTag("mFluid"));
             if (tContents != null && tContents.amount > 0) {
                 tooltip.add(
-                    GT_LanguageManager.addStringLocalization(
-                        "TileEntity_TANK_INFO",
-                        "Contains Fluid: ",
-                        !GregTech_API.sPostloadFinished) + EnumChatFormatting.YELLOW
+                    GT_LanguageManager.addStringLocalization("TileEntity_TANK_INFO", "Contains Fluid: ")
+                        + EnumChatFormatting.YELLOW
                         + tContents.getLocalizedName()
                         + EnumChatFormatting.GRAY);
                 tooltip.add(
-                    GT_LanguageManager.addStringLocalization(
-                        "TileEntity_TANK_AMOUNT",
-                        "Fluid Amount: ",
-                        !GregTech_API.sPostloadFinished) + EnumChatFormatting.GREEN
+                    GT_LanguageManager.addStringLocalization("TileEntity_TANK_AMOUNT", "Fluid Amount: ")
+                        + EnumChatFormatting.GREEN
                         + formatNumbers(tContents.amount)
                         + " L"
                         + EnumChatFormatting.GRAY);