From 72e8fb4c2472ef3b2597aa9f7f2ea6d9930ef1bf Mon Sep 17 00:00:00 2001 From: Hexicube Date: Wed, 14 Oct 2015 05:58:11 +0100 Subject: [PATCH] Fix for bee name changes in resource packs StatCollector includes language files from resource packs, and should be used over LanguageRegistry which only includes language files from mod jars. --- .../main/utils/LocalizationManager.java | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/main/java/magicbees/main/utils/LocalizationManager.java b/src/main/java/magicbees/main/utils/LocalizationManager.java index 27710a8..f499cdf 100644 --- a/src/main/java/magicbees/main/utils/LocalizationManager.java +++ b/src/main/java/magicbees/main/utils/LocalizationManager.java @@ -6,21 +6,13 @@ public class LocalizationManager { public static String getLocalizedString(String key) { - String result = LanguageRegistry.instance().getStringLocalization(key); - if (result.isEmpty()) - { - result = LanguageRegistry.instance().getStringLocalization(key, "en_US"); - } - return result; + if(StatCollector.canTranslate(key)) return StatCollector.translateToLocal(key); + else return StatCollector.translateToFallback(key); } public static String getLocalizedString(String key, Object... objects) { - String result = LanguageRegistry.instance().getStringLocalization(key); - if (result.isEmpty()) - { - result = LanguageRegistry.instance().getStringLocalization(key, "en_US"); - } - return String.format(result, objects); + if(StatCollector.canTranslate(key)) return String.format(StatCollector.translateToLocal(key), objects); + else return String.format(StatCollector.translateToFallback(key), objects); } }