Fix player kick, support spigot

Author: Rothes

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/user/ConsoleUser.kt

@@ -32,7 +32,7 @@ object ConsoleUser: BukkitUser(), LogUser {
         colorSchemeUnsafe = userData.colorScheme
     }
 
-    override fun <T> kick(locales: MultiLangConfiguration<T>, block: T.() -> String?, vararg params: TagResolver) {
+    override fun <T> kick(lang: MultiLangConfiguration<T>, block: T.() -> String?, vararg params: TagResolver) {
         throw UnsupportedOperationException("Cannot kick a ConsoleUser")
     }
 

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/user/GenericUser.kt

@@ -22,7 +22,7 @@ class GenericUser(override val commandSender: CommandSender): BukkitUser() {
 
     override val isOnline: Boolean = false
 
-    override fun <T> kick(locales: MultiLangConfiguration<T>, block: T.() -> String?, vararg params: TagResolver) {
+    override fun <T> kick(lang: MultiLangConfiguration<T>, block: T.() -> String?, vararg params: TagResolver) {
         throw UnsupportedOperationException("Cannot kick a GenericUser")
     }
 

bukkit/src/main/kotlin/io/github/rothes/esu/bukkit/user/PlayerUser.kt

@@ -1,13 +1,13 @@
 package io.github.rothes.esu.bukkit.user
 
 import io.github.rothes.esu.bukkit.audience
+import io.github.rothes.esu.bukkit.util.ServerCompatibility
 import io.github.rothes.esu.bukkit.util.version.adapter.PlayerAdapter.Companion.connected
-import io.github.rothes.esu.core.colorscheme.ColorSchemes
 import io.github.rothes.esu.core.configuration.MultiLangConfiguration
 import io.github.rothes.esu.core.storage.StorageManager
 import io.github.rothes.esu.core.util.AdventureConverter.server
+import io.github.rothes.esu.core.util.ComponentUtils.legacy
 import io.github.rothes.esu.lib.adventure.audience.Audience
-import io.github.rothes.esu.lib.adventure.text.minimessage.MiniMessage
 import io.github.rothes.esu.lib.adventure.text.minimessage.tag.resolver.TagResolver
 import org.bukkit.Bukkit
 import org.bukkit.command.CommandSender
@@ -63,9 +63,13 @@ class PlayerUser(override val uuid: UUID, initPlayer: Player? = null): BukkitUse
         colorSchemeUnsafe = userData.colorScheme
     }
 
-    override fun <T> kick(locales: MultiLangConfiguration<T>, block: T.() -> String?, vararg params: TagResolver) {
-        player.kick(MiniMessage.miniMessage().deserialize(localed(locales, block), *params,
-            ColorSchemes.schemes.get(colorScheme) { tagResolver }!!).server)
+    override fun <T> kick(lang: MultiLangConfiguration<T>, block: T.() -> String?, vararg params: TagResolver) {
+        val msg = buildMiniMessage(lang, block, params = params)
+        if (ServerCompatibility.isPaper)
+            player.kick(msg.server)
+        else
+            @Suppress("DEPRECATION") // Spigot
+            player.kickPlayer(msg.legacy)
     }
 
     override fun equals(other: Any?): Boolean {

core/src/main/kotlin/io/github/rothes/esu/core/user/User.kt

@@ -142,7 +142,7 @@ interface User {
         audience.sendMessage(message)
     }
 
-    fun <T> kick(locales: MultiLangConfiguration<T>, block: T.() -> String?, vararg params: TagResolver)
+    fun <T> kick(lang: MultiLangConfiguration<T>, block: T.() -> String?, vararg params: TagResolver)
 
     fun actionBar(message: Component) {
         audience.sendActionBar(message)

velocity/src/main/kotlin/io/github/rothes/esu/velocity/user/ConsoleUser.kt

@@ -32,7 +32,7 @@ object ConsoleUser: VelocityUser(), LogUser {
         colorSchemeUnsafe = userData.colorScheme
     }
 
-    override fun <T> kick(locales: MultiLangConfiguration<T>, block: T.() -> String?, vararg params: TagResolver) {
+    override fun <T> kick(lang: MultiLangConfiguration<T>, block: T.() -> String?, vararg params: TagResolver) {
         throw UnsupportedOperationException("Cannot kick a ConsoleUser")
     }
 

velocity/src/main/kotlin/io/github/rothes/esu/velocity/user/PlayerUser.kt

@@ -56,8 +56,8 @@ class PlayerUser(override val uuid: UUID, initPlayer: Player? = null): VelocityU
         colorSchemeUnsafe = userData.colorScheme
     }
 
-    override fun <T> kick(locales: MultiLangConfiguration<T>, block: T.() -> String?, vararg params: TagResolver) {
-        player.disconnect(buildMiniMessage(locales, block, *params).server)
+    override fun <T> kick(lang: MultiLangConfiguration<T>, block: T.() -> String?, vararg params: TagResolver) {
+        player.disconnect(buildMiniMessage(lang, block, *params).server)
     }
 
     override fun equals(other: Any?): Boolean {