Merge pull request #33 from SLNE-Development/feat/sort-lobby-server-endlich

feat: sort lobby servers by display name in NavigatorInventory

Author: TheBjoRedCraft

gradle.properties

@@ -1,4 +1,4 @@
 kotlin.code.style=official
 kotlin.stdlib.default.dependency=false
 org.gradle.parallel=true
-version=1.21.11-3.0.9-SNAPSHOT
+version=1.21.11-3.0.10-SNAPSHOT

src/main/kotlin/dev/slne/surf/lobby/config/LobbyConfig.kt

@@ -5,6 +5,7 @@ import org.spongepowered.configurate.objectmapping.ConfigSerializable
 
 @ConfigSerializable
 data class LobbyConfig(
+    val survivalOpen: Boolean = false,
     val minHeight: Int = 0,
     val eventServerName: String = "event",
     val survivalServerName: String = "survival",

src/main/kotlin/dev/slne/surf/lobby/hook/npc/SurfNpcHook.kt

@@ -252,6 +252,18 @@ object SurfNpcHook {
     }
 
     private fun queueToSurvivalServer(player: Player) {
+        if (!lobbyConfig.survivalOpen && !player.hasPermission(PermissionRegistry.SURVIVAL_BYPASS)) {
+            player.sendText {
+                spacer("[")
+                note("Nepomuk")
+                spacer("]")
+                appendSpace()
+                error("Der Survival Server startet bald, sei bereit!")
+            }
+            return
+        }
+
+
         surfCoreApi.getServerByName(lobbyConfig.survivalServerName)
             ?.let { server ->
                 plugin.launch {

src/main/kotlin/dev/slne/surf/lobby/inventory/impl/NavigatorInventory.kt

@@ -122,58 +122,60 @@ fun lobbySelectorInventory() = menu(buildText { spacer("Lobby Auswahl") }, 3) {
         fillWith(ItemType.GRAY_STAINED_GLASS_PANE.createItemStack())
     })
     addPane(PaginatedPane(1, 1, 7, 1, Pane.Priority.HIGHEST).apply {
-        populateWithGuiItems(surfCoreApi.getServerByCategory(lobbyConfig.lobbyCategory).map {
-            GuiItem(buildItem(ItemType.RECOVERY_COMPASS) {
-                displayName { variableValue(it.name) }
-
-                buildLore {
-                    emptyLine()
-                    line {
-                        spacer("-")
-                        appendSpace()
-                        note("Status: ")
-                        variableValue(
+        populateWithGuiItems(
+            surfCoreApi.getServerByCategory(lobbyConfig.lobbyCategory).sortedBy { it.displayName }
+                .map {
+                    GuiItem(buildItem(ItemType.RECOVERY_COMPASS) {
+                        displayName { variableValue(it.displayName) }
+
+                        buildLore {
+                            emptyLine()
+                            line {
+                                spacer("-")
+                                appendSpace()
+                                note("Status: ")
+                                variableValue(
+                                    if (it.state == SurfServerState.RUNNING) {
+                                        "Online"
+                                    } else {
+                                        "Offline"
+                                    }
+                                )
+                            }
+                            line {
+                                spacer("-")
+                                appendSpace()
+                                note("Spieler: ")
+                                variableValue("${it.getPlayerCount()} / ${it.maxPlayers}")
+                            }
                             if (it.state == SurfServerState.RUNNING) {
-                                "Online"
-                            } else {
-                                "Offline"
+                                emptyLine()
+                                line {
+                                    spacer("» Klicke, um diesem Lobby Server beizutreten")
+                                }
                             }
-                        )
-                    }
-                    line {
-                        spacer("-")
-                        appendSpace()
-                        note("Spieler: ")
-                        variableValue("${it.getPlayerCount()} / ${it.maxPlayers}")
-                    }
-                    if (it.state == SurfServerState.RUNNING) {
-                        emptyLine()
-                        line {
-                            spacer("» Klicke, um diesem Lobby Server beizutreten")
                         }
+                    }) { event ->
+                        val player = event.whoClicked as? Player ?: return@GuiItem
+                        val updatedServer = surfCoreApi.getServerByName(it.name) ?: return@GuiItem
+
+                        if (updatedServer.state != SurfServerState.RUNNING) {
+                            player.sendText {
+                                appendInfoPrefix()
+                                error("Dieser Server ist derzeit nicht erreichbar!")
+                            }
+                            return@GuiItem
+                        }
+
+                        updatedServer.pullPlayers(player.surfPlayer)
                     }
-                }
-            }) { event ->
-                val player = event.whoClicked as? Player ?: return@GuiItem
-                val updatedServer = surfCoreApi.getServerByName(it.name) ?: return@GuiItem
-
-                if (updatedServer.state != SurfServerState.RUNNING) {
-                    player.sendText {
-                        appendInfoPrefix()
-                        error("Dieser Server ist derzeit nicht erreichbar!")
+                }.ifEmpty {
+                listOf(GuiItem(buildItem(Material.BARRIER) {
+                    displayName {
+                        error("Keine Lobby Server verfügbar")
                     }
-                    return@GuiItem
-                }
-
-                updatedServer.pullPlayers(player.surfPlayer)
-            }
-        }.ifEmpty {
-            listOf(GuiItem(buildItem(Material.BARRIER) {
-                displayName {
-                    error("Keine Lobby Server verfügbar")
-                }
-            }))
-        })
+                }))
+            })
     })
     setOnGlobalClick { it.cancel() }
 }

src/main/kotlin/dev/slne/surf/lobby/utils/PermissionRegistry.kt

@@ -13,6 +13,7 @@ object PermissionRegistry : PermissionRegistry() {
 
     val EVENT_BYPASS = create("$PREFIX.event.bypass")
     val QUEUE_BYPASS = create("$PREFIX.queue.bypass")
+    val SURVIVAL_BYPASS = create("$PREFIX.survival.bypass")
 
     val PUSHBACK_ATTACK = create("$PREFIX.pushback.attack")
     val PUSHBACK_ITEM = create("$PREFIX.pushback.item")