diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ChatPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ChatPlugin.java index 941a98ac..ca17dcff 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ChatPlugin.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ChatPlugin.java @@ -106,7 +106,7 @@ public class ChatPlugin extends Bot.Listener { final String ansi = ComponentUtilities.stringifyAnsi(component); for (Listener listener : listeners) { - if (!isCommandSuggestions && !isAuth && !isImposterFormat) listener.systemMessageReceived(component, string, ansi); + if (!isCommandSuggestions && !isAuth) listener.systemMessageReceived(component, string, ansi); listener.systemMessageReceived(component, isCommandSuggestions, isAuth, isImposterFormat, string, ansi); if (playerMessage != null) listener.playerMessageReceived(playerMessage); diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ConsolePlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ConsolePlugin.java index bbe7a53b..e43cbaa2 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ConsolePlugin.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/ConsolePlugin.java @@ -1,5 +1,6 @@ package land.chipmunk.chayapak.chomens_bot.plugins; +import com.github.steveice10.packetlib.event.session.ConnectedEvent; import land.chipmunk.chayapak.chomens_bot.Bot; import land.chipmunk.chayapak.chomens_bot.Configuration; import land.chipmunk.chayapak.chomens_bot.Main; @@ -23,6 +24,8 @@ public class ConsolePlugin implements Completer { public String prefix; + public Component formatPrefix; + private static final List listeners = new ArrayList<>(); public ConsolePlugin (List allBots, Configuration discordConfig, JDA jda) { @@ -39,6 +42,13 @@ public class ConsolePlugin implements Completer { bot.console = this; + bot.addListener(new Bot.Listener() { + @Override + public void connected(ConnectedEvent event) { + bot.console.formatPrefix = Component.text(bot.username + " Console").color(NamedTextColor.GRAY); + } + }); + bot.logger = new LoggerPlugin(bot); } @@ -104,7 +114,7 @@ public class ConsolePlugin implements Completer { bot.chat.tellraw( Component.translatable( "[%s] %s › %s", - Component.text(bot.username + " Console").color(NamedTextColor.GRAY), + formatPrefix, Component.text(bot.config.ownerName).color(ColorUtilities.getColorByString(bot.config.colorPalette.ownerName)), Component.text(line).color(NamedTextColor.GRAY) ).color(NamedTextColor.DARK_GRAY) diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/FormatCheckerPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/FormatCheckerPlugin.java index ca063fbe..307475df 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/FormatCheckerPlugin.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/FormatCheckerPlugin.java @@ -43,6 +43,8 @@ public class FormatCheckerPlugin extends ChatPlugin.Listener { final Component prefix = format.args().get(0); + if (prefix.equals(bot.console.formatPrefix)) return false; + if (!(prefix instanceof TranslatableComponent translatablePrefix)) return true; final Component userHash = translatablePrefix.args().get(0);