Improved Tab Complementation for Homes and Entities

Author: LarsEsDoch

src/main/java/dev/lars/utilsmanager/commands/admin/EntityCommand.java

@@ -2,20 +2,25 @@
 
 import dev.lars.apimanager.apis.languageAPI.LanguageAPI;
 import dev.lars.utilsmanager.utils.Statements;
+import dev.lars.utilsmanager.utils.SuggestHelper;
 import io.papermc.paper.command.brigadier.BasicCommand;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NonNull;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
+import java.util.*;
 
 public class EntityCommand implements BasicCommand {
 
+    private static final List<String> ENTITY_NAMES =
+        Arrays.stream(EntityType.values())
+              .map(Enum::name)
+              .toList();
+
     @Override
     public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
         if (!(stack.getExecutor() instanceof Player player)) {
@@ -65,22 +70,30 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
     }
 
     @Override
-    public Collection<String> suggest(final CommandSourceStack commandSourceStack, final String[] args) {
-        if (args.length == 0 || args.length == 1) {
-            Collection<String> entityList = new ArrayList<>();
-            for (EntityType entity : EntityType.values()) {
-                entityList.add(entity.name().toLowerCase());
-            }
-            return entityList;
+    public @NonNull Collection<String> suggest(final @NonNull CommandSourceStack commandSourceStack, final String[] args) {
+        Player player = (Player) commandSourceStack.getSender();
+        if(!player.hasPermission("utilsmanager.entity")) {
+            player.sendMessage(Statements.getNotAllowed(player));
+            return Collections.emptyList();
+        }
+        if (args.length == 0) {
+            return ENTITY_NAMES;
+        }
+        if (args.length == 1) {
+            return SuggestHelper.filter(args[0], ENTITY_NAMES.toArray(new String[0]));
         }
         return Collections.emptyList();
     }
 
     private void sendUsage(Player player) {
         if (LanguageAPI.getApi().getLanguage(player) == 2) {
-            player.sendMessage(NamedTextColor.GRAY + "Verwendung" + NamedTextColor.DARK_GRAY + ": " + NamedTextColor.BLUE + "/entity <Entität> <Anzahl>");
+            player.sendMessage(Statements.getUsage(player)
+                    .append(Component.text("/entity <Entität> <Anzahl>", NamedTextColor.BLUE))
+            );
         } else {
-            player.sendMessage(NamedTextColor.GRAY + "Use" + NamedTextColor.DARK_GRAY + ": " + NamedTextColor.BLUE + "/entity <entity> <amount>");
+            player.sendMessage(Statements.getUsage(player)
+                    .append(Component.text("/entity <entity> <amount>", NamedTextColor.BLUE))
+            );
         }
     }
-}
+}

src/main/java/dev/lars/utilsmanager/commands/teleport/home/DeleteHomeCommand.java

@@ -3,16 +3,16 @@
 import dev.lars.apimanager.apis.homeAPI.HomeAPI;
 import dev.lars.apimanager.apis.languageAPI.LanguageAPI;
 import dev.lars.utilsmanager.utils.Statements;
+import dev.lars.utilsmanager.utils.SuggestHelper;
 import io.papermc.paper.command.brigadier.BasicCommand;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NonNull;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
+import java.util.*;
 
 public class DeleteHomeCommand implements BasicCommand {
 
@@ -59,10 +59,15 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
     }
 
     @Override
-    public Collection<String> suggest(final CommandSourceStack commandSourceStack, final String[] args) {
+    public @NonNull Collection<String> suggest(final CommandSourceStack commandSourceStack, final String[] args) {
         Player player = (Player) commandSourceStack.getSender();
-        if (args.length == 0 || args.length == 1) {
-            return new ArrayList<>(HomeAPI.getApi().getOwnHomes(player));
+        Collection<String> homes = Objects.requireNonNullElse(HomeAPI.getApi().getOwnHomes(player), Collections.emptyList());
+
+        if (args.length == 0) {
+            return homes;
+        }
+        if (args.length == 1) {
+            return SuggestHelper.filter(args[0], homes.toArray(new String[0]));
         }
         return Collections.emptyList();
     }

src/main/java/dev/lars/utilsmanager/commands/teleport/home/HomeCommand.java

@@ -4,18 +4,17 @@
 import dev.lars.apimanager.apis.homeAPI.HomeAPI;
 import dev.lars.apimanager.apis.languageAPI.LanguageAPI;
 import dev.lars.utilsmanager.utils.Statements;
+import dev.lars.utilsmanager.utils.SuggestHelper;
 import io.papermc.paper.command.brigadier.BasicCommand;
 import io.papermc.paper.command.brigadier.CommandSourceStack;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
+import org.jspecify.annotations.NonNull;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 public class HomeCommand implements BasicCommand {
 
@@ -68,14 +67,16 @@ public void execute(@NotNull CommandSourceStack stack, @NotNull String[] args) {
     }
 
     @Override
-    public Collection<String> suggest(final CommandSourceStack commandSourceStack, final String[] args) {
-        if (args.length == 0 || args.length == 1) {
-            List<String> homes = new ArrayList<>();
-            for (String string : HomeAPI.getApi().getHomes((Player) commandSourceStack.getSender())) {
-                homes.add(string.toLowerCase());
-            }
+    public @NonNull Collection<String> suggest(final CommandSourceStack commandSourceStack, final String[] args) {
+        Player player = (Player) commandSourceStack.getSender();
+        Collection<String> homes = Objects.requireNonNullElse(HomeAPI.getApi().getHomes(player), Collections.emptyList());
+
+        if (args.length == 0) {
             return homes;
         }
+        if (args.length == 1) {
+            return SuggestHelper.filter(args[0], homes.toArray(new String[0]));
+        }
         return Collections.emptyList();
     }