diff --git a/gradle.properties b/gradle.properties index b0cb119..92393db 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,7 +26,7 @@ loader_version_range=[1,) # The unique mod identifier for the mod. Must be lowercase in English locale. Must fit the regex [a-z][a-z0-9_]{1,63} # Must match the String constant located in the main mod class annotated with @Mod. -mod_id=extendedaeplus +mod_id=extendedae_plus # The human-readable display name for the mod. mod_name=ExtendedAE-Plus # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default. diff --git a/src/main/java/com/extendedae_plus/ExtendedAEPlus.java b/src/main/java/com/extendedae_plus/ExtendedAEPlus.java index 08f21c6..a923b8f 100644 --- a/src/main/java/com/extendedae_plus/ExtendedAEPlus.java +++ b/src/main/java/com/extendedae_plus/ExtendedAEPlus.java @@ -37,7 +37,7 @@ import appeng.core.definitions.AEBlockEntities; @Mod(ExtendedAEPlus.MODID) public class ExtendedAEPlus { // Define mod id in a common place for everything to reference - public static final String MODID = "extendedaeplus"; + public static final String MODID = "extendedae_plus"; // Directly reference a slf4j logger public static final Logger LOGGER = LogUtils.getLogger(); // 移除 MDK 示例注册，改为使用实际模组的方块/物品/创造物品栏注册见 ModBlocks、ModItems、ModCreativeTabs diff --git a/src/main/java/com/extendedae_plus/content/crafting/EPlusCraftingUnitType.java b/src/main/java/com/extendedae_plus/content/crafting/EPlusCraftingUnitType.java index 79953fd..7e82b4b 100644 --- a/src/main/java/com/extendedae_plus/content/crafting/EPlusCraftingUnitType.java +++ b/src/main/java/com/extendedae_plus/content/crafting/EPlusCraftingUnitType.java @@ -27,8 +27,10 @@ public enum EPlusCraftingUnitType implements ICraftingUnitType { @Override public int getAcceleratorThreads() { - // 返回真实线程值，单块可能超过 16。上限校验已由 mixin 绕过。 - return this.threads; + // AE2 在 CraftingCPUCluster.addBlockEntity 中对单块线程数做了上限 16 的硬校验。 + // 这里先进行夹取，避免形成结构时抛出 IllegalArgumentException 导致崩溃。 + // 后续如需突破上限，应通过 Mixin/扩展在集群层面增加“额外并行度”的实现。 + return Math.min(this.threads, 16); } @Override diff --git a/src/main/resources/assets/extendedae_plus/models/block/crafting/1024x_accelerator_formed_v2.json b/src/main/resources/assets/extendedae_plus/models/block/crafting/1024x_accelerator_formed_v2.json new file mode 100644 index 0000000..cff3f74 --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/models/block/crafting/1024x_accelerator_formed_v2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "extendedae_plus:block/crafting/1024x_accelerator_light" + } +} diff --git a/src/main/resources/assets/extendedae_plus/models/block/crafting/16x_accelerator_formed_v2.json b/src/main/resources/assets/extendedae_plus/models/block/crafting/16x_accelerator_formed_v2.json new file mode 100644 index 0000000..67d394b --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/models/block/crafting/16x_accelerator_formed_v2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "extendedae_plus:block/crafting/16x_accelerator_light" + } +} diff --git a/src/main/resources/assets/extendedae_plus/models/block/crafting/256x_accelerator_formed_v2.json b/src/main/resources/assets/extendedae_plus/models/block/crafting/256x_accelerator_formed_v2.json new file mode 100644 index 0000000..fba3dea --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/models/block/crafting/256x_accelerator_formed_v2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "extendedae_plus:block/crafting/256x_accelerator_light" + } +} diff --git a/src/main/resources/assets/extendedae_plus/models/block/crafting/4x_accelerator_formed_v2.json b/src/main/resources/assets/extendedae_plus/models/block/crafting/4x_accelerator_formed_v2.json new file mode 100644 index 0000000..0d37c9b --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/models/block/crafting/4x_accelerator_formed_v2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "extendedae_plus:block/crafting/4x_accelerator_light" + } +} diff --git a/src/main/resources/assets/extendedae_plus/models/block/crafting/64x_accelerator_formed_v2.json b/src/main/resources/assets/extendedae_plus/models/block/crafting/64x_accelerator_formed_v2.json new file mode 100644 index 0000000..11d03f1 --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/models/block/crafting/64x_accelerator_formed_v2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "extendedae_plus:block/crafting/64x_accelerator_light" + } +} diff --git a/src/main/resources/assets/extendedae_plus/models/block/wireless_transceiver.json b/src/main/resources/assets/extendedae_plus/models/block/wireless_transceiver.json index b7f5686..af1490e 100644 --- a/src/main/resources/assets/extendedae_plus/models/block/wireless_transceiver.json +++ b/src/main/resources/assets/extendedae_plus/models/block/wireless_transceiver.json @@ -1,5 +1,5 @@ { - "parent": "minecraft:block/cube_all", + "parent": "block/cube_all", "textures": { "all": "extendedae_plus:block/wireless_transceiver" } diff --git a/src/main/resources/assets/extendedaeplus/lang/en_us.json b/src/main/resources/assets/extendedaeplus/lang/en_us.json deleted file mode 100644 index c7674aa..0000000 --- a/src/main/resources/assets/extendedaeplus/lang/en_us.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "itemGroup.extendedaeplus": "Example Mod Tab", - "block.extendedaeplus.example_block": "Example Block", - "item.extendedaeplus.example_item": "Example Item", - - "extendedaeplus.configuration.title": "ExtendedAE-Plus Configs", - "extendedaeplus.configuration.section.extendedaeplus.common.toml": "ExtendedAE-Plus Configs", - "extendedaeplus.configuration.section.extendedaeplus.common.toml.title": "ExtendedAE-Plus Configs", - "extendedaeplus.configuration.items": "Item List", - "extendedaeplus.configuration.logDirtBlock": "Log Dirt Block", - "extendedaeplus.configuration.magicNumberIntroduction": "Magic Number Text", - "extendedaeplus.configuration.magicNumber": "Magic Number" -} diff --git a/src/main/resources/extendedaeplus.mixins.json b/src/main/resources/extendedae_plus.mixins.json similarity index 99% rename from src/main/resources/extendedaeplus.mixins.json rename to src/main/resources/extendedae_plus.mixins.json index 52170ec..eb5d6eb 100644 --- a/src/main/resources/extendedaeplus.mixins.json +++ b/src/main/resources/extendedae_plus.mixins.json @@ -43,4 +43,4 @@ "overwrites": { "requireAnnotations": true } -} \ No newline at end of file +}