From 08277b1df92634fe6b7879a051b15c7f931a85b0 Mon Sep 17 00:00:00 2001 From: GaLi Date: Mon, 1 Dec 2025 17:20:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E8=A3=85=E9=85=8D=E7=9F=A9?= =?UTF-8?q?=E9=98=B5=E9=80=9F=E5=BA=A6=E6=A0=B8=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/extendedae_plus/ExtendedAEPlus.java | 7 +++++ .../content/matrix/SpeedCorePlusBlock.java | 22 ++++++++++++++++ .../matrix/SpeedCorePlusBlockEntity.java | 24 ++++++++++++++++++ .../init/ModBlockEntities.java | 7 +++++ .../com/extendedae_plus/init/ModBlocks.java | 7 +++++ .../extendedae_plus/init/ModCreativeTabs.java | 4 +++ .../com/extendedae_plus/init/ModItems.java | 5 ++++ .../assembler_matrix_speed_plus.json | 5 ++++ .../assets/extendedae_plus/lang/en_us.json | 1 + .../assets/extendedae_plus/lang/zh_cn.json | 1 + .../block/assembler_matrix_speed_plus.json | 6 +++++ .../item/assembler_matrix_speed_plus.json | 3 +++ .../block/assembler_matrix_speed_plus.png | Bin 0 -> 250 bytes 13 files changed, 92 insertions(+) create mode 100644 src/main/java/com/extendedae_plus/content/matrix/SpeedCorePlusBlock.java create mode 100644 src/main/java/com/extendedae_plus/content/matrix/SpeedCorePlusBlockEntity.java create mode 100644 src/main/resources/assets/extendedae_plus/blockstates/assembler_matrix_speed_plus.json create mode 100644 src/main/resources/assets/extendedae_plus/models/block/assembler_matrix_speed_plus.json create mode 100644 src/main/resources/assets/extendedae_plus/models/item/assembler_matrix_speed_plus.json create mode 100644 src/main/resources/assets/extendedae_plus/textures/block/assembler_matrix_speed_plus.png diff --git a/src/main/java/com/extendedae_plus/ExtendedAEPlus.java b/src/main/java/com/extendedae_plus/ExtendedAEPlus.java index 9261160..04ada31 100644 --- a/src/main/java/com/extendedae_plus/ExtendedAEPlus.java +++ b/src/main/java/com/extendedae_plus/ExtendedAEPlus.java @@ -80,6 +80,13 @@ public class ExtendedAEPlus { null, null ); + + ModBlocks.ASSEMBLER_MATRIX_SPEED_PLUS.get().setBlockEntity( + com.extendedae_plus.content.matrix.SpeedCorePlusBlockEntity.class, + ModBlockEntities.ASSEMBLER_MATRIX_SPEED_PLUS_BE.get(), + null, + null + ); }); } diff --git a/src/main/java/com/extendedae_plus/content/matrix/SpeedCorePlusBlock.java b/src/main/java/com/extendedae_plus/content/matrix/SpeedCorePlusBlock.java new file mode 100644 index 0000000..c7d1b8d --- /dev/null +++ b/src/main/java/com/extendedae_plus/content/matrix/SpeedCorePlusBlock.java @@ -0,0 +1,22 @@ +package com.extendedae_plus.content.matrix; + +import com.extendedae_plus.init.ModItems; +import com.glodblock.github.extendedae.common.blocks.matrix.BlockAssemblerMatrixBase; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.state.BlockBehaviour; + +public class SpeedCorePlusBlock extends BlockAssemblerMatrixBase { + + public SpeedCorePlusBlock() { + super(); + } + + public SpeedCorePlusBlock(BlockBehaviour.Properties props) { + super(props); + } + + @Override + public Item getPresentItem() { + return ModItems.ASSEMBLER_MATRIX_SPEED_PLUS.get(); + } +} diff --git a/src/main/java/com/extendedae_plus/content/matrix/SpeedCorePlusBlockEntity.java b/src/main/java/com/extendedae_plus/content/matrix/SpeedCorePlusBlockEntity.java new file mode 100644 index 0000000..4d0d2f2 --- /dev/null +++ b/src/main/java/com/extendedae_plus/content/matrix/SpeedCorePlusBlockEntity.java @@ -0,0 +1,24 @@ +package com.extendedae_plus.content.matrix; + +import com.extendedae_plus.init.ModBlockEntities; +import com.glodblock.github.extendedae.common.me.matrix.ClusterAssemblerMatrix; +import com.glodblock.github.extendedae.common.tileentities.matrix.TileAssemblerMatrixFunction; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.block.state.BlockState; + +public class SpeedCorePlusBlockEntity extends TileAssemblerMatrixFunction { + + public SpeedCorePlusBlockEntity(BlockPos pos, BlockState blockState) { + super(ModBlockEntities.ASSEMBLER_MATRIX_SPEED_PLUS_BE.get(), pos, blockState); + } + + @Override + public void add(ClusterAssemblerMatrix cluster) { + if (cluster == null) { + return; + } + for (int i = 0; i < 5; i++) { + cluster.addSpeedCore(); + } + } +} diff --git a/src/main/java/com/extendedae_plus/init/ModBlockEntities.java b/src/main/java/com/extendedae_plus/init/ModBlockEntities.java index 585d5ac..63e1c79 100644 --- a/src/main/java/com/extendedae_plus/init/ModBlockEntities.java +++ b/src/main/java/com/extendedae_plus/init/ModBlockEntities.java @@ -1,10 +1,12 @@ package com.extendedae_plus.init; import com.extendedae_plus.ExtendedAEPlus; +import com.extendedae_plus.content.matrix.SpeedCorePlusBlockEntity; import com.extendedae_plus.content.wireless.WirelessTransceiverBlockEntity; import com.extendedae_plus.content.matrix.UploadCoreBlockEntity; import com.extendedae_plus.content.controller.NetworkPatternControllerBlockEntity; import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraftforge.fml.common.Mod; import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.registries.RegistryObject; @@ -25,6 +27,11 @@ public final class ModBlockEntities { () -> BlockEntityType.Builder.of(NetworkPatternControllerBlockEntity::new, ModBlocks.NETWORK_PATTERN_CONTROLLER.get()).build(null)); + public static final RegistryObject> ASSEMBLER_MATRIX_SPEED_PLUS_BE = + BLOCK_ENTITY_TYPES.register("assembler_matrix_speed_plus", + ()-> BlockEntityType.Builder.of(SpeedCorePlusBlockEntity::new, + ModBlocks.ASSEMBLER_MATRIX_SPEED_PLUS.get()).build(null)); + // 装配矩阵上传核心 public static final RegistryObject> UPLOAD_CORE_BE = BLOCK_ENTITY_TYPES.register("assembler_matrix_upload_core", diff --git a/src/main/java/com/extendedae_plus/init/ModBlocks.java b/src/main/java/com/extendedae_plus/init/ModBlocks.java index a1d87ff..f2f4d31 100644 --- a/src/main/java/com/extendedae_plus/init/ModBlocks.java +++ b/src/main/java/com/extendedae_plus/init/ModBlocks.java @@ -5,6 +5,7 @@ import appeng.blockentity.crafting.CraftingBlockEntity; import appeng.core.definitions.AEBlockEntities; import com.extendedae_plus.ExtendedAEPlus; import com.extendedae_plus.content.crafting.EPlusCraftingUnitType; +import com.extendedae_plus.content.matrix.SpeedCorePlusBlock; import com.extendedae_plus.content.matrix.UploadCoreBlock; import com.extendedae_plus.content.wireless.WirelessTransceiverBlock; import net.minecraft.world.level.block.Block; @@ -50,6 +51,12 @@ public final class ModBlocks { } ); + // 装配矩阵速度核心 Plus（内部功能块） + public static final RegistryObject ASSEMBLER_MATRIX_SPEED_PLUS = BLOCKS.register( + "assembler_matrix_speed_plus", + SpeedCorePlusBlock::new + ); + // Crafting Accelerators (reuse MAE2 textures/models) public static final RegistryObject CRAFTING_ACCELERATOR_4x = BLOCKS.register( "4x_crafting_accelerator", diff --git a/src/main/java/com/extendedae_plus/init/ModCreativeTabs.java b/src/main/java/com/extendedae_plus/init/ModCreativeTabs.java index ba6defa..9b097de 100644 --- a/src/main/java/com/extendedae_plus/init/ModCreativeTabs.java +++ b/src/main/java/com/extendedae_plus/init/ModCreativeTabs.java @@ -20,6 +20,10 @@ public final class ModCreativeTabs { output.accept(ModItems.NETWORK_PATTERN_CONTROLLER.get()); // 装配矩阵上传核心 output.accept(ModItems.ASSEMBLER_MATRIX_UPLOAD_CORE.get()); + //超级装配矩阵速度核心 + output.accept(ModItems.ASSEMBLER_MATRIX_SPEED_PLUS.get()); + + //实体加速器&加速卡 output.accept(ModItems.CRAFTING_ACCELERATOR_4x.get()); output.accept(ModItems.CRAFTING_ACCELERATOR_16x.get()); output.accept(ModItems.CRAFTING_ACCELERATOR_64x.get()); diff --git a/src/main/java/com/extendedae_plus/init/ModItems.java b/src/main/java/com/extendedae_plus/init/ModItems.java index baeff56..cec2134 100644 --- a/src/main/java/com/extendedae_plus/init/ModItems.java +++ b/src/main/java/com/extendedae_plus/init/ModItems.java @@ -37,6 +37,11 @@ public final class ModItems { () -> new BlockItem(ModBlocks.ASSEMBLER_MATRIX_UPLOAD_CORE.get(), new Item.Properties()) ); + public static final RegistryObject ASSEMBLER_MATRIX_SPEED_PLUS = ITEMS.register( + "assembler_matrix_speed_plus", + ()-> new BlockItem(ModBlocks.ASSEMBLER_MATRIX_SPEED_PLUS.get(), new Item.Properties()) + ); + // Crafting Accelerators public static final RegistryObject CRAFTING_ACCELERATOR_4x = ITEMS.register( "4x_crafting_accelerator", diff --git a/src/main/resources/assets/extendedae_plus/blockstates/assembler_matrix_speed_plus.json b/src/main/resources/assets/extendedae_plus/blockstates/assembler_matrix_speed_plus.json new file mode 100644 index 0000000..228c33d --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/blockstates/assembler_matrix_speed_plus.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "extendedae_plus:block/assembler_matrix_speed_plus" } + } +} 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 65a0640..2fe8d63 100644 --- a/src/main/resources/assets/extendedae_plus/lang/en_us.json +++ b/src/main/resources/assets/extendedae_plus/lang/en_us.json @@ -67,6 +67,7 @@ "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", + "block.extendedae_plus.assembler_matrix_speed_plus": "Assembler Matrix Speed Core Plus", "extendedae_plus.upload_to_matrix": "Upload to Assembly Matrix", "extendedae_plus.upload_to_matrix.success": "Pattern uploaded to the assembly matrix", 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 d74e78e..aaed226 100644 --- a/src/main/resources/assets/extendedae_plus/lang/zh_cn.json +++ b/src/main/resources/assets/extendedae_plus/lang/zh_cn.json @@ -67,6 +67,7 @@ "block.extendedae_plus.1024x_crafting_accelerator": "1024x并行处理单元", "block.extendedae_plus.network_pattern_controller": "样板供应器状态控制器", "block.extendedae_plus.assembler_matrix_upload_core": "装配矩阵上传核心", + "block.extendedae_plus.assembler_matrix_speed_plus": "超级装配矩阵速度核心", "extendedae_plus.upload_to_matrix": "上传到装配矩阵", "extendedae_plus.upload_to_matrix.success": "样板已上传到装配矩阵", diff --git a/src/main/resources/assets/extendedae_plus/models/block/assembler_matrix_speed_plus.json b/src/main/resources/assets/extendedae_plus/models/block/assembler_matrix_speed_plus.json new file mode 100644 index 0000000..c50fee8 --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/models/block/assembler_matrix_speed_plus.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "extendedae_plus:block/assembler_matrix_speed_plus" + } +} diff --git a/src/main/resources/assets/extendedae_plus/models/item/assembler_matrix_speed_plus.json b/src/main/resources/assets/extendedae_plus/models/item/assembler_matrix_speed_plus.json new file mode 100644 index 0000000..da67abb --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/models/item/assembler_matrix_speed_plus.json @@ -0,0 +1,3 @@ +{ + "parent": "extendedae_plus:block/assembler_matrix_speed_plus" +} diff --git a/src/main/resources/assets/extendedae_plus/textures/block/assembler_matrix_speed_plus.png b/src/main/resources/assets/extendedae_plus/textures/block/assembler_matrix_speed_plus.png new file mode 100644 index 0000000000000000000000000000000000000000..f9baae3d82ff3020160f073f50c96f632638bc15 GIT binary patch literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|>pfi@Ln`LX33B8*WFXL!`d)6z zoG+}kuJ#YiS>&J0uW?vcwL+mo?h`Y+8P8%j&)pZwmRZl9>znlaw8XNOhmq^2^}af8 zJbUrSs`3qYT^{js#aL;CFPM@#_gP=9|AGipZl1Nq3bh_D#gFnVWstqvxqelU_<{vV zobUe{yh&0C?QM;^6J+%?#`o-27t^KdmdSHj=`E-}l*?Lrpm;^}FTNgTe~DWM4fj)h;* literal 0 HcmV?d00001