fix(fabric): 修复语言文件

Nova-Committee · Feb 21, 2024 · cbd7432 · cbd7432
1 parent 0b06e3d
commit cbd7432
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 7 deletions.
diff --git a/fabric/src/main/java/cn/evole/mods/mcbot/init/event/IBotEvent.java b/fabric/src/main/java/cn/evole/mods/mcbot/init/event/IBotEvent.java
@@ -53,7 +53,6 @@ public void onMessage(GroupMessageEvent event) {
                             send = split[1];
                         else return;
                     }
-                    Const.LOGGER.info(send);
                     val nick = McBot.bot.getGroupMemberInfo(event.getGroupId(), event.getUserId(), true);
                     String groupNick = ModConfig.INSTANCE.getCmd().isGroupNickOn() // 是否使用群昵称
                             ? nick == null ? event.getSender().getCard() : nick.getData().getCard() // 防止api返回为空

diff --git a/fabric/src/main/java/cn/evole/mods/mcbot/util/MessageThread.java b/fabric/src/main/java/cn/evole/mods/mcbot/util/MessageThread.java
@@ -57,7 +57,7 @@ public void run() {
     }
 
     public void start() {
-        Const.LOGGER.info(String.format("转发游戏消息: %s", messageString != null ? messageString : messageArray));
+        Const.LOGGER.debug(String.format("转发游戏消息: %s", messageString != null ? messageString : messageArray));
         Thread thread = new Thread(this, "MessageThread");
         thread.start();
     }

diff --git a/fabric/src/main/java/cn/evole/mods/mcbot/util/locale/I18n.java b/fabric/src/main/java/cn/evole/mods/mcbot/util/locale/I18n.java
@@ -72,7 +72,6 @@ public static String get(String key, Object... args) {
                 }
             }
         } catch (Exception e) {
-            e.printStackTrace();
             return "TranslateError{\"key\":\"" + key + "\",\"args\":" + Arrays.toString(args) + "}";
         }
     }

diff --git a/fabric/src/main/java/cn/evole/mods/mcbot/util/onebot/CQUtils.java b/fabric/src/main/java/cn/evole/mods/mcbot/util/onebot/CQUtils.java
@@ -32,10 +32,6 @@ public static boolean hasImg(String msg) {
     }
 
     public static String replace(String msg) {
-        if (ModConfig.INSTANCE.getBotConfig().isMiraiHttp()){
-            return msg;
-        }
-
         if (msg.indexOf('[') == -1)
             return BotUtils.unescape(msg);
 

diff --git a/fabric/src/main/resources/assets/mcbot/icon.png b/fabric/src/main/resources/assets/mcbot/icon.png
diff --git a/...rapper/src/main/resources/lang/en_us.json → fabric/src/main/resources/lang/en_us.json b/...rapper/src/main/resources/lang/en_us.json → fabric/src/main/resources/lang/en_us.json
@@ -39,6 +39,8 @@
   "mcbot.death.attack.freeze.player": "%1$s was frozen to death by %2$s",
   "mcbot.death.attack.generic": "%1$s died",
   "mcbot.death.attack.generic.player": "%1$s died because of %2$s",
+  "mcbot.death.attack.genericKill": "%1$s died",
+  "mcbot.death.attack.genericKill.player": "%1$s died because of %2$s",
   "mcbot.death.attack.hotFloor": "%1$s discovered the floor was lava",
   "mcbot.death.attack.hotFloor.player": "%1$s walked into the danger zone due to %2$s",
   "mcbot.death.attack.indirectMagic": "%1$s was killed by %2$s using magic",

diff --git a/...rapper/src/main/resources/lang/zh_cn.json → fabric/src/main/resources/lang/zh_cn.json b/...rapper/src/main/resources/lang/zh_cn.json → fabric/src/main/resources/lang/zh_cn.json
@@ -39,6 +39,8 @@
   "mcbot.death.attack.freeze.player": "%1$s被%2$s冻死了",
   "mcbot.death.attack.generic": "%1$s死了",
   "mcbot.death.attack.generic.player": "%1$s死于%2$s",
+  "mcbot.death.attack.genericKill": "%1$s死了",
+  "mcbot.death.attack.genericKill.player": "%1$s死于%2$s",
   "mcbot.death.attack.hotFloor": "%1$s发现了地板是熔岩做的",
   "mcbot.death.attack.hotFloor.player": "%1$s因%2$s而步入危险之地",
   "mcbot.death.attack.inFire": "%1$s浴火焚身",

diff --git a/...rapper/src/main/resources/lang/zh_hk.json → fabric/src/main/resources/lang/zh_hk.json b/...rapper/src/main/resources/lang/zh_hk.json → fabric/src/main/resources/lang/zh_hk.json
@@ -39,6 +39,8 @@
     "mcbot.death.attack.freeze.player": "%1$s 被 %2$s 凍死咗",
     "mcbot.death.attack.generic": "%1$s 死咗",
     "mcbot.death.attack.generic.player": "%1$s 死於 %2$s",
+    "mcbot.death.attack.genericKill": "%1$s 死咗",
+    "mcbot.death.attack.genericKill.player": "%1$s 死於 %2$s",
     "mcbot.death.attack.hotFloor": "%1$s 發覺地板係熔岩鋪嘅",
     "mcbot.death.attack.hotFloor.player": "%1$s 因為 %2$s 而行入咗危險地帶",
     "mcbot.death.attack.inFire": "%1$s 燒到熔咗",

diff --git a/...rapper/src/main/resources/lang/zh_tw.json → fabric/src/main/resources/lang/zh_tw.json b/...rapper/src/main/resources/lang/zh_tw.json → fabric/src/main/resources/lang/zh_tw.json
@@ -39,6 +39,8 @@
     "mcbot.death.attack.freeze.player": "%1$s 被 %2$s 凍死了",
     "mcbot.death.attack.generic": "%1$s 死亡",
     "mcbot.death.attack.generic.player": "%1$s 因 %2$s 而死",
+    "mcbot.death.attack.genericKill": "%1$s 死亡",
+    "mcbot.death.attack.genericKill.player": "%1$s 因 %2$s 而死",
     "mcbot.death.attack.hotFloor": "%1$s 察覺地面是片熔岩",
     "mcbot.death.attack.hotFloor.player": "%1$s 因為 %2$s 而走進了危險地帶",
     "mcbot.death.attack.inFire": "%1$s 在火焰中昇天",
-Original file line number
+Diff line change
@@ Expand Up / @@ -72,7 +72,6 @@ public static String get(String key, Object... args) { @@
                     }
                 }
             } catch (Exception e) {
-                e.printStackTrace();
                 return "TranslateError{\"key\":\"" + key + "\",\"args\":" + Arrays.toString(args) + "}";
             }
         }
@@ Expand Down @@