Rewrite/command api

Movecraft/build.gradle.kts

@@ -13,6 +13,7 @@ dependencies {
     runtimeOnly(project(":movecraft-v1_21", "reobf"))
     implementation(project(":movecraft-api"))
     compileOnly("org.yaml:snakeyaml:2.0")
+    implementation("co.aikar:acf-paper:0.5.1-SNAPSHOT")
 }
 
 tasks.shadowJar {
@@ -25,7 +26,11 @@ tasks.shadowJar {
         include(project(":movecraft-v1_18"))
         include(project(":movecraft-v1_20"))
         include(project(":movecraft-v1_21"))
+        include(dependency("co.aikar:acf-paper:0.5.1-SNAPSHOT"))
     }
+
+    relocate("co.aikar.commands", "Movecraft.acf")
+    relocate("co.aikar.locales", "Movecraft.locales")
 }
 
 tasks.processResources {

Movecraft/src/main/java/net/countercraft/movecraft/Movecraft.java

@@ -23,7 +23,6 @@
 import net.countercraft.movecraft.config.Settings;
 import net.countercraft.movecraft.craft.ChunkManager;
 import net.countercraft.movecraft.craft.CraftManager;
-import net.countercraft.movecraft.craft.datatag.CraftDataTagRegistry;
 import net.countercraft.movecraft.features.contacts.ContactsCommand;
 import net.countercraft.movecraft.features.contacts.ContactsManager;
 import net.countercraft.movecraft.features.contacts.ContactsSign;
@@ -198,16 +197,7 @@ public void onEnable() {
 
         getServer().getPluginManager().registerEvents(new InteractListener(), this);
 
-        getCommand("movecraft").setExecutor(new MovecraftCommand());
-        getCommand("release").setExecutor(new ReleaseCommand());
-        getCommand("pilot").setExecutor(new PilotCommand());
-        getCommand("rotate").setExecutor(new RotateCommand());
-        getCommand("cruise").setExecutor(new CruiseCommand());
-        getCommand("craftreport").setExecutor(new CraftReportCommand());
-        getCommand("manoverboard").setExecutor(new ManOverboardCommand());
-        getCommand("scuttle").setExecutor(new ScuttleCommand());
-        getCommand("crafttype").setExecutor(new CraftTypeCommand());
-        getCommand("craftinfo").setExecutor(new CraftInfoCommand());
+        initializeCommands();
 
         getServer().getPluginManager().registerEvents(new BlockListener(), this);
         getServer().getPluginManager().registerEvents(new PlayerListener(), this);
@@ -244,6 +234,21 @@ public void onEnable() {
         logger.info("[V " + getDescription().getVersion() + "] has been enabled.");
     }
 
+    private void initializeCommands() {
+        MovecraftCommandManager movecraftCommandManager = new MovecraftCommandManager(this);
+
+        movecraftCommandManager.registerCommand(new MovecraftCommand());
+        movecraftCommandManager.registerCommand(new CraftInfoCommand());
+        movecraftCommandManager.registerCommand(new CraftReportCommand());
+        movecraftCommandManager.registerCommand(new CraftTypeCommand());
+        movecraftCommandManager.registerCommand(new CruiseCommand());
+        movecraftCommandManager.registerCommand(new ManOverboardCommand());
+        movecraftCommandManager.registerCommand(new PilotCommand());
+        movecraftCommandManager.registerCommand(new ReleaseCommand());
+        movecraftCommandManager.registerCommand(new RotateCommand());
+        movecraftCommandManager.registerCommand(new ScuttleCommand());
+    }
+
     @Override
     public void onLoad() {
         super.onLoad();

Movecraft/src/main/java/net/countercraft/movecraft/commands/CraftInfoCommand.java

@@ -1,23 +1,24 @@
 package net.countercraft.movecraft.commands;
 
+import co.aikar.commands.BaseCommand;
+import co.aikar.commands.InvalidCommandArgument;
+import co.aikar.commands.annotation.*;
 import net.countercraft.movecraft.MovecraftLocation;
 import net.countercraft.movecraft.craft.Craft;
 import net.countercraft.movecraft.craft.CraftManager;
 import net.countercraft.movecraft.craft.type.CraftType;
-import net.countercraft.movecraft.util.MathUtils;
 import net.countercraft.movecraft.util.TopicPaginator;
-import org.bukkit.command.Command;
+import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabExecutor;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.OptionalInt;
 import java.util.function.Function;
 
-public class CraftInfoCommand implements TabExecutor {
+@CommandAlias("craftinfo")
+public class CraftInfoCommand extends BaseCommand {
     private static final List<Function<Craft,? extends Iterable<String>>> providers = new ArrayList<>();
     static {
         registerMultiProvider(CraftInfoCommand::allowedBlockProvider);
@@ -48,51 +49,48 @@ public static void registerProvider(@NotNull Function<Craft, String> provider){
         providers.add(provider.andThen(List::of));
     }
 
+    @Default
+    @Syntax("[player] <page>")
+    @Description("Get information on a piloted craft")
+    @CommandCompletion("@players")
+    public static void onOtherPlayer(CommandSender commandSender, String[] args) {
+        if (args.length > 2) {
+            throw new InvalidCommandArgument("Max allowed arguments: 2");
+        }
 
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
-        if(args.length == 0){
-            if (!(sender instanceof Player)){
-                sender.sendMessage("Supply a parameter.");
-                return true;
+        try {
+            int page = args.length == 0 ? 1 : Integer.parseInt(args[0]);
+            if (!(commandSender instanceof Player player)) {
+                commandSender.sendMessage("You can't run this command on yourself as console");
+                return;
             }
-            Craft craft = CraftManager.getInstance().getCraftByPlayer(((Player) sender));
-            if(craft == null){
-                sender.sendMessage("You must be piloting a craft.");
-                return true;
+
+            Craft craft = CraftManager.getInstance().getCraftByPlayer(player);
+            if (craft == null) {
+                commandSender.sendMessage("No player craft found");
+                return;
             }
-            craftInfo(sender, craft, 1);
-            return true;
-        }
-        OptionalInt pageQuery;
-        if (sender instanceof  Player && (pageQuery = MathUtils.parseInt(args[0])).isPresent()){
-            Craft craft = CraftManager.getInstance().getCraftByPlayer(((Player) sender));
-            if(craft == null){
-                sender.sendMessage("You must be piloting a craft.");
-                return true;
+
+            craftInfo(commandSender, craft, page);
+
+        } catch (NumberFormatException e) {
+            Player playerSubject = Bukkit.getPlayer(args[0]);
+            if (playerSubject == null) {
+                commandSender.sendMessage("First argument must be either a number or a player");
+                return;
             }
-            craftInfo(sender, craft, pageQuery.getAsInt());
-            return true;
-        }
-        var craft = CraftManager.getInstance().getCraftByPlayerName(args[0]);
-        if (craft == null) {
-            sender.sendMessage("No player found");
-            return true;
-        }
-        if(args.length > 1){
-            pageQuery = MathUtils.parseInt(args[1]);
-            if(pageQuery.isEmpty()){
-                sender.sendMessage("Parameter " + args[1] + " must be a page number.");
-                return true;
+
+            Craft craft = CraftManager.getInstance().getCraftByPlayer(playerSubject);
+            if (craft == null) {
+                commandSender.sendMessage("No player craft found");
+                return;
             }
-        } else {
-            pageQuery = OptionalInt.of(1);
+
+            craftInfo(commandSender, craft, args.length == 1 ? 1 : Integer.parseInt(args[1]));
         }
-        craftInfo(sender, craft, pageQuery.getAsInt());
-        return true;
     }
 
-    public void craftInfo(@NotNull CommandSender commandSender, @NotNull Craft craft, int page){
+    public static void craftInfo(@NotNull CommandSender commandSender, @NotNull Craft craft, int page){
         TopicPaginator paginator = new TopicPaginator("Craft Info");
         for(var provider : providers){
             for(var line : provider.apply(craft)){
@@ -106,9 +104,4 @@ public void craftInfo(@NotNull CommandSender commandSender, @NotNull Craft craft
         for(String line : paginator.getPage(page))
             commandSender.sendMessage(line);
     }
-
-    @Override
-    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, @NotNull String[] args) {
-        return null;
-    }
 }

Movecraft/src/main/java/net/countercraft/movecraft/commands/CraftReportCommand.java

@@ -1,5 +1,7 @@
 package net.countercraft.movecraft.commands;
 
+import co.aikar.commands.BaseCommand;
+import co.aikar.commands.annotation.*;
 import net.countercraft.movecraft.craft.Craft;
 import net.countercraft.movecraft.craft.CraftManager;
 import net.countercraft.movecraft.craft.PilotedCraft;
@@ -11,45 +13,36 @@
 import net.countercraft.movecraft.util.hitboxes.HitBox;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.jetbrains.annotations.NotNull;
 
-public class CraftReportCommand implements CommandExecutor {
-    @Override
-    public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String s, String[] args) {
-        if (commandSender.getName().equalsIgnoreCase("craftreport"))
-            return false;
+@CommandAlias("craftreport")
+@CommandPermission("movecraft.commands,movecraft.commands.craftreport")
+public class CraftReportCommand extends BaseCommand {
 
-        if (!commandSender.hasPermission("movecraft.commands")
-                || !commandSender.hasPermission("movecraft.commands.craftreport")) {
-            commandSender.sendMessage(Component.empty()
-                    .append(ChatUtils.errorPrefix())
-                    .append(I18nSupport.getInternationalisedComponent("Insufficient Permissions")));
-            return true;
-        }
+    @Default
+    @Syntax("<page>")
+    @Description("Reports on all active craft")
+    public static void onCommand(CommandSender commandSender, @Optional String pageString) {
         int page;
         try {
-            if (args.length == 0)
+            if (pageString == null)
                 page = 1;
             else
-                page = Integer.parseInt(args[0]);
-        }
-        catch (NumberFormatException e) {
+                page = Integer.parseInt(pageString);
+        } catch (NumberFormatException e) {
             commandSender.sendMessage(Component.empty()
                     .append(ChatUtils.commandPrefix())
                     .append(I18nSupport.getInternationalisedComponent("Paginator - Invalid Page"))
                     .append(Component.text("\""))
-                    .append(Component.text(args[0]))
+                    .append(Component.text(pageString))
                     .append(Component.text("\"")));
-            return true;
+            return;
         }
         if (CraftManager.getInstance().isEmpty()) {
             commandSender.sendMessage(Component.empty()
                     .append(ChatUtils.commandPrefix())
                     .append(I18nSupport.getInternationalisedComponent("Craft Report - None Found")));
-            return true;
+            return;
         }
         ComponentPaginator paginator = new ComponentPaginator(
                 I18nSupport.getInternationalisedComponent("Craft Report"),
@@ -87,12 +80,11 @@ else if (craft.getDisabled())
                     .append(ChatUtils.commandPrefix())
                     .append(I18nSupport.getInternationalisedComponent("Paginator - Invalid page"))
                     .append(Component.text(" \""))
-                    .append(Component.text(args[0]))
+                    .append(Component.text(page))
                     .append(Component.text("\"")));
-            return true;
+            return;
         }
         for (Component line : paginator.getPage(page))
             commandSender.sendMessage(line);
-        return true;
     }
 }