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 55caf826..00000000 Binary files a/fabric/src/main/resources/assets/mcbot/icon.png and /dev/null differ 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 在火焰中昇天",