[2.4.2] 基础支持26.1.2

Author: ItsFlicker

build.gradle.kts

@@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     java
-    id("io.izzel.taboolib") version "2.0.31"
+    id("io.izzel.taboolib") version "2.0.37"
     id("org.jetbrains.kotlin.jvm") version "2.2.20"
 }
 
@@ -41,7 +41,7 @@ subprojects {
 //            disableOnUnsupportedVersion = false
         }
         version {
-            taboolib = "6.2.4-e7fd043"
+            taboolib = "6.3.0-716e043"
             coroutines = null
         }
     }

gradle.properties

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

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

@@ -34,7 +34,8 @@ abstract class NMS {
         @JvmStatic
         val instance by unsafeLazy {
             if (MinecraftVersion.versionId < 12005) nmsProxy<NMS>()
-            else nmsProxy<NMS>("me.arasple.mc.trchat.api.nms.NMSImpl12005")
+            else if (MinecraftVersion.versionId < 260100) nmsProxy<NMS>("me.arasple.mc.trchat.api.nms.NMSImpl12005")
+            else nmsProxy<NMS>("me.arasple.mc.trchat.api.nms.NMSImpl260100")
         }
 
         // 1.20.4-

project/module-nms/v26/build.gradle.kts

@@ -0,0 +1,9 @@
+dependencies {
+    compileOnly(project(":project:common"))
+    compileOnly(project(":project:module-chat"))
+    compileOnly(project(":project:module-nms"))
+    compileOnly("ink.ptms.core:v260100:260100")
+    compileOnly("com.velocitypowered:velocity-brigadier:1.0.0-SNAPSHOT")
+}
+
+taboolib { subproject = true }

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

@@ -0,0 +1,47 @@
+package me.arasple.mc.trchat.api.nms
+
+import me.arasple.mc.trchat.util.ServerUtil
+import net.minecraft.network.chat.Component
+import org.bukkit.craftbukkit.entity.CraftPlayer
+import org.bukkit.craftbukkit.util.CraftChatMessage
+import org.bukkit.entity.Player
+import org.bukkit.inventory.ItemStack
+import taboolib.common.platform.function.adaptPlayer
+import taboolib.module.chat.ComponentText
+import taboolib.module.nms.MinecraftLanguage
+import taboolib.module.nms.getLanguageKey
+import taboolib.platform.Folia
+import taboolib.platform.util.hoverItem
+import java.util.*
+
+class NMSImpl260100 : NMS() {
+
+    override fun craftChatMessageFromComponent(component: ComponentText): Any {
+        return CraftChatMessage.fromJSON(component.toRawMessage())
+    }
+
+    override fun rawMessageFromCraftChatMessage(component: Any): String {
+        return CraftChatMessage.toJSON(component as Component)
+    }
+
+    override fun sendMessage(receiver: Player, component: ComponentText, sender: UUID?, usePacket: Boolean) {
+        if (!usePacket || Folia.isFolia || ServerUtil.isModdedServer) {
+            component.sendTo(adaptPlayer(receiver))
+            return
+        }
+        val player = (receiver as CraftPlayer).handle
+        player.sendSystemMessage(craftChatMessageFromComponent(component) as Component)
+    }
+
+    override fun hoverItem(component: ComponentText, itemStack: ItemStack): ComponentText {
+        return component.hoverItem(itemStack)
+    }
+
+    override fun optimizeNBT(itemStack: ItemStack, nbtWhitelist: Array<String>): ItemStack {
+        return itemStack
+    }
+
+    override fun getLocaleKey(itemStack: ItemStack): MinecraftLanguage.LanguageKey {
+        return itemStack.getLanguageKey()
+    }
+}

project/runtime-bukkit/build.gradle.kts

@@ -8,7 +8,7 @@ dependencies {
     compileOnly(project(":project:module-chat"))
     compileOnly(project(":project:module-compat"))
     compileOnly(project(":project:module-nms"))
-    compileOnly("ink.ptms.core:v12105:12105:universal")
+    compileOnly("ink.ptms.core:v260100:260100")
     compileOnly("net.md-5:bungeecord-chat:1.21-R0.3")
     compileOnly(fileTree(rootDir.resolve("libs")))
 

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

@@ -23,6 +23,7 @@ object ListenerPackets {
 
     /**
      * 去除进入时右上角提示/禁止聊天举报
+     * FIXME
      */
     @SubscribeEvent
     fun secure(e: PacketSendEvent) {
@@ -41,6 +42,9 @@ object ListenerPackets {
             "PacketPlayOutLogin" -> {
                 if (versionId >= 12005) e.packet.source.setProperty("l", true, findToParent = false, remap = false)
             }
+            "ClientboundLoginPacket" -> {
+                if (versionId >= 260100) e.packet.source.setProperty("enforcesSecureChat", true, findToParent = false, remap = false)
+            }
         }
     }
 

settings.gradle.kts

@@ -6,6 +6,7 @@ include("project:module-adventure")
 include("project:module-chat")
 include("project:module-compat")
 include("project:module-nms")
+include("project:module-nms:v26")
 include("project:runtime-bukkit")
 include("project:runtime-bungee")
 include("project:runtime-velocity")