Sendto can now handle serverids short and long

Author: petethepossum

type.generic/src/main/java/net/swofty/type/generic/command/commands/SendToCommand.java

@@ -2,42 +2,76 @@
 
 import net.minestom.server.command.builder.arguments.ArgumentEnum;
 import net.minestom.server.command.builder.arguments.ArgumentString;
-import net.swofty.commons.ServerManager;
+import net.minestom.server.command.builder.suggestion.SuggestionEntry;
 import net.swofty.commons.ServerType;
+import net.swofty.velocity.gamemanager.GameManager;
 import net.swofty.type.generic.command.CommandParameters;
 import net.swofty.type.generic.command.HypixelCommand;
 import net.swofty.type.generic.user.HypixelPlayer;
 import net.swofty.type.generic.user.categories.Rank;
 
-@CommandParameters(aliases = "transfer",
+import java.util.UUID;
+
+@CommandParameters(
+        aliases = "transfer",
         description = "Transfers a player to another server",
-        usage = "/sendto <server_type>",
+        usage = "/sendto <server_type|server_id>",
         permission = Rank.STAFF,
-        allowsConsole = false)
+        allowsConsole = false
+)
 public class SendToCommand extends HypixelCommand {
+
     @Override
     public void registerUsage(MinestomCommand command) {
-        ArgumentEnum<ServerType> serverType = new ArgumentEnum<>("server_type", ServerType.class);
-        ArgumentString serverId = new ArgumentString("server_id");
+
+        ArgumentEnum<ServerType> serverType =
+                new ArgumentEnum<>("server_type", ServerType.class);
+
+
+        ArgumentString serverId = new ArgumentString("server_id")
+                .setSuggestionCallback((sender, context, suggestion) -> {
+                    GameManager.getServers().values().forEach(list -> {
+                        list.forEach(gs -> {
+                            suggestion.addEntry(new SuggestionEntry(gs.shortDisplayName()));
+                            suggestion.addEntry(new SuggestionEntry(gs.displayName()));
+                        });
+                    });
+                });
+
 
         command.addSyntax((sender, context) -> {
             if (!permissionCheck(sender)) return;
-            ServerType type = context.get(serverType);
+
             HypixelPlayer player = (HypixelPlayer) sender;
+            ServerType type = context.get(serverType);
 
             player.sendTo(type, true);
         }, serverType);
 
         command.addSyntax((sender, context) -> {
             if (!permissionCheck(sender)) return;
-            String id = context.get(serverId);
+
             HypixelPlayer player = (HypixelPlayer) sender;
+            String input = context.get(serverId);
+
 
-            if (ServerManager.isValidServerId(id)) {
-                player.sendTo(id, true);
-            } else {
-                player.sendMessage("Invalid server ID.");
+            GameManager.GameServer gs = GameManager.getFromDisplayName(input);
+            if (gs != null) {
+                player.sendTo(gs.internalID(), true);
+                return;
             }
+
+
+            try {
+                UUID uuid = UUID.fromString(input);
+                gs = GameManager.getFromUUID(uuid);
+                if (gs != null) {
+                    player.sendTo(gs.internalID(), true);
+                    return;
+                }
+            } catch (IllegalArgumentException ignored) {}
+
+            player.sendMessage("§cServer not found.");
         }, serverId);
     }
 }

velocity.extension/src/main/java/net/swofty/velocity/gamemanager/GameManager.java

@@ -162,4 +162,18 @@ public boolean hasEmptySlots() {
             return maxPlayers > registeredServer().getPlayersConnected().size();
         }
     }
+    public static @Nullable GameServer getFromDisplayName(String name) {
+        for (ArrayList<GameServer> list : servers.values()) {
+            for (GameServer gs : list) {
+                if (gs.displayName().equalsIgnoreCase(name)
+                        || gs.shortDisplayName().equalsIgnoreCase(name)) {
+                    return gs;
+                }
+            }
+        }
+        return null;
+    }
+    public static boolean hasServer(String name) {
+        return getFromDisplayName(name) != null;
+    }
 }