From cbd74324cf5101653ee7b80076fbdc4a1a431cbd Mon Sep 17 00:00:00 2001 From: cnlimiter Date: Wed, 21 Feb 2024 13:44:15 +0800 Subject: [PATCH] =?UTF-8?q?fix(fabric):=20=E4=BF=AE=E5=A4=8D=E8=AF=AD?= =?UTF-8?q?=E8=A8=80=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evole/mods/mcbot/init/event/IBotEvent.java | 1 - .../cn/evole/mods/mcbot/util/MessageThread.java | 2 +- .../cn/evole/mods/mcbot/util/locale/I18n.java | 1 - .../evole/mods/mcbot/util/onebot/CQUtils.java | 4 ---- fabric/src/main/resources/assets/mcbot/icon.png | Bin 36375 -> 0 bytes .../src/main/resources/lang/en_us.json | 2 ++ .../src/main/resources/lang/zh_cn.json | 2 ++ .../src/main/resources/lang/zh_hk.json | 2 ++ .../src/main/resources/lang/zh_tw.json | 2 ++ 9 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 fabric/src/main/resources/assets/mcbot/icon.png rename fabric/{wrapper => }/src/main/resources/lang/en_us.json (98%) rename fabric/{wrapper => }/src/main/resources/lang/zh_cn.json (99%) rename fabric/{wrapper => }/src/main/resources/lang/zh_hk.json (99%) rename fabric/{wrapper => }/src/main/resources/lang/zh_tw.json (99%) 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 index b30c5118..5a857032 100644 --- 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 index 96943c6d..75bdaee1 100644 --- 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 index 701b908f..f5b2b220 100644 --- 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 index 37d4a1ed..ea298d04 100644 --- 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 deleted file mode 100644 index 55caf826d91eb3a0bff501790d46c6e47a1a36bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36375 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 diff --git a/fabric/wrapper/src/main/resources/lang/en_us.json b/fabric/src/main/resources/lang/en_us.json similarity index 98% rename from fabric/wrapper/src/main/resources/lang/en_us.json rename to fabric/src/main/resources/lang/en_us.json index cd0814c2..56d43466 100644 --- a/fabric/wrapper/src/main/resources/lang/en_us.json +++ b/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/fabric/wrapper/src/main/resources/lang/zh_cn.json b/fabric/src/main/resources/lang/zh_cn.json similarity index 99% rename from fabric/wrapper/src/main/resources/lang/zh_cn.json rename to fabric/src/main/resources/lang/zh_cn.json index 6bc674d7..9ecc57eb 100644 --- a/fabric/wrapper/src/main/resources/lang/zh_cn.json +++ b/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/fabric/wrapper/src/main/resources/lang/zh_hk.json b/fabric/src/main/resources/lang/zh_hk.json similarity index 99% rename from fabric/wrapper/src/main/resources/lang/zh_hk.json rename to fabric/src/main/resources/lang/zh_hk.json index 5e8eca26..18834c46 100644 --- a/fabric/wrapper/src/main/resources/lang/zh_hk.json +++ b/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/fabric/wrapper/src/main/resources/lang/zh_tw.json b/fabric/src/main/resources/lang/zh_tw.json similarity index 99% rename from fabric/wrapper/src/main/resources/lang/zh_tw.json rename to fabric/src/main/resources/lang/zh_tw.json index 2d555116..bb02bd4d 100644 --- a/fabric/wrapper/src/main/resources/lang/zh_tw.json +++ b/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 在火焰中昇天",