From eca88798415b958458a3f52382e2af48ec9d1ce3 Mon Sep 17 00:00:00 2001 From: GaLi <3096147684@qq.com> Date: Fri, 22 Aug 2025 20:55:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A01024=E5=B9=B6=E8=A1=8C?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8D=95=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extendedae_plus/client/ClientProxy.java | 4 ++++ .../EPlusCraftingCubeModelProvider.java | 3 +++ .../crafting/EPlusCraftingUnitType.java | 4 +++- .../com/extendedae_plus/init/ModBlocks.java | 9 +++++++++ .../extendedae_plus/init/ModCreativeTabs.java | 1 + .../com/extendedae_plus/init/ModItems.java | 5 +++++ .../1024x_crafting_accelerator.json | 6 ++++++ .../assets/extendedae_plus/lang/zh_cn.json | 4 +++- .../block/crafting/1024x_accelerator.json | 4 ++++ .../item/1024x_crafting_accelerator.json | 1 + .../block/crafting/1024x_accelerator.png | Bin 0 -> 794 bytes .../block/crafting/1024x_accelerator_light.png | Bin 0 -> 183 bytes .../block/crafting/256x_accelerator_light.png | Bin 6052 -> 179 bytes .../recipes/1024x_crafting_accelerator.json | 13 +++++++++++++ 14 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/extendedae_plus/blockstates/1024x_crafting_accelerator.json create mode 100644 src/main/resources/assets/extendedae_plus/models/block/crafting/1024x_accelerator.json create mode 100644 src/main/resources/assets/extendedae_plus/models/item/1024x_crafting_accelerator.json create mode 100644 src/main/resources/assets/extendedae_plus/textures/block/crafting/1024x_accelerator.png create mode 100644 src/main/resources/assets/extendedae_plus/textures/block/crafting/1024x_accelerator_light.png create mode 100644 src/main/resources/data/extendedae_plus/recipes/1024x_crafting_accelerator.json 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 0000000000000000000000000000000000000000..fd3d226f599c972b6af91d78021a67048d4f912a GIT binary patch literal 794 zcmV+#1LgdQP)fWfaDL@5g=boyp{5>cnw68d~Ve29s(*O0-@0 zQKb|`w3y;T{Ij|ip%7FkuDX!6)@`da2r9)a65A$9l6&Xtz8}ZM45$YVoW;ZM9L~d| z-r87`@x)Wt0YMNEj4@FRy`GrL~%UzV#RO1n*YS3Ld z#lmuz7z5pxPBGtErco3uop_EEBjwQ{B4CwP7-In_t7E>r^%do?qQBDT>+iP^px^It zW9tS^XMFnJ$8_2qP@t8)ZY6JvSE!1_*cr+%)8j%^`-rYMaE%)f3>`^ow z6Ey+_qNV_*M`E3!|Kdr0e(;d;uV)~FPARdrevX${&+_cx0AGixT7j~l%nSm=m^dy6 ztggMn+WI<5YqU}dtut0`jb?+QC@5S;RvOYy!e#~^A_|3Zh7bbw*sw6yB6p4~GgFJb_ee@KGslOQuM%%Z z%AEn--t+A3J;7*Auh(UF_fLwW0h93B2m?L9FBs;Xjd=P~X1IbsOx{_&V< z^(>A=tqm@B_{o@Nvp`+GbY3!-QuWg#(`!z0ElYgpygNd{tm>iOf?eVsd@d#G!8r#GEO(id f+!(?8;uV9NUyR`F-S)?UmNR&|`njxgN@xNA&t5*% literal 0 HcmV?d00001 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 cabc1073b688b1e25103c8a0b1bfbbbbdb8e6194..c1a8ca17d847993033f2ec64e12c38c5674410f7 100644 GIT binary patch delta 151 zcmV;I0BHZDFS7xVB!2;OQb$4nuFf3k0001ONkl8NOCL?s{vgd0N;;95fDf!pSu76002ovPDHLk FV1nfSJLv!b literal 6052 zcmeHLe{d969p4KyNz=wjX+|ToWoKzMQ1|xd-R*93Fd>&FH|9c`1QP0xu($g*S-88s z>~3(O{u^Dilt*ZR>nac8?Zy{v^FAIEkyCVdzVX6 zpiPG2_(v}D^4`ApeV^}-_kG{*clR3&^)+*UZQ;x$KWg@ z@qWoC0)Nkw6B0Q{T=1bSAm2v4s;VJeRfQ)_L(^jj!_vF^b_8pWG?Z>y(G;&<@`>(} z&f^V_zw1RL$Z2!^1<-lZTJ3ZYgM~EE)53b|)L{ z9rH#%UqnU^oZj*6^Y4lWQVVhZ2XzCz^EN#5d+jsdDYf2T$&76+$@}{z{P?Tv**g~( zzj0yk+4{XN2}6Gyy*QBnn+J|<*igHB&1U^pqhu)dyZn*9Gv#-mSaME0_h7i-&h>8& zo;kN*Wao*zp>4ZPy;{-vXzS;?e)Q{O`(kU4zJ8Qh`TF9v<30P#Kc3mQ^6h7Khvzj^55r-My*lnvf+;kO5Vy8oY@7cf;{_11#n z;gT}yzV`-)UcNXu@}9BcE9;jXd(o6ncDzvohZ@tHTkY0Joun9XudEtT2k)m0OWl5kQt)7G}r^$r1$braUgpj3}deYX71nywU zQKQQa5(KQ{0b z+?iBE(N!rYjHGIUpO1z6iHAB z)|7C1i3WJdO#HP@`U zW@LdG5zl(pthr`nff*6cde_HhuA+%gh$sOsmMQo^*w-<#9X>AJn5nr7(y~WRUmEyf vN$1lqW9K>PvGs3ZXPa&R$uH4=#jq#7bw~8^pS&^%ys&U}eW-u=ng{+1xj4x? 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 } +}