Add aliases to some commands and code reorganization

magicmq · Aug 17, 2024 · 2e3ee65 · 2e3ee65
1 parent 01c2d46
commit 2e3ee65
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 6 deletions.
diff --git a/src/main/java/dev/magicmq/pyspigot/command/PySpigotCommand.java b/src/main/java/dev/magicmq/pyspigot/command/PySpigotCommand.java
@@ -156,7 +156,7 @@ private void printHelp(CommandSender sender, String label) {
         subCommands.forEach(subCommand -> {
             SubCommandMeta subCommandMeta = subCommand.getClass().getAnnotation(SubCommandMeta.class);
             if (sender.hasPermission(subCommandMeta.permission()) || subCommandMeta.permission().equals("")) {
-                if ((subCommandMeta.playerOnly() && sender instanceof Player) || !subCommandMeta.playerOnly()) {
+                if (!subCommandMeta.playerOnly() || sender instanceof Player) {
                     sender.sendMessage(HELP_CMD_FORMAT
                             .replace("%maincommand%", label)
                             .replace("%subcommand%", subCommandMeta.usage().equals("") ? subCommandMeta.command() : subCommandMeta.command() + " " + subCommandMeta.usage())

diff --git a/src/main/java/dev/magicmq/pyspigot/command/subcommands/HelpCommand.java b/src/main/java/dev/magicmq/pyspigot/command/subcommands/HelpCommand.java
@@ -26,9 +26,9 @@
 
 @SubCommandMeta(
         command = "help",
+        aliases = {"gethelp"},
         permission = "pyspigot.command.help",
-        description = "Useful information for PySpigot and how to get help",
-        aliases = {"gethelp"}
+        description = "Useful information for PySpigot and how to get help"
 )
 public class HelpCommand implements SubCommand {
 

diff --git a/src/main/java/dev/magicmq/pyspigot/command/subcommands/InfoCommand.java b/src/main/java/dev/magicmq/pyspigot/command/subcommands/InfoCommand.java
@@ -47,9 +47,9 @@
 
 @SubCommandMeta(
         command = "info",
+        aliases = {"scriptinfo"},
         permission = "pyspigot.command.info",
         description = "Print information about a script, including uptime, registered listeners, commands, and more info",
-        aliases = {"scriptinfo"},
         usage = "<scriptname>"
 )
 public class InfoCommand implements SubCommand {

diff --git a/src/main/java/dev/magicmq/pyspigot/command/subcommands/ListScriptsCommand.java b/src/main/java/dev/magicmq/pyspigot/command/subcommands/ListScriptsCommand.java
@@ -29,9 +29,9 @@
 
 @SubCommandMeta(
         command = "listscripts",
+        aliases = {"list", "scriptslist", "ls"},
         permission = "pyspigot.command.listscripts",
         description = "List all scripts",
-        aliases = {"list", "scriptslist", "ls"},
         usage = "[page]"
 )
 public class ListScriptsCommand implements SubCommand {

diff --git a/src/main/java/dev/magicmq/pyspigot/command/subcommands/LoadCommand.java b/src/main/java/dev/magicmq/pyspigot/command/subcommands/LoadCommand.java
@@ -29,6 +29,7 @@
 
 @SubCommandMeta(
         command = "load",
+        aliases = {"start"},
         permission = "pyspigot.command.load",
         description = "Load a script with the specified name",
         usage = "<scriptname>"

diff --git a/src/main/java/dev/magicmq/pyspigot/command/subcommands/ReloadAllCommand.java b/src/main/java/dev/magicmq/pyspigot/command/subcommands/ReloadAllCommand.java
@@ -26,7 +26,7 @@
 
 @SubCommandMeta(
         command = "reloadall",
-        aliases = {"reset"},
+        aliases = {"resetall"},
         permission = "pyspigot.command.reloadall",
         description = "Perform a complete reload of the plugin, including configs, libraries, and all scripts."
 )

diff --git a/src/main/java/dev/magicmq/pyspigot/command/subcommands/ReloadCommand.java b/src/main/java/dev/magicmq/pyspigot/command/subcommands/ReloadCommand.java
@@ -29,6 +29,7 @@
 
 @SubCommandMeta(
         command = "reload",
+        aliases = {"restart"},
         permission = "pyspigot.command.reload",
         description = "Reload a script with the specified name",
         usage = "<scriptname>"

diff --git a/src/main/java/dev/magicmq/pyspigot/command/subcommands/UnloadCommand.java b/src/main/java/dev/magicmq/pyspigot/command/subcommands/UnloadCommand.java
@@ -27,6 +27,7 @@
 
 @SubCommandMeta(
         command = "unload",
+        aliases = {"stop"},
         permission = "pyspigot.command.unload",
         description = "Unload a script with the specified name",
         usage = "<scriptname>"