refactor: update motd system and add layout system

Author: Dominic-Kaemereit

.idea/gradle.xml

@@ -5,10 +5,12 @@ import app.simplecloud.plugin.proxy.bungeecord.handler.TabListHandler
 import app.simplecloud.plugin.proxy.bungeecord.listener.ConfigureTagResolversListener
 import app.simplecloud.plugin.proxy.bungeecord.listener.ProxyPingListener
 import app.simplecloud.plugin.proxy.bungeecord.listener.TabListListener
+import app.simplecloud.plugin.proxy.shared.config.GeneralConfig
 import app.simplecloud.plugin.proxy.shared.config.YamlConfig
-import app.simplecloud.plugin.proxy.shared.config.motd.MotdConfiguration
+import app.simplecloud.plugin.proxy.shared.config.motd.MotdLayoutConfiguration
 import app.simplecloud.plugin.proxy.shared.config.placeholder.PlaceHolderConfiguration
 import app.simplecloud.plugin.proxy.shared.config.tablis.TabListConfiguration
+import app.simplecloud.plugin.proxy.shared.handler.MotdLayoutHandler
 import net.kyori.adventure.platform.bungeecord.BungeeAudiences
 import net.kyori.adventure.text.Component
 import net.kyori.adventure.text.minimessage.MiniMessage
@@ -18,11 +20,13 @@ import net.md_5.bungee.api.plugin.Plugin
 
 class ProxyBungeeCordPlugin: Plugin() {
 
-    lateinit var motdConfiguration: MotdConfiguration
+    lateinit var generalConfiguration: GeneralConfig
     lateinit var tabListConfiguration: TabListConfiguration
     lateinit var placeHolderConfiguration: PlaceHolderConfiguration
 
+    val config = YamlConfig(this.dataFolder.path)
     val tabListHandler = TabListHandler(this)
+    val motdLayoutHandler = MotdLayoutHandler(config, generalConfiguration)
 
     private var adventure: BungeeAudiences? = null
 
@@ -31,15 +35,17 @@ class ProxyBungeeCordPlugin: Plugin() {
     override fun onEnable() {
         val config = YamlConfig(this.dataFolder.path)
 
-        this.motdConfiguration = config.load<MotdConfiguration>("motd")!!
-        config.save("motd", this.motdConfiguration)
+        this.generalConfiguration = config.load<GeneralConfig>("general")!!
+        config.save("general", this.generalConfiguration)
 
         this.tabListConfiguration = config.load<TabListConfiguration>("tablist")!!
         config.save("tablist", this.tabListConfiguration)
 
         this.placeHolderConfiguration = config.load<PlaceHolderConfiguration>("placeholder")!!
         config.save("placeholder", this.placeHolderConfiguration)
 
+        this.motdLayoutHandler.loadMotdLayouts()
+
         this.adventure = BungeeAudiences.create(this);
 
         if (this.tabListConfiguration.tabListUpdateTime > 0)

.idea/misc.xml

@@ -29,7 +29,7 @@ class ConfigureTagResolversListener(
                 pingColors,
                 onlinePlayers,
                 realMaxPlayers,
-                this.plugin.motdConfiguration
+                this.plugin.motdLayoutHandler.getCurrentMotdLayout()
             )
         )
     }

proxy-bungeecord/src/main/kotlin/app/simplecloud/plugin/proxy/bungeecord/ProxyBungeeCordPlugin.kt

@@ -30,7 +30,7 @@ class ProxyPingListener(
 
         val response = event.response
 
-        val motdConfiguration = this.plugin.motdConfiguration
+        val motdConfiguration = this.plugin.motdLayoutHandler.getCurrentMotdLayout()
 
         val firstLine = motdConfiguration.firstLines.random()
         val secondLine = motdConfiguration.secondLines.random()

proxy-bungeecord/src/main/kotlin/app/simplecloud/plugin/proxy/bungeecord/listener/ConfigureTagResolversListener.kt

@@ -0,0 +1,8 @@
+package app.simplecloud.plugin.proxy.shared.config
+
+import org.spongepowered.configurate.objectmapping.ConfigSerializable
+
+@ConfigSerializable
+data class GeneralConfig(
+    var currentLayout: String = "default-motd"
+)

proxy-bungeecord/src/main/kotlin/app/simplecloud/plugin/proxy/bungeecord/listener/ProxyPingListener.kt

@@ -7,7 +7,7 @@ import org.spongepowered.configurate.yaml.NodeStyle
 import org.spongepowered.configurate.yaml.YamlConfigurationLoader
 import java.io.File
 
-open class YamlConfig(private val dirPath: String) {
+open class YamlConfig(val dirPath: String) {
 
     inline fun <reified T> load(): T? {
         return load(null)

proxy-shared/src/main/kotlin/app/simplecloud/plugin/proxy/shared/config/GeneralConfig.kt

@@ -3,7 +3,7 @@ package app.simplecloud.plugin.proxy.shared.config.motd
 import org.spongepowered.configurate.objectmapping.ConfigSerializable
 
 @ConfigSerializable
-data class MotdConfiguration(
+data class MotdLayoutConfiguration(
     val firstLines: List<String> = listOf("<gradient:#00fcff:#0da1a3><bold>SimpleCloud</bold></gradient> <dark_gray>»<gray> Simplify your network <dark_gray>|<bold><#4595ff> 1.12<#545454> - <#4595ff>1.20</bold>"),
     val secondLines: List<String> = listOf("<dark_gray>× <#178fff>Status<dark_gray>: <bold><#22cc22>Online</bold> <dark_gray>- <#ffffff>%PROXY%"),
     val playerInfo: List<String> = listOf(),

proxy-shared/src/main/kotlin/app/simplecloud/plugin/proxy/shared/config/YamlConfig.kt

@@ -0,0 +1,56 @@
+package app.simplecloud.plugin.proxy.shared.handler
+
+import app.simplecloud.plugin.proxy.shared.config.GeneralConfig
+import app.simplecloud.plugin.proxy.shared.config.YamlConfig
+import app.simplecloud.plugin.proxy.shared.config.motd.MotdLayoutConfiguration
+import java.io.File
+
+class MotdLayoutHandler(
+    val yamlConfig: YamlConfig,
+    val generalConfig: GeneralConfig
+) {
+
+    private val loadedMotdLayouts: MutableMap<String, MotdLayoutConfiguration> = mutableMapOf()
+
+    fun loadMotdLayouts() {
+        loadedMotdLayouts.clear()
+        val directory = File(yamlConfig.dirPath + "/layout")
+
+        if (!directory.exists()) {
+            directory.mkdirs()
+        }
+
+        directory.listFiles()?.forEach {
+            val name = it.nameWithoutExtension
+            val motdLayout = yamlConfig.load<MotdLayoutConfiguration>("layout/$name")
+            if (motdLayout != null) {
+                loadedMotdLayouts[name] = motdLayout
+                println("Loaded motd layout: $name")
+            }
+        }
+
+        if (loadedMotdLayouts.isEmpty()) {
+            println("No motd layouts found, creating default motd layout")
+            val defaultMotdLayout = MotdLayoutConfiguration()
+            yamlConfig.save("layout/default-motd", defaultMotdLayout)
+            loadedMotdLayouts["default-motd"] = defaultMotdLayout
+        }
+    }
+
+    fun getMotdLayout(name: String): MotdLayoutConfiguration {
+        return loadedMotdLayouts[name] ?: MotdLayoutConfiguration()
+    }
+
+    fun getCurrentMotdLayout(): MotdLayoutConfiguration {
+        return getMotdLayout(generalConfig.currentLayout)
+    }
+
+    fun getLoadedMotdLayouts(): List<String> {
+        return loadedMotdLayouts.keys.toList()
+    }
+
+    fun setMotdLayout(name: String) {
+        generalConfig.currentLayout = name
+        yamlConfig.save("general", generalConfig)
+    }
+}

…/shared/config/motd/MotdConfiguration.kt …d/config/motd/MotdLayoutConfiguration.ktproxy-shared/src/main/kotlin/app/simplecloud/plugin/proxy/shared/config/motd/MotdConfiguration.kt renamed to proxy-shared/src/main/kotlin/app/simplecloud/plugin/proxy/shared/config/motd/MotdLayoutConfiguration.kt proxy-shared/src/main/kotlin/app/simplecloud/plugin/proxy/shared/config/motd/MotdConfiguration.kt renamed to proxy-shared/src/main/kotlin/app/simplecloud/plugin/proxy/shared/config/motd/MotdLayoutConfiguration.kt

@@ -1,7 +1,7 @@
 package app.simplecloud.plugin.proxy.shared.resolver
 
 import app.simplecloud.plugin.proxy.shared.config.motd.MaxPlayerDisplayType
-import app.simplecloud.plugin.proxy.shared.config.motd.MotdConfiguration
+import app.simplecloud.plugin.proxy.shared.config.motd.MotdLayoutConfiguration
 import app.simplecloud.plugin.proxy.shared.config.placeholder.PingColor
 import net.kyori.adventure.text.minimessage.Context
 import net.kyori.adventure.text.minimessage.tag.Tag
@@ -21,7 +21,7 @@ object TagResolverHelper {
         pingColors: List<PingColor>,
         onlinePlayers: Int,
         realMaxPlayers: Int,
-        motdConfiguration: MotdConfiguration
+        motdConfiguration: MotdLayoutConfiguration
     ): List<TagResolver> {
         return listOf(
             Placeholder.unparsed(TagResolverNames.SERVER_NAME, serverName),
@@ -46,7 +46,7 @@ object TagResolverHelper {
     fun getMaxPlayersTagResolver(
         onlinePlayers: Int,
         realMaxPlayers: Int,
-        motdConfiguration: MotdConfiguration
+        motdConfiguration: MotdLayoutConfiguration
     ): TagResolver {
         val maxPlayers = when (motdConfiguration.maxPlayerDisplayType) {
             MaxPlayerDisplayType.REAL -> realMaxPlayers