feat: proxy decided names

Swofty-Developments · Swofty-Developments · commit b20be4e9149e · 2025-07-29T22:58:55.000+10:00
Took 1 hour 8 minutes
diff --git a/commons/src/main/java/net/swofty/commons/UnderstandableProxyServer.java b/commons/src/main/java/net/swofty/commons/UnderstandableProxyServer.java
@@ -7,14 +7,19 @@
 import java.util.List;
 import java.util.UUID;
 
-public record UnderstandableProxyServer(String name, UUID uuid, ServerType type, int port, List<UUID> players) {
+public record UnderstandableProxyServer(String name, UUID uuid, ServerType type,
+                                        int port, List<UUID> players, int maxPlayers,
+                                        String shortName
+                                        ) {
     public JSONObject toJSON() {
         return new JSONObject()
                 .put("name", name)
                 .put("uuid", uuid.toString())
                 .put("type", type.name())
                 .put("port", port)
-                .put("players", players);
+                .put("players", players)
+                .put("max_players", maxPlayers)
+                .put("short_name", shortName);
     }
 
     public static UnderstandableProxyServer singleFromJSON(JSONObject json) {
@@ -27,7 +32,9 @@ public static UnderstandableProxyServer singleFromJSON(JSONObject json) {
                 UUID.fromString(json.getString("uuid")),
                 ServerType.valueOf(json.getString("type")),
                 json.getInt("port"),
-                players
+                players,
+                json.getInt("max_players"),
+                json.getString("short_name")
         );
     }
 
diff --git a/commons/src/main/java/net/swofty/commons/proxy/requirements/to/RegisterServerRequirements.java b/commons/src/main/java/net/swofty/commons/proxy/requirements/to/RegisterServerRequirements.java
@@ -15,7 +15,8 @@ public List<RequiredKey> getRequiredKeysForProxy() {
     @Override
     public List<RequiredKey> getRequiredKeysForServer() {
         return List.of(
-                new RequiredKey("type") // Type of the server
+                new RequiredKey("type"), // Type of the server
+                new RequiredKey("max_players") // Max players for the server
                 // OPTIONALLY YOU CAN PASS THROUGH A PORT TO FORCE IT
         );
     }
diff --git a/commons/src/main/java/net/swofty/commons/proxy/requirements/to/ServerNameRequirements.java b/commons/src/main/java/net/swofty/commons/proxy/requirements/to/ServerNameRequirements.java
@@ -8,7 +8,8 @@ public class ServerNameRequirements extends ProxyChannelRequirements {
     @Override
     public List<RequiredKey> getRequiredKeysForProxy() {
         return List.of(
-                new RequiredKey("server-name")
+                new RequiredKey("server-name"),
+                new RequiredKey("shortened-server-name")
         );
     }
 
diff --git a/loader/src/main/java/net/swofty/loader/SkyBlock.java b/loader/src/main/java/net/swofty/loader/SkyBlock.java
@@ -30,10 +30,7 @@
 import org.tinylog.Logger;
 
 import java.lang.reflect.InvocationTargetException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.UUID;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -59,15 +56,19 @@ public static void main(String[] args) {
         ServerType serverType = ServerType.valueOf(args[0].toUpperCase());
         long startTime = System.currentTimeMillis();
 
-        boolean isPterodactyl = Configuration.getOrDefault("pterodaddctyl-mode" , false);
+        Map<String, String> options = parseOptionalArgs(args);
+        Integer maxPlayers = options.containsKey("--max-players") ?
+                Integer.parseInt(options.get("--max-players")) : 0;
+        Integer pterodactylPort = options.containsKey("--pterodactyl-port") ?
+                Integer.parseInt(options.get("--pterodactyl-port")) : -1;
 
-        if (isPterodactyl && args.length < 2) {
-            Logger.error("Please specify server port.");
+        boolean isPterodactyl = Configuration.getOrDefault("pterodactyl-mode" , false);
+
+        if (isPterodactyl && pterodactylPort == -1) {
+            Logger.error("Please specify server port for pterodactyl mode with --pterodactyl-port");
             System.exit(0);
         }
 
-        int pterodactylPort = isPterodactyl ? Integer.parseInt(args[1]) : -1;
-
         /**
          * Initialize TypeLoader
          */
@@ -151,11 +152,14 @@ public static void main(String[] args) {
             Logger.info("Server Type: " + serverType.name());
             Logger.info("Internal ID: " + serverUUID.toString());
             SkyBlockConst.setPort(port);
+            SkyBlockConst.setMaxPlayers(maxPlayers);
 
             ServerOutboundMessage.sendMessageToProxy(
                     ToProxyChannels.REQUEST_SERVERS_NAME, new JSONObject(),
                     (response) -> {
                         SkyBlockConst.setServerName((String) response.get("server-name"));
+                        SkyBlockConst.setShortenedServerName((String) response.get("shortened-server-name"));
+                        Logger.info("Received server name: " + SkyBlockConst.getServerName());
                     });
             checkProxyConnected(MinecraftServer.getSchedulerManager());
 
@@ -195,8 +199,10 @@ public void onFlag(UUID uuid, FlagType flagType) {
 
         ServerOutboundMessage.sendMessageToProxy(
                 ToProxyChannels.REGISTER_SERVER,
-                new JSONObject().put("type", serverType.name())
-                        .put("port" , pterodactylPort),
+                new JSONObject()
+                        .put("type", serverType.name())
+                        .put("port" , pterodactylPort)
+                        .put("max_players", maxPlayers),
                 (response) -> startServer.complete(Integer.parseInt(response.get("port").toString())));
     }
 
@@ -231,4 +237,14 @@ ToProxyChannels.PROXY_IS_ONLINE, new JSONObject(), (response) -> {
             return TaskSchedule.seconds(1);
         } , ExecutionType.TICK_END);
     }
+
+    private static Map<String, String> parseOptionalArgs(String[] args) {
+        Map<String, String> options = new HashMap<>();
+        for (int i = 0; i < args.length - 1; i++) {
+            if (args[i].startsWith("--")) {
+                options.put(args[i], args[i + 1]);
+            }
+        }
+        return options;
+    }
 }
diff --git a/type.generic/src/main/java/net/swofty/types/generic/SkyBlockConst.java b/type.generic/src/main/java/net/swofty/types/generic/SkyBlockConst.java
@@ -21,12 +21,18 @@ public class SkyBlockConst {
     private static String serverName;
     @Getter
     @Setter
+    private static String shortenedServerName;
+    @Getter
+    @Setter
     private static SkyBlockTypeLoader typeLoader;
     @Getter
     private static Integer currentIslandVersion = 1;
     @Getter
     @Setter
     private static int port;
+    @Getter
+    @Setter
+    private static int maxPlayers;
 
     public static boolean isIslandServer() {
         return typeLoader.getType() == ServerType.ISLAND;
diff --git a/type.generic/src/main/java/net/swofty/types/generic/event/actions/player/data/ActionPlayerDataLoaded.java b/type.generic/src/main/java/net/swofty/types/generic/event/actions/player/data/ActionPlayerDataLoaded.java
@@ -49,7 +49,7 @@ public void run(PlayerSpawnEvent event) {
             if (rank.isStaff()) {
                 CustomGroups.staffMembers.add(player);
             }
-            player.sendMessage("§7Sending to server mini" + SkyBlockConst.getServerName() + "...");
+
             player.sendMessage("§7 ");
             player.sendMessage("§aYour profile is: §e" + player.getDataHandler().get(
                     DataHandler.Data.PROFILE_NAME, DatapointString.class).getValue());
diff --git a/type.generic/src/main/java/net/swofty/types/generic/event/actions/player/data/ActionPlayerDataSpawn.java b/type.generic/src/main/java/net/swofty/types/generic/event/actions/player/data/ActionPlayerDataSpawn.java
@@ -88,7 +88,7 @@ public void run(PlayerSpawnEvent event) {
         // Manually call region event with a delay
         MathUtility.delay(() -> {
             SkyBlockRegion playerRegion = player.getRegion();
-            if (playerRegion != null)
+            if (playerRegion != null && player.isOnline())
                 SkyBlockEventHandler.callSkyBlockEvent(new PlayerRegionChangeEvent(
                         player,
                         null,
diff --git a/type.generic/src/main/java/net/swofty/types/generic/user/SkyBlockScoreboard.java b/type.generic/src/main/java/net/swofty/types/generic/user/SkyBlockScoreboard.java
@@ -53,7 +53,7 @@ public static void start() {
                 Sidebar sidebar = new Sidebar(Component.text("  " + getSidebarName(skyblockName, false)
                         + (player.isCoop() ? " §b§lCO-OP  " : "  ")));
 
-                addLine("§7" + new SimpleDateFormat("MM/dd/yy").format(new Date()) + " §8m" + SkyBlockConst.getServerName(), sidebar);
+                addLine("§7" + new SimpleDateFormat("MM/dd/yy").format(new Date()) + " §8" + SkyBlockConst.getServerName(), sidebar);
                 addLine("§7 ", sidebar);
                 addLine("§f " + SkyBlockCalendar.getMonthName() + " " + StringUtility.ntify(SkyBlockCalendar.getDay()), sidebar);
                 addLine("§7 " + SkyBlockCalendar.getDisplay(SkyBlockCalendar.getElapsed()), sidebar);
diff --git a/type.hub/src/main/java/net/swofty/type/hub/gui/GUIHubSelector.java b/type.hub/src/main/java/net/swofty/type/hub/gui/GUIHubSelector.java
@@ -79,8 +79,8 @@ public void run(InventoryPreClickEvent e, SkyBlockPlayer player) {
                     UnderstandableProxyServer smallestServer = serversToUse.stream()
                             .min(Comparator.comparingInt((UnderstandableProxyServer server) -> server.players().size()))
                            .orElseThrow();
-                    player.sendMessage("§7Request join for Hub mega" + smallestServer.name() + "...");
                     ProxyPlayer proxyPlayer = new ProxyPlayer(player.getUuid());
+                    proxyPlayer.sendMessage("§7Request join for Hub " + smallestServer.name() + "...");
                     proxyPlayer.transferToWithIndication(smallestServer.uuid())
                             .orTimeout(3, TimeUnit.SECONDS)
                             .exceptionally(throwable -> {
@@ -97,8 +97,8 @@ public void run(InventoryPreClickEvent e, SkyBlockPlayer player) {
 
                 int randomIndex = (int) (Math.random() * serversToUse.size());
                 UnderstandableProxyServer randomServer = serversToUse.get(randomIndex);
-                player.sendMessage("§7Request join for Hub mega" + randomServer.name() + "...");
                 ProxyPlayer proxyPlayer = new ProxyPlayer(player.getUuid());
+                proxyPlayer.sendMessage("§7Request join for Hub " + randomServer.name() + "...");
                 proxyPlayer.transferToWithIndication(randomServer.uuid())
                         .orTimeout(3, TimeUnit.SECONDS)
                         .exceptionally(throwable -> {
@@ -121,7 +121,7 @@ public ItemStack.Builder getItem(SkyBlockPlayer player) {
                         "§7or the other?",
                         " ",
                         "§7Hub Servers: §a" + servers.size(),
-                        "§7Current: §3mega" + SkyBlockConst.getServerName() + " §7(" + SkyBlockGenericLoader.getLoadedPlayers().size() + ")",
+                        "§7Current: §3" + SkyBlockConst.getServerName() + " §7(" + SkyBlockGenericLoader.getLoadedPlayers().size() + "/" + SkyBlockConst.getMaxPlayers() + ")",
                         " ",
                         "§bRight-Click for a small server!",
                         "§eClick to join a random hub!"
@@ -149,18 +149,23 @@ protected String getTitle(SkyBlockPlayer player, String query, int page, Paginat
     @Override
     protected GUIClickableItem createItemFor(UnderstandableProxyServer server, int slot, SkyBlockPlayer player) {
         boolean isThisServer = server.port() == SkyBlockConst.getPort();
+        boolean isFull = server.players().size() >= server.maxPlayers();
+
         return new GUIClickableItem(slot) {
+            private int counterAtThisMoment;
 
             @Override
             public ItemStack.Builder getItem(SkyBlockPlayer player) {
                 counter++;
+                counterAtThisMoment = Integer.valueOf(counter);
                 return ItemStackCreator.getStack(
                         (isThisServer ? "§c"  : "§a") + "SkyBlock Hub #" + counter,
                         (isThisServer ? Material.RED_CONCRETE  : Material.QUARTZ_BLOCK), 1,
-                        "§7Players: " + server.players().size(),
-                        "§8Server: mega" + server.name(),
+                        "§7Players: " + server.players().size() + "/" + server.maxPlayers(),
+                        "§8Server: " + server.name(),
                         " ",
-                        (isThisServer ? "§cAlready connected!" : "§eClick to connect!")
+                        (isThisServer ? "§cAlready connected!" :
+                                isFull ? "§cFull!" : "§eClick to connect!")
                 );
             }
 
@@ -172,14 +177,19 @@ public void run(InventoryPreClickEvent e, SkyBlockPlayer player) {
                     return;
                 }
 
+                if (isFull) {
+                    player.sendMessage("§cYou cannot join this server because it is full!");
+                    return;
+                }
+
                 if (sending) {
                     player.sendMessage("§cWe are currently trying to queue you into another server!");
                     return;
                 }
 
                 sending = true;
-                player.sendMessage("§7Request join for Hub #" + counter + " (mega" + server.name() + ")...");
                 ProxyPlayer proxyPlayer = new ProxyPlayer(player.getUuid());
+                proxyPlayer.sendMessage("§7Request join for Hub #" + counterAtThisMoment + " (" + server.name() + ")...");
                 proxyPlayer.transferToWithIndication(server.uuid())
                         .orTimeout(3, TimeUnit.SECONDS)
                         .exceptionally(throwable -> {
diff --git a/type.hub/src/main/java/net/swofty/type/hub/tab/HubServerModule.java b/type.hub/src/main/java/net/swofty/type/hub/tab/HubServerModule.java
@@ -16,7 +16,7 @@ public List<TablistEntry> getEntries(SkyBlockPlayer player) {
         ));
 
         entries.add(new TablistEntry("§b§lArea: §7Hub", TablistSkinRegistry.GRAY));
-        entries.add(new TablistEntry(" Server: §8mini" + SkyBlockConst.getServerName(), TablistSkinRegistry.GRAY));
+        entries.add(new TablistEntry(" Server: §8" + SkyBlockConst.getServerName(), TablistSkinRegistry.GRAY));
 
         fillRestWithGray(entries);
 
diff --git a/type.island/src/main/java/net/swofty/type/island/tab/IslandServerModule.java b/type.island/src/main/java/net/swofty/type/island/tab/IslandServerModule.java
@@ -27,7 +27,7 @@ public List<TablistEntry> getEntries(SkyBlockPlayer player) {
         ));
 
         entries.add(new TablistEntry("§b§lArea: §7Private Island", TablistSkinRegistry.GRAY));
-        entries.add(new TablistEntry(" Server: §8mini" + SkyBlockConst.getServerName(), TablistSkinRegistry.GRAY));
+        entries.add(new TablistEntry(" Server: §8" + SkyBlockConst.getServerName(), TablistSkinRegistry.GRAY));
         entries.add(new TablistEntry(" Minions: §9" + minions.size() + "§7/§9" + data.getSlots(), TablistSkinRegistry.GRAY));
 
         entries.add(getGrayEntry());
diff --git a/type.thefarmingislands/src/main/java/net/swofty/type/thefarmingislands/tab/TheFarmingIslandsServerModule.java b/type.thefarmingislands/src/main/java/net/swofty/type/thefarmingislands/tab/TheFarmingIslandsServerModule.java
@@ -16,7 +16,7 @@ public List<TablistEntry> getEntries(SkyBlockPlayer player) {
         ));
 
         entries.add(new TablistEntry("§b§lArea: §7The Farming Islands", TablistSkinRegistry.GRAY));
-        entries.add(new TablistEntry(" Server: §8mini" + SkyBlockConst.getServerName(), TablistSkinRegistry.GRAY));
+        entries.add(new TablistEntry(" Server: §8" + SkyBlockConst.getServerName(), TablistSkinRegistry.GRAY));
 
         fillRestWithGray(entries);
 
diff --git a/velocity.extension/src/main/java/net/swofty/velocity/SkyBlockVelocity.java b/velocity.extension/src/main/java/net/swofty/velocity/SkyBlockVelocity.java
@@ -173,7 +173,7 @@ public void onProxyInitialization(ProxyInitializeEvent event) {
     public void onPlayerJoin(PlayerChooseInitialServerEvent event) {
         Player player = event.getPlayer();
 
-        if (!GameManager.hasType(ServerType.ISLAND)) {
+        if (!GameManager.hasType(ServerType.ISLAND) || !GameManager.isAnyEmpty(ServerType.ISLAND)) {
             player.disconnect(
                     Component.text("§cThere are no SkyBlock (type=ISLAND) servers available at the moment.")
             );
@@ -246,6 +246,7 @@ public void onServerCrash(KickedFromServerEvent event) {
                 }
                 transferHandler.noLimboTransferTo(server.registeredServer());
                 event.getPlayer().sendPlainMessage("§cAn exception occurred in your connection, so you were put into another SkyBlock server.");
+                event.getPlayer().sendPlainMessage("§7Sending to server " + server.displayName() + "...");
             } catch (Exception e) {
                 Logger.getAnonymousLogger().log(Level.SEVERE, "An exception occurred while trying to transfer " + event.getPlayer().getUsername() + " to " + serverType, e);
                 transferHandler.forceRemoveFromLimbo();
diff --git a/velocity.extension/src/main/java/net/swofty/velocity/gamemanager/BalanceConfigurations.java b/velocity.extension/src/main/java/net/swofty/velocity/gamemanager/BalanceConfigurations.java
@@ -26,7 +26,12 @@ public class BalanceConfigurations {
 
     public static @Nullable GameManager.GameServer getServerFor(Player player, ServerType type) {
         for (BalanceConfiguration configuration : configurations.get(type)) {
-            GameManager.GameServer server = configuration.getServer(player, GameManager.getFromType(type));
+            List<GameManager.GameServer> serversToConsider = GameManager.getFromType(type);
+            serversToConsider.removeIf(server -> {
+                return server.maxPlayers() <= server.registeredServer().getPlayersConnected().size();
+            });
+
+            GameManager.GameServer server = configuration.getServer(player, serversToConsider);
             if (server != null) return server;
         }
         return null;
diff --git a/velocity.extension/src/main/java/net/swofty/velocity/gamemanager/GameManager.java b/velocity.extension/src/main/java/net/swofty/velocity/gamemanager/GameManager.java
@@ -22,22 +22,32 @@ public class GameManager {
     @Getter
     private static Map<ServerType, ArrayList<GameServer>> servers = new HashMap<>();
 
-    public static GameServer addServer(ServerType type, UUID serverID, int port) {
+    public static GameServer addServer(ServerType type, UUID serverID, int port, int maxPlayers) {
         port = port == -1 ? getNextAvailablePort() : port;    // if port is -1 then get next available port
         RegisteredServer registeredServer = SkyBlockVelocity.getServer().registerServer(
                 new ServerInfo(serverID.toString(), new InetSocketAddress(Configuration.get("host-name"), port))
         );
 
+        String rootName = maxPlayers <= 20 ? "mini" : "mega";
+        String shortenedRootName = maxPlayers <= 20 ? "m" : "M";
+
         String displayName = getNextAvailableDisplayName() + "" +
                 Character.toUpperCase((char) (new Random().nextInt(26) + 'a'));
 
-        GameServer server = new GameServer(displayName, serverID, registeredServer);
+        GameServer server = new GameServer(
+                rootName + displayName, shortenedRootName + displayName,
+                serverID, registeredServer, maxPlayers
+        );
         if (!servers.containsKey(type)) servers.put(type, new ArrayList<>(List.of(server)));
         else servers.get(type).add(server);
 
         return server;
     }
 
+    public static boolean isAnyEmpty(ServerType type) {
+        return servers.get(type).stream().anyMatch(gameServer -> gameServer.maxPlayers() > gameServer.registeredServer().getPlayersConnected().size());
+    }
+
     public static @Nullable GameServer getFromRegisteredServer(RegisteredServer registeredServer) {
         for (ArrayList<GameServer> gameServers : servers.values()) {
             for (GameServer gameServer : gameServers) {
@@ -135,5 +145,11 @@ private static int getNextAvailablePort() {
         return highestPort + 1;
     }
 
-    public record GameServer(String displayName, UUID internalID, RegisteredServer registeredServer) { }
+    public record GameServer(String displayName, String shortDisplayName,
+                             UUID internalID, RegisteredServer registeredServer,
+                             int maxPlayers) {
+        public boolean hasEmptySlots() {
+            return maxPlayers > registeredServer().getPlayersConnected().size();
+        }
+    }
 }
diff --git a/velocity.extension/src/main/java/net/swofty/velocity/gamemanager/TransferHandler.java b/velocity.extension/src/main/java/net/swofty/velocity/gamemanager/TransferHandler.java
diff --git a/velocity.extension/src/main/java/net/swofty/velocity/redis/listeners/ListenerPlayerHandler.java b/velocity.extension/src/main/java/net/swofty/velocity/redis/listeners/ListenerPlayerHandler.java
diff --git a/velocity.extension/src/main/java/net/swofty/velocity/redis/listeners/ListenerServerInitialized.java b/velocity.extension/src/main/java/net/swofty/velocity/redis/listeners/ListenerServerInitialized.java
diff --git a/velocity.extension/src/main/java/net/swofty/velocity/redis/listeners/ListenerServerName.java b/velocity.extension/src/main/java/net/swofty/velocity/redis/listeners/ListenerServerName.java
diff --git a/velocity.extension/src/main/java/net/swofty/velocity/redis/listeners/ListenerServersInformation.java b/velocity.extension/src/main/java/net/swofty/velocity/redis/listeners/ListenerServersInformation.java

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,8 @@ public class ServerNameRequirements extends ProxyChannelRequirements {`
`8`	`8`	`@Override`
`9`	`9`	`public List<RequiredKey> getRequiredKeysForProxy() {`
`10`	`10`	`return List.of(`
`11`		`- new RequiredKey("server-name")`
	`11`	`+ new RequiredKey("server-name"),`
	`12`	`+ new RequiredKey("shortened-server-name")`
`12`	`13`	`);`
`13`	`14`	`}`
`14`	`15`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public void run(PlayerSpawnEvent event) {`
`49`	`49`	`if (rank.isStaff()) {`
`50`	`50`	`CustomGroups.staffMembers.add(player);`
`51`	`51`	`}`
`52`		`- player.sendMessage("§7Sending to server mini" + SkyBlockConst.getServerName() + "...");`
	`52`	`+`
`53`	`53`	`player.sendMessage("§7 ");`
`54`	`54`	`player.sendMessage("§aYour profile is: §e" + player.getDataHandler().get(`
`55`	`55`	`DataHandler.Data.PROFILE_NAME, DatapointString.class).getValue());`