Merge pull request #5 from SLNE-Development/feat/surf-redis

Keviro · web-flow · commit 84bdc17c3e8a · 2025-12-24T13:29:38.000+01:00
Feat/surf redis
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,6 +12,8 @@ dependencies {
     compileOnly("surf-hologram:surf-hologram-api:1.21.10-1.0.1-20251011.094119-1")
     compileOnly("dev.slne.surf.npc:surf-npc-api:1.21.10-1.5.0-20251009.154819-1")
     compileOnly("com.nexomc:nexo:1.16.1")
+    implementation("dev.slne.surf:surf-redis:1.0.0-SNAPSHOT")
+    implementation("dev.slne.surf.event:surf-event-base-api-redis:1.21.11-1.0.0-SNAPSHOT")
 }
 
 version = findProperty("version") as String
diff --git a/src/main/kotlin/dev/slne/surf/lobby/PaperMain.kt b/src/main/kotlin/dev/slne/surf/lobby/PaperMain.kt
@@ -1,13 +1,18 @@
 package dev.slne.surf.lobby
 
 import com.github.shynixn.mccoroutine.folia.SuspendingJavaPlugin
+import com.github.shynixn.mccoroutine.folia.launch
 import dev.slne.surf.lobby.command.lobbyCommand
+import dev.slne.surf.lobby.command.spawnCommand
 import dev.slne.surf.lobby.config.LobbyConfigHolder
+import dev.slne.surf.lobby.event.eventServerBridge
+import dev.slne.surf.lobby.event.listener.EventServerStateChangeListener
 import dev.slne.surf.lobby.hologram.SurfHologramHook
 import dev.slne.surf.lobby.listener.*
 import dev.slne.surf.lobby.manager.PushbackManager
 import dev.slne.surf.lobby.nexo.NexoHook
 import dev.slne.surf.lobby.npc.SurfNpcHook
+import dev.slne.surf.redis.RedisApi
 import dev.slne.surf.surfapi.bukkit.api.event.register
 import org.bukkit.Bukkit
 import org.bukkit.inventory.ItemType
@@ -16,6 +21,7 @@ import org.bukkit.plugin.java.JavaPlugin
 val plugin get() = JavaPlugin.getPlugin(PaperMain::class.java)
 
 class PaperMain : SuspendingJavaPlugin() {
+    lateinit var redisApi: RedisApi
     override fun onEnable() {
         if (surfNpcHook) {
             SurfNpcHook.initialize()
@@ -37,6 +43,19 @@ class PaperMain : SuspendingJavaPlugin() {
         PushbackManager.startTask()
 
         lobbyCommand()
+        spawnCommand()
+
+        redisApi = RedisApi.create(plugin.dataPath)
+        redisApi.registerRequestHandler(EventServerStateChangeListener)
+        redisApi.freezeAndConnect()
+
+        launch {
+            eventServerBridge.requestState()
+        }
+    }
+
+    override fun onDisable() {
+        redisApi.disconnect()
     }
 
     fun getInvisibleItem() =
diff --git a/src/main/kotlin/dev/slne/surf/lobby/command/LobbyCommand.kt b/src/main/kotlin/dev/slne/surf/lobby/command/LobbyCommand.kt
@@ -9,7 +9,7 @@ import dev.slne.surf.lobby.surfNpcHook
 import dev.slne.surf.lobby.utils.PermissionRegistry
 import dev.slne.surf.surfapi.core.api.messages.adventure.sendText
 
-fun lobbyCommand() = commandTree("lobby") {
+fun lobbyCommand() = commandTree("surflobby") {
     withPermission(PermissionRegistry.COMMAND_LOBBY)
 
     literalArgument("reload") {
diff --git a/src/main/kotlin/dev/slne/surf/lobby/command/SpawnCommand.kt b/src/main/kotlin/dev/slne/surf/lobby/command/SpawnCommand.kt
@@ -0,0 +1,19 @@
+package dev.slne.surf.lobby.command
+
+import dev.jorel.commandapi.kotlindsl.commandTree
+import dev.jorel.commandapi.kotlindsl.playerExecutor
+import dev.slne.surf.lobby.lobbyConfig
+import dev.slne.surf.lobby.utils.PermissionRegistry
+import dev.slne.surf.surfapi.core.api.messages.adventure.sendText
+
+fun spawnCommand() = commandTree("spawn") {
+    withPermission(PermissionRegistry.COMMAND_SPAWN)
+    playerExecutor { player, _ ->
+        player.teleportAsync(lobbyConfig.spawnPoint.toLocation()).thenRun {
+            player.sendText {
+                appendPrefix()
+                success("Du wurdest zum Spawn teleportiert.")
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/dev/slne/surf/lobby/config/LobbyConfig.kt b/src/main/kotlin/dev/slne/surf/lobby/config/LobbyConfig.kt
@@ -7,7 +7,7 @@ import org.spongepowered.configurate.objectmapping.ConfigSerializable
 data class LobbyConfig(
     val spawnPoint: LocationConfig = LocationConfig.default(),
     val survivalNpc: LocationConfig = LocationConfig.default(),
-    val eventNpc: LocationConfig = LocationConfig.default()
+    val eventNpc: LocationConfig = LocationConfig.default(),
 ) {
     @ConfigSerializable
     data class LocationConfig(
diff --git a/src/main/kotlin/dev/slne/surf/lobby/event/EventServerBridge.kt b/src/main/kotlin/dev/slne/surf/lobby/event/EventServerBridge.kt
@@ -0,0 +1,22 @@
+package dev.slne.surf.lobby.event
+
+import dev.slne.surf.event.base.api.redis.request.EventServerStateRequest
+import dev.slne.surf.event.base.api.redis.response.EventServerStateResponse
+import dev.slne.surf.lobby.event.state.LocalEventServerState
+import dev.slne.surf.lobby.plugin
+
+val eventServerBridge = EventServerBridge()
+
+class EventServerBridge {
+    var state: LocalEventServerState = LocalEventServerState.UNKNOWN
+
+    suspend fun requestState() = runCatching {
+        plugin.logger.info("Requesting event server state...")
+        val response =
+            plugin.redisApi.sendRequest<EventServerStateResponse>(EventServerStateRequest())
+        state = LocalEventServerState.ofState(response.state)
+        plugin.logger.info("Received event server state: $state")
+    }.onFailure {
+        state = LocalEventServerState.UNKNOWN
+    }
+}
diff --git a/src/main/kotlin/dev/slne/surf/lobby/event/listener/EventServerStateChangeListener.kt b/src/main/kotlin/dev/slne/surf/lobby/event/listener/EventServerStateChangeListener.kt
@@ -0,0 +1,13 @@
+package dev.slne.surf.lobby.event.listener
+
+import dev.slne.surf.event.base.api.redis.event.EventServerStateChangeRedisEvent
+import dev.slne.surf.lobby.event.eventServerBridge
+import dev.slne.surf.lobby.event.state.LocalEventServerState
+import dev.slne.surf.redis.event.OnRedisEvent
+
+object EventServerStateChangeListener {
+    @OnRedisEvent
+    fun onEventServerStateChange(event: EventServerStateChangeRedisEvent) {
+        eventServerBridge.state = LocalEventServerState.ofState(event.to)
+    }
+}
diff --git a/src/main/kotlin/dev/slne/surf/lobby/event/state/LocalEventServerState.kt b/src/main/kotlin/dev/slne/surf/lobby/event/state/LocalEventServerState.kt
@@ -0,0 +1,18 @@
+package dev.slne.surf.lobby.event.state
+
+import dev.slne.surf.event.base.api.common.state.EventServerState
+
+enum class LocalEventServerState {
+    OPEN,
+    CLOSED,
+    UNKNOWN;
+
+    companion object {
+        fun ofState(eventServerState: EventServerState): LocalEventServerState {
+            return when (eventServerState) {
+                EventServerState.OPEN -> OPEN
+                EventServerState.CLOSED -> CLOSED
+            }
+        }
+    }
+}
diff --git a/src/main/kotlin/dev/slne/surf/lobby/inventory/impl/NavigatorInventory.kt b/src/main/kotlin/dev/slne/surf/lobby/inventory/impl/NavigatorInventory.kt
@@ -1,34 +1,95 @@
 package dev.slne.surf.lobby.inventory.impl
 
 import com.github.stefvanschie.inventoryframework.pane.util.Slot
+import dev.slne.surf.lobby.event.eventServerBridge
+import dev.slne.surf.lobby.event.state.LocalEventServerState
 import dev.slne.surf.lobby.plugin
+import dev.slne.surf.lobby.utils.PermissionRegistry
 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.messages.adventure.sendText
 import dev.slne.surf.surfapi.core.api.messages.adventure.text
+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)
+
+        setOnClick {
+            val player = it.whoClicked as? Player ?: return@setOnClick
+
+            when (eventServerBridge.state) {
+                LocalEventServerState.OPEN -> {
+                    surfBukkitApi.sendPlayerToServer(player, "event")
+                    return@setOnClick
+                }
+
+                LocalEventServerState.CLOSED -> {
+                    if (player.hasPermission(PermissionRegistry.EVENT_BYPASS)) {
+                        surfBukkitApi.sendPlayerToServer(player, "event")
+                        return@setOnClick
+                    }
+                    player.sendText {
+                        appendPrefix()
+                        error("Der Event Server ist aktuell geschlossen!")
+                    }
+                }
+
+                LocalEventServerState.UNKNOWN -> {
+                    player.sendText {
+                        appendPrefix()
+                        error("Aktuell findet kein Event statt!")
+                    }
+                }
+            }
+            it.whoClicked.closeInventory()
+        }
     }
 
     staticPane(Slot.fromXY(1, 0), 3, 3) {
         fillWith(survivalServerItem)
+
+        setOnClick {
+            it.whoClicked.sendText {
+                appendPrefix()
+                error("Die ")
+                variableValue("1.21 Season vom Survival Server")
+                error(" ist beendet. Es steht nicht fest, wann eine neue Season startet. Bitte habe Geduld.")
+            }
+            it.whoClicked.closeInventory()
+        }
     }
 
     staticPane(Slot.fromXY(0, 4), 2, 3) {
         fillWith(lobbyOneServerItem)
+
+        setOnClick {
+            val player = it.whoClicked as? Player ?: return@setOnClick
+            surfBukkitApi.sendPlayerToServer(player, "lobby01")
+        }
     }
 
     staticPane(Slot.fromXY(3, 4), 2, 3) {
         fillWith(lobbyTwoServerItem)
+
+        setOnClick {
+            val player = it.whoClicked as? Player ?: return@setOnClick
+            surfBukkitApi.sendPlayerToServer(player, "lobby02")
+        }
     }
     staticPane(Slot.fromXY(6, 4), 2, 3) {
         fillWith(lobbyThreeServerItem)
+
+        setOnClick {
+            val player = it.whoClicked as? Player ?: return@setOnClick
+            surfBukkitApi.sendPlayerToServer(player, "lobby03")
+        }
     }
 }
 
diff --git a/src/main/kotlin/dev/slne/surf/lobby/listener/DamageListener.kt b/src/main/kotlin/dev/slne/surf/lobby/listener/DamageListener.kt
@@ -8,6 +8,7 @@ import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.entity.EntityDamageByEntityEvent
 import org.bukkit.event.entity.EntityDamageEvent
+import org.bukkit.event.entity.FoodLevelChangeEvent
 
 object DamageListener : Listener {
     @EventHandler
@@ -23,4 +24,11 @@ object DamageListener : Listener {
             event.cancel()
         }
     }
+
+    @EventHandler
+    fun onFoodLose(event: FoodLevelChangeEvent) {
+        if (event.entity is Player) {
+            event.cancel()
+        }
+    }
 }
diff --git a/src/main/kotlin/dev/slne/surf/lobby/nexo/NexoHook.kt b/src/main/kotlin/dev/slne/surf/lobby/nexo/NexoHook.kt
@@ -5,5 +5,5 @@ import org.bukkit.inventory.ItemType
 
 object NexoHook {
     fun getInvisibleItem() =
-        NexoItems.itemFromId("invisible_item")?.finalItemStack ?: ItemType.PAPER.createItemStack()
+        NexoItems.itemFromId("invisible_item")?.build() ?: ItemType.PAPER.createItemStack()
 }
diff --git a/src/main/kotlin/dev/slne/surf/lobby/utils/PermissionRegistry.kt b/src/main/kotlin/dev/slne/surf/lobby/utils/PermissionRegistry.kt
@@ -7,9 +7,12 @@ object PermissionRegistry : PermissionRegistry() {
     private const val PREFIX = "surf.lobby"
     private const val COMMAND_PREFIX = "$PREFIX.command"
 
+    val COMMAND_SPAWN = create("$COMMAND_PREFIX.spawn")
     val COMMAND_LOBBY = create("$COMMAND_PREFIX.lobby")
     val COMMAND_LOBBY_RELOAD = create("$COMMAND_PREFIX.lobby.reload")
 
+    val EVENT_BYPASS = create("$PREFIX.event.bypass")
+
     val PUSHBACK_ATTACK = create("$PREFIX.pushback.attack")
     val PUSHBACK_ITEM = create("$PREFIX.pushback.item")
     val PROTECTION_BYPASS = create("$PREFIX.bypass")

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@ dependencies {`
`12`	`12`	`compileOnly("surf-hologram:surf-hologram-api:1.21.10-1.0.1-20251011.094119-1")`
`13`	`13`	`compileOnly("dev.slne.surf.npc:surf-npc-api:1.21.10-1.5.0-20251009.154819-1")`
`14`	`14`	`compileOnly("com.nexomc:nexo:1.16.1")`
	`15`	`+ implementation("dev.slne.surf:surf-redis:1.0.0-SNAPSHOT")`
	`16`	`+ implementation("dev.slne.surf.event:surf-event-base-api-redis:1.21.11-1.0.0-SNAPSHOT")`
`15`	`17`	`}`
`16`	`18`
`17`	`19`	`version = findProperty("version") as String`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import org.bukkit.event.EventHandler`
`8`	`8`	`import org.bukkit.event.Listener`
`9`	`9`	`import org.bukkit.event.entity.EntityDamageByEntityEvent`
`10`	`10`	`import org.bukkit.event.entity.EntityDamageEvent`
	`11`	`+import org.bukkit.event.entity.FoodLevelChangeEvent`
`11`	`12`
`12`	`13`	`object DamageListener : Listener {`
`13`	`14`	`@EventHandler`
`@@ -23,4 +24,11 @@ object DamageListener : Listener {`
`23`	`24`	`event.cancel()`
`24`	`25`	`}`
`25`	`26`	`}`
	`27`	`+`
	`28`	`+ @EventHandler`
	`29`	`+ fun onFoodLose(event: FoodLevelChangeEvent) {`
	`30`	`+ if (event.entity is Player) {`
	`31`	`+ event.cancel()`
	`32`	`+ }`
	`33`	`+ }`
`26`	`34`	`}`