[2.3.16] 1.21.11

Author: ItsFlicker

build.gradle.kts

@@ -37,9 +37,10 @@ subprojects {
             install(JavaScript)
             install(Bukkit, BungeeCord, Velocity)
             disableOnSkippedVersion = false
+//            disableOnUnsupportedVersion = false
         }
         version {
-            taboolib = "6.2.4-7f8b30dc"
+            taboolib = "6.2.4-5902762"
             coroutines = null
         }
     }

gradle.properties

@@ -1,5 +1,5 @@
 group=me.arasple.mc.trchat
-version=2.3.15
+version=2.3.16
 kotlin.incremental=true
 kotlin.incremental.java=true
 kotlin.caching.enabled=true

project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/api/event/TrChatEvent.kt

@@ -3,7 +3,6 @@ package me.arasple.mc.trchat.api.event
 import me.arasple.mc.trchat.module.display.ChatSession
 import me.arasple.mc.trchat.module.display.channel.Channel
 import me.arasple.mc.trchat.module.display.channel.PrivateChannel
-import me.arasple.mc.trchat.util.pass
 import taboolib.module.chat.ComponentText
 import taboolib.module.chat.Components
 import taboolib.platform.type.BukkitProxyEvent
@@ -12,6 +11,9 @@ import taboolib.platform.type.BukkitProxyEvent
  * TrChatEvent
  * me.arasple.mc.trchat.api.event
  *
+ * 在 ChannelEvents 前触发
+ * component 仅包含玩家消息部分
+ *
  * @author ItsFlicker
  * @since 2021/8/20 20:53
  */
@@ -25,12 +27,6 @@ class TrChatEvent(
 
     val player = session.player
 
-    var message = component.toLegacyText()
-        set(value) {
-            field = value
-            component = Components.text(value)
-        }
-
     init {
         if (channel is PrivateChannel) {
             val event = TrChatPrivateEvent(channel, session, component)
@@ -39,28 +35,10 @@ class TrChatEvent(
             this.component = event.component
         }
     }
-    fun getFullMessage() : String{
-        // 获取符合条件的格式
-        val format = channel.formats.firstOrNull { it.condition.pass(player) }
-        // 构建完整消息
-        val fullComponent = Components.empty()
 
-        // 添加前缀
-        format?.prefix?.forEach { prefix ->
-            prefix.value.firstOrNull { it.condition.pass(player) }?.content
-                ?.toTextComponent(player)?.let { fullComponent.append(it) }
-        }
-
-        // 添加消息内容
-        fullComponent.append(component)
-
-        // 添加后缀
-        format?.suffix?.forEach { suffix ->
-            suffix.value.firstOrNull { it.condition.pass(player) }?.content
-                ?.toTextComponent(player)?.let { fullComponent.append(it) }
-        }
+    fun getMessage() = component.toLegacyText()
 
-        val fullMessage = fullComponent.toLegacyText()
-        return fullMessage
+    fun setMessage(message: String) {
+        component = Components.text(message)
     }
 }

project/runtime-bukkit/src/main/kotlin/me/arasple/mc/trchat/api/event/TrChatSendEvent.kt

@@ -0,0 +1,36 @@
+package me.arasple.mc.trchat.api.event
+
+import me.arasple.mc.trchat.module.display.ChatSession
+import me.arasple.mc.trchat.module.display.channel.Channel
+import taboolib.module.chat.ComponentText
+import taboolib.module.chat.Components
+import taboolib.platform.type.BukkitProxyEvent
+
+/**
+ * TrChatSendEvent
+ * me.arasple.mc.trchat.api.event
+ *
+ * 在消息链构造完成后触发
+ * component 包含整条即将发送的聊天消息
+ *
+ */
+class TrChatSendEvent(
+    val channel: Channel,
+    val session: ChatSession,
+    var component: ComponentText,
+    val type: Type = Type.COMMON
+) : BukkitProxyEvent() {
+
+    val player = session.player
+
+    fun getMessage() = component.toLegacyText()
+
+    fun setMessage(message: String) {
+        component = Components.text(message)
+    }
+
+    enum class Type {
+        COMMON, SENDER, RECEIVER
+    }
+
+}

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

@@ -2,6 +2,7 @@ package me.arasple.mc.trchat.module.display.channel
 
 import me.arasple.mc.trchat.TrChat
 import me.arasple.mc.trchat.api.event.TrChatEvent
+import me.arasple.mc.trchat.api.event.TrChatSendEvent
 import me.arasple.mc.trchat.api.impl.BukkitProxyManager
 import me.arasple.mc.trchat.module.conf.file.Settings
 import me.arasple.mc.trchat.module.display.channel.obj.*
@@ -153,7 +154,7 @@ open class Channel(
         ChatLogs.logNormal(player.name, plain)
         Metrics.increase(0)
 
-        val component = Components.empty()
+        var component = Components.empty()
         formats.firstOrNull { it.condition.pass(player) }?.let { format ->
             format.prefix
                 .mapNotNull { prefix -> prefix.value.firstOrNull { it.condition.pass(player) }?.content?.toTextComponent(player) }
@@ -169,6 +170,11 @@ open class Channel(
             session.cancelChat = false
             return ChannelExecuteResult(failedReason = ChannelExecuteResult.FailReason.EVENT)
         }
+        val sendEvent = TrChatSendEvent(this, session, component)
+        if (!sendEvent.call()) {
+            return ChannelExecuteResult(failedReason = ChannelExecuteResult.FailReason.EVENT)
+        }
+        component = sendEvent.component
         // Proxy
         if (settings.proxy) {
             if (BukkitProxyManager.processor != null || settings.forceProxy) {

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

@@ -1,6 +1,7 @@
 package me.arasple.mc.trchat.module.display.channel
 
 import me.arasple.mc.trchat.api.event.TrChatEvent
+import me.arasple.mc.trchat.api.event.TrChatSendEvent
 import me.arasple.mc.trchat.api.impl.BukkitProxyManager
 import me.arasple.mc.trchat.module.display.channel.obj.ChannelBindings
 import me.arasple.mc.trchat.module.display.channel.obj.ChannelEvents
@@ -164,8 +165,8 @@ class PrivateChannel(
             ?: return ChannelExecuteResult(failedReason = ChannelExecuteResult.FailReason.EVENT)
         plain = msg.toPlainText()
 
-        val send = Components.empty()
         val msgComponent = Components.empty()
+        var send = Components.empty()
         sender.firstOrNull { it.condition.pass(player) }?.let { format ->
             format.prefix
                 .mapNotNull { prefix -> prefix.value.firstOrNull { it.condition.pass(player) }?.content?.toTextComponent(player) }
@@ -179,7 +180,7 @@ class PrivateChannel(
                 .forEach { suffix -> send.append(suffix) }
         } ?: return ChannelExecuteResult(failedReason = ChannelExecuteResult.FailReason.NO_FORMAT)
 
-        val receive = Components.empty()
+        var receive = Components.empty()
         receiver.firstOrNull { it.condition.pass(player) }?.let { format ->
             format.prefix
                 .mapNotNull { prefix -> prefix.value.firstOrNull { it.condition.pass(player) }?.content?.toTextComponent(player) }
@@ -198,7 +199,11 @@ class PrivateChannel(
         if (!events.send(player, to, plain)) {
             return ChannelExecuteResult(failedReason = ChannelExecuteResult.FailReason.EVENT)
         }
-        player.sendComponent(player, send)
+        val senderEvent = TrChatSendEvent(this, session, send, type = TrChatSendEvent.Type.SENDER)
+        if (senderEvent.call()) {
+            send = senderEvent.component
+            player.sendComponent(player, send)
+        }
 
         PlayerData.spying.forEach {
             Bukkit.getPlayer(it)?.sendLang("Private-Message-Spy-Format", player.name, to, msgComponent.toLegacyText())
@@ -209,6 +214,12 @@ class PrivateChannel(
         ChatLogs.logPrivate(player.name, to, plain)
         Metrics.increase(0)
 
+        val receiverEvent = TrChatSendEvent(this, session, receive, type = TrChatSendEvent.Type.RECEIVER)
+        if (!receiverEvent.call()) {
+            return ChannelExecuteResult(failedReason = ChannelExecuteResult.FailReason.EVENT)
+        }
+        receive = receiverEvent.component
+
         if (settings.proxy && BukkitProxyManager.processor != null) {
             BukkitProxyManager.sendPrivateRaw(
                 player,