[2.4.6] 支持26.2和Adventure兼容

Author: ItsFlicker

gradle.properties

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

project/module-chat/src/main/kotlin/taboolib/module/chat/impl/AdventureComponent.kt

@@ -1,5 +1,6 @@
 package taboolib.module.chat.impl
 
+import net.kyori.adventure.audience.Audience
 import net.kyori.adventure.key.Key
 import net.kyori.adventure.nbt.api.BinaryTagHolder
 import net.kyori.adventure.text.Component
@@ -17,7 +18,6 @@ import net.md_5.bungee.api.chat.BaseComponent
 import net.md_5.bungee.chat.ComponentSerializer
 import taboolib.common.UnsupportedVersionException
 import taboolib.common.platform.ProxyCommandSender
-import taboolib.common.platform.ProxyPlayer
 import taboolib.common.platform.function.onlinePlayers
 import taboolib.module.chat.*
 import java.awt.Color
@@ -51,11 +51,7 @@ class AdventureComponent() : ComponentText {
     }
 
     override fun sendTo(sender: ProxyCommandSender) {
-        if (sender is ProxyPlayer) {
-            sender.sendRawMessage(toRawMessage())
-        } else {
-            sender.sendMessage(toLegacyText())
-        }
+        (sender.origin as Audience).sendMessage(component)
     }
 
     override fun newLine(): ComponentText {
@@ -166,12 +162,12 @@ class AdventureComponent() : ComponentText {
 
     override fun click(action: ClickAction, value: String): ComponentText {
         when (action) {
-            ClickAction.OPEN_URL,
-            ClickAction.OPEN_FILE,
-            ClickAction.RUN_COMMAND,
-            ClickAction.SUGGEST_COMMAND,
-            ClickAction.CHANGE_PAGE,
-            ClickAction.COPY_TO_CLIPBOARD -> latest.clickEvent(ClickEvent.clickEvent(ClickEvent.Action.valueOf(action.name), value))
+            ClickAction.OPEN_URL -> latest.clickEvent(ClickEvent.openUrl(value))
+            ClickAction.OPEN_FILE -> latest.clickEvent(ClickEvent.openFile(value))
+            ClickAction.RUN_COMMAND -> latest.clickEvent(ClickEvent.runCommand(value))
+            ClickAction.SUGGEST_COMMAND -> latest.clickEvent(ClickEvent.suggestCommand(value))
+            ClickAction.CHANGE_PAGE -> latest.clickEvent(ClickEvent.changePage(value.toInt()))
+            ClickAction.COPY_TO_CLIPBOARD -> latest.clickEvent(ClickEvent.copyToClipboard(value))
             // 插入文本
             ClickAction.INSERTION -> clickInsertText(value)
         }

project/module-nms/src/main/java/taboolib/module/nms/MeteorReflection.java

@@ -8,9 +8,9 @@ import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
 import taboolib.common.platform.function.adaptPlayer
 import taboolib.module.chat.ComponentText
+import taboolib.module.chat.Components
 import taboolib.module.nms.MinecraftLanguage
 import taboolib.module.nms.getLanguageKey
-import taboolib.platform.Folia
 import taboolib.platform.util.hoverItem
 import java.util.*
 
@@ -25,7 +25,7 @@ class NMSImpl12005 : NMS() {
     }
 
     override fun sendMessage(receiver: Player, component: ComponentText, sender: UUID?, usePacket: Boolean) {
-        if (!usePacket || Folia.isFolia || ServerUtil.isModdedServer) {
+        if (!usePacket || Components.useAdventure || ServerUtil.isModdedServer) {
             component.sendTo(adaptPlayer(receiver))
             return
         }

project/module-nms/src/main/kotlin/me/arasple/mc/trchat/api/nms/NMSImpl12005.kt

@@ -8,9 +8,9 @@ import org.bukkit.entity.Player
 import org.bukkit.inventory.ItemStack
 import taboolib.common.platform.function.adaptPlayer
 import taboolib.module.chat.ComponentText
+import taboolib.module.chat.Components
 import taboolib.module.nms.MinecraftLanguage
 import taboolib.module.nms.getLanguageKey
-import taboolib.platform.Folia
 import taboolib.platform.util.hoverItem
 import java.util.*
 
@@ -25,7 +25,7 @@ class NMSImpl260100 : NMS() {
     }
 
     override fun sendMessage(receiver: Player, component: ComponentText, sender: UUID?, usePacket: Boolean) {
-        if (!usePacket || Folia.isFolia || ServerUtil.isModdedServer) {
+        if (!usePacket || Components.useAdventure || ServerUtil.isModdedServer) {
             component.sendTo(adaptPlayer(receiver))
             return
         }

project/module-nms/v26/src/main/kotlin/me/arasple/mc/trchat/api/nms/NMSImpl260100.kt

@@ -15,6 +15,7 @@ import taboolib.common.platform.event.EventPriority
 import taboolib.common.platform.event.SubscribeEvent
 import taboolib.module.configuration.ConfigNode
 import java.util.*
+import java.util.concurrent.ConcurrentHashMap
 
 /**
  * @author ItsFlicker
@@ -27,7 +28,7 @@ object ListenerChat {
     var cancelEvent = false
         private set
 
-    private val cachePrefix = mutableMapOf<UUID, String>()
+    private val cachePrefix = ConcurrentHashMap<UUID, String>()
 
     @Ghost
     @SubscribeEvent(priority = EventPriority.HIGHEST, ignoreCancelled = true)