Added help command for being able to see command usages.

Author: RealMangorage

build.gradle

@@ -77,7 +77,7 @@ dependencies {
     bootstrap("org.mangorage:mangobotbootstrap:1.0.84")
     launchtarget("org.mangorage:mangobotlaunchtarget:0.1.8")
 
-    plugin('org.mangorage:mangobot:12.0.98')
+    plugin('org.mangorage:mangobot:12.0.101')
 
     library('org.slf4j:slf4j-simple:2.0.13') // Use a recent version)
     library('org.luaj:luaj-jme:3.0.1')

src/main/java/org/mangorage/mangobotplugin/BotEventListener.java

@@ -79,11 +79,14 @@ public void onMessageReceived(MessageReceivedEvent event) {
                     event.getMessage().reply(result.getMessage()).queue();
 
                 if (isSilent)
-                    TaskScheduler.getExecutor().schedule(() -> {
-                        message.delete().queue();
-                    }, 250, TimeUnit.MILLISECONDS);
+                    TaskScheduler.getExecutor().schedule(
+                            () -> {
+                                message.delete().queue();
+                                },
+                            250,
+                            TimeUnit.MILLISECONDS
+                    );
             } else {
-
                 String[] command_pre = rawMessage.split(" ");
                 Arguments arguments = Arguments.of(Arrays.copyOfRange(command_pre, 1, command_pre.length));
 
@@ -95,7 +98,12 @@ public void onMessageReceived(MessageReceivedEvent event) {
                     if (msg != null)
                         message.reply(msg).queue();
                 }
+            }
 
+            if (!cmdParseResult.getMessages().isEmpty()) {
+                message.reply(
+                        String.join("\n", cmdParseResult.getMessages())
+                ).queue();
             }
         }
     }

src/main/java/org/mangorage/mangobotplugin/commands/misc/HelpCommand.java

@@ -0,0 +1,38 @@
+package org.mangorage.mangobotplugin.commands.misc;
+
+import net.dv8tion.jda.api.entities.Message;
+import org.mangorage.mangobotcore.api.command.v1.CommandParseResult;
+import org.mangorage.mangobotcore.api.command.v1.ICommandDispatcher;
+import org.mangorage.mangobotcore.api.command.v1.argument.RequiredArg;
+import org.mangorage.mangobotcore.api.command.v1.argument.types.StringArgumentType;
+import org.mangorage.mangobotcore.api.jda.command.v2.AbstractJDACommand;
+import org.mangorage.mangobotcore.api.jda.command.v2.JDACommandResult;
+
+public class HelpCommand extends AbstractJDACommand {
+    private final ICommandDispatcher<Message, JDACommandResult> commandDispatcher;
+    private final RequiredArg<String> commandArg;
+
+    public HelpCommand(String name, ICommandDispatcher<Message, JDACommandResult> commandDispatcher) {
+        super(name);
+        this.commandDispatcher = commandDispatcher;
+        this.commandArg = registerRequiredArgument(
+                "command",
+                "The command to get help for",
+                StringArgumentType.single()
+        );
+    }
+
+    @Override
+    public JDACommandResult run(Message message, String[] arguments, CommandParseResult commandParseResult) throws Throwable {
+        final String commandName = commandArg.get(arguments, commandParseResult);
+        var command = commandDispatcher.getCommand(commandName);
+        if (command == null) {
+            message.reply("Command `" + commandName + "` not found.").queue();
+        } else {
+            message.reply(
+                    String.join("\n", command.buildUsage())
+            ).queue();
+        }
+        return JDACommandResult.PASS;
+    }
+}

…mangobotplugin/commands/PingCommand.java …botplugin/commands/misc/PingCommand.javasrc/main/java/org/mangorage/mangobotplugin/commands/PingCommand.java renamed to src/main/java/org/mangorage/mangobotplugin/commands/misc/PingCommand.java src/main/java/org/mangorage/mangobotplugin/commands/PingCommand.java renamed to src/main/java/org/mangorage/mangobotplugin/commands/misc/PingCommand.java

@@ -1,4 +1,4 @@
-package org.mangorage.mangobotplugin.commands;
+package org.mangorage.mangobotplugin.commands.misc;
 
 import net.dv8tion.jda.api.entities.Message;
 import org.mangorage.mangobotcore.api.command.v1.CommandParseResult;

…angobotplugin/commands/PingsCommand.java …otplugin/commands/misc/PingsCommand.javasrc/main/java/org/mangorage/mangobotplugin/commands/PingsCommand.java renamed to src/main/java/org/mangorage/mangobotplugin/commands/misc/PingsCommand.java src/main/java/org/mangorage/mangobotplugin/commands/PingsCommand.java renamed to src/main/java/org/mangorage/mangobotplugin/commands/misc/PingsCommand.java

@@ -1,4 +1,4 @@
-package org.mangorage.mangobotplugin.commands;
+package org.mangorage.mangobotplugin.commands.misc;
 
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Message;

src/main/java/org/mangorage/mangobotplugin/commands/trick/TrickManager.java

@@ -14,8 +14,11 @@ public final class TrickManager {
             .build(Trick.class);
 
     private final Map<TrickKey, Trick> loadedTricks = new HashMap<>();
+    private final MangoBot plugin;
 
     public TrickManager(MangoBot plugin) {
+        this.plugin = plugin;
+
         // Load tricks from data handler
         TRICKS_DATA_HANDLER.load(plugin.getPluginDirectory()).forEach(data -> {
             loadedTricks.put(new TrickKey(data.getTrickID(), data.getGuildID()), data);
@@ -39,4 +42,14 @@ public Trick getTrickForGuildByName(long guildId, String name) {
         return loadedTricks.get(new TrickKey(name, guildId));
     }
 
+    public boolean removeTrick(String trickID, long guildID) {
+        TrickKey key = new TrickKey(trickID, guildID);
+        Trick removed = loadedTricks.remove(key);
+        if (removed != null) {
+            TRICKS_DATA_HANDLER.delete(plugin.getPluginDirectory(), removed);
+            return true;
+        }
+        return false;
+    }
+
 }

src/main/java/org/mangorage/mangobotplugin/commands/trick/impl/TrickRemoveSubCommand.java

@@ -2,21 +2,36 @@
 
 import net.dv8tion.jda.api.entities.Message;
 import org.mangorage.mangobotcore.api.command.v1.CommandParseResult;
+import org.mangorage.mangobotcore.api.command.v1.argument.RequiredArg;
+import org.mangorage.mangobotcore.api.command.v1.argument.types.StringArgumentType;
 import org.mangorage.mangobotcore.api.jda.command.v2.AbstractJDACommand;
 import org.mangorage.mangobotcore.api.jda.command.v2.JDACommandResult;
 import org.mangorage.mangobotplugin.commands.trick.TrickManager;
 
 public final class TrickRemoveSubCommand extends AbstractJDACommand {
+
+
     private final TrickManager trickManager;
+    private final RequiredArg<String> trickArg;
 
     public TrickRemoveSubCommand(String name, TrickManager trickManager) {
         super(name);
         this.trickManager = trickManager;
+        this.trickArg = registerRequiredArgument(
+                "trick_id",
+                "The Trick ID",
+                StringArgumentType.single()
+        );
     }
 
     @Override
     public JDACommandResult run(Message context, String[] arguments, CommandParseResult commandParseResult) throws Throwable {
-        context.reply("Removing tricks is under maintenance!").queue();
+        final var trickName = trickArg.get(arguments, commandParseResult);
+        if (trickManager.removeTrick(trickName, context.getGuildIdLong())) {
+            context.reply("Successfully removed trick: " + trickName).queue();
+        } else {
+            context.reply("No trick found with ID: " + trickName).queue();
+        }
         return JDACommandResult.PASS;
     }
 }

src/main/java/org/mangorage/mangobotplugin/entrypoint/MangoBot.java

@@ -21,12 +21,13 @@
 import org.mangorage.mangobotcore.api.util.jda.slash.command.Command;
 import org.mangorage.mangobotplugin.BotEventListener;
 import org.mangorage.mangobotplugin.commands.internal.homedepot.HomeDepotCommand;
+import org.mangorage.mangobotplugin.commands.misc.HelpCommand;
 import org.mangorage.mangobotplugin.commands.trick.TrickManager;
 import org.mangorage.mangobotplugin.commands.trick.impl.TrickCommand;
 import org.mangorage.mangobotplugin.pagedlist.PagedListManager;
 import org.mangorage.mangobotplugin.actions.TrashButtonAction;
-import org.mangorage.mangobotplugin.commands.PingCommand;
-import org.mangorage.mangobotplugin.commands.PingsCommand;
+import org.mangorage.mangobotplugin.commands.misc.PingCommand;
+import org.mangorage.mangobotplugin.commands.misc.PingsCommand;
 
 import java.nio.file.Path;
 import java.util.EnumSet;
@@ -81,6 +82,7 @@ public final class MangoBot implements Plugin {
     public MangoBot() {
         ACTION_REGISTRY.register(new TrashButtonAction());
 
+        commandDispatcher.register(new HelpCommand("help", getCommandDispatcher()));
         commandDispatcher.register(new PingCommand("ping"));
         commandDispatcher.register(new PingsCommand("pings"));;
         commandDispatcher.register(new HomeDepotCommand("homedepot"));