超级装配矩阵速度核心&超级核心系列资源文件

build/generated/sources/modMetadata/META-INF/neoforge.mods.toml

@@ -33,7 +33,7 @@ displayURL = "https://github.com/GaLicn/ExtendedAE_Plus"
 logoFile="logo.png"
 
 # A text field displayed in the mod UI
-credits="GaLi,C-H716"
+credits="C-H716"
 
 # A text field displayed in the mod UI
 authors = "GaLi" #optional

src/main/java/com/extendedae_plus/ExtendedAEPlus.java

@@ -9,6 +9,7 @@ import appeng.items.parts.PartModelsHelper;
 import com.extendedae_plus.api.ids.EAPComponents;
 import com.extendedae_plus.api.storage.InfinityBigIntegerCellHandler;
 import com.extendedae_plus.config.ModConfigs;
+import com.extendedae_plus.content.matrix.SpeedCorePlusBlockEntity;
 import com.extendedae_plus.init.*;
 import com.extendedae_plus.util.storage.InfinityStorageManager;
 import com.mojang.logging.LogUtils;
@@ -150,6 +151,14 @@ public class ExtendedAEPlus {
                     null,
                     null
                 );
+
+                ModBlocks.ASSEMBLER_MATRIX_SPEED_PLUS.get().setBlockEntity(
+                        SpeedCorePlusBlockEntity.class,
+                        ModBlockEntities.ASSEMBLER_MATRIX_SPEED_PLUS_BE.get(),
+                        null,
+                        null
+                );
+
                 LOGGER.info("Bound UploadCoreBlockEntity to assembler matrix upload core block.");
             } catch (Throwable t) {
                 LOGGER.warn("Failed to bind block entities: {}", t.toString());

src/main/java/com/extendedae_plus/content/matrix/SpeedCorePlusBlock.java

@@ -0,0 +1,17 @@
+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;
+
+public class SpeedCorePlusBlock extends BlockAssemblerMatrixBase<SpeedCorePlusBlockEntity> {
+
+    public SpeedCorePlusBlock(Properties props) {
+        super(props);
+    }
+
+    @Override
+    public Item getPresentItem() {
+        return ModItems.ASSEMBLER_MATRIX_SPEED_PLUS.get();
+    }
+}

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();
+        }
+    }
+}

src/main/java/com/extendedae_plus/init/ModBlockEntities.java

@@ -1,6 +1,7 @@
 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.controller.NetworkPatternControllerBlockEntity;
 import com.extendedae_plus.content.matrix.UploadCoreBlockEntity;
@@ -49,4 +50,10 @@ public final class ModBlockEntities {
             BLOCK_ENTITY_TYPES.register("upload_core",
                     () -> BlockEntityType.Builder.of(UploadCoreBlockEntity::new,
                             ModBlocks.ASSEMBLER_MATRIX_UPLOAD_CORE.get()).build(null));
+
+    //超级装配矩阵速度核心
+    public static final DeferredHolder<BlockEntityType<?>,BlockEntityType<SpeedCorePlusBlockEntity>> 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));
 }

src/main/java/com/extendedae_plus/init/ModBlocks.java

@@ -1,6 +1,8 @@
 package com.extendedae_plus.init;
 
 import com.extendedae_plus.ExtendedAEPlus;
+import com.extendedae_plus.content.controller.NetworkPatternControllerBlock;
+import com.extendedae_plus.content.matrix.SpeedCorePlusBlock;
 import com.extendedae_plus.content.wireless.WirelessTransceiverBlock;
 import com.extendedae_plus.content.crafting.EPlusCraftingUnitType;
 import com.extendedae_plus.content.matrix.UploadCoreBlock;
@@ -31,7 +33,7 @@ public final class ModBlocks {
     // AE2 网络模式控制器方块
     public static final DeferredBlock<Block> NETWORK_PATTERN_CONTROLLER = BLOCKS.register(
             "network_pattern_controller",
-            () -> new com.extendedae_plus.content.controller.NetworkPatternControllerBlock(
+            () -> new NetworkPatternControllerBlock(
                     BlockBehaviour.Properties.of()
                             .mapColor(MapColor.METAL)
                             .strength(1.5F, 6.0F)
@@ -85,4 +87,12 @@ public final class ModBlocks {
                             .requiresCorrectToolForDrops()
             )
     );
+    public static final DeferredBlock<SpeedCorePlusBlock> ASSEMBLER_MATRIX_SPEED_PLUS = BLOCKS.register(
+            "assembler_matrix_speed_plus",
+            () -> new SpeedCorePlusBlock(
+                    BlockBehaviour.Properties.of()
+                            .strength(1.5F, 6.0F)
+                            .requiresCorrectToolForDrops()
+            )
+    );
 }

src/main/java/com/extendedae_plus/init/ModCreativeTabs.java

@@ -30,7 +30,8 @@ public final class ModCreativeTabs {
                                 ModItems.CHANNEL_CARD.get().getDefaultInstance(),
                                 ModItems.VIRTUAL_CRAFTING_CARD.get().getDefaultInstance(),
                                 ModItems.ENTITY_TICKER_PART_ITEM.get().getDefaultInstance(),
-                                ModItems.INFINITY_BIGINTEGER_CELL_ITEM.get().getDefaultInstance()
+                                ModItems.INFINITY_BIGINTEGER_CELL_ITEM.get().getDefaultInstance(),
+                                ModItems.ASSEMBLER_MATRIX_SPEED_PLUS.get().getDefaultInstance()
                         ).forEach(output::accept);
 
                         // 放入四个预设的 stacks（x2,x4,x8,x16），使用 ModItems 工厂创建

src/main/java/com/extendedae_plus/init/ModItems.java

@@ -63,6 +63,11 @@ public final class ModItems {
             "assembler_matrix_upload_core",
             () -> new BlockItem(ModBlocks.ASSEMBLER_MATRIX_UPLOAD_CORE.get(), new Item.Properties())
     );
+    //超级装配矩阵速度核心
+    public static final DeferredItem<Item> ASSEMBLER_MATRIX_SPEED_PLUS = ITEMS.register(
+            "assembler_matrix_speed_plus",
+            ()->new BlockItem(ModBlocks.ASSEMBLER_MATRIX_SPEED_PLUS.get(), new Item.Properties())
+    );
     static final DeferredItem<Item> NETWORK_PATTERN_CONTROLLER = ITEMS.register(
             "network_pattern_controller",
             () -> new BlockItem(ModBlocks.NETWORK_PATTERN_CONTROLLER.get(), new Item.Properties())

src/main/resources/assets/extendedae_plus/blockstates/assembler_matrix_crafter_plus.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "extendedae_plus:block/assembler_matrix_crafter_plus" }
+  }
+}

src/main/resources/assets/extendedae_plus/blockstates/assembler_matrix_pattern_plus.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "extendedae_plus:block/assembler_matrix_pattern_plus" }
+  }
+}

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" }
+  }
+}

src/main/resources/assets/extendedae_plus/blockstates/wireless_transceiver.json

@@ -1,5 +1,10 @@
 {
   "variants": {
-    "": { "model": "extendedae_plus:block/wireless_transceiver" }
+    "state=0": { "model": "extendedae_plus:block/wirelesstransceiver/wireless_transceiver_0" },
+    "state=1": { "model": "extendedae_plus:block/wirelesstransceiver/wireless_transceiver_1" },
+    "state=2": { "model": "extendedae_plus:block/wirelesstransceiver/wireless_transceiver_2" },
+    "state=3": { "model": "extendedae_plus:block/wirelesstransceiver/wireless_transceiver_3" },
+    "state=4": { "model": "extendedae_plus:block/wirelesstransceiver/wireless_transceiver_4" },
+    "state=5": { "model": "extendedae_plus:block/wirelesstransceiver/wireless_transceiver_5" }
   }
 }

src/main/resources/assets/extendedae_plus/lang/en_us.json

@@ -47,6 +47,9 @@
   "block.extendedae_plus.1024x_crafting_accelerator": "1024x Crafting Accelerator",
   "block.extendedae_plus.network_pattern_controller": "Pattern Provider Status Controller",
   "block.extendedae_plus.assembler_matrix_upload_core": "Assembly Matrix Upload Core",
+  "block.extendedae_plus.assembler_matrix_speed_plus": "Assembler Matrix Speed Core Plus",
+  "block.extendedae_plus.assembler_matrix_crafter_plus": "Assembler Matrix Crafter Core Plus",
+  "block.extendedae_plus.assembler_matrix_pattern_plus": "Assembler Matrix Pattern Core Plus",
 
   "extendedae_plus.upload_to_matrix": "Upload to Assembly Matrix",
   "extendedae_plus.upload_to_matrix.success": "Pattern Uploaded to Assembly Matrix",

src/main/resources/assets/extendedae_plus/lang/zh_cn.json

@@ -47,6 +47,9 @@
   "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": "超级装配矩阵速度核心",
+  "block.extendedae_plus.assembler_matrix_crafter_plus": "超级装配矩阵合成核心",
+  "block.extendedae_plus.assembler_matrix_pattern_plus": "超级装配矩阵样板核心",
 
   "extendedae_plus.upload_to_matrix": "上传到装配矩阵",
   "extendedae_plus.upload_to_matrix.success": "样板已上传到装配矩阵",

src/main/resources/assets/extendedae_plus/models/block/assembler_matrix_crafter_plus.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "extendedae_plus:block/assembler_matrix_crafter_plus"
+  }
+}

src/main/resources/assets/extendedae_plus/models/block/assembler_matrix_pattern_plus.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "extendedae_plus:block/assembler_matrix_pattern_plus"
+  }
+}

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"
+  }
+}

src/main/resources/assets/extendedae_plus/models/block/wireless_transceiver.json

@@ -1,6 +1,7 @@
 {
-  "parent": "block/cube_all",
+  "parent": "minecraft:block/cube_all",
   "textures": {
-    "all": "extendedae_plus:block/wireless_transceiver"
+    "all": "extendedae_plus:block/wireless_transceiver/wireless_transceiver_5"
   }
 }
+

src/main/resources/assets/extendedae_plus/models/block/wirelesstransceiver/wireless_transceiver_0.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "extendedae_plus:block/wireless_transceiver/wireless_transceiver_0"
+  }
+}
+

src/main/resources/assets/extendedae_plus/models/block/wirelesstransceiver/wireless_transceiver_1.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "extendedae_plus:block/wireless_transceiver/wireless_transceiver_1"
+  }
+}
+

src/main/resources/assets/extendedae_plus/models/block/wirelesstransceiver/wireless_transceiver_2.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "extendedae_plus:block/wireless_transceiver/wireless_transceiver_2"
+  }
+}
+

src/main/resources/assets/extendedae_plus/models/block/wirelesstransceiver/wireless_transceiver_3.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "extendedae_plus:block/wireless_transceiver/wireless_transceiver_3"
+  }
+}
+

src/main/resources/assets/extendedae_plus/models/block/wirelesstransceiver/wireless_transceiver_4.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "extendedae_plus:block/wireless_transceiver/wireless_transceiver_4"
+  }
+}
+

src/main/resources/assets/extendedae_plus/models/block/wirelesstransceiver/wireless_transceiver_5.json

@@ -0,0 +1,7 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "extendedae_plus:block/wireless_transceiver/wireless_transceiver_5"
+  }
+}
+

src/main/resources/assets/extendedae_plus/models/item/assembler_matrix_crafter_plus.json

@@ -0,0 +1,3 @@
+{
+  "parent": "extendedae_plus:block/assembler_matrix_crafter_plus"
+}

src/main/resources/assets/extendedae_plus/models/item/assembler_matrix_pattern_plus.json

@@ -0,0 +1,3 @@
+{
+  "parent": "extendedae_plus:block/assembler_matrix_pattern_plus"
+}

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"
+}

src/main/resources/data/extendedae_plus/loot_table/blocks/assembler_matrix_crafter_plus.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "extendedae_plus:assembler_matrix_crafter_plus"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/main/resources/data/extendedae_plus/loot_table/blocks/assembler_matrix_pattern_plus.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "extendedae_plus:assembler_matrix_pattern_plus"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/main/resources/data/extendedae_plus/loot_table/blocks/assembler_matrix_speed_plus.json

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "extendedae_plus:assembler_matrix_speed_plus"
+        }
+      ],
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ]
+    }
+  ]
+}

src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json

@@ -8,6 +8,7 @@
     "extendedae_plus:16x_crafting_accelerator",
     "extendedae_plus:64x_crafting_accelerator",
     "extendedae_plus:256x_crafting_accelerator",
-    "extendedae_plus:1024x_crafting_accelerator"
+    "extendedae_plus:1024x_crafting_accelerator",
+    "extendedae_plus:assembler_matrix_speed_plus"
   ]
 }

src/main/resources/data/minecraft/tags/block/needs_stone_tool.json

@@ -1,12 +1,14 @@
 {
   "replace": false,
   "values": [
+    "extendedae_plus:network_pattern_controller",
     "extendedae_plus:wireless_transceiver",
     "extendedae_plus:assembler_matrix_upload_core",
     "extendedae_plus:4x_crafting_accelerator",
     "extendedae_plus:16x_crafting_accelerator",
     "extendedae_plus:64x_crafting_accelerator",
     "extendedae_plus:256x_crafting_accelerator",
-    "extendedae_plus:1024x_crafting_accelerator"
+    "extendedae_plus:1024x_crafting_accelerator",
+    "extendedae_plus:assembler_matrix_speed_plus"
   ]
 }