diff --git a/src/main/java/land/chipmunk/chipmunkmod/config/Configuration.java b/src/main/java/land/chipmunk/chipmunkmod/config/Configuration.java index 7d16a8b..0fffa84 100644 --- a/src/main/java/land/chipmunk/chipmunkmod/config/Configuration.java +++ b/src/main/java/land/chipmunk/chipmunkmod/config/Configuration.java @@ -34,7 +34,7 @@ public class Configuration { public BotInfo hbot = new BotInfo("#", null); public BotInfo sbot = new BotInfo(":", null); public BotInfo chipmunk = new BotInfo("'", null); - public BotInfo chomens = new BotInfo("*", null); + public ChomeNSBotInfo chomens = new ChomeNSBotInfo("*", null, false); public BotInfo fnfboyfriend = new BotInfo("~", null); public BotInfo qilk = new BotInfo(">", null); public BotInfo nbot = new BotInfo("?", null); @@ -56,6 +56,19 @@ public class Configuration { } } + @ConfigSerializable + public static class ChomeNSBotInfo extends BotInfo { + public boolean autoValidate; + + public ChomeNSBotInfo () { + } + + public ChomeNSBotInfo (final String prefix, @Nullable final String key, final boolean autoValidate) { + super(prefix, key); + this.autoValidate = autoValidate; + } + } + @ConfigSerializable public static class BotInfo { public String prefix; @@ -93,8 +106,8 @@ public class Configuration { .hoverEvent( HoverEvent.showText( Component.text( - "Click here to open the ChipmunkMod source code (chayapak's fork)", - NamedTextColor.GREEN + "Click here to open the ChipmunkMod source code (chayapak's fork)", + NamedTextColor.GREEN ) ) ) @@ -105,7 +118,7 @@ public class Configuration { HoverEvent.showText( Component.text( "Click here to copy the message to your clipboard", - NamedTextColor.GREEN + NamedTextColor.GREEN ) ) ) diff --git a/src/main/java/land/chipmunk/chipmunkmod/mixin/ChatScreenMixin.java b/src/main/java/land/chipmunk/chipmunkmod/mixin/ChatScreenMixin.java index fee55b0..84976cc 100644 --- a/src/main/java/land/chipmunk/chipmunkmod/mixin/ChatScreenMixin.java +++ b/src/main/java/land/chipmunk/chipmunkmod/mixin/ChatScreenMixin.java @@ -71,7 +71,7 @@ public abstract class ChatScreenMixin { ChipmunkMod.LOGGER.error("Error while trying to request TestBot webhook", e); } }); - } else if (chatText.startsWith(ChipmunkMod.CONFIG.bots.chomens.prefix)) { + } else if (ChipmunkMod.CONFIG.bots.chomens.autoValidate && chatText.startsWith(ChipmunkMod.CONFIG.bots.chomens.prefix)) { final List commands = ChomeNSBotCommandSuggestions.INSTANCE.commands; final List moreOrTrustedCommands = commands.stream()