remove: useless/not used imports

Author: Dominic-Kaemereit

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

@@ -7,7 +7,6 @@ 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.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

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

@@ -2,17 +2,19 @@ package app.simplecloud.plugin.proxy.bungeecord.listener
 
 import app.simplecloud.plugin.proxy.bungeecord.ProxyBungeeCordPlugin
 import app.simplecloud.plugin.proxy.shared.config.motd.MaxPlayerDisplayType
-import app.simplecloud.plugin.proxy.shared.event.MotdConfiguration
 import net.kyori.adventure.text.Component
-import net.kyori.adventure.text.minimessage.MiniMessage
 import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer
+import net.md_5.bungee.api.Favicon
 import net.md_5.bungee.api.ServerPing.*
 import net.md_5.bungee.api.event.ProxyPingEvent
 import net.md_5.bungee.api.plugin.Listener
 import net.md_5.bungee.event.EventHandler
+import java.awt.image.BufferedImage
+import java.io.File
 import java.net.InetAddress
 import java.net.InetSocketAddress
 import java.util.*
+import javax.imageio.ImageIO
 
 class ProxyPingListener(
     private val plugin: ProxyBungeeCordPlugin
@@ -67,6 +69,15 @@ class ProxyPingListener(
                 -1
             )
         }
+
+        val favicon = if (motdConfiguration.serverIcon == "") {
+            response.faviconObject
+        } else {
+            val serverIcon: BufferedImage = ImageIO.read(File(motdConfiguration.serverIcon))
+            Favicon.create(serverIcon)
+        }
+
+        response.setFavicon(favicon)
     }
 
 }

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

@@ -1,13 +1,15 @@
 package app.simplecloud.plugin.proxy.shared.config.motd
 
 import org.spongepowered.configurate.objectmapping.ConfigSerializable
+import java.awt.image.BufferedImage
 
 @ConfigSerializable
 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(),
     val versionName: String = "",
+    var serverIcon: String = "server-icon.png",
     val maxPlayerDisplayType: MaxPlayerDisplayType? = MaxPlayerDisplayType.REAL,
     val dynamicPlayerRange: Int = 1
 )

proxy-shared/src/main/kotlin/app/simplecloud/plugin/proxy/shared/handler/MotdLayoutHandler.kt

@@ -3,7 +3,12 @@ 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.awt.image.BufferedImage
+import java.io.ByteArrayOutputStream
 import java.io.File
+import java.util.*
+import javax.imageio.ImageIO
+
 
 class MotdLayoutHandler(
     val yamlConfig: YamlConfig,
@@ -24,6 +29,7 @@ class MotdLayoutHandler(
             val name = it.nameWithoutExtension
             val motdLayout = yamlConfig.load<MotdLayoutConfiguration>("layout/$name")
             if (motdLayout != null) {
+                //motdLayout.serverIcon = convirtImageFileToBase64Url(File(motdLayout.serverIcon))
                 loadedMotdLayouts[name] = motdLayout
                 println("Loaded motd layout: $name")
             }
@@ -53,4 +59,19 @@ class MotdLayoutHandler(
         generalConfig.currentLayout = name
         yamlConfig.save("general", generalConfig)
     }
+
+    /*fun convirtImageFileToBase64Url(imageFile: File): String {
+        /*if (!imageFile.exists()) {
+            println("Image file not found: ${imageFile.absolutePath}")
+            return ""
+        }
+
+        val serverIcon: BufferedImage = ImageIO.read(imageFile)
+        val outputStream = ByteArrayOutputStream()
+        ImageIO.write(serverIcon, "png", outputStream)
+        val iconBytes = outputStream.toByteArray()
+        return Base64.getEncoder().encodeToString(iconBytes)
+         */
+        return imageFile.name
+    }*/
 }

proxy-velocity/src/main/kotlin/app/simplecloud/plugin/proxy/velocity/ProxyVelocityPlugin.kt

@@ -2,7 +2,6 @@ package app.simplecloud.plugin.proxy.velocity
 
 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 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

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

@@ -6,10 +6,16 @@ import com.velocitypowered.api.event.Subscribe
 import com.velocitypowered.api.event.proxy.ProxyPingEvent
 import com.velocitypowered.api.proxy.server.ServerPing
 import com.velocitypowered.api.proxy.server.ServerPing.SamplePlayer
+import com.velocitypowered.api.util.Favicon
+import java.awt.image.BufferedImage
+import java.io.ByteArrayOutputStream
+import java.io.File
 import java.net.InetAddress
 import java.util.*
+import javax.imageio.ImageIO
 import kotlin.jvm.optionals.getOrNull
 
+
 class ProxyPingListener(
     private val plugin: ProxyVelocityPlugin
 ) {
@@ -53,12 +59,20 @@ class ProxyPingListener(
             )
         }
 
+        val favicon = if (motdConfiguration.serverIcon == "") {
+            serverPing.favicon.orElse(null)
+        } else {
+            val serverIcon: BufferedImage = ImageIO.read(File(motdConfiguration.serverIcon))
+            Favicon.create(serverIcon)
+        }
+
         event.ping = event.ping.asBuilder()
             .version(versions)
             .onlinePlayers(onlinePlayers)
             .maximumPlayers(maxPlayers)
             .samplePlayers(*samplePlayers.toTypedArray())
             .description(messageOfTheDay)
+            .favicon(favicon)
             .build()
     }