Escape MiniMessage tags in item display names to prevent Nexo colorization

Author: daniel-skopek

common/src/main/java/com/loohp/interactivechat/modules/ItemDisplay.java

@@ -35,6 +35,7 @@
 import com.loohp.interactivechat.utils.ComponentCompacting;
 import com.loohp.interactivechat.utils.ComponentFlattening;
 import com.loohp.interactivechat.utils.ComponentReplacing;
+import com.loohp.interactivechat.utils.ComponentStyling;
 import com.loohp.interactivechat.utils.ComponentUtils;
 import com.loohp.interactivechat.utils.FilledMapUtils;
 import com.loohp.interactivechat.utils.HashUtils;
@@ -222,13 +223,18 @@ public static Component createItemDisplay(OfflineICPlayer player, ItemStack item
         for (Component child : flattened) {
             if (child instanceof TextComponent) {
                 TextComponent text = (TextComponent) child;
-                cleaned.add(text.content(ChatColorUtils.stripColor(text.content())));
+                cleaned.add(text.content(ChatColorUtils.escapeMiniMessageTags(ChatColorUtils.stripColor(text.content()))));
             } else {
                 cleaned.add(child);
             }
         }
         itemDisplayNameComponent = ComponentCompacting.optimize(Component.empty().children(cleaned));
 
+        ItemStack hoverItem = (trimmedItem == null ? item : trimmedItem).clone();
+        if (itemMeta != null && itemMeta.hasDisplayName()) {
+            NMS.getInstance().setItemStackDisplayName(hoverItem, ComponentStyling.stripColor(itemDisplayNameComponent));
+        }
+
         amountString = String.valueOf(itemAmount);
         Key key = ItemNBTUtils.getNMSItemStackNamespacedKey(item);
 
@@ -237,12 +243,12 @@ public static Component createItemDisplay(OfflineICPlayer player, ItemStack item
             if (item.getType().equals(Material.AIR)) {
                 showHover = false;
             }
-            Map<Key, DataComponentValue> dataComponents = ItemNBTUtils.getNMSItemStackDataComponents(trimmedItem == null ? item : trimmedItem);
+            Map<Key, DataComponentValue> dataComponents = ItemNBTUtils.getNMSItemStackDataComponents(hoverItem);
             dataComponents.remove(Key.key("minecraft", "container"));
             dataComponents.remove(Key.key("minecraft", "bundle_contents"));
             showItem = dataComponents.isEmpty() ? ShowItem.showItem(key, itemAmount) : ShowItem.showItem(key, itemAmount, dataComponents);
         } else {
-            String tag = ItemNBTUtils.getNMSItemStackTag(trimmedItem == null ? item : trimmedItem);
+            String tag = ItemNBTUtils.getNMSItemStackTag(hoverItem);
             showItem = tag == null ? ShowItem.showItem(key, itemAmount) : ShowItem.showItem(key, itemAmount, BinaryTagHolder.binaryTagHolder(tag));
         }
 

common/src/main/java/com/loohp/interactivechat/utils/ChatColorUtils.java

@@ -21,6 +21,7 @@
 package com.loohp.interactivechat.utils;
 
 import com.loohp.interactivechat.InteractiveChat;
+import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.md_5.bungee.api.ChatColor;
 
 import java.util.Arrays;
@@ -46,6 +47,10 @@ public static String stripColor(String string) {
         return string.replaceAll("\u00a7[0-9A-Fa-fk-orx]", "");
     }
 
+    public static String escapeMiniMessageTags(String string) {
+        return MiniMessage.miniMessage().escapeTags(string);
+    }
+
     public static String filterIllegalColorCodes(String string) {
         return filterIllegalColorCodes(string, com.loohp.interactivechat.InteractiveChat.version.isLegacyRGB());
     }