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

@@ -17,13 +17,14 @@
 
 package net.countercraft.movecraft;
 
+import co.aikar.commands.InvalidCommandArgument;
 import io.papermc.paper.datapack.Datapack;
 import net.countercraft.movecraft.async.AsyncManager;
 import net.countercraft.movecraft.commands.*;
 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.craft.type.CraftType;
 import net.countercraft.movecraft.features.contacts.ContactsCommand;
 import net.countercraft.movecraft.features.contacts.ContactsManager;
 import net.countercraft.movecraft.features.contacts.ContactsSign;
@@ -46,6 +47,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.logging.Logger;
@@ -198,16 +200,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 +237,52 @@ public void onEnable() {
         logger.info("[V " + getDescription().getVersion() + "] has been enabled.");
     }
 
+    private void initializeCommands() {
+        MovecraftCommandManager movecraftCommandManager = new MovecraftCommandManager(this);
+        var commandCompletions = movecraftCommandManager.getCommandCompletions();
+
+        commandCompletions.registerCompletion("crafttypes", c ->  {
+            Set<CraftType> craftTypes = CraftManager.getInstance().getCraftTypes();
+            List<String> craftNames = craftTypes.stream().map(type -> type.getStringProperty(CraftType.NAME)).toList();
+            return craftNames;
+        });
+
+        commandCompletions.registerCompletion("directions", c -> {
+            var allDirections = CruiseDirection.valuesString();
+            var allButNone = allDirections.stream().filter(p -> !p.equals("none")).toList();
+            return allButNone;
+        });
+
+        var commandContexts = movecraftCommandManager.getCommandContexts();
+
+        commandContexts.registerContext(CruiseDirection.class, (c) -> {
+            String data = c.popFirstArg();
+            return CruiseDirection.fromString(data);
+        });
+
+        commandContexts.registerContext(CraftType.class, (c) -> {
+            String data = c.popFirstArg();
+            CraftType type = CraftManager.getInstance().getCraftTypeFromString(data);
+
+            if (type == null) {
+                throw new InvalidCommandArgument("You must supply a craft type!");
+            }
+
+            return type;
+        });
+
+        movecraftCommandManager.registerCommand(new MovecraftCommand());
+        movecraftCommandManager.registerCommand(new CraftInfoCommand());
+        movecraftCommandManager.registerCommand(new CraftReportCommand());
+        movecraftCommandManager.registerCommand(new CraftTypeCommand());
+        movecraftCommandManager.registerCommand(new CruiseCommand());
+        getCommand("release").setExecutor(new ReleaseCommand());
+        getCommand("pilot").setExecutor(new PilotCommand());
+        getCommand("rotate").setExecutor(new RotateCommand());
+        getCommand("manoverboard").setExecutor(new ManOverboardCommand());
+        getCommand("scuttle").setExecutor(new ScuttleCommand());
+    }
+
     @Override
     public void onLoad() {
         super.onLoad();

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

@@ -1,23 +1,23 @@
 package net.countercraft.movecraft.commands;
 
+import co.aikar.commands.BaseCommand;
+import co.aikar.commands.annotation.*;
+import co.aikar.commands.bukkit.contexts.OnlinePlayer;
 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.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 +48,34 @@ public static void registerProvider(@NotNull Function<Craft, String> provider){
         providers.add(provider.andThen(List::of));
     }
 
-
-    @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;
-            }
-            Craft craft = CraftManager.getInstance().getCraftByPlayer(((Player) sender));
-            if(craft == null){
-                sender.sendMessage("You must be piloting a craft.");
-                return true;
-            }
-            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(sender, craft, pageQuery.getAsInt());
-            return true;
-        }
-        var craft = CraftManager.getInstance().getCraftByPlayerName(args[0]);
+    @Default
+    @Syntax("[player|self] <page>")
+    @Description("Get information on a piloted craft")
+    @CommandCompletion("@players")
+    public static void onCommand(Player player, OnlinePlayer subject, @Default("1") int page) {
+        var craft = CraftManager.getInstance().getCraftByPlayer(subject.getPlayer());
         if (craft == null) {
-            sender.sendMessage("No player found");
-            return true;
+            //maybe no craft found would be more correct
+            player.sendMessage("No player found");
+            return;
         }
-        if(args.length > 1){
-            pageQuery = MathUtils.parseInt(args[1]);
-            if(pageQuery.isEmpty()){
-                sender.sendMessage("Parameter " + args[1] + " must be a page number.");
-                return true;
-            }
-        } else {
-            pageQuery = OptionalInt.of(1);
+
+        craftInfo(player, craft, page);
+    }
+
+    @Subcommand("self")
+    @Syntax("<page>")
+    public static void selfCraftInfo(Player player, @Default("1") int page) {
+        Craft craft = CraftManager.getInstance().getCraftByPlayer(player);
+        if(craft == null){
+            player.sendMessage("You must be piloting a craft.");
+            return;
         }
-        craftInfo(sender, craft, pageQuery.getAsInt());
-        return true;
+
+        craftInfo(player, craft, page);
     }
 
-    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 +89,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,38 @@
 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;
-        }
-        int page;
+    @Default
+    @Syntax("<page>")
+    @Description("Reports on all active craft")
+    public static void onCommand(CommandSender commandSender, @Default("1") int page) {
+        // TODO: This is ugly to read, maybe better make a component concatenator method in ChatUtils?
+        // TODO: Should we keep the error for invalid page or just default to 1 in this case?
+        /*
         try {
             if (args.length == 0)
                 page = 1;
             else
                 page = Integer.parseInt(args[0]);
-        }
-        catch (NumberFormatException e) {
+        } 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("\"")));
-            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 +82,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;
     }
 }