fix: use TextComponent#content instead of Component#serialize during …

…regex checks
MineInAbyss · Jul 11, 2024 · 4485728 · 4485728
1 parent 1d5b89f
commit 4485728
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 19 deletions.
diff --git a/core/src/main/kotlin/com/mineinabyss/emojy/EmojyHelpers.kt b/core/src/main/kotlin/com/mineinabyss/emojy/EmojyHelpers.kt
@@ -6,6 +6,7 @@ import com.mineinabyss.idofront.textcomponents.miniMsg
 import com.mineinabyss.idofront.textcomponents.serialize
 import net.kyori.adventure.key.Key
 import net.kyori.adventure.text.Component
+import net.kyori.adventure.text.TextComponent
 import net.kyori.adventure.text.TextReplacementConfig
 import net.kyori.adventure.translation.GlobalTranslator
 import org.bukkit.NamespacedKey
@@ -23,9 +24,21 @@ val ORIGINAL_ITEM_RENAME_TEXT = NamespacedKey.fromString("emojy:original_item_re
 
 fun spaceComponent(space: Int) = Component.textOfChildren(Component.text(Space.of(space)).font(emojyConfig.spaceFont))
 
+private fun Component.asFlatTextContent(): String {
+    return buildString {
+        append((this@asFlatTextContent as? TextComponent)?.content())
+        append(this@asFlatTextContent.children().joinToString("") { it.asFlatTextContent() })
+        append(this@asFlatTextContent.children().joinToString("") { it.asFlatTextContent() })
+        (this@asFlatTextContent.hoverEvent()?.value() as? Component)?.let {
+            append((it as? TextComponent)?.content())
+            append(it.children().joinToString("") { it.asFlatTextContent() })
+        }
+    }
+}
+
 fun Component.transformEmotes(locale: Locale? = null, insert: Boolean = false): Component {
     var component = GlobalTranslator.render(this, locale ?: Locale.US)
-    val serialized = component.serialize()
+    val serialized = component.asFlatTextContent()
 
     for (emote in emojy.emotes) emote.baseRegex.findAll(serialized).forEach { match ->
 
@@ -71,7 +84,7 @@ fun Component.transformEmotes(locale: Locale? = null, insert: Boolean = false):
 
 fun Component.escapeEmoteIDs(player: Player?): Component {
     var component = this
-    val serialized = component.serialize()
+    val serialized = component.asFlatTextContent()
 
     // Replace all unicodes found in default font with a random one
     // This is to prevent use of unicodes from the font the chat is in
@@ -123,7 +136,7 @@ fun Component.escapeEmoteIDs(player: Player?): Component {
 
 fun Component.unescapeEmoteIds(): Component {
     var component = this
-    val serialized = this.serialize()
+    val serialized = component.asFlatTextContent()
 
     for (emote in emojy.emotes) emote.escapedRegex.findAll(serialized).forEach { match ->
         component = component.replaceText(

diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,3 @@
 group=com.mineinabyss
 version=0.9
-idofrontVersion=0.24.9
+idofrontVersion=0.24.12
diff --git a/v1_21_R1/src/main/kotlin/com/mineinabyss/emojy/nms/v1_21_R1/EmojyNMSHandler.kt b/v1_21_R1/src/main/kotlin/com/mineinabyss/emojy/nms/v1_21_R1/EmojyNMSHandler.kt
@@ -16,6 +16,7 @@ import io.netty.channel.ChannelPromise
 import io.papermc.paper.adventure.AdventureComponent
 import io.papermc.paper.adventure.PaperAdventure
 import io.papermc.paper.network.ChannelInitializeListenerHolder
+import net.minecraft.core.NonNullList
 import net.minecraft.network.Connection
 import net.minecraft.network.chat.ChatType
 import net.minecraft.network.chat.Component
@@ -29,6 +30,7 @@ import net.minecraft.world.item.ItemStack
 import org.bukkit.NamespacedKey
 import org.bukkit.craftbukkit.inventory.CraftItemStack
 import org.bukkit.entity.Player
+import org.bukkit.inventory.AnvilInventory
 import java.util.*
 
 class EmojyNMSHandler(emojy: EmojyPlugin) : IEmojyNMSHandler {
@@ -67,21 +69,21 @@ class EmojyNMSHandler(emojy: EmojyPlugin) : IEmojyNMSHandler {
                                 } ?: it
                             })
                             is ClientboundContainerSetSlotPacket -> ClientboundContainerSetSlotPacket(packet.containerId, packet.stateId, packet.slot, packet.item.transformItemNameLore())
-                            //is ClientboundContainerSetContentPacket -> ClientboundContainerSetContentPacket(
-                            //    packet.containerId, packet.stateId, NonNullList.of(packet.items.first(),
-                            //        *packet.items.map {
-                            //            val inv = connection.player.bukkitEntity.openInventory.topInventory
-                            //            val bukkit = CraftItemStack.asBukkitCopy(it)
-
-                            //            // If item is firstItem in AnvilInventory we want to set it to have the plain-text displayname
-                            //            if (inv is AnvilInventory && inv.firstItem == bukkit)
-                            //                bukkit.itemMeta?.persistentDataContainer?.get(ORIGINAL_ITEM_RENAME_TEXT, DataType.STRING)?.let { og ->
-                            //                    CraftItemStack.asNMSCopy(bukkit.editItemMeta {
-                            //                        setDisplayName(og)
-                            //                    })
-                            //                } ?: it.transformItemNameLore()
-                            //            else it.transformItemNameLore()
-                            //        }.toTypedArray()), packet.carriedItem)
+                            is ClientboundContainerSetContentPacket -> ClientboundContainerSetContentPacket(
+                                packet.containerId, packet.stateId, NonNullList.of(packet.items.first(),
+                                    *packet.items.map {
+                                        val inv = connection.player.bukkitEntity.openInventory.topInventory
+                                        val bukkit = CraftItemStack.asBukkitCopy(it)
+
+                                        // If item is firstItem in AnvilInventory we want to set it to have the plain-text displayname
+                                        if (inv is AnvilInventory && inv.firstItem == bukkit)
+                                            bukkit.itemMeta?.persistentDataContainer?.get(ORIGINAL_ITEM_RENAME_TEXT, DataType.STRING)?.let { og ->
+                                                CraftItemStack.asNMSCopy(bukkit.editItemMeta {
+                                                    setDisplayName(og)
+                                                })
+                                            } ?: it.transformItemNameLore()
+                                        else it.transformItemNameLore()
+                                    }.toTypedArray()), packet.carriedItem)
                             is ClientboundBossEventPacket -> {
                                 // Access the private field 'operation'
                                 val operationField = ClientboundBossEventPacket::class.java.getDeclaredField("operation").apply { isAccessible = true }