R3944Realms/ExtendedAE_Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复不支持直接跳过的错误逻辑

Browse Source
This commit is contained in:
C-H716 2025-09-25 01:24:43 +08:00
parent 4651cf7064
commit 0d5b42d086
3 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/extendedae_plus/config/ModConfig.java
View File

@ -127,7 +127,7 @@ public final class ModConfig {
@Configurable @Configurable
@Configurable.Comment(value = { @Configurable.Comment(value = {
"是否限制合成样板自动上传仅进入分子操纵者", "限制合成样板自动上传仅进入分子操纵者",
"开启后，合成样板将只自动上传到分子操纵者，不再上传至装配矩阵" "开启后，合成样板将只自动上传到分子操纵者，不再上传至装配矩阵"
}) })
@Configurable.Synchronized @Configurable.Synchronized

10
src/main/java/com/extendedae_plus/util/ExtendedAEPatternUploadUtil.java
View File

@ -170,7 +170,8 @@ public class ExtendedAEPatternUploadUtil {
try { try {
ResourceLocation rl = new ResourceLocation(key); ResourceLocation rl = new ResourceLocation(key);
CUSTOM_NAMES.put(rl, cnValue); CUSTOM_NAMES.put(rl, cnValue);
} catch (Exception ignored) {} } catch (Exception ignored) {
}
} else { } else {
CUSTOM_ALIASES.put(key.toLowerCase(), cnValue); CUSTOM_ALIASES.put(key.toLowerCase(), cnValue);
} }
@ -227,7 +228,8 @@ public class ExtendedAEPatternUploadUtil {
if (target.equals(cur)) { if (target.equals(cur)) {
CUSTOM_NAMES.remove(rl); CUSTOM_NAMES.remove(rl);
} }
} catch (Exception ignored) {} } catch (Exception ignored) {
}
} else { } else {
// 别名按小写存放 // 别名按小写存放
String lower = k.toLowerCase(); String lower = k.toLowerCase();
@ -473,13 +475,13 @@ public class ExtendedAEPatternUploadUtil {
clearAndRestorePattern(player, menu, stack, encodedSlot); clearAndRestorePattern(player, menu, stack, encodedSlot);
return false; return false;
} }
if (ModConfig.INSTANCE.restrictCraftingPatternToMolecular) {
if (!AEUtils.molecularFilter(stack, player.level())) { if (!AEUtils.molecularFilter(stack, player.level())) {
player.sendSystemMessage(Component.literal("ExtendedAE Plus: 分子操纵者不支持该类型样板")); player.sendSystemMessage(Component.literal("ExtendedAE Plus: 分子操纵者不支持该类型样板"));
clearAndRestorePattern(player, menu, stack, encodedSlot); clearAndRestorePattern(player, menu, stack, encodedSlot);
return false; return false;
} }
}
List<InternalInventory> gtInventories = findAllGTMatrixPatternInventories(grid); List<InternalInventory> gtInventories = findAllGTMatrixPatternInventories(grid);
if (uploadPattern(player, encodedSlot, stack, gtInventories)) if (uploadPattern(player, encodedSlot, stack, gtInventories))
return true; return true;

5
src/main/resources/assets/extendedae_plus/lang/zh_cn.json
View File

@ -18,6 +18,7 @@
"item.extendedae_plus.1024x_crafting_accelerator": "1024x并行处理单元", "item.extendedae_plus.1024x_crafting_accelerator": "1024x并行处理单元",
"item.extendedae_plus.network_pattern_controller": "样板供应器状态控制器", "item.extendedae_plus.network_pattern_controller": "样板供应器状态控制器",
"item.extendedae_plus.entity_speed_card": "实体加速卡", "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.x2": "实体加速卡 (x2)",
"item.extendedae_plus.entity_speed_card.x4": "实体加速卡 (x4)", "item.extendedae_plus.entity_speed_card.x4": "实体加速卡 (x4)",
"item.extendedae_plus.entity_speed_card.x8": "实体加速卡 (x8)", "item.extendedae_plus.entity_speed_card.x8": "实体加速卡 (x8)",
@ -88,6 +89,10 @@
"config.extendedae_plus.option.entityTickerBlackList": "实体加速器黑名单", "config.extendedae_plus.option.entityTickerBlackList": "实体加速器黑名单",
"config.extendedae_plus.option.entityTickerMultipliers": "实体加速器额外消耗倍率", "config.extendedae_plus.option.entityTickerMultipliers": "实体加速器额外消耗倍率",
"config.extendedae_plus.option.craftingPauseThreshold": "AE合成计算暂停检查阈值", "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": "装配矩阵上传核心",
"block.extendedae_plus.assembler_matrix_upload_core.tooltip.upload": "上传到装配矩阵", "block.extendedae_plus.assembler_matrix_upload_core.tooltip.upload": "上传到装配矩阵",
"block.extendedae_plus.assembler_matrix_upload_core.tooltip.upload_success": "样板已上传到装配矩阵", "block.extendedae_plus.assembler_matrix_upload_core.tooltip.upload_success": "样板已上传到装配矩阵",