Merge pull request #123 from Simba98/forge-pr

Forge PR
Nova-Committee · Dec 16, 2023 · a1ed8bd · a1ed8bd
2 parents 68f11e4 + 642d6c0
commit a1ed8bd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/forge/src/main/java/cn/evole/mods/mcbot/IMcBot.java b/forge/src/main/java/cn/evole/mods/mcbot/IMcBot.java
@@ -6,6 +6,7 @@
 import cn.evole.mods.mcbot.init.event.IPlayerEvent;
 import cn.evole.mods.mcbot.init.event.ITickEvent;
 import cn.evole.mods.mcbot.init.handler.CustomCmdHandler;
+import cn.evole.mods.mcbot.util.locale.I18n;
 import cn.evole.onebot.client.connection.ConnectFactory;
 import cn.evole.onebot.client.core.Bot;
 import cn.evole.onebot.client.handler.EventBus;
@@ -44,6 +45,7 @@ public void init(Path config_dir) {
         CONFIG_FOLDER = Const.configDir.resolve("mcbot");
         FileUtils.checkFolder(CONFIG_FOLDER);
         CONFIG_FILE = CONFIG_FOLDER.resolve("config.toml");
+        I18n.init(config_dir);
         Runtime.getRuntime().addShutdownHook(new Thread(IMcBot::killOutThreads));
     }
 

diff --git a/forge/src/main/java/cn/evole/mods/mcbot/init/event/ITickEvent.java b/forge/src/main/java/cn/evole/mods/mcbot/init/event/ITickEvent.java
@@ -33,11 +33,12 @@ public static Queue<String> getSendQueue() {
     public static void register(MinecraftServer server) {
         String toSend = SEND_QUEUE.poll();
         if (ModConfig.INSTANCE != null
+                && server != null
                 && server.isDedicatedServer()
                 && toSend != null
         ) {
             //#if MC >= 11900
-            server.getPlayerList().broadcastSystemMessage(Component.literal(toSend), false);
+                        server.getPlayerList().broadcastSystemMessage(Component.literal(toSend), false);
             //#elseif MC <= 11502
             //$$ server.getPlayerList().broadcastMessage(new TextComponent(toSend), false);
             //#else

diff --git a/forge/src/main/java/cn/evole/mods/mcbot/util/locale/I18n.java b/forge/src/main/java/cn/evole/mods/mcbot/util/locale/I18n.java
@@ -32,8 +32,8 @@ public static void init(Path folder) {
         translations = new HashMap<>();
         LANG_FOLDER = folder.resolve("lang");
         FileUtils.checkFolder(LANG_FOLDER);
-        LANG_FILE = "/lang/" + ModConfig.INSTANCE.getCommon().getLanguageSelect() + ".json";
-        DEFAULT_LANG_FILE = "/lang/en_us.json";
+        LANG_FILE = "assets/mcbot/lang/" + ModConfig.INSTANCE.getCommon().getLanguageSelect() + ".json";
+        DEFAULT_LANG_FILE = "assets/mcbot/lang/en_us.json";
 
         Path optional = FMLLoader.getLoadingModList().getModFileById("mcbot").getFile().findResource(LANG_FILE);