From 5b64e396f23dd3fa90d3efed0dc397f44bb7e2f8 Mon Sep 17 00:00:00 2001
From: SuperYuTian <2953516620@qq.com>
Date: Sun, 14 Jun 2026 15:22:38 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=9D=E7=95=99=20MiniMessage=20?=
 =?UTF-8?q?=E5=8D=81=E5=85=AD=E8=BF=9B=E5=88=B6=E9=A2=9C=E8=89=B2=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/io/yaohun/questengine/util/ColorUtil.java    | 12 ++++++++----
 .../io/yaohun/questengine/util/ColorUtilTest.java    |  8 ++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/io/yaohun/questengine/util/ColorUtil.java b/src/main/java/com/io/yaohun/questengine/util/ColorUtil.java
index 6ab503d..05cd6e9 100644
--- a/src/main/java/com/io/yaohun/questengine/util/ColorUtil.java
+++ b/src/main/java/com/io/yaohun/questengine/util/ColorUtil.java
@@ -12,9 +12,13 @@ import java.util.stream.Collectors;
 
 public class ColorUtil {
 
-    private static final Pattern HEX_PATTERN = Pattern.compile("#[a-fA-F0-9]{6}");
+    private static final Pattern LEGACY_HEX_PATTERN = Pattern.compile("(?<!<)#[a-fA-F0-9]{6}");
     private static final MiniMessage MINI_MESSAGE = MiniMessage.miniMessage();
-    private static final LegacyComponentSerializer LEGACY_SERIALIZER = LegacyComponentSerializer.legacySection();
+    private static final LegacyComponentSerializer LEGACY_SERIALIZER = LegacyComponentSerializer.builder()
+            .character('§')
+            .hexColors()
+            .useUnusualXRepeatedCharacterHexFormat()
+            .build();
 
     public static String color(String text) {
         if (text == null) {
@@ -35,7 +39,7 @@ public class ColorUtil {
     }
 
     private static String translateHexColors(String text) {
-        Matcher matcher = HEX_PATTERN.matcher(text);
+        Matcher matcher = LEGACY_HEX_PATTERN.matcher(text);
         while (matcher.find()) {
             String hexCode = text.substring(matcher.start(), matcher.end());
             String replaceSharp = hexCode.replace('#', 'x');
@@ -45,7 +49,7 @@ public class ColorUtil {
                 builder.append("&").append(c);
             }
             text = text.replace(hexCode, builder.toString());
-            matcher = HEX_PATTERN.matcher(text);
+            matcher = LEGACY_HEX_PATTERN.matcher(text);
         }
 
         return text;
diff --git a/src/test/java/com/io/yaohun/questengine/util/ColorUtilTest.java b/src/test/java/com/io/yaohun/questengine/util/ColorUtilTest.java
index 8ceb83c..a163f09 100644
--- a/src/test/java/com/io/yaohun/questengine/util/ColorUtilTest.java
+++ b/src/test/java/com/io/yaohun/questengine/util/ColorUtilTest.java
@@ -28,6 +28,14 @@ class ColorUtilTest {
         assertEquals("§l加粗", ColorUtil.color("<bold>加粗</bold>"));
     }
 
+    @Test
+    void colorSupportsPureMiniMessageHexTags() {
+        assertEquals(
+                "§fꑟ §x§f§4§9§e§0§b已接取任务 §x§f§1§f§c§d§e资源采集",
+                ColorUtil.color("<!i><white>ꑟ <#f49e0b>已接取任务 <#f1fcde>资源采集")
+        );
+    }
+
     @Test
     void colorSupportsMixedMiniMessageAndLegacyFormatting() {
         assertEquals("§a领取§r §c奖励", ColorUtil.color("<green>领取</green> &c奖励"));