From 40b7604531ec2ceb962c7a4616e1864c829a1ea0 Mon Sep 17 00:00:00 2001
From: cuftica <maki.marko.09@gmail.com>
Date: Sun, 4 Jun 2023 18:31:55 +0200
Subject: [PATCH] Added options to sort servers by players and to not show
 offline servers

---
 PSHubCore.iml                                 |  3 ++
 .../hubcore/guis/SelectorGui.java             | 34 ++++++++++++++-----
 src/main/resources/config.yml                 |  3 ++
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/PSHubCore.iml b/PSHubCore.iml
index fa63d4b..b7bcc0b 100644
--- a/PSHubCore.iml
+++ b/PSHubCore.iml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="4">
+  <component name="CheckStyle-IDEA-Module" serialisationVersion="2">
+    <option name="activeLocationsIds" />
+  </component>
   <component name="FacetManager">
     <facet type="minecraft" name="Minecraft">
       <configuration>
diff --git a/src/main/java/os/arcadiadevs/playerservers/hubcore/guis/SelectorGui.java b/src/main/java/os/arcadiadevs/playerservers/hubcore/guis/SelectorGui.java
index f7ee251..22d1fec 100644
--- a/src/main/java/os/arcadiadevs/playerservers/hubcore/guis/SelectorGui.java
+++ b/src/main/java/os/arcadiadevs/playerservers/hubcore/guis/SelectorGui.java
@@ -7,10 +7,13 @@ import com.samjakob.spigui.item.ItemBuilder;
 import org.bukkit.entity.Player;
 import os.arcadiadevs.playerservers.hubcore.PsHubCore;
 import os.arcadiadevs.playerservers.hubcore.enums.ServerStatus;
+import os.arcadiadevs.playerservers.hubcore.models.Server;
 import os.arcadiadevs.playerservers.hubcore.utils.BungeeUtil;
 import os.arcadiadevs.playerservers.hubcore.utils.ChatUtil;
 
 import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
 
 /**
  * Handles the selector GUI.
@@ -45,7 +48,15 @@ public class SelectorGui {
             .getServers();
 
 
-    servers.forEach(server -> {
+    List<Server> filteredServers = new ArrayList<>(servers);
+
+    filteredServers.sort(Comparator.comparing(s -> s.getInfo().players() != null ? -s.getInfo().players() : 0));
+
+    final var serversPage = instance.getConfig().getBoolean("gui.selector.menu.sort-by-players")
+        ? filteredServers
+        : servers;
+
+    serversPage.forEach(server -> {
       final var onlinexMaterial =
           XMaterial.matchXMaterial(instance.getConfig().getString("gui.selector.menu.online.block"))
               .orElse(XMaterial.PLAYER_HEAD).parseItem();
@@ -53,12 +64,17 @@ public class SelectorGui {
           XMaterial.matchXMaterial(
                   instance.getConfig().getString("gui.selector.menu.offline.block"))
               .orElse(XMaterial.RED_TERRACOTTA).parseItem();
-      
+
       final var serverInfo = server.getInfo();
+      final var online = serverInfo.status() == ServerStatus.ONLINE;
+      final boolean showOffline = instance.getConfig().getBoolean("gui.selector.menu.show-offline");
+
+      if (!showOffline && !online) {
+        return;
+      }
 
       final var itemBuilder = new ItemBuilder(
           serverInfo.status() == ServerStatus.ONLINE ? onlinexMaterial : offlinexMaterial);
-      final var online = serverInfo.status() == ServerStatus.ONLINE;
 
       var lore = instance.getConfig().getStringList(
           serverInfo.status() == ServerStatus.ONLINE ? "gui.selector.menu.online.lore" :
@@ -67,9 +83,9 @@ public class SelectorGui {
       lore = lore.stream()
           .map(s -> s.replaceAll("%server%", server.getId()))
           .map(s -> s.replaceAll("%status%", online ? "&aOnline" : "&cOffline"))
-          .map(s -> s.replaceAll("%players%", online ? serverInfo.players() + "" : "0"))
-          .map(s -> s.replaceAll("%maxplayers%", online ? serverInfo.maxPlayers() + "" : "0"))
-          .map(s -> s.replaceAll("%port%", server.getDefaultAllocation().getPort() + ""))
+          .map(s -> s.replaceAll("%players%", online ? String.valueOf(serverInfo.players()) : "0"))
+          .map(s -> s.replaceAll("%maxplayers%", online ? String.valueOf(serverInfo.maxPlayers()) : "0"))
+          .map(s -> s.replaceAll("%port%", String.valueOf(server.getDefaultAllocation().getPort())))
           .map(s -> s.replaceAll("%motd%", online ? serverInfo.motd() : "&cOffline"))
           .map(s -> s.replaceAll("%node%", server.getNode().getName()))
           .map(s -> s.replaceAll("%owner%", server.getOfflinePlayer().getName()))
@@ -81,9 +97,9 @@ public class SelectorGui {
                   online ? "gui.selector.menu.online.name" : "gui.selector.menu.offline.name")
               .replaceAll("%server%", server.getId())
               .replaceAll("%status%", online ? "&aOnline" : "&cOffline")
-              .replaceAll("%players%", online ? serverInfo.players() + "" : "0")
-              .replaceAll("%maxplayers%", online ? serverInfo.maxPlayers() + "" : "0")
-              .replaceAll("%port%", server.getDefaultAllocation().getPort() + "")
+              .replaceAll("%players%", online ? String.valueOf(serverInfo.players()) : "0")
+              .replaceAll("%maxplayers%", online ? String.valueOf(serverInfo.maxPlayers()) : "0")
+              .replaceAll("%port%", String.valueOf(server.getDefaultAllocation().getPort()))
               .replaceAll("%motd%", online ? serverInfo.motd() : "&cOffline")
               .replaceAll("%node%", server.getNode().getName())
               .replaceAll("%owner%", server.getOfflinePlayer().getName())
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index 02f5ced..a2e7cc9 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -40,6 +40,9 @@ gui:
         - "&7selector or to create your own one"
 
     menu:
+      show-offline: true
+      sort-by-players: true
+
       name: "&aServer Selector"
       online:
         block: "PLAYER_HEAD"