Merge pull request #14 from SLNE-Development/feat/new-lobby-selector

refactor: reorganize inventory logic and enhance navigation options

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.1-SNAPSHOT
+version=1.21.11-3.0.2-SNAPSHOT

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

@@ -3,36 +3,35 @@ package dev.slne.surf.lobby.inventory.impl
 import com.github.stefvanschie.inventoryframework.pane.util.Slot
 import dev.slne.surf.event.base.api.common.state.EventServerState
 import dev.slne.surf.lobby.event.eventServerBridge
+import dev.slne.surf.lobby.lobbyConfig
 import dev.slne.surf.lobby.plugin
 import dev.slne.surf.lobby.utils.Locations
 import dev.slne.surf.surfapi.bukkit.api.builder.buildLore
 import dev.slne.surf.surfapi.bukkit.api.builder.displayName
 import dev.slne.surf.surfapi.bukkit.api.event.cancel
 import dev.slne.surf.surfapi.bukkit.api.inventory.dsl.menu
 import dev.slne.surf.surfapi.bukkit.api.inventory.dsl.staticPane
-import dev.slne.surf.surfapi.bukkit.api.surfBukkitApi
 import dev.slne.surf.surfapi.core.api.font.toSmallCaps
-import dev.slne.surf.surfapi.core.api.messages.adventure.playSound
-import dev.slne.surf.surfapi.core.api.messages.adventure.text
+import dev.slne.surf.surfapi.core.api.messages.adventure.*
 import org.bukkit.Sound
 import org.bukkit.entity.Player
 
 fun navigatorInventory() = menu(text("<shift:-46><glyph:server_selector>"), 6) {
     setOnGlobalDrag { it.cancel() }
     setOnGlobalClick { it.cancel() }
 
-    staticPane(Slot.fromXY(5, 0), 3, 3) {
-        fillWith(eventServerItem)
+    staticPane(Slot.fromXY(1, 0), 3, 3) {
+        fillWith(survivalServerItem)
 
         setOnClick {
             val player = it.whoClicked as? Player ?: return@setOnClick
 
 //            if(player.isPremium()) { TODO: Premium Rang
-//                surfBukkitApi.sendPlayerToServer(player, "event")
+//                surfBukkitApi.sendPlayerToServer(player, "survival")
 //                return@setOnClick
 //            }
 
-            player.teleportAsync(Locations.EVENT_TELEPORT.getLocation()).thenRun {
+            player.teleportAsync(Locations.SURVIVAL_TELEPORT.getLocation()).thenRun {
                 player.playSound(true) {
                     type(Sound.ENTITY_ENDERMAN_TELEPORT)
                     pitch(2.0f)
@@ -42,18 +41,18 @@ fun navigatorInventory() = menu(text("<shift:-46><glyph:server_selector>"), 6) {
         }
     }
 
-    staticPane(Slot.fromXY(1, 0), 3, 3) {
-        fillWith(survivalServerItem)
+    staticPane(Slot.fromXY(5, 0), 3, 3) {
+        fillWith(eventServerItem)
 
         setOnClick {
             val player = it.whoClicked as? Player ?: return@setOnClick
 
 //            if(player.isPremium()) { TODO: Premium Rang
-//                surfBukkitApi.sendPlayerToServer(player, "survival")
+//                surfBukkitApi.sendPlayerToServer(player, "event")
 //                return@setOnClick
 //            }
 
-            player.teleportAsync(Locations.SURVIVAL_TELEPORT.getLocation()).thenRun {
+            player.teleportAsync(Locations.EVENT_TELEPORT.getLocation()).thenRun {
                 player.playSound(true) {
                     type(Sound.ENTITY_ENDERMAN_TELEPORT)
                     pitch(2.0f)
@@ -63,31 +62,76 @@ fun navigatorInventory() = menu(text("<shift:-46><glyph:server_selector>"), 6) {
         }
     }
 
-    staticPane(Slot.fromXY(0, 4), 2, 3) {
-        fillWith(lobbyOneServerItem)
+    staticPane(Slot.fromXY(0, 4), 2, 2) {
+        fillWith(lobbySelectorItem)
 
         setOnClick {
-            val player = it.whoClicked as? Player ?: return@setOnClick
-            surfBukkitApi.sendPlayerToServer(player, "lobby01")
+            lobbySelectorInventory().show(it.whoClicked)
         }
     }
 
-    staticPane(Slot.fromXY(3, 4), 2, 3) {
-        fillWith(lobbyTwoServerItem)
+    staticPane(Slot.fromXY(2, 4), 2, 2) {
+        fillWith(spawnItem)
 
         setOnClick {
-            val player = it.whoClicked as? Player ?: return@setOnClick
-            surfBukkitApi.sendPlayerToServer(player, "lobby02")
+            it.whoClicked.closeInventory()
+            it.whoClicked.teleportAsync(lobbyConfig.spawnPoint.toLocation()).thenRun {
+                it.whoClicked.sendText {
+                    appendInfoPrefix()
+                    info("Du wurdest zum Spawn teleportiert.")
+                }
+            }
         }
     }
-    staticPane(Slot.fromXY(6, 4), 2, 3) {
-        fillWith(lobbyThreeServerItem)
+
+    staticPane(Slot.fromXY(5, 4), 2, 2) {
+        fillWith(rulesItem)
 
         setOnClick {
-            val player = it.whoClicked as? Player ?: return@setOnClick
-            surfBukkitApi.sendPlayerToServer(player, "lobby03")
+            it.whoClicked.closeInventory()
+            it.whoClicked.sendText {
+                appendInfoPrefix()
+                info("Das Regelwerk findest du hier: ")
+                append {
+                    variableValue("server.castcrafter.de/rules")
+                    clickOpensUrl("https://server.castcrafter.de/rules")
+                }
+            }
         }
     }
+
+    staticPane(Slot.fromXY(7, 4), 2, 2) {
+        fillWith(cosmeticsItem)
+    }
+}
+
+fun lobbySelectorInventory() = menu(buildText { spacer("Lobby Auswahl") }, 4) {
+    setOnGlobalDrag { it.cancel() }
+    setOnGlobalClick { it.cancel() }
+}
+
+private val lobbySelectorItem = plugin.getInvisibleItem().apply {
+    displayName {
+        primary("Lobby Auswahl")
+    }
+}
+
+private val spawnItem = plugin.getInvisibleItem().apply {
+    displayName {
+        primary("Spawn")
+    }
+}
+
+private val rulesItem = plugin.getInvisibleItem().apply {
+    displayName {
+        primary("Regelwerk")
+    }
+}
+
+private val cosmeticsItem = plugin.getInvisibleItem().apply {
+    displayName {
+        primary("???")
+    }
 }
 
 private val survivalServerItem = plugin.getInvisibleItem().apply {
@@ -136,22 +180,4 @@ private val eventServerItem
             }
 
         }
-    }
-
-private val lobbyOneServerItem = plugin.getInvisibleItem().apply {
-    displayName {
-        primary("Lobby 1")
-    }
-}
-
-private val lobbyTwoServerItem = plugin.getInvisibleItem().apply {
-    displayName {
-        primary("Lobby 2")
-    }
-}
-
-private val lobbyThreeServerItem = plugin.getInvisibleItem().apply {
-    displayName {
-        primary("Lobby 3")
-    }
-}
+    }