Merge remote-tracking branch 'origin/develop/fix' into develop/gtl_support

# Conflicts:
#	src/main/java/com/extendedae_plus/network/crafting/CraftingMonitorOpenProviderC2SPacket.java
#	src/main/resources/assets/extendedae_plus/lang/zh_cn.json

src/main/java/com/extendedae_plus/network/crafting/CraftingMonitorOpenProviderC2SPacket.java

@@ -92,8 +92,7 @@ public class CraftingMonitorOpenProviderC2SPacket {
 
                 try {
                     ProviderUIHelper.openProviderUI(provider, pattern, player);
-                } catch (Exception ignored) {
+                } catch (Exception ignored) {}
-                }
             }
         });
         context.setPacketHandled(true);
@@ -155,20 +154,17 @@ public class CraftingMonitorOpenProviderC2SPacket {
      * GridHelper: 从菜单中获取网格实例
      */
     private static final class GridHelper {
-        private GridHelper() {
+        private GridHelper() {}
-        }
 
         /**
          * 获取菜单对应的 Grid
-         *
          * @param menu 当前 AEBaseMenu
          * @return Grid 或 null
          */
         private static IGrid getGridFromMenu(AEBaseMenu menu) {
             Object target = menu.getTarget();
             if (target instanceof IActionHost host && host.getActionableNode() != null) {
-                return host.getActionableNode()
+                return host.getActionableNode().getGrid();
-                        .getGrid();
             }
             return null;
         }
@@ -178,15 +174,13 @@ public class CraftingMonitorOpenProviderC2SPacket {
      * PatternLocator: 根据样板定位可用的 Provider
      */
     private static final class PatternLocator {
-        private PatternLocator() {
+        private PatternLocator() {}
-        }
 
         /**
          * 查找提供指定样板的可用 Provider
-         *
+         * @param cs CraftingService
-         * @param cs      CraftingService
          * @param pattern 样板
-         * @param grid    当前 Grid
+         * @param grid 当前 Grid
          * @return 第一个可用的 PatternProviderLogic 或 null
          */
         private static PatternProviderLogic findValidProvider(CraftingService cs, IPatternDetails pattern, IGrid grid) {
@@ -207,8 +201,7 @@ public class CraftingMonitorOpenProviderC2SPacket {
      * ProviderUIHelper: 打开 Provider UI 并发送客户端反馈
      */
     private static final class ProviderUIHelper {
-        private ProviderUIHelper() {
+        private ProviderUIHelper() {}
-        }
 
         /**
          * 打开 Provider UI
@@ -218,8 +211,8 @@ public class CraftingMonitorOpenProviderC2SPacket {
          * 4. 发送 Pattern 输出高亮包
          *
          * @param provider PatternProviderLogic 实例
-         * @param pattern  样板
+         * @param pattern 样板
-         * @param player   玩家
+         * @param player 玩家
          */
         private static void openProviderUI(PatternProviderLogic provider, IPatternDetails pattern, ServerPlayer player) {
             var host = ((PatternProviderLogicAccessor) provider).eap$host();
@@ -235,9 +228,7 @@ public class CraftingMonitorOpenProviderC2SPacket {
                     new SetBlockHighlightS2CPacket(
                             pbe.getBlockPos(),
                             isPart ? ((AEBasePart) host).getSide() : null,
-                            pbe.getLevel()
+                            pbe.getLevel().dimension().location(),
-                                    .dimension()
-                                    .location(),
                             (long) (6000 * GlodUtil.clamp(1.0, 1, 30))
                     ),
                     player.connection.connection,
@@ -245,30 +236,15 @@ public class CraftingMonitorOpenProviderC2SPacket {
             );
 
             // 聊天提示
-            if (CompareModVersionUtil.compareTo("expatternprovider", "1.4.7")) {
+            player.displayClientMessage(
-                player.displayClientMessage(
+                    Component.translatable(
-                        MessageUtil.createEnhancedHighlightMessage(
+                            "chat.extendedae_plus.terminal.pos",
-                                player,
+                            pbe.getBlockPos().toShortString(),
-                                pbe.getBlockPos(),
+                            pbe.getLevel().dimension().location().getPath(),
-                                pbe.getLevel()
+                            (int) Math.sqrt(player.blockPosition().distSqr(host.getBlockEntity().getBlockPos()))
-                                        .dimension(),
+                    ),
-                                "chat.ex_pattern_access_terminal.pos"),
+                    false
-                        false
+            );
-                );
-            } else {
-                player.displayClientMessage(
-                        Component.translatable(
-                                "chat.ex_pattern_access_terminal.pos",
-                                pbe.getBlockPos()
-                                        .toShortString(),
-                                pbe.getLevel()
-                                        .dimension()
-                                        .location()
-                                        .getPath()
-                        ),
-                        false
-                );
-            }
 
             // 页码同步
             int slot = PatternProviderDataUtil.findSlotForPattern(provider, pattern.getDefinition());

src/main/resources/assets/extendedae_plus/lang/en_us.json

@@ -56,6 +56,8 @@
   "extendedae_plus.upload_to_matrix.repetition": "The Assembly Matrix already contains the same pattern, upload skipped and blank pattern returned",
   "extendedae_plus.upload_to_GTMatrix.repetition": "The Molecular Manipulator already contains the same pattern, upload skipped and blank pattern returned",
 
+  "chat.extendedae_plus.terminal.pos": "The crafting plan's corresponding provider is now highlighted at: %s, Dimension: %s (%s blocks away)",
+
   "extendedae_plus.screen.reload_mapping": "Reload Mapping",
   "extendedae_plus.screen.reload_mapping_success": "Overloading mapping successful",
   "extendedae_plus.screen.reload_mapping_fail": "Overloading mapping failed: %s",

src/main/resources/assets/extendedae_plus/lang/zh_cn.json

@@ -56,6 +56,8 @@
   "extendedae_plus.upload_to_matrix.repetition": "装配矩阵已存在相同样板，已跳过上传并返还空白样板",
   "extendedae_plus.upload_to_GTMatrix.repetition": "分子操纵者已存在相同样板，已跳过上传并返还空白样板",
 
+  "chat.extendedae_plus.terminal.pos": "合成计划对应供应器现在突出显示在：%s，维度：%s (%s个方块外)",
+
   "extendedae_plus.screen.reload_mapping": "重载映射",
   "extendedae_plus.screen.reload_mapping_success": "重载映射成功",
   "extendedae_plus.screen.reload_mapping_fail": "重载映射失败: %s",