From e00f56ab06e9b3fc14046c8700b0b015eeaf5a3b Mon Sep 17 00:00:00 2001 From: r4phael Date: Sun, 17 Jan 2021 19:13:01 +0800 Subject: Fix multiblock machine tooltip error --- src/main/java/gregtech/api/util/GT_LanguageManager.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/main/java/gregtech/api/util/GT_LanguageManager.java') diff --git a/src/main/java/gregtech/api/util/GT_LanguageManager.java b/src/main/java/gregtech/api/util/GT_LanguageManager.java index c87e0f7417..59c4d178b4 100644 --- a/src/main/java/gregtech/api/util/GT_LanguageManager.java +++ b/src/main/java/gregtech/api/util/GT_LanguageManager.java @@ -33,8 +33,12 @@ public class GT_LanguageManager { TEMPMAP.put(aKey.trim(), aEnglish); LanguageRegistry.instance().injectLanguage("en_US", TEMPMAP); TEMPMAP.clear(); - if(sUseEnglishFile && !aWriteIntoLangFile && LANGMAP.containsKey(aKey)){ - aEnglish = LANGMAP.get(aKey); + if(sUseEnglishFile && !aWriteIntoLangFile){ + if (!LANGMAP.containsKey(aKey)) { + Property tProperty = sEnglishFile.get("LanguageFile", aKey, aEnglish); + aEnglish = tProperty.getString(); + LANGMAP.put(aKey, aEnglish); + } else aEnglish = LANGMAP.get(aKey); } return aEnglish; } -- cgit From 8c44892856b9345d0eec2469c4915132dc24f868 Mon Sep 17 00:00:00 2001 From: r4phael Date: Mon, 18 Jan 2021 22:02:41 +0800 Subject: Replace tab with 4 spaces --- src/main/java/gregtech/api/util/GT_LanguageManager.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main/java/gregtech/api/util/GT_LanguageManager.java') diff --git a/src/main/java/gregtech/api/util/GT_LanguageManager.java b/src/main/java/gregtech/api/util/GT_LanguageManager.java index 59c4d178b4..5046af9e5f 100644 --- a/src/main/java/gregtech/api/util/GT_LanguageManager.java +++ b/src/main/java/gregtech/api/util/GT_LanguageManager.java @@ -34,11 +34,11 @@ public class GT_LanguageManager { LanguageRegistry.instance().injectLanguage("en_US", TEMPMAP); TEMPMAP.clear(); if(sUseEnglishFile && !aWriteIntoLangFile){ - if (!LANGMAP.containsKey(aKey)) { - Property tProperty = sEnglishFile.get("LanguageFile", aKey, aEnglish); - aEnglish = tProperty.getString(); - LANGMAP.put(aKey, aEnglish); - } else aEnglish = LANGMAP.get(aKey); + if (!LANGMAP.containsKey(aKey)) { + Property tProperty = sEnglishFile.get("LanguageFile", aKey, aEnglish); + aEnglish = tProperty.getString(); + LANGMAP.put(aKey, aEnglish); + } else aEnglish = LANGMAP.get(aKey); } return aEnglish; } -- cgit From 7a47b85780bd78118bb5a31cf119fa6417e596a5 Mon Sep 17 00:00:00 2001 From: Usernm Date: Thu, 20 May 2021 13:15:20 +0300 Subject: Fix translations from resourcepacks. Without this fix gregtech always use localised names from GregTech.lang in minecraft root folder. With this fix you can change localisations on fly using resourcepacks. --- src/main/java/gregtech/api/util/GT_LanguageManager.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/main/java/gregtech/api/util/GT_LanguageManager.java') diff --git a/src/main/java/gregtech/api/util/GT_LanguageManager.java b/src/main/java/gregtech/api/util/GT_LanguageManager.java index 5046af9e5f..e0c23fce8e 100644 --- a/src/main/java/gregtech/api/util/GT_LanguageManager.java +++ b/src/main/java/gregtech/api/util/GT_LanguageManager.java @@ -67,7 +67,12 @@ public class GT_LanguageManager { public static String getTranslation(String aKey) { if (aKey == null) return E; - String tTrimmedKey = aKey.trim(), rTranslation = LanguageRegistry.instance().getStringLocalization(tTrimmedKey); + String tTrimmedKey = aKey.trim(), rTranslation; + if (sUseEnglishFile) { + rTranslation = LanguageRegistry.instance().getStringLocalization(tTrimmedKey); + } else { + rTranslation = StatCollector.translateToLocal(tTrimmedKey); + } if (GT_Utility.isStringInvalid(rTranslation)) { rTranslation = StatCollector.translateToLocal(tTrimmedKey); if (GT_Utility.isStringInvalid(rTranslation) || tTrimmedKey.equals(rTranslation)) { -- cgit