feat: 1.21.10 support (#17)

Author: Taiyou06

build.gradle.kts

@@ -44,13 +44,14 @@ dependencies {
     compileOnly(idofrontLibs.minecraft.mccoroutine)
 
     // Shaded
-    paperweight.paperDevBundle("1.21.8-R0.1-SNAPSHOT") //NMS
+    paperweight.paperDevBundle("1.21.10-R0.1-SNAPSHOT") //NMS
     implementation(project(path = ":core"))
     implementation(project(path = ":v1_21_R1"))
     implementation(project(path = ":v1_21_R2"))
     implementation(project(path = ":v1_21_R3"))
     implementation(project(path = ":v1_21_R4"))
     implementation(project(path = ":v1_21_R6"))
+    implementation(project(path = ":v1_21_R8"))
 }
 
 tasks {

core/src/main/kotlin/com/mineinabyss/emojy/nms/EmojyNMSHandlers.kt

@@ -12,6 +12,7 @@ object EmojyNMSHandlers {
             "1.21.4" -> "v1_21_R3"
             "1.21.5" -> "v1_21_R4"
             "1.21.6", "1.21.7", "1.21.8" -> "v1_21_R6"
+            "1.21.9", "1.21.10" -> "v1_21_R8"
             else -> throw IllegalStateException("Unsupported server version")
         }
         runCatching {

settings.gradle.kts

@@ -35,4 +35,4 @@ dependencyResolutionManagement {
     }
 }
 
-include("core", "v1_21_R1", "v1_21_R2", "v1_21_R3", "v1_21_R4", "v1_21_R6")
+include("core", "v1_21_R1", "v1_21_R2", "v1_21_R3", "v1_21_R4", "v1_21_R6", "v1_21_R8")

v1_21_R8/build.gradle.kts

@@ -0,0 +1,44 @@
+import io.papermc.paperweight.userdev.ReobfArtifactConfiguration
+
+plugins {
+    id("com.mineinabyss.conventions.kotlin.jvm")
+    id("com.mineinabyss.conventions.autoversion")
+    id("io.papermc.paperweight.userdev") version "2.0.0-beta.18"
+}
+
+repositories {
+    gradlePluginPortal()
+    maven("https://repo.mineinabyss.com/releases")
+    maven("https://repo.mineinabyss.com/snapshots")
+    maven("https://repo.papermc.io/repository/maven-public/")
+    google()
+}
+
+paperweight.reobfArtifactConfiguration.set(ReobfArtifactConfiguration.MOJANG_PRODUCTION)
+
+dependencies {
+    // MineInAbyss platform
+    compileOnly(idofrontLibs.kotlinx.serialization.json)
+    compileOnly(idofrontLibs.kotlinx.serialization.kaml)
+    compileOnly(idofrontLibs.kotlinx.coroutines)
+    compileOnly(idofrontLibs.minecraft.mccoroutine)
+
+    // Shaded
+    implementation(idofrontLibs.bundles.idofront.core)
+    implementation(project(":core"))
+    paperweight.paperDevBundle("1.21.10-R0.1-SNAPSHOT") //NMS
+}
+
+tasks {
+
+    compileJava {
+        options.encoding = Charsets.UTF_8.name()
+        options.release.set(21)
+    }
+    javadoc {
+        options.encoding = Charsets.UTF_8.name()
+    }
+    processResources {
+        filteringCharset = Charsets.UTF_8.name()
+    }
+}

v1_21_R8/src/main/kotlin/com/mineinabyss/emojy/nms/v1_21_R8/EmojyChannelHandler.kt

@@ -0,0 +1,62 @@
+package com.mineinabyss.emojy.nms.v1_21_R8
+
+import com.jeff_media.morepersistentdatatypes.DataType
+import com.mineinabyss.emojy.ORIGINAL_ITEM_RENAME_TEXT
+import com.mineinabyss.emojy.escapeEmoteIDs
+import com.mineinabyss.emojy.nms.IEmojyNMSHandler
+import com.mineinabyss.emojy.transformEmotes
+import com.mineinabyss.emojy.unescapeEmoteIds
+import io.papermc.paper.datacomponent.DataComponentTypes
+import io.papermc.paper.event.player.AsyncChatCommandDecorateEvent
+import io.papermc.paper.event.player.AsyncChatDecorateEvent
+import org.bukkit.event.EventHandler
+import org.bukkit.event.EventPriority
+import org.bukkit.event.Listener
+import org.bukkit.event.inventory.PrepareAnvilEvent
+import org.bukkit.event.player.PlayerEditBookEvent
+import org.bukkit.event.player.PlayerJoinEvent
+import org.bukkit.event.player.PlayerQuitEvent
+
+@Suppress("UnstableApiUsage")
+class EmojyListener(val handler: IEmojyNMSHandler) : Listener {
+
+    @EventHandler
+    fun PlayerJoinEvent.onJoin() {
+        handler.inject(player)
+    }
+
+    @EventHandler
+    fun PlayerQuitEvent.onQuit() {
+        handler.uninject(player)
+    }
+
+    // Replace with result not original message to avoid borking other chat formatting
+    @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
+    fun AsyncChatDecorateEvent.onPlayerChat() {
+        result(result().escapeEmoteIDs(player()))
+    }
+
+    @EventHandler
+    fun AsyncChatCommandDecorateEvent.onPlayerCommandChat() {
+        result(result().escapeEmoteIDs(player()))
+    }
+
+    @EventHandler
+    fun PrepareAnvilEvent.onAnvil() {
+        result?.editPersistentDataContainer {
+            if (view.renameText == null || result?.hasData(DataComponentTypes.CUSTOM_NAME) != true)
+                it.remove(ORIGINAL_ITEM_RENAME_TEXT)
+            else it.set(ORIGINAL_ITEM_RENAME_TEXT, DataType.STRING, view.renameText!!)
+        }
+    }
+
+    @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+    fun PlayerEditBookEvent.onBookEdit() {
+        if (isSigning) newBookMeta = newBookMeta.apply {
+            pages(pages().map {
+                it.escapeEmoteIDs(player).transformEmotes().unescapeEmoteIds()
+            })
+        }
+    }
+}
+

v1_21_R8/src/main/kotlin/com/mineinabyss/emojy/nms/v1_21_R8/EmojyListener.kt

@@ -0,0 +1,39 @@
+@file:Suppress("unused")
+
+package com.mineinabyss.emojy.nms.v1_21_R8
+
+import com.mineinabyss.emojy.EmojyPlugin
+import com.mineinabyss.emojy.nms.IEmojyNMSHandler
+import com.mineinabyss.idofront.plugin.listeners
+import net.minecraft.network.Connection
+import org.bukkit.craftbukkit.entity.CraftPlayer
+import org.bukkit.entity.Player
+
+class EmojyNMSHandler(emojy: EmojyPlugin) : IEmojyNMSHandler {
+
+    override fun inject(player: Player) {
+        val channel = (player as CraftPlayer).handle.connection.connection.channel
+        val pipeline = channel.pipeline()
+
+        val emojyChannelHandler = EmojyChannelHandler(player)
+        pipeline.toMap().keys.forEach {
+            if (pipeline.get(it) !is Connection) return@forEach
+            pipeline.addBefore(it, IEmojyNMSHandler.EMOJY_CHANNEL_HANDLER, emojyChannelHandler)
+        }
+    }
+
+    override fun uninject(player: Player) {
+        val channel = (player as CraftPlayer).handle.connection.connection.channel
+        val pipeline = channel.pipeline()
+
+        channel.eventLoop().submit {
+            pipeline.remove(IEmojyNMSHandler.EMOJY_CHANNEL_HANDLER)
+        }
+    }
+
+    init {
+        emojy.listeners(EmojyListener(this))
+    }
+
+    override val supported get() = true
+}