feat: refactor config handling by introducing LobbyConfigHolder and update event cancellation usage

Author: TheBjoRedCraft

src/main/kotlin/dev/slne/surf/lobby/PaperMain.kt

@@ -2,7 +2,7 @@ package dev.slne.surf.lobby
 
 import com.github.shynixn.mccoroutine.folia.SuspendingJavaPlugin
 import dev.slne.surf.lobby.command.lobbyCommand
-import dev.slne.surf.lobby.config.LobbyConfig
+import dev.slne.surf.lobby.config.LobbyConfigHolder
 import dev.slne.surf.lobby.hologram.SurfHologramHook
 import dev.slne.surf.lobby.listener.DoubleJumpListener
 import dev.slne.surf.lobby.listener.GameModeListener
@@ -34,7 +34,7 @@ class PaperMain : SuspendingJavaPlugin() {
     }
 }
 
-val lobbyConfig get() = LobbyConfig.getConfig()
-
+val lobbyConfigHolder = LobbyConfigHolder()
+val lobbyConfig get() = lobbyConfigHolder.lobbyConfig
 val surfNpcHook get() = Bukkit.getPluginManager().isPluginEnabled("surf-npc-bukkit")
 val surfHologramHook get() = Bukkit.getPluginManager().isPluginEnabled("surf-hologram-paper")

src/main/kotlin/dev/slne/surf/lobby/command/LobbyCommand.kt

@@ -3,7 +3,7 @@ package dev.slne.surf.lobby.command
 import dev.jorel.commandapi.kotlindsl.anyExecutor
 import dev.jorel.commandapi.kotlindsl.commandTree
 import dev.jorel.commandapi.kotlindsl.literalArgument
-import dev.slne.surf.lobby.config.LobbyConfig
+import dev.slne.surf.lobby.lobbyConfigHolder
 import dev.slne.surf.lobby.utils.PermissionRegistry
 import dev.slne.surf.surfapi.core.api.messages.adventure.sendText
 
@@ -13,7 +13,7 @@ fun lobbyCommand() = commandTree("lobby") {
     literalArgument("reload") {
         withPermission(PermissionRegistry.COMMAND_LOBBY_RELOAD)
         anyExecutor { executor, _ ->
-            LobbyConfig.reloadFromFile()
+            lobbyConfigHolder.reload()
 
             executor.sendText {
                 appendPrefix()

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

@@ -1,7 +1,5 @@
 package dev.slne.surf.lobby.config
 
-import dev.slne.surf.lobby.plugin
-import dev.slne.surf.surfapi.core.api.config.SpongeYmlConfigClass
 import org.bukkit.Location
 import org.spongepowered.configurate.objectmapping.ConfigSerializable
 
@@ -11,16 +9,7 @@ data class LobbyConfig(
     val survivalNpc: LocationConfig = LocationConfig.default(),
     val eventNpc: LocationConfig = LocationConfig.default()
 ) {
-    companion object : SpongeYmlConfigClass<LobbyConfig>(
-        LobbyConfig::class.java,
-        plugin.dataPath,
-        "lobby.yml"
-    ) {
-        init {
-            init()
-        }
-    }
-
+    @ConfigSerializable
     data class LocationConfig(
         val world: String,
         val x: Double,
@@ -37,16 +26,14 @@ data class LobbyConfig(
         }
 
         companion object {
-            fun default(): LocationConfig {
-                return LocationConfig(
-                    world = "world",
-                    x = 0.0,
-                    y = 100.0,
-                    z = 0.0,
-                    yaw = 0.0f,
-                    pitch = 0.0f
-                )
-            }
+            fun default() = LocationConfig(
+                world = "world",
+                x = 0.0,
+                y = 100.0,
+                z = 0.0,
+                yaw = 0.0f,
+                pitch = 0.0f
+            )
         }
     }
 }

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

@@ -0,0 +1,27 @@
+package dev.slne.surf.lobby.config
+
+import dev.slne.surf.lobby.plugin
+import dev.slne.surf.surfapi.core.api.config.manager.SpongeConfigManager
+import dev.slne.surf.surfapi.core.api.config.surfConfigApi
+
+class LobbyConfigHolder {
+    private val configManager: SpongeConfigManager<LobbyConfig>
+
+    init {
+        surfConfigApi.createSpongeYmlConfig(
+            LobbyConfig::class.java,
+            plugin.dataPath,
+            "lobby.yml"
+        )
+        configManager = surfConfigApi.getSpongeConfigManagerForConfig(
+            LobbyConfig::class.java
+        )
+        reload()
+    }
+
+    fun reload() {
+        configManager.reloadFromFile()
+    }
+
+    val lobbyConfig get() = configManager.config
+}

src/main/kotlin/dev/slne/surf/lobby/listener/DoubleJumpListener.kt

@@ -1,5 +1,6 @@
 package dev.slne.surf.lobby.listener
 
+import dev.slne.surf.surfapi.bukkit.api.event.cancel
 import org.bukkit.GameMode
 import org.bukkit.Particle
 import org.bukkit.block.BlockFace
@@ -36,6 +37,6 @@ object DoubleJumpListener : Listener {
         player.allowFlight = false
         player.isFlying = false
 
-        event.isCancelled = true
+        event.cancel()
     }
 }

src/main/kotlin/dev/slne/surf/lobby/listener/WorldProtectionListener.kt

@@ -1,6 +1,7 @@
 package dev.slne.surf.lobby.listener
 
 import dev.slne.surf.lobby.utils.PermissionRegistry
+import dev.slne.surf.surfapi.bukkit.api.event.cancel
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
 import org.bukkit.event.block.BlockBreakEvent
@@ -14,7 +15,7 @@ object WorldProtectionListener : Listener {
             return
         }
 
-        event.isCancelled = true
+        event.cancel()
     }
 
     @EventHandler
@@ -23,7 +24,7 @@ object WorldProtectionListener : Listener {
             return
         }
 
-        event.isCancelled = true
+        event.cancel()
     }
 
     @EventHandler
@@ -32,6 +33,6 @@ object WorldProtectionListener : Listener {
             return
         }
 
-        event.isCancelled = true
+        event.cancel()
     }
 }