From 8a4318ee1f678c3a9d70da2e04339bd515014f72 Mon Sep 17 00:00:00 2001 From: nossr50 Date: Sat, 28 Sep 2019 17:14:28 -0700 Subject: [PATCH] Load locale manager after config manager --- .../java/com/gmail/nossr50/locale/LocaleManager.java | 1 + src/main/java/com/gmail/nossr50/mcMMO.java | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gmail/nossr50/locale/LocaleManager.java b/src/main/java/com/gmail/nossr50/locale/LocaleManager.java index 37d3686f5..6b93cc074 100644 --- a/src/main/java/com/gmail/nossr50/locale/LocaleManager.java +++ b/src/main/java/com/gmail/nossr50/locale/LocaleManager.java @@ -118,6 +118,7 @@ public final class LocaleManager { pluginRef.getLogger().log(Level.WARNING, "Failed to load locale from " + localePath, e); } } + bundle = ResourceBundle.getBundle(BUNDLE_ROOT, locale); enBundle = ResourceBundle.getBundle(BUNDLE_ROOT, java.util.Locale.US); } diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/src/main/java/com/gmail/nossr50/mcMMO.java index 39f1e2470..49dc1ea52 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/src/main/java/com/gmail/nossr50/mcMMO.java @@ -138,9 +138,6 @@ public class mcMMO extends JavaPlugin { PluginManager pluginManager = getServer().getPluginManager(); healthBarPluginEnabled = pluginManager.getPlugin("HealthBar") != null; - //Init Locale Manager - localeManager = new LocaleManager(this); - //Init Permission Tools permissionTools = new PermissionTools(this); @@ -148,9 +145,12 @@ public class mcMMO extends JavaPlugin { setupFilePaths(); - //modManager = new ModManager(); - + //Init config manager etc loadConfigFiles(); + + //Init Locale Manager + localeManager = new LocaleManager(this); + registerDynamicSettings(); //Do this after configs are loaded //Init TextComponentFactory