From a7b6846fa0abecd1764863ffeb9f1105f494530a Mon Sep 17 00:00:00 2001 From: ChomeNS <95471003+ChomeNS@users.noreply.github.com> Date: Sat, 7 Oct 2023 20:22:53 +0700 Subject: [PATCH] ignore case actions + other stuff simple to add because new args parser --- .../chayapak/chomens_bot/chatParsers/KaboomChatParser.java | 2 +- .../chayapak/chomens_bot/command/CommandContext.java | 6 ++++-- .../chayapak/chomens_bot/commands/BotVisibilityCommand.java | 2 +- .../chayapak/chomens_bot/commands/CloopCommand.java | 2 +- .../chayapak/chomens_bot/commands/ConsoleCommand.java | 2 +- .../chayapak/chomens_bot/commands/FilterCommand.java | 2 +- .../chipmunk/chayapak/chomens_bot/commands/HelpCommand.java | 6 +++--- .../chayapak/chomens_bot/commands/IPFilterCommand.java | 2 +- .../chipmunk/chayapak/chomens_bot/commands/InfoCommand.java | 2 +- .../chipmunk/chayapak/chomens_bot/commands/MailCommand.java | 2 +- .../chayapak/chomens_bot/commands/MusicCommand.java | 2 +- .../chayapak/chomens_bot/commands/ScreenshareCommand.java | 2 +- .../chayapak/chomens_bot/commands/TPSBarCommand.java | 2 +- .../chayapak/chomens_bot/commands/WhitelistCommand.java | 2 +- .../chayapak/chomens_bot/plugins/BruhifyPlugin.java | 2 +- .../chayapak/chomens_bot/plugins/CommandHandlerPlugin.java | 2 +- 16 files changed, 21 insertions(+), 19 deletions(-) diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/chatParsers/KaboomChatParser.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/chatParsers/KaboomChatParser.java index 0e4c33a8..3cc57c5a 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/chatParsers/KaboomChatParser.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/chatParsers/KaboomChatParser.java @@ -28,7 +28,7 @@ public class KaboomChatParser implements ChatParser { public PlayerMessage parse (TextComponent message) { List children = message.children(); - if (!message.content().equals("") || !message.style().isEmpty() || children.size() < 3) return null; + if (!message.content().isEmpty() || !message.style().isEmpty() || children.size() < 3) return null; final Component prefix = children.get(0); Component displayName = Component.empty(); diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/command/CommandContext.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/command/CommandContext.java index 101dedc0..ec0bce20 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/command/CommandContext.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/command/CommandContext.java @@ -38,7 +38,9 @@ public class CommandContext { private int argsPosition = 0; public String getString (boolean greedy, boolean required) throws CommandException { return getString(greedy, required, "string"); } - private String getString (boolean greedy, boolean required, String type) throws CommandException { + public String getString (boolean greedy, boolean required, boolean returnLowerCase) throws CommandException { return getString(greedy, returnLowerCase, required, "string"); } + private String getString (boolean greedy, boolean required, String type) throws CommandException { return getString(greedy, required, false, type); } + private String getString (boolean greedy, boolean returnLowerCase, boolean required, String type) throws CommandException { if (argsPosition >= args.length || args[argsPosition] == null) { if (required) { throw new CommandException( @@ -66,7 +68,7 @@ public class CommandContext { argsPosition++; - return string; + return returnLowerCase ? string.toLowerCase() : string; } public Integer getInteger (boolean required) throws CommandException { diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/BotVisibilityCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/BotVisibilityCommand.java index 48473622..7ae986fc 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/BotVisibilityCommand.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/BotVisibilityCommand.java @@ -25,7 +25,7 @@ public class BotVisibilityCommand extends Command { public Component execute(CommandContext context) throws CommandException { final Bot bot = context.bot; - final String action = context.getString(false, false); + final String action = context.getString(false, false, false); if (action.isEmpty()) { final boolean visibility = bot.selfCare.visibility; diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/CloopCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/CloopCommand.java index e0fc6949..44a1cc7a 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/CloopCommand.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/CloopCommand.java @@ -30,7 +30,7 @@ public class CloopCommand extends Command { public Component execute(CommandContext context) throws CommandException { final Bot bot = context.bot; - final String action = context.getString(false, true); + final String action = context.getString(false, true, true); switch (action) { case "add" -> { diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ConsoleCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ConsoleCommand.java index 594832a6..e2490af4 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ConsoleCommand.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ConsoleCommand.java @@ -31,7 +31,7 @@ public class ConsoleCommand extends Command { public Component execute(CommandContext context) throws CommandException { final Bot bot = context.bot; - final String action = context.getString(false, true); + final String action = context.getString(false, true, true); switch (action) { case "server" -> { diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/FilterCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/FilterCommand.java index 6cf8c9d9..6c525a80 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/FilterCommand.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/FilterCommand.java @@ -45,7 +45,7 @@ public class FilterCommand extends Command { boolean ignoreCase = false; boolean regex = false; - String action = context.getString(false, true); + String action = context.getString(false, true, true); // this is a mess if (action.equals("-ignorecase")) { diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/HelpCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/HelpCommand.java index 0b9e1f25..bb208092 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/HelpCommand.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/HelpCommand.java @@ -106,16 +106,16 @@ public class HelpCommand extends Command { final String prefix = context.prefix; for (Command command : CommandHandlerPlugin.commands) { - if (!command.name.equals(commandName) && !Arrays.stream(command.aliases).toList().contains(commandName)) continue; + if (!command.name.equalsIgnoreCase(commandName) && !Arrays.stream(command.aliases).toList().contains(commandName.toLowerCase())) continue; - final String actualCommandName = command.name; + final String actualCommandName = command.name.toLowerCase(); final List usages = new ArrayList<>(); usages.add( Component.empty() .append(Component.text(prefix + actualCommandName).color(ColorUtilities.getColorByString(bot.config.colorPalette.secondary))) .append(Component.text( - (command.aliases.length > 0 && !command.aliases[0].equals("")) ? + (command.aliases.length > 0 && !command.aliases[0].isEmpty()) ? " (" + String.join(", ", command.aliases) + ")" : "" ).color(NamedTextColor.WHITE)) diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/IPFilterCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/IPFilterCommand.java index f42a533f..523aba9f 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/IPFilterCommand.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/IPFilterCommand.java @@ -37,7 +37,7 @@ public class IPFilterCommand extends Command { public Component execute(CommandContext context) throws CommandException { final Bot bot = context.bot; - final String action = context.getString(false, true); + final String action = context.getString(false, true, true); switch (action) { case "add" -> { diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/InfoCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/InfoCommand.java index ea489812..ab8f86d5 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/InfoCommand.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/InfoCommand.java @@ -47,7 +47,7 @@ public class InfoCommand extends Command { public Component execute(CommandContext context) throws CommandException { final Bot bot = context.bot; - final String action = context.getString(false, true); + final String action = context.getString(false, true, true); switch (action) { case "creator" -> { diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MailCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MailCommand.java index 48153d4a..9a5955a0 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MailCommand.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MailCommand.java @@ -52,7 +52,7 @@ public class MailCommand extends Command { // kinda messy ngl - final String action = context.getString(false, true); + final String action = context.getString(false, true, true); switch (action) { case "send" -> { diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MusicCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MusicCommand.java index 21bfd809..e98cbd95 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MusicCommand.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/MusicCommand.java @@ -69,7 +69,7 @@ public class MusicCommand extends Command { if (ratelimit > 10) return null; - final String action = context.getString(false, true); + final String action = context.getString(false, true, true); root = MusicPlayerPlugin.SONG_DIR; return switch (action) { diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ScreenshareCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ScreenshareCommand.java index 92bf1fe0..e9609008 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ScreenshareCommand.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/ScreenshareCommand.java @@ -30,7 +30,7 @@ public class ScreenshareCommand extends Command { public Component execute(CommandContext context) throws CommandException { final Bot bot = context.bot; - final String action = context.getString(false, true); + final String action = context.getString(false, true, true); try { switch (action) { diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/TPSBarCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/TPSBarCommand.java index 89d8fb1c..17e51efe 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/TPSBarCommand.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/TPSBarCommand.java @@ -25,7 +25,7 @@ public class TPSBarCommand extends Command { public Component execute(CommandContext context) throws CommandException { final Bot bot = context.bot; - final String action = context.getString(false, true); + final String action = context.getString(false, true, true); switch (action) { case "on" -> { diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/WhitelistCommand.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/WhitelistCommand.java index 78bdc003..dcea7b9d 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/WhitelistCommand.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/commands/WhitelistCommand.java @@ -29,7 +29,7 @@ public class WhitelistCommand extends Command { public Component execute(CommandContext context) throws CommandException { final Bot bot = context.bot; - final String action = context.getString(false, true); + final String action = context.getString(false, true, true); switch (action) { case "enable" -> { diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/BruhifyPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/BruhifyPlugin.java index f9c2f66c..4f765c98 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/BruhifyPlugin.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/BruhifyPlugin.java @@ -14,7 +14,7 @@ public class BruhifyPlugin { public BruhifyPlugin (Bot bot) { bot.executor.scheduleAtFixedRate(() -> { - if (bruhifyText.equals("")) return; + if (bruhifyText.isEmpty()) return; int hue = startHue; String displayName = bruhifyText; diff --git a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/CommandHandlerPlugin.java b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/CommandHandlerPlugin.java index c1a868f9..feddeb13 100644 --- a/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/CommandHandlerPlugin.java +++ b/src/main/java/land/chipmunk/chayapak/chomens_bot/plugins/CommandHandlerPlugin.java @@ -186,7 +186,7 @@ public class CommandHandlerPlugin { command.name.equals(searchTerm.toLowerCase()) || Arrays.stream(command.aliases).toList().contains(searchTerm.toLowerCase()) ) && - !searchTerm.equals("") // ig yup + !searchTerm.isEmpty() // ig yup ) { return command; }