From a2b280345f9a161269418e2f1cee0b3d33353926 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Mon, 26 Aug 2024 23:25:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E6=9D=90=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../superbwarfare/entity/Mk42Entity.java | 2 +- .../superbwarfare/entity/Mle1934Entity.java | 4 +-- .../mcreator/superbwarfare/init/ModItems.java | 2 ++ .../assets/superbwarfare/lang/en_us.json | 2 ++ .../assets/superbwarfare/lang/zh_cn.json | 2 ++ .../superbwarfare/models/item/motor.json | 6 ++++ .../superbwarfare/models/item/propeller.json | 6 ++++ .../textures/item/mortar_barrel.png | Bin 275 -> 236 bytes .../textures/item/mortar_deployer.png | Bin 361 -> 346 bytes .../superbwarfare/textures/item/motor.png | Bin 0 -> 403 bytes .../superbwarfare/textures/item/propeller.png | Bin 0 -> 242 bytes .../superbwarfare/recipes/drone_crafting.json | 8 +++--- .../recipes/lightsaber_crafting.json | 2 +- .../superbwarfare/recipes/motor_crafting.json | 27 ++++++++++++++++++ .../recipes/propeller_crafting.json | 21 ++++++++++++++ 15 files changed, 74 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/assets/superbwarfare/models/item/motor.json create mode 100644 src/main/resources/assets/superbwarfare/models/item/propeller.json create mode 100644 src/main/resources/assets/superbwarfare/textures/item/motor.png create mode 100644 src/main/resources/assets/superbwarfare/textures/item/propeller.png create mode 100644 src/main/resources/data/superbwarfare/recipes/motor_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/propeller_crafting.json diff --git a/src/main/java/net/mcreator/superbwarfare/entity/Mk42Entity.java b/src/main/java/net/mcreator/superbwarfare/entity/Mk42Entity.java index b904be397..cac20c529 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/Mk42Entity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/Mk42Entity.java @@ -237,7 +237,7 @@ public class Mk42Entity extends PathfinderMob implements GeoEntity, ICannonEntit player, level, hitDamage, explosionRadius, explosionDamage, fireProbability, fireTime).durability(durability); entityToSpawn.setPos(this.getX(), this.getEyeY(), this.getZ()); - entityToSpawn.shoot(this.getLookAngle().x, this.getLookAngle().y, this.getLookAngle().z, 15, 0.1f); + entityToSpawn.shoot(this.getLookAngle().x, this.getLookAngle().y, this.getLookAngle().z, 15, 0.05f); level.addFreshEntity(entityToSpawn); if (player instanceof ServerPlayer serverPlayer) { diff --git a/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java b/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java index 20449bbea..4c7a1fb40 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java @@ -248,7 +248,7 @@ public class Mle1934Entity extends PathfinderMob implements GeoEntity, ICannonEn entityToSpawnLeft.setPos(this.getX() + leftPos.x, this.getEyeY() - 0.2 + leftPos.y, this.getZ() + leftPos.z); - entityToSpawnLeft.shoot(this.getLookAngle().x, this.getLookAngle().y, this.getLookAngle().z, 18, 0.1f); + entityToSpawnLeft.shoot(this.getLookAngle().x, this.getLookAngle().y, this.getLookAngle().z, 18, 0.05f); level.addFreshEntity(entityToSpawnLeft); //右炮管 @@ -263,7 +263,7 @@ public class Mle1934Entity extends PathfinderMob implements GeoEntity, ICannonEn entityToSpawnRight.setPos(this.getX() + rightPos.x, this.getEyeY() - 0.2 + rightPos.y, this.getZ() + rightPos.z); - entityToSpawnRight.shoot(this.getLookAngle().x, this.getLookAngle().y, this.getLookAngle().z, 18, 0.1f); + entityToSpawnRight.shoot(this.getLookAngle().x, this.getLookAngle().y, this.getLookAngle().z, 18, 0.05f); level.addFreshEntity(entityToSpawnRight); player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> capability.recoilHorizon = 1); diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java index 5a3188cff..fbe34b0fd 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java @@ -91,6 +91,8 @@ public class ModItems { public static final RegistryObject MK_42_SPAWN_EGG = ITEMS.register("mk42_spawn_egg", () -> new ForgeSpawnEggItem(ModEntities.MK_42, -8348258, -2630437, new Item.Properties())); public static final RegistryObject MLE_1934_SPAWN_EGG = ITEMS.register("mle1934_spawn_egg", () -> new ForgeSpawnEggItem(ModEntities.MLE_1934, -3355444, -14146005, new Item.Properties())); public static final RegistryObject ANCIENT_CPU = ITEMS.register("ancient_cpu", () -> new Item(new Item.Properties().rarity(Rarity.RARE))); + public static final RegistryObject PROPELLER = ITEMS.register("propeller", () -> new Item(new Item.Properties())); + public static final RegistryObject MOTOR = ITEMS.register("motor", () -> new Item(new Item.Properties())); public static final RegistryObject DRONE = ITEMS.register("drone", Drone::new); public static final RegistryObject MONITOR = ITEMS.register("monitor", Monitor::new); diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 3b149a9aa..57c545917 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -150,6 +150,8 @@ "item.superbwarfare.mle1934_spawn_egg": "138.6mm50 Mle1934 R1938 Spawn Egg", "item.superbwarfare.drone": "Drone", "item.superbwarfare.monitor": "Monitor", + "item.superbwarfare.propeller": "Propeller", + "item.superbwarfare.motor": "Motor", "item.superbwarfare.hand_grenade": "Hand Grenade", "item.superbwarfare.rgo_grenade": "RGO Grenade", "item.superbwarfare.transcript": "Transcript", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 2af3ea168..edf5384ca 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -150,6 +150,8 @@ "item.superbwarfare.mle1934_spawn_egg": "138.6mm50 Mle1934 R1938刷怪蛋", "item.superbwarfare.drone": "无人机", "item.superbwarfare.monitor": "遥控器", + "item.superbwarfare.propeller": "螺旋桨", + "item.superbwarfare.motor": "马达", "item.superbwarfare.hand_grenade": "M67手榴弹", "item.superbwarfare.rgo_grenade": "RGO手榴弹", "item.superbwarfare.transcript": "成绩单", diff --git a/src/main/resources/assets/superbwarfare/models/item/motor.json b/src/main/resources/assets/superbwarfare/models/item/motor.json new file mode 100644 index 000000000..2043d1f06 --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/item/motor.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "superbwarfare:item/motor" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/propeller.json b/src/main/resources/assets/superbwarfare/models/item/propeller.json new file mode 100644 index 000000000..db20b847f --- /dev/null +++ b/src/main/resources/assets/superbwarfare/models/item/propeller.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "superbwarfare:item/propeller" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/textures/item/mortar_barrel.png b/src/main/resources/assets/superbwarfare/textures/item/mortar_barrel.png index ccdb8a1d22d75a80618fe61936c4063888715df2..2698169a8bdd90b17f45a911fe9be06f9a4bbbfa 100644 GIT binary patch delta 187 zcmV;s07UL_t(Ijh)l63c@fHK+&5PoTQ7G!NIY6MnQyvpP-8$>f%Ra z7hD_z9bAeo#zg~B3wiHBmcY3rkbr!mbwq`O^)BJhqLSdvYRh5o(w=q1T7rj155T>i z@N8}bUvPqNd^~xk&6UM`31EyA+ZmiM5IhE8G*E&^1Eu(HKs17X0#cj>G&lvc7@%r9 pJ%;x~(&Fq2p+}6fX*=CFeF44ch+>a2NgMzG002ovPDHLkV1jkfQe^-D delta 226 zcmV<803HAA0h0odIe*1TL_t(Ijh)h=3&KDY$MNq(7!0u-yRfh#*e?nq2wKcq{2Ld= z;*to)>w?92uqv3&peRGPz3sKTgU`Lk`@y@k!2_O-!kG11^Kybi~LpFAeFO8k=iv$kj6bXA)>TZA=xgcCjp!#xLiRiN?{X?P}PZ6)CQ~` cnSUex1Q26x<+6)HqW}N^07*qoM6N<$f?{H3x&QzG diff --git a/src/main/resources/assets/superbwarfare/textures/item/mortar_deployer.png b/src/main/resources/assets/superbwarfare/textures/item/mortar_deployer.png index 2e704dc3d85d89a74afba1fa0073b18349449e86..28066d337f0484f4ed6a0f593bd635e5ea5580f7 100644 GIT binary patch delta 298 zcmV+_0oDHL0@?zQIe!dEL_t(IjlGkxO2beXg};Q_A=%X{giGS$APxnggMm&i4xwwo zSI8@bzCs?t)!j+xQXCw_y@Xg}L~wIxpw~ffNt3j;f}Zi-|2yaWTrT{lj!q6$^~~G` zKJOninrsAzk+1#)Ub}*>eRKUxr#Ek$S!qy(?{7`Q$X~z0Ab)g~7uc$)wuY-FW*HWa zq&?Y3C(qoMT1Y$`8D$d_zzb|890@?DH(%85pPk|bcCB{Vqy=E*1zDOP9Eorw7nfgy zS(;$wMXf~``6?ccj6vwC7Qo|pX24X9lUKTO7vV^Ipag3vcgFzY6|QpU)zDFqSS}FaQ7m07*qoM6N<$f?Vc}NB{r; delta 313 zcmV-90mlB?0_g&fIe!~TL_t(IjjfWgO2beXg}(&tkUW5<5JJ+WgLEhe4i-9faR^xp zeTBS2=_}+RT)R67btn}aLI)QqA=VfW+#C|sG?Qgi5zEGu30e|3*d*b0%t_9gM=TF!^ ztUK|KIfqY^8$E=k#V600000 LNkvXXu0mjf1Q?Zq diff --git a/src/main/resources/assets/superbwarfare/textures/item/motor.png b/src/main/resources/assets/superbwarfare/textures/item/motor.png new file mode 100644 index 0000000000000000000000000000000000000000..6e060150004cd63c0dbd48f7979e38a9718f4063 GIT binary patch literal 403 zcmV;E0c`$>P)r(mzXrQ547V@AauBN5g3F*?a*x1)!P6jG55}WI&~HAUALm{U{6|DYMMS3> zF6^Z=>oOV^5$*T;YK)m&FvK6{8O^%rZ+ONJ%kBmMy>^#oOvvZ+IF5s=n&Di)54WoK ztS*IkeE#HYIe_Ch>_@zt8$aA@cM0!oalCm%`}LhMxm*I^ zuKsOCe;^_{pUKgxUX9^F)``Zu99|W8`?0wh;#@8Vz)dF3#l!6wUW|4*z4qd%(nZxel|5e{_V{6uKxW8D_Liz_y$3fhLE#7JRXS+a{@dVdtS`)?9~%vV{@@F hHZYhVcKr$i1IK})mH*xCW&_>J;OXk;vd$@?2>>HjS_A+9 literal 0 HcmV?d00001 diff --git a/src/main/resources/data/superbwarfare/recipes/drone_crafting.json b/src/main/resources/data/superbwarfare/recipes/drone_crafting.json index 02e6ed677..c2d3c50fb 100644 --- a/src/main/resources/data/superbwarfare/recipes/drone_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/drone_crafting.json @@ -8,19 +8,19 @@ ], "key": { "a": { - "item": "minecraft:black_carpet" + "item": "superbwarfare:propeller" }, "b": { - "item": "minecraft:piston" + "item": "superbwarfare:motor" }, "c": { "item": "minecraft:compass" }, "d": { - "item": "minecraft:iron_ingot" + "item": "minecraft:iron_nugget" }, "e": { - "item": "minecraft:dropper" + "item": "superbwarfare:shield_cell" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/lightsaber_crafting.json b/src/main/resources/data/superbwarfare/recipes/lightsaber_crafting.json index 190572a77..5c877ebeb 100644 --- a/src/main/resources/data/superbwarfare/recipes/lightsaber_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/lightsaber_crafting.json @@ -14,7 +14,7 @@ "item": "minecraft:beacon" }, "c": { - "item": "superbwarfare:tungsten_rod" + "item": "superbwarfare:shield_cell" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/motor_crafting.json b/src/main/resources/data/superbwarfare/recipes/motor_crafting.json new file mode 100644 index 000000000..c3f98b587 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/motor_crafting.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "aba", + "aba", + "cdc" + ], + "key": { + "a": { + "tag": "forge:plates/copper" + }, + "b": { + "item": "minecraft:iron_ingot" + }, + "c": { + "item": "minecraft:iron_nugget" + }, + "d": { + "item": "minecraft:lodestone" + } + }, + "result": { + "item": "superbwarfare:motor", + "count": 32 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/propeller_crafting.json b/src/main/resources/data/superbwarfare/recipes/propeller_crafting.json new file mode 100644 index 000000000..6919c9947 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/propeller_crafting.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + " a ", + "aba", + " a " + ], + "key": { + "a": { + "tag": "minecraft:planks" + }, + "b": { + "item": "minecraft:iron_nugget" + } + }, + "result": { + "item": "superbwarfare:propeller", + "count": 2 + } +} \ No newline at end of file