From 0d5b42d0863249c46efdb9de70a99ff2b0afc2d1 Mon Sep 17 00:00:00 2001 From: C-H716 <1536152356@qq.com> Date: Thu, 25 Sep 2025 01:24:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=9B=B4=E6=8E=A5=E8=B7=B3=E8=BF=87=E7=9A=84=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/extendedae_plus/config/ModConfig.java | 2 +- .../util/ExtendedAEPatternUploadUtil.java | 22 ++++++++++--------- .../assets/extendedae_plus/lang/zh_cn.json | 5 +++++ 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/extendedae_plus/config/ModConfig.java b/src/main/java/com/extendedae_plus/config/ModConfig.java index f413c11..f55ee29 100644 --- a/src/main/java/com/extendedae_plus/config/ModConfig.java +++ b/src/main/java/com/extendedae_plus/config/ModConfig.java @@ -127,7 +127,7 @@ public final class ModConfig { @Configurable @Configurable.Comment(value = { - "是否限制合成样板自动上传仅进入分子操纵者", + "限制合成样板自动上传仅进入分子操纵者", "开启后，合成样板将只自动上传到分子操纵者，不再上传至装配矩阵" }) @Configurable.Synchronized diff --git a/src/main/java/com/extendedae_plus/util/ExtendedAEPatternUploadUtil.java b/src/main/java/com/extendedae_plus/util/ExtendedAEPatternUploadUtil.java index c415ccd..0882492 100644 --- a/src/main/java/com/extendedae_plus/util/ExtendedAEPatternUploadUtil.java +++ b/src/main/java/com/extendedae_plus/util/ExtendedAEPatternUploadUtil.java @@ -170,7 +170,8 @@ public class ExtendedAEPatternUploadUtil { try { ResourceLocation rl = new ResourceLocation(key); CUSTOM_NAMES.put(rl, cnValue); - } catch (Exception ignored) {} + } catch (Exception ignored) { + } } else { CUSTOM_ALIASES.put(key.toLowerCase(), cnValue); } @@ -227,7 +228,8 @@ public class ExtendedAEPatternUploadUtil { if (target.equals(cur)) { CUSTOM_NAMES.remove(rl); } - } catch (Exception ignored) {} + } catch (Exception ignored) { + } } else { // 别名按小写存放 String lower = k.toLowerCase(); @@ -397,7 +399,7 @@ public class ExtendedAEPatternUploadUtil { /** * 获取玩家当前的样板访问终端菜单（支持ExtendedAE和原版AE2） - * + * * @param player 玩家 * @return PatternAccessTermMenu实例，如果玩家没有打开则返回null */ @@ -473,18 +475,18 @@ public class ExtendedAEPatternUploadUtil { clearAndRestorePattern(player, menu, stack, encodedSlot); return false; } - - if (!AEUtils.molecularFilter(stack, player.level())){ - player.sendSystemMessage(Component.literal("ExtendedAE Plus: 分子操纵者不支持该类型样板")); - clearAndRestorePattern(player, menu, stack, encodedSlot); - return false; + if (ModConfig.INSTANCE.restrictCraftingPatternToMolecular) { + if (!AEUtils.molecularFilter(stack, player.level())) { + player.sendSystemMessage(Component.literal("ExtendedAE Plus: 分子操纵者不支持该类型样板")); + clearAndRestorePattern(player, menu, stack, encodedSlot); + return false; + } } - List gtInventories = findAllGTMatrixPatternInventories(grid); if (uploadPattern(player, encodedSlot, stack, gtInventories)) return true; - if (ModConfig.INSTANCE.restrictCraftingPatternToMolecular){ + if (ModConfig.INSTANCE.restrictCraftingPatternToMolecular) { return false; } diff --git a/src/main/resources/assets/extendedae_plus/lang/zh_cn.json b/src/main/resources/assets/extendedae_plus/lang/zh_cn.json index eb60ec2..076e6aa 100644 --- a/src/main/resources/assets/extendedae_plus/lang/zh_cn.json +++ b/src/main/resources/assets/extendedae_plus/lang/zh_cn.json @@ -18,6 +18,7 @@ "item.extendedae_plus.1024x_crafting_accelerator": "1024x并行处理单元", "item.extendedae_plus.network_pattern_controller": "样板供应器状态控制器", "item.extendedae_plus.entity_speed_card": "实体加速卡", + "item.extendedae_plus.entity_speed_card.x1": "§k§l?#@§r§8不§k§l1§r限§k§l0§r存于§k§l%§r现实的§c实§k&0%§r体加§k§l*§r速卡§k§l...§r", "item.extendedae_plus.entity_speed_card.x2": "实体加速卡 (x2)", "item.extendedae_plus.entity_speed_card.x4": "实体加速卡 (x4)", "item.extendedae_plus.entity_speed_card.x8": "实体加速卡 (x8)", @@ -88,6 +89,10 @@ "config.extendedae_plus.option.entityTickerBlackList": "实体加速器黑名单", "config.extendedae_plus.option.entityTickerMultipliers": "实体加速器额外消耗倍率", "config.extendedae_plus.option.craftingPauseThreshold": "AE合成计算暂停检查阈值", + "config.extendedae_plus.option.restrictCraftingPatternToMolecular": "限制合成样板自动上传仅进入分子操纵者", + + + "block.extendedae_plus.assembler_matrix_upload_core.tooltip": "装配矩阵上传核心", "block.extendedae_plus.assembler_matrix_upload_core.tooltip.upload": "上传到装配矩阵", "block.extendedae_plus.assembler_matrix_upload_core.tooltip.upload_success": "样板已上传到装配矩阵",