fix(tab completer) tab completer for /manhunt

Author: anhgelus

src/main/java/world/anhgelus/manhuntplugin/ManhuntPlugin.java

@@ -7,13 +7,11 @@
 import world.anhgelus.gamelibrary.commands.Subcommand;
 import world.anhgelus.gamelibrary.game.Game;
 import world.anhgelus.gamelibrary.game.commands.GameCommandManager;
+import world.anhgelus.gamelibrary.game.commands.GameCommands;
 import world.anhgelus.gamelibrary.game.engine.GameEngine;
 import world.anhgelus.gamelibrary.team.Team;
 import world.anhgelus.gamelibrary.util.config.ConfigAPI;
-import world.anhgelus.manhuntplugin.command.manhunt.GetCompassSubcommand;
-import world.anhgelus.manhuntplugin.command.manhunt.ManhuntCommand;
-import world.anhgelus.manhuntplugin.command.manhunt.TeamSubcommand;
-import world.anhgelus.manhuntplugin.command.manhunt.TrackerSubcommand;
+import world.anhgelus.manhuntplugin.command.manhunt.*;
 import world.anhgelus.manhuntplugin.conditions.GConditions;
 import world.anhgelus.manhuntplugin.conditions.SConditions;
 import world.anhgelus.manhuntplugin.conditions.WConditions;
@@ -46,8 +44,9 @@ public void onEnable() {
 
         final PluginCommand gameCommand = getCommand("game");
         if (gameCommand != null) {
-            gameCommand.setExecutor(manager.registerGameCommands());
-            gameCommand.setTabCompleter(manager.registerGameTabCompleter());
+            final GameCommands gameCommands = manager.registerGameCommands();
+            gameCommand.setExecutor(gameCommands);
+            gameCommand.setTabCompleter(gameCommands.getGenericTabCompleter());
         }
 
         // Initialize the teams
@@ -58,7 +57,7 @@ public void onEnable() {
 
         // Register the commands
         final List<Subcommand> manhuntSubcommands = List.of(
-                new TeamSubcommand(), new TrackerSubcommand(), new GetCompassSubcommand()
+                new TeamSubcommand(), new TrackerSubcommand(), new GetCompassSubcommand(), new CompassSubcommand()
         );
         final PluginCommand manhuntCommand = getCommand("manhunt");
         if (manhuntCommand != null) {

src/main/java/world/anhgelus/manhuntplugin/command/manhunt/CompassSubcommand.java

@@ -27,12 +27,21 @@ public boolean onCommand(Player player, String[] args) {
 
     @Override
     public List<String> getTabCompleter(Player player, String[] args) {
-        return MaterialHelper.generatePossibilitiesForTab();
+        return compassSubTab(player, args);
     }
 
+    /**
+     * Execute the compass subcommand (/manhunt compass)
+     * @param player The player who executed the command
+     * @param args The arguments of the command
+     */
     public static void compassSub(Player player, String[] args) {
+        if (args.length < 1) {
+            return;
+        }
         if (args.length == 1) {
             SenderHelper.sendInfo(player, "/manhunt compass|tracker set|get|track");
+            return;
         }
         String sub = args[1];
         switch (sub) {
@@ -61,4 +70,24 @@ public static void compassSub(Player player, String[] args) {
             default -> SenderHelper.sendInfo(player, "/manhunt compass|tracker set|get|track");
         }
     }
+
+    /**
+     * Get the tab completer for the compass subcommand (/manhunt compass)
+     * @param player The player who executed the command
+     * @param args The arguments of the command
+     * @return The list of possible completions
+     */
+    public static List<String> compassSubTab(Player player, String[] args) { // manhunt compass set|get|track <other>
+        if (args.length == 2) {
+            return List.of("set", "get", "track");
+        }
+        if (args.length != 3) {
+            return null;
+        }
+        return switch (args[1]) {
+            case "set" -> MaterialHelper.generatePossibilitiesForTab();
+            case "track" -> Bukkit.getOnlinePlayers().stream().map(Player::getName).toList();
+            default -> null;
+        };
+    }
 }

src/main/java/world/anhgelus/manhuntplugin/command/manhunt/ManhuntCommand.java

@@ -13,8 +13,8 @@ public ManhuntCommand(List<Subcommand> subcommands) {
     }
 
     @Override
-    protected boolean command(Player player, String[] args) {
-        if (!onSubcommand(player, args)) {
+    protected boolean command(Player player, String label, String[] args) {
+        if (!onSubcommand(player, label, args)) {
             SenderHelper.sendWarning(player, "Unknown subcommand: " + args[0]);
         }
         return true;

src/main/java/world/anhgelus/manhuntplugin/command/manhunt/TeamSubcommand.java

@@ -41,7 +41,7 @@ public boolean onCommand(Player player, String[] args) {
 
     @Override
     public List<String> getTabCompleter(Player player, String[] args) {
-        if (args.length == 3) {
+        if (args.length == 4) { // /manhunt team add <team> <player>
             final String sub = args[1];
             final List<String> players = Bukkit.getOnlinePlayers().stream().map(Player::getName).toList();
             switch (sub) {
@@ -51,7 +51,7 @@ public List<String> getTabCompleter(Player player, String[] args) {
                 case "list":
                     return null;
             }
-        } else if (args.length == 4 && !args[1].equals("list")) {
+        } else if (args.length == 5 && !args[1].equals("list")) {
             final TeamList[] teams = TeamList.values();
             final String[] teamNames = new String[teams.length];
             for (int i = 0; i < teams.length; i++) {

src/main/java/world/anhgelus/manhuntplugin/command/manhunt/TrackerSubcommand.java

@@ -3,7 +3,6 @@
 import org.bukkit.entity.Player;
 import world.anhgelus.gamelibrary.commands.Permission;
 import world.anhgelus.gamelibrary.commands.Subcommand;
-import world.anhgelus.manhuntplugin.utils.MaterialHelper;
 
 import java.util.List;
 
@@ -20,6 +19,6 @@ public boolean onCommand(Player player, String[] args) {
 
     @Override
     public List<String> getTabCompleter(Player player, String[] args) {
-        return MaterialHelper.generatePossibilitiesForTab();
+        return CompassSubcommand.compassSubTab(player, args);
     }
 }