[2.3.7] 1.21.8 & 功能更新 & 修复

* 修复低版本铁砧问题
* 新增Kether mute动作
* 支持禁言不在线/跨服玩家
* 支持为自定义功能添加冷却时间

Author: ItsFlicker

build.gradle.kts

@@ -40,8 +40,6 @@ subprojects {
         version {
             taboolib = "6.2.3-a372a91"
             coroutines = null
-//            isSkipKotlin = true
-//            isSkipKotlinRelocate = true
         }
     }
 

gradle.properties

@@ -1,5 +1,5 @@
 group=me.arasple.mc.trchat
-version=2.3.6
+version=2.3.7
 kotlin.incremental=true
 kotlin.incremental.java=true
 kotlin.incremental.useClasspathSnapshot=true

plugin/build.gradle.kts

@@ -19,6 +19,10 @@ taboolib {
             name("Multiverse-Core").with("bukkit").loadafter(true)
             name("Geyser-Spigot").with("bukkit").loadafter(true)
         }
+//        version {
+//            isSkipKotlin = true
+//            isSkipKotlinRelocate = true
+//        }
     }
     relocate("com.eatthepath.uuid.", "${rootProject.group}.library.uuid.")
 //    relocate("net.md_5.bungee", "net.md_5.bungee121")

project/common/src/main/kotlin/me/arasple/mc/trchat/util/Util.kt

@@ -11,6 +11,15 @@ private val reportedErrors = mutableListOf<String>()
 val nilUUID = UUID(0, 0)
 val papiRegex = "(%)(.+?)(%)|(:)(.+?)(:)|(?!\\{\")((\\{)(.+?)(}))".toRegex()
 
+fun hasClass(className: String): Boolean {
+    return try {
+        Class.forName(className)
+        true
+    } catch (_: ClassNotFoundException) {
+        false
+    }
+}
+
 fun Throwable.print(title: String, printStackTrace: Boolean = true) {
     console().sendMessage("§c[TrChat] §7$title")
     console().sendMessage("§7${javaClass.name}: $localizedMessage")

project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/api/impl/BukkitProxyManager.kt

@@ -8,8 +8,8 @@ import me.arasple.mc.trchat.module.internal.hook.isVanished
 import me.arasple.mc.trchat.module.internal.proxy.BukkitProxyProcessor
 import me.arasple.mc.trchat.module.internal.proxy.redis.RedisManager
 import me.arasple.mc.trchat.util.parseString
+import net.md_5.bungee.api.ChatColor
 import org.bukkit.Bukkit
-import org.bukkit.ChatColor
 import org.bukkit.plugin.messaging.PluginMessageRecipient
 import org.spigotmc.SpigotConfig
 import taboolib.common.platform.Platform

project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/conf/Loader.kt

@@ -25,12 +25,14 @@ import taboolib.common.io.newFile
 import taboolib.common.platform.Platform
 import taboolib.common.platform.PlatformSide
 import taboolib.common.platform.ProxyCommandSender
+import taboolib.common.platform.function.console
 import taboolib.common.platform.function.getDataFolder
 import taboolib.common.platform.function.releaseResourceFile
 import taboolib.common.util.asList
 import taboolib.common.util.orNull
 import taboolib.common.util.unsafeLazy
 import taboolib.common5.Coerce
+import taboolib.common5.util.parseMillis
 import taboolib.library.configuration.ConfigurationSection
 import taboolib.module.configuration.util.getMap
 import taboolib.module.lang.sendLang
@@ -196,10 +198,13 @@ object Loader {
             val priority = map.getInt("priority", 100)
             val regex = map.getString("pattern")!!.toRegex()
             val filterTextRegex = map.getString("text-filter")?.toRegex()
+            val cooldown = kotlin.runCatching { map.getString("cooldown")?.parseMillis() }
+                .onFailure { console().sendLang("Mute-Wrong-Format", map.getString("cooldown")!!) }
+                .getOrNull()
             val displayJson = parseJSON(map.getConfigurationSection("display")!!.toMap(), isMsg = false)
             val reaction = map["action"]?.let { Reaction(it.asList()) }
 
-            CustomFunction(id, condition, priority, regex, filterTextRegex, displayJson, reaction)
+            CustomFunction(id, condition, priority, regex, filterTextRegex, cooldown, displayJson, reaction)
         }.sortedBy { it.priority }
 
         Function.reload(functions)

project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/ChatSession.kt

@@ -8,7 +8,6 @@ import me.arasple.mc.trchat.util.color.CustomColor
 import me.arasple.mc.trchat.util.color.MessageColors
 import me.arasple.mc.trchat.util.data
 import org.bukkit.entity.Player
-import taboolib.expansion.getDataContainer
 import taboolib.library.reflex.Reflex.Companion.getProperty
 import taboolib.module.chat.ComponentText
 import taboolib.module.chat.Components
@@ -52,7 +51,7 @@ class ChatSession(val player: Player) {
         return if (forces.isNotEmpty()) {
             CustomColor.get(forces[0])
         } else {
-            val selectedColor = player.getDataContainer()["color"].takeIf { it != "null" }
+            val selectedColor = player.data.color
             if (selectedColor != null && player.hasPermission(MessageColors.COLOR_PERMISSION_NODE + selectedColor)) {
                 CustomColor.get(selectedColor)
             } else {

project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/format/MsgComponent.kt

@@ -22,7 +22,7 @@ import taboolib.module.chat.impl.AdventureComponent
  */
 class MsgComponent(val defaultColor: List<Pair<CustomColor, Condition?>>, style: List<Style>) : JsonComponent(null, style) {
 
-    fun processComponent(sender: CommandSender, msg: TextComponent, disabledFunctions: List<String>): TextComponent {
+    private fun processComponent(sender: CommandSender, msg: TextComponent, disabledFunctions: List<String>): TextComponent {
         val children = msg.children().map { processComponent(sender, it as TextComponent, disabledFunctions) }
         val new = createComponent(sender, msg.content(), disabledFunctions).toAdventureObject() as TextComponent
         val style = new.style().merge(msg.style())

project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/display/function/CustomFunction.kt

@@ -5,7 +5,9 @@ import me.arasple.mc.trchat.module.internal.script.Condition
 import me.arasple.mc.trchat.module.internal.script.Reaction
 import me.arasple.mc.trchat.util.pass
 import org.bukkit.entity.Player
+import taboolib.common5.Baffle
 import taboolib.module.chat.ComponentText
+import java.util.concurrent.TimeUnit
 
 /**
  * @author ItsFlicker
@@ -17,10 +19,13 @@ class CustomFunction(
     val priority: Int,
     val regex: Regex,
     val filterTextRegex: Regex?,
+    val cooldown: Long?,
     val displayJson: JsonComponent,
     override val reaction: Reaction?
 ) : Function(id) {
 
+    val baffle = cooldown?.let { Baffle.of(it, TimeUnit.MILLISECONDS) }
+
     override fun createVariable(sender: Player, message: String): String {
         return message.replaceRegex(regex, filterTextRegex) { "{{$id:$it}}" }
     }
@@ -34,6 +39,12 @@ class CustomFunction(
     }
 
     override fun checkCooldown(sender: Player, message: String): Boolean {
+        if (sender.hasPermission("trchat.bypass.customcd")) {
+            return true
+        }
+        if (baffle != null) {
+            return baffle.hasNext(sender.name)
+        }
         return true
     }
 

project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/module/internal/TrChatBukkit.kt

@@ -11,6 +11,7 @@ import me.arasple.mc.trchat.module.display.channel.Channel
 import me.arasple.mc.trchat.module.display.function.Function
 import me.arasple.mc.trchat.module.internal.data.PlayerData
 import me.arasple.mc.trchat.module.internal.hook.HookPlugin
+import me.arasple.mc.trchat.util.hasClass
 import org.bukkit.Bukkit
 import taboolib.common.LifeCycle
 import taboolib.common.platform.*
@@ -31,13 +32,10 @@ object TrChatBukkit : Plugin() {
     var isGlobalMuting = false
 
     internal fun detectPaperEnv() {
-        try {
-            // Paper 1.16.5+
-            Class.forName("com.destroystokyo.paper.PaperConfig")
-            if (versionId >= 11604) {
-                isPaperEnv = true
-            }
-        } catch (_: ClassNotFoundException) {
+        if ((hasClass("com.destroystokyo.paper.PaperConfig")
+            || hasClass("io.papermc.paper.configuration.Configuration"))
+            && versionId >= 11604) {
+            isPaperEnv = true
         }
         if (Folia.isFolia || (isPaperEnv && MinecraftVersion.isHigherOrEqual(MinecraftVersion.V1_20))) {
             Components.useAdventure = true
@@ -51,6 +49,7 @@ object TrChatBukkit : Plugin() {
 //        registerLifeCycleTask(LifeCycle.INIT, 0) {
 //            YamlUpdater.update("settings.yml", updateExists = false)
 //        }
+        MinecraftVersion.supportedVersion[13] = arrayOf("!1.21", "1.21.1", "!1.21.2", "1.21.3", "1.21.4", "1.21.5", "!1.21.6", "1.21.7", "1.21.8")
     }
 
     override fun onLoad() {