From 6e5b6b46f02094a6d9a77d800fbc3f4bad56944a Mon Sep 17 00:00:00 2001 From: GaLicn <133291877+GaLicn@users.noreply.github.com> Date: Fri, 19 Sep 2025 20:40:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E9=85=8D=E7=9F=A9=E9=98=B5=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E6=A0=B8=E5=BF=83=E8=B4=B4=E5=9B=BE=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../util/ExtendedAEPatternUploadUtil.java | 6 +++--- .../blockstates/assembler_matrix_upload_core.json | 5 +++++ .../assets/extendedae_plus/lang/en_us.json | 4 +++- .../assets/extendedae_plus/lang/zh_cn.json | 9 ++++++++- .../block/assembler_matrix_upload_core.json | 6 ++++++ .../models/item/assembler_matrix_upload_core.json | 3 +++ .../block/assembler_matrix_upload_core.png | Bin 0 -> 225 bytes 7 files changed, 28 insertions(+), 5 deletions(-) create mode 100644 src/main/resources/assets/extendedae_plus/blockstates/assembler_matrix_upload_core.json create mode 100644 src/main/resources/assets/extendedae_plus/models/block/assembler_matrix_upload_core.json create mode 100644 src/main/resources/assets/extendedae_plus/models/item/assembler_matrix_upload_core.json create mode 100644 src/main/resources/assets/extendedae_plus/textures/block/assembler_matrix_upload_core.png diff --git a/src/main/java/com/extendedae_plus/util/ExtendedAEPatternUploadUtil.java b/src/main/java/com/extendedae_plus/util/ExtendedAEPatternUploadUtil.java index 7911c9d..d9f2542 100644 --- a/src/main/java/com/extendedae_plus/util/ExtendedAEPatternUploadUtil.java +++ b/src/main/java/com/extendedae_plus/util/ExtendedAEPatternUploadUtil.java @@ -632,7 +632,8 @@ public class ExtendedAEPatternUploadUtil { } /** - * 判断给定矩阵集群中是否存在且仅存在一个“装配矩阵上传核心”。 + * 判断给定矩阵集群中是否存在“装配矩阵上传核心”。 + * 要求：至少存在 1 个即可，不限制数量。 * 传入任意属于该集群的 Tile（如 Pattern/Crafter/Frame 等）。 */ private static boolean clusterHasSingleUploadCore(TileAssemblerMatrixBase any) { @@ -644,10 +645,9 @@ public class ExtendedAEPatternUploadUtil { var te = it.next(); if (te instanceof com.extendedae_plus.content.matrix.UploadCoreBlockEntity) { cores++; - if (cores > 1) return false; // 至多一个 } } - return cores == 1; // 恰好一个 + return cores >= 1; // 至少一个即可 } catch (Throwable t) { return false; } diff --git a/src/main/resources/assets/extendedae_plus/blockstates/assembler_matrix_upload_core.json b/src/main/resources/assets/extendedae_plus/blockstates/assembler_matrix_upload_core.json new file mode 100644 index 0000000..a099eb5 --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/blockstates/assembler_matrix_upload_core.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "extendedae_plus:block/assembler_matrix_upload_core" } + } +} diff --git a/src/main/resources/assets/extendedae_plus/lang/en_us.json b/src/main/resources/assets/extendedae_plus/lang/en_us.json index 2187081..320a792 100644 --- a/src/main/resources/assets/extendedae_plus/lang/en_us.json +++ b/src/main/resources/assets/extendedae_plus/lang/en_us.json @@ -35,6 +35,7 @@ "block.extendedae_plus.256x_crafting_accelerator": "256x Crafting Accelerator", "block.extendedae_plus.1024x_crafting_accelerator": "1024x Crafting Accelerator", "block.extendedae_plus.network_pattern_controller": "Pattern Supplier State Controller", + "block.extendedae_plus.assembler_matrix_upload_core": "Assembler Matrix Upload Core", "extendedae_plus.upload_to_matrix": "Upload to Assembly Matrix", "extendedae_plus.upload_to_matrix.success": "Pattern uploaded to the assembly matrix", @@ -85,5 +86,6 @@ "config.extendedae_plus.option.entityTickerCost": "Entity Ticker Base Energy Cost", "config.extendedae_plus.option.entityTickerBlackList": "Entity Ticker Blacklist", "config.extendedae_plus.option.entityTickerMultipliers": "Entity Ticker Extra Consumption Multipliers", - "config.extendedae_plus.option.craftingPauseThreshold": "AE synthesis calculation pause check threshold" + "config.extendedae_plus.option.craftingPauseThreshold": "AE synthesis calculation pause check threshold", + "block.extendedae_plus.assembler_matrix_upload_core": "Assembler Matrix Upload Core" } \ No newline at end of file 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 d89594e..d7996ab 100644 --- a/src/main/resources/assets/extendedae_plus/lang/zh_cn.json +++ b/src/main/resources/assets/extendedae_plus/lang/zh_cn.json @@ -35,6 +35,7 @@ "block.extendedae_plus.256x_crafting_accelerator": "256x并行处理单元", "block.extendedae_plus.1024x_crafting_accelerator": "1024x并行处理单元", "block.extendedae_plus.network_pattern_controller": "样板供应器状态控制器", + "block.extendedae_plus.assembler_matrix_upload_core": "装配矩阵上传核心", "extendedae_plus.upload_to_matrix": "上传到装配矩阵", "extendedae_plus.upload_to_matrix.success": "样板已上传到装配矩阵", @@ -85,5 +86,11 @@ "config.extendedae_plus.option.entityTickerCost": "实体加速器能量消耗基础值", "config.extendedae_plus.option.entityTickerBlackList": "实体加速器黑名单", "config.extendedae_plus.option.entityTickerMultipliers": "实体加速器额外消耗倍率", - "config.extendedae_plus.option.craftingPauseThreshold": "AE合成计算暂停检查阈值" + "config.extendedae_plus.option.craftingPauseThreshold": "AE合成计算暂停检查阈值", + "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": "样板已上传到装配矩阵", + "block.extendedae_plus.assembler_matrix_upload_core.tooltip.upload_fail_not_crafting": "仅支持上传合成样板，处理样板将被忽略", + "block.extendedae_plus.assembler_matrix_upload_core.tooltip.upload_fail_no_matrix": "未在当前网络中找到已成型的装配矩阵", + "block.extendedae_plus.assembler_matrix_upload_core.tooltip.upload_fail_full": "装配矩阵的样板仓已满或无法插入" } \ No newline at end of file diff --git a/src/main/resources/assets/extendedae_plus/models/block/assembler_matrix_upload_core.json b/src/main/resources/assets/extendedae_plus/models/block/assembler_matrix_upload_core.json new file mode 100644 index 0000000..768aff9 --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/models/block/assembler_matrix_upload_core.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "extendedae_plus:block/assembler_matrix_upload_core" + } +} diff --git a/src/main/resources/assets/extendedae_plus/models/item/assembler_matrix_upload_core.json b/src/main/resources/assets/extendedae_plus/models/item/assembler_matrix_upload_core.json new file mode 100644 index 0000000..5470af1 --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/models/item/assembler_matrix_upload_core.json @@ -0,0 +1,3 @@ +{ + "parent": "extendedae_plus:block/assembler_matrix_upload_core" +} diff --git a/src/main/resources/assets/extendedae_plus/textures/block/assembler_matrix_upload_core.png b/src/main/resources/assets/extendedae_plus/textures/block/assembler_matrix_upload_core.png new file mode 100644 index 0000000000000000000000000000000000000000..bac350b1ca8ac3c6423aaea69b4134ef3d5ea517 GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|W_!9ghFJ6_ z??>IlPn_yFcrzm=Qqph*?}?feHY4$My`3uj z3MLC?c5y!7nsMO|1EbU4SwM6`>Bk(EE30QlOgS}Czj+z^ayB-$wx{*mU(cIxNb6{m z=9hIpb_J||mf5EMzH5E*DWiM4|Ib*`arj-Pk3*e}!XE}hX8%hK43qvIU|QHwF2wN7 X%K4y}yVzc!GZ{Qx{an^LB{Ts5t+`n7 literal 0 HcmV?d00001