diff --git a/src/main/java/one/oth3r/sit/file/FileData.java b/src/main/java/one/oth3r/sit/file/FileData.java index 71b978c..1c781c5 100644 --- a/src/main/java/one/oth3r/sit/file/FileData.java +++ b/src/main/java/one/oth3r/sit/file/FileData.java @@ -60,23 +60,11 @@ public class FileData { return playerSettings.getOrDefault(player, sittingConfig); } - /// the language / text system for the mod - private static final LanguageReader langReader = new LanguageReader( - new ResourceReader("assets/sit-oth3r/lang/",Sit.class.getClassLoader()), - new ResourceReader(Data.CONFIG_DIR),"en_us","en_us"); - - public static LanguageReader getLangReader() { - return langReader; - } - /** * loads all config files to memory */ public static void loadFiles() { getServerConfig().load(); - // load the language reader - langReader.updateLanguage(getServerConfig().getLang()); - getSittingConfig().load(); // if loading file and is on supported server on client, send the new settings over if (Data.isClient() && Data.isSupportedServer()) { diff --git a/src/main/java/one/oth3r/sit/file/ServerConfig.java b/src/main/java/one/oth3r/sit/file/ServerConfig.java index bfc8660..9eb2ff2 100644 --- a/src/main/java/one/oth3r/sit/file/ServerConfig.java +++ b/src/main/java/one/oth3r/sit/file/ServerConfig.java @@ -283,6 +283,9 @@ public class ServerConfig implements CustomFile { version = 2.3; this.lang = this.lang.substring(0,3)+this.lang.substring(3).toLowerCase(); } + + // update the language reader + LanguageReg.getLang(Data.MOD_ID).updateLanguage(lang); } @Override diff --git a/src/main/java/one/oth3r/sit/utl/Chat.java b/src/main/java/one/oth3r/sit/utl/Chat.java index 6dc2867..57f8536 100644 --- a/src/main/java/one/oth3r/sit/utl/Chat.java +++ b/src/main/java/one/oth3r/sit/utl/Chat.java @@ -1,7 +1,7 @@ package one.oth3r.sit.utl; import one.oth3r.otterlib.chat.CTxT; -import one.oth3r.sit.file.FileData; +import one.oth3r.otterlib.registry.LanguageReg; import java.awt.*; @@ -11,6 +11,6 @@ public class Chat { } public static CTxT lang(String key, Object... args) { - return FileData.getLangReader().dynamicTranslatable(key, args); + return LanguageReg.getLang(Data.MOD_ID).dynamicTranslatable(key, args); } }