From 32cc796498cf441dbbe5801cfa32a414d35cd46d Mon Sep 17 00:00:00 2001
From: GaLicn <133291877+GaLicn@users.noreply.github.com>
Date: Tue, 30 Sep 2025 12:29:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0=E6=97=B6?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E5=88=B0=E5=AE=A2=E6=88=B7=E7=AB=AF?=
 =?UTF-8?q?=E7=BF=BB=E8=AF=91=E9=94=AE=E5=9B=BA=E5=AE=9A=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/ui/ProviderSelectScreen.java       | 25 ++++++++++++++++++-
 .../util/ExtendedAEPatternUploadUtil.java     | 10 ++++++--
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/extendedae_plus/client/ui/ProviderSelectScreen.java b/src/main/java/com/extendedae_plus/client/ui/ProviderSelectScreen.java
index 1984717..6b8b229 100644
--- a/src/main/java/com/extendedae_plus/client/ui/ProviderSelectScreen.java
+++ b/src/main/java/com/extendedae_plus/client/ui/ProviderSelectScreen.java
@@ -183,10 +183,29 @@ public class ProviderSelectScreen extends Screen {
         }
     }
 
+    /**
+     * 将服务器发送的名称（可能是 Component JSON）反序列化为本地化文本
+     */
+    private String deserializeComponentName(String name) {
+        try {
+            // 如果名称是 JSON 格式的 Component，反序列化后获取本地化文本
+            if (name.startsWith("{") || name.startsWith("\"")) {
+                Component component = Component.Serializer.fromJson(name);
+                if (component != null) {
+                    return component.getString();
+                }
+            }
+        } catch (Exception e) {
+            // 如果不是 JSON 或解析失败，使用原始字符串
+        }
+        return name;
+    }
+
     private String buildLabel(int idx) {
         String name = fNames.get(idx);
         int totalSlots = fTotalSlots.get(idx);
         int count = fCount.get(idx);
+        
         // 不显示具体 id，显示合并统计：名称（总空位）x数量
         return name + "  (" + totalSlots + ")  x" + count;
     }
@@ -215,7 +234,11 @@ public class ProviderSelectScreen extends Screen {
             String name = names.get(i);
             long id = ids.get(i);
             int slots = emptySlots.get(i);
-            Group g = map.computeIfAbsent(name, k -> new Group());
+            
+            // 将 Component JSON 转换为本地化文本用于分组键
+            String groupKey = deserializeComponentName(name);
+            
+            Group g = map.computeIfAbsent(groupKey, k -> new Group());
             g.count++;
             g.totalSlots += Math.max(0, slots);
             // 挑选空位最多的作为代表 id；若并列，保留先到者
diff --git a/src/main/java/com/extendedae_plus/util/ExtendedAEPatternUploadUtil.java b/src/main/java/com/extendedae_plus/util/ExtendedAEPatternUploadUtil.java
index d9f2542..6715411 100644
--- a/src/main/java/com/extendedae_plus/util/ExtendedAEPatternUploadUtil.java
+++ b/src/main/java/com/extendedae_plus/util/ExtendedAEPatternUploadUtil.java
@@ -941,7 +941,9 @@ public class ExtendedAEPatternUploadUtil {
             // 尝试获取供应器的组信息来构建显示名称
             var group = container.getTerminalGroup();
             if (group != null) {
-                return group.name().getString();
+                // 使用 Component 序列化来保持翻译键，而不是直接 getString()
+                // 这样客户端可以根据自己的语言设置进行翻译
+                return Component.Serializer.toJson(group.name());
             }
         } catch (Exception e) {
             // 忽略异常，使用默认名称
@@ -1183,7 +1185,11 @@ public class ExtendedAEPatternUploadUtil {
         if (container == null) return "未知供应器";
         try {
             var group = container.getTerminalGroup();
-            if (group != null) return group.name().getString();
+            if (group != null) {
+                // 使用 Component 序列化来保持翻译键，而不是直接 getString()
+                // 这样客户端可以根据自己的语言设置进行翻译
+                return Component.Serializer.toJson(group.name());
+            }
         } catch (Throwable ignored) {
         }
         return "样板供应器";