Basic Command loader and reloader.

thevalleyy · Apr 28, 2024 · 456d749 · 456d749
1 parent fde4733
commit 456d749
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/src/main/java/tk/thevalleyy/customcommands/MainCommand.java b/src/main/java/tk/thevalleyy/customcommands/MainCommand.java
@@ -11,6 +11,7 @@
 import com.velocitypowered.api.proxy.ProxyServer;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -119,6 +120,31 @@ public static BrigadierCommand createBrigadierCommand(final ProxyServer proxy) {
                                                                                         .deserialize(
                                                                                                 CustomCommands.Prefix + "<gray>Config reloaded."));
                                                                     }
+
+                                                                    // create an instance of registerCustomCommands
+                                                                    registerCustomCommands registerCustomCommands = new registerCustomCommands();
+                                                                    Path commandsFolder = Path.of(CustomCommands.folder + "/Commands/");
+
+                                                                    try {
+                                                                        // create the default command
+                                                                        registerCustomCommands.createDefaultCommand(commandsFolder);
+
+                                                                        // load all custom commands
+                                                                        registerCustomCommands.loadCustomCommands(commandsFolder);
+                                                                    } catch (Exception e) {
+                                                                        player.sendMessage(
+                                                                                MiniMessage.miniMessage()
+                                                                                        .deserialize(
+                                                                                                CustomCommands.Prefix
+                                                                                                        + "<red>Failed to reload the custom commands. <newline> <gray>Check the console for more information."));
+                                                                        return 0;
+                                                                    }
+
+                                                                    player.sendMessage(
+                                                                            MiniMessage.miniMessage()
+                                                                                    .deserialize(
+                                                                                            CustomCommands.Prefix + "<gray>Custom commands reloaded."));
+
                                                                     break;
 
                                                                 case "help": // display the dynamic generated help message

diff --git a/src/main/java/tk/thevalleyy/customcommands/registerCustomCommands.java b/src/main/java/tk/thevalleyy/customcommands/registerCustomCommands.java
@@ -2,14 +2,10 @@
 
 import com.moandjiezana.toml.Toml;
 import com.mojang.brigadier.Command;
-import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.builder.RequiredArgumentBuilder;
 import com.mojang.brigadier.tree.LiteralCommandNode;
 import com.velocitypowered.api.command.BrigadierCommand;
 import com.velocitypowered.api.command.CommandSource;
-import com.velocitypowered.api.command.VelocityBrigadierMessage;
-import com.velocitypowered.api.proxy.ProxyServer;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 
 import java.io.File;
@@ -111,6 +107,7 @@ public void loadCustomCommands(Path folder) {
                 String permission = toml.getString("Permission");
                 String response = toml.getString("Response");
                 long cooldown = toml.getLong("Cooldown");
+                // todo: report errors if the values are null to the user (console or in-game)
 
                 // register the command
                 try {