diff --git a/src/main/java/com/extendedae_plus/client/ClientProxy.java b/src/main/java/com/extendedae_plus/client/ClientProxy.java index 10d95d9..3f1a2c6 100644 --- a/src/main/java/com/extendedae_plus/client/ClientProxy.java +++ b/src/main/java/com/extendedae_plus/client/ClientProxy.java @@ -33,5 +33,9 @@ public final class ClientProxy { BuiltInModelHooks.addBuiltInModel( ExtendedAEPlus.id("block/crafting/256x_accelerator_formed_v2"), new CraftingCubeModel(new EPlusCraftingCubeModelProvider(EPlusCraftingUnitType.ACCELERATOR_256x))); + + BuiltInModelHooks.addBuiltInModel( + ExtendedAEPlus.id("block/crafting/1024x_accelerator_formed_v2"), + new CraftingCubeModel(new EPlusCraftingCubeModelProvider(EPlusCraftingUnitType.ACCELERATOR_1024x))); } } diff --git a/src/main/java/com/extendedae_plus/client/render/crafting/EPlusCraftingCubeModelProvider.java b/src/main/java/com/extendedae_plus/client/render/crafting/EPlusCraftingCubeModelProvider.java index edd3b36..3e98d51 100644 --- a/src/main/java/com/extendedae_plus/client/render/crafting/EPlusCraftingCubeModelProvider.java +++ b/src/main/java/com/extendedae_plus/client/render/crafting/EPlusCraftingCubeModelProvider.java @@ -44,6 +44,8 @@ public class EPlusCraftingCubeModelProvider "64x_accelerator_light"); protected static final Material ACCELERATOR_256X_LIGHT = texture(ExtendedAEPlus.MODID, "256x_accelerator_light"); + protected static final Material ACCELERATOR_1024X_LIGHT = texture(ExtendedAEPlus.MODID, + "1024x_accelerator_light"); public EPlusCraftingCubeModelProvider(EPlusCraftingUnitType type) { super(type); @@ -74,6 +76,7 @@ public class EPlusCraftingCubeModelProvider case ACCELERATOR_16x -> textureGetter.apply(ACCELERATOR_16X_LIGHT); case ACCELERATOR_64x -> textureGetter.apply(ACCELERATOR_64X_LIGHT); case ACCELERATOR_256x -> textureGetter.apply(ACCELERATOR_256X_LIGHT); + case ACCELERATOR_1024x -> textureGetter.apply(ACCELERATOR_1024X_LIGHT); }; } 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 06c7085..79953fd 100644 --- a/src/main/java/com/extendedae_plus/content/crafting/EPlusCraftingUnitType.java +++ b/src/main/java/com/extendedae_plus/content/crafting/EPlusCraftingUnitType.java @@ -9,7 +9,8 @@ public enum EPlusCraftingUnitType implements ICraftingUnitType { ACCELERATOR_4x(0, 4), ACCELERATOR_16x(0, 16), ACCELERATOR_64x(0, 64), - ACCELERATOR_256x(0, 256); + ACCELERATOR_256x(0, 256), + ACCELERATOR_1024x(0, 1024); private final long storage; private final int threads; @@ -37,6 +38,7 @@ public enum EPlusCraftingUnitType implements ICraftingUnitType { case ACCELERATOR_16x -> ModItems.ACCELERATOR_16x.get(); case ACCELERATOR_64x -> ModItems.ACCELERATOR_64x.get(); case ACCELERATOR_256x -> ModItems.ACCELERATOR_256x.get(); + case ACCELERATOR_1024x -> ModItems.ACCELERATOR_1024x.get(); }; } } diff --git a/src/main/java/com/extendedae_plus/init/ModBlocks.java b/src/main/java/com/extendedae_plus/init/ModBlocks.java index 6f86659..db87bbb 100644 --- a/src/main/java/com/extendedae_plus/init/ModBlocks.java +++ b/src/main/java/com/extendedae_plus/init/ModBlocks.java @@ -64,4 +64,13 @@ public final class ModBlocks { return b; } ); + + public static final RegistryObject ACCELERATOR_1024x = BLOCKS.register( + "1024x_crafting_accelerator", + () -> { + var b = new CraftingUnitBlock(EPlusCraftingUnitType.ACCELERATOR_1024x); + b.setBlockEntity(CraftingBlockEntity.class, AEBlockEntities.CRAFTING_UNIT, null, null); + return b; + } + ); } diff --git a/src/main/java/com/extendedae_plus/init/ModCreativeTabs.java b/src/main/java/com/extendedae_plus/init/ModCreativeTabs.java index 52d28dd..6218e93 100644 --- a/src/main/java/com/extendedae_plus/init/ModCreativeTabs.java +++ b/src/main/java/com/extendedae_plus/init/ModCreativeTabs.java @@ -24,6 +24,7 @@ public final class ModCreativeTabs { output.accept(ModItems.ACCELERATOR_16x.get()); output.accept(ModItems.ACCELERATOR_64x.get()); output.accept(ModItems.ACCELERATOR_256x.get()); + output.accept(ModItems.ACCELERATOR_1024x.get()); }) .build()); } diff --git a/src/main/java/com/extendedae_plus/init/ModItems.java b/src/main/java/com/extendedae_plus/init/ModItems.java index d5c69a6..150c5e1 100644 --- a/src/main/java/com/extendedae_plus/init/ModItems.java +++ b/src/main/java/com/extendedae_plus/init/ModItems.java @@ -37,4 +37,9 @@ public final class ModItems { "256x_crafting_accelerator", () -> new BlockItem(ModBlocks.ACCELERATOR_256x.get(), new Item.Properties()) ); + + public static final RegistryObject ACCELERATOR_1024x = ITEMS.register( + "1024x_crafting_accelerator", + () -> new BlockItem(ModBlocks.ACCELERATOR_1024x.get(), new Item.Properties()) + ); } diff --git a/src/main/resources/assets/extendedae_plus/blockstates/1024x_crafting_accelerator.json b/src/main/resources/assets/extendedae_plus/blockstates/1024x_crafting_accelerator.json new file mode 100644 index 0000000..c413d09 --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/blockstates/1024x_crafting_accelerator.json @@ -0,0 +1,6 @@ +{ + "variants": { + "formed=false": { "model": "extendedae_plus:block/crafting/1024x_accelerator" }, + "formed=true": { "model": "extendedae_plus:block/crafting/1024x_accelerator_formed_v2" } + } +} 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 7ef5235..5af7dbc 100644 --- a/src/main/resources/assets/extendedae_plus/lang/zh_cn.json +++ b/src/main/resources/assets/extendedae_plus/lang/zh_cn.json @@ -20,9 +20,11 @@ "block.extendedae_plus.16x_crafting_accelerator": "16x并行处理单元", "block.extendedae_plus.64x_crafting_accelerator": "64x并行处理单元", "block.extendedae_plus.256x_crafting_accelerator": "256x并行处理单元", + "block.extendedae_plus.1024x_crafting_accelerator": "1024x并行处理单元", "item.extendedae_plus.4x_crafting_accelerator": "4x并行处理单元", "item.extendedae_plus.16x_crafting_accelerator": "16x并行处理单元", "item.extendedae_plus.64x_crafting_accelerator": "64x并行处理单元", - "item.extendedae_plus.256x_crafting_accelerator": "256x并行处理单元" + "item.extendedae_plus.256x_crafting_accelerator": "256x并行处理单元", + "item.extendedae_plus.1024x_crafting_accelerator": "1024x并行处理单元" } \ No newline at end of file diff --git a/src/main/resources/assets/extendedae_plus/models/block/crafting/1024x_accelerator.json b/src/main/resources/assets/extendedae_plus/models/block/crafting/1024x_accelerator.json new file mode 100644 index 0000000..4bd63fc --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/models/block/crafting/1024x_accelerator.json @@ -0,0 +1,4 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { "all": "extendedae_plus:block/crafting/1024x_accelerator" } +} diff --git a/src/main/resources/assets/extendedae_plus/models/item/1024x_crafting_accelerator.json b/src/main/resources/assets/extendedae_plus/models/item/1024x_crafting_accelerator.json new file mode 100644 index 0000000..8299c46 --- /dev/null +++ b/src/main/resources/assets/extendedae_plus/models/item/1024x_crafting_accelerator.json @@ -0,0 +1 @@ +{ "parent": "extendedae_plus:block/crafting/1024x_accelerator" } diff --git a/src/main/resources/assets/extendedae_plus/textures/block/crafting/1024x_accelerator.png b/src/main/resources/assets/extendedae_plus/textures/block/crafting/1024x_accelerator.png new file mode 100644 index 0000000..fd3d226 Binary files /dev/null and b/src/main/resources/assets/extendedae_plus/textures/block/crafting/1024x_accelerator.png differ diff --git a/src/main/resources/assets/extendedae_plus/textures/block/crafting/1024x_accelerator_light.png b/src/main/resources/assets/extendedae_plus/textures/block/crafting/1024x_accelerator_light.png new file mode 100644 index 0000000..3933be4 Binary files /dev/null and b/src/main/resources/assets/extendedae_plus/textures/block/crafting/1024x_accelerator_light.png differ diff --git a/src/main/resources/assets/extendedae_plus/textures/block/crafting/256x_accelerator_light.png b/src/main/resources/assets/extendedae_plus/textures/block/crafting/256x_accelerator_light.png index cabc107..c1a8ca1 100644 Binary files a/src/main/resources/assets/extendedae_plus/textures/block/crafting/256x_accelerator_light.png and b/src/main/resources/assets/extendedae_plus/textures/block/crafting/256x_accelerator_light.png differ diff --git a/src/main/resources/data/extendedae_plus/recipes/1024x_crafting_accelerator.json b/src/main/resources/data/extendedae_plus/recipes/1024x_crafting_accelerator.json new file mode 100644 index 0000000..518b2ae --- /dev/null +++ b/src/main/resources/data/extendedae_plus/recipes/1024x_crafting_accelerator.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " ", + "ACA", + " " + ], + "key": { + "A": { "item": "ae2:cell_component_256k" }, + "C": { "item": "extendedae_plus:256x_crafting_accelerator" } + }, + "result": { "item": "extendedae_plus:1024x_crafting_accelerator", "count": 1 } +}