From aad489880fd8b6bc309db218158629350413d648 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Tue, 7 Jan 2025 02:48:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=A7=E5=9E=8B=E7=94=B5?= =?UTF-8?q?=E5=8A=A8=E6=9C=BA=E5=92=8C=E8=BD=AE=E6=A4=85=E9=85=8D=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../b69ee8a2655365569b979911c0440daa8c470ac2 | 3 +- .../models/item/large_motor.json | 6 ++++ .../datagen/ModItemModelProvider.java | 1 + .../entity/vehicle/MobileVehicleEntity.java | 13 ++++---- .../superbwarfare/init/ModItems.java | 1 + .../assets/superbwarfare/lang/en_us.json | 1 + .../assets/superbwarfare/lang/zh_cn.json | 1 + .../textures/item/large_motor.png | Bin 0 -> 457 bytes .../recipes/large_motor_crafting.json | 18 +++++++++++ .../recipes/speedboat_crafting.json | 2 +- .../recipes/wheel_chair_crafting.json | 30 ++++++++++++++++++ 11 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 src/generated/resources/assets/superbwarfare/models/item/large_motor.json create mode 100644 src/main/resources/assets/superbwarfare/textures/item/large_motor.png create mode 100644 src/main/resources/data/superbwarfare/recipes/large_motor_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/wheel_chair_crafting.json diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index 30ff9127d..25776245a 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,4 +1,4 @@ -// 1.20.1 2025-01-05T22:08:45.9480261 Item Models: superbwarfare +// 1.20.1 2025-01-07T02:18:22.6361822 Item Models: superbwarfare 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_12_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_47_blueprint.json @@ -46,6 +46,7 @@ e04bbd61e716fc5d53c9425aba508fc3287bfd57 assets/superbwarfare/models/item/iron_p 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/javelin_blueprint.json 195c1b7cbcce9b0ac42ecbfc21a8cafff8c78372 assets/superbwarfare/models/item/jump_pad.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/k_98_blueprint.json +4c9b6c2911ae5e6e2a026d2ae9d3c0564cdba0b3 assets/superbwarfare/models/item/large_motor.json ce9e4fd8ea92cfdbdda158776c1b6e1b482a3f2a assets/superbwarfare/models/item/lead_ingot.json f66c351b4843ad4d4e086ccfb7d4d0221227d196 assets/superbwarfare/models/item/legendary_material_pack.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m2hb_blueprint.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/large_motor.json b/src/generated/resources/assets/superbwarfare/models/item/large_motor.json new file mode 100644 index 000000000..17a9f8a3d --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/large_motor.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "superbwarfare:item/large_motor" + } +} \ No newline at end of file diff --git a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java index 8e547a90a..5ebf5a45e 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -29,6 +29,7 @@ public class ModItemModelProvider extends ItemModelProvider { simpleItem(ModItems.ANCIENT_CPU); simpleItem(ModItems.PROPELLER); simpleItem(ModItems.MOTOR); + simpleItem(ModItems.LARGE_MOTOR); simpleItem(ModItems.DRONE); simpleItem(ModItems.TARGET_DEPLOYER); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/MobileVehicleEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/MobileVehicleEntity.java index c8852dbdd..adcaf2267 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/MobileVehicleEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/MobileVehicleEntity.java @@ -78,15 +78,12 @@ public class MobileVehicleEntity extends EnergyVehicleEntity { if ((verticalCollision)) { if (this instanceof IHelicopterEntity) { this.hurt(ModDamageTypes.causeVehicleStrikeDamage(this.level().registryAccess(), this, this.getFirstPassenger() == null ? this : this.getFirstPassenger()), (float) (100 * ((lastTickSpeed - 0.3) * (lastTickSpeed - 0.3)))); + this.bounceVertical(Direction.getNearest(this.getDeltaMovement().x(), this.getDeltaMovement().y(), this.getDeltaMovement().z()).getOpposite()); + crash = true; } else if (Mth.abs((float) lastTickVerticalSpeed) > 0.6) { this.hurt(ModDamageTypes.causeVehicleStrikeDamage(this.level().registryAccess(), this, this.getFirstPassenger() == null ? this : this.getFirstPassenger()), (float) (240 * ((Mth.abs((float) lastTickVerticalSpeed) - 0.6) * (lastTickSpeed - 0.4) * (lastTickSpeed - 0.4)))); + this.bounceVertical(Direction.getNearest(this.getDeltaMovement().x(), this.getDeltaMovement().y(), this.getDeltaMovement().z()).getOpposite()); } - this.bounceVertical(Direction.getNearest(this.getDeltaMovement().x(), this.getDeltaMovement().y(), this.getDeltaMovement().z()).getOpposite()); - if (!this.level().isClientSide) { - this.level().playSound(null, this, ModSounds.VEHICLE_STRIKE.get(), this.getSoundSource(), 1, 1); - } - collisionCoolDown = 4; - crash = true; } if (this.horizontalCollision) { @@ -113,6 +110,10 @@ public class MobileVehicleEntity extends EnergyVehicleEntity { public void bounceVertical(Direction direction) { if (direction.getAxis() == Direction.Axis.Y) { + if (!this.level().isClientSide) { + this.level().playSound(null, this, ModSounds.VEHICLE_STRIKE.get(), this.getSoundSource(), 1, 1); + } + collisionCoolDown = 4; this.setDeltaMovement(this.getDeltaMovement().multiply(0.9, -0.8, 0.9)); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java index 05616a6d4..10fb76253 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java @@ -120,6 +120,7 @@ public class ModItems { 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 LARGE_MOTOR = ITEMS.register("large_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 6bb4e7864..0ff96d63e 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -185,6 +185,7 @@ "des.superbwarfare.monitor": "Drone Distance: %1$s", "item.superbwarfare.propeller": "Propeller", "item.superbwarfare.motor": "Motor", + "item.superbwarfare.large_motor": "Large 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 49ca87cf8..432ea5739 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -184,6 +184,7 @@ "des.superbwarfare.monitor": "无人机距离你: %1$s", "item.superbwarfare.propeller": "螺旋桨", "item.superbwarfare.motor": "马达", + "item.superbwarfare.large_motor": "大型电动机", "item.superbwarfare.hand_grenade": "M67手榴弹", "item.superbwarfare.rgo_grenade": "RGO手榴弹", "item.superbwarfare.transcript": "成绩单", diff --git a/src/main/resources/assets/superbwarfare/textures/item/large_motor.png b/src/main/resources/assets/superbwarfare/textures/item/large_motor.png new file mode 100644 index 0000000000000000000000000000000000000000..7bd4ad8eed65f45f7cf871247d3819fe92865518 GIT binary patch literal 457 zcmV;)0XF`LP)D)4yvIVI0Tt_j7d&1SG)+!~!OssZqd@b&M@41T$`$hw6lnGTlmqpgh$ zUR1N$CWG%CA$qk=x)y? z*+LL-zA6dI!_eaK(@S1`ns9cz{gv5lwx@b?o#k?w_t95QgTq36FbWb3;5p|^7={20 z1_J=T*PfBBd<>~UyRz#ivb>_ z2hKSIsI?Z~_W>Bj21Rr6UmYYLQ$I=i)#cS6L|Md>;k?Pe00000NkvXXu0mjfzoyaB literal 0 HcmV?d00001 diff --git a/src/main/resources/data/superbwarfare/recipes/large_motor_crafting.json b/src/main/resources/data/superbwarfare/recipes/large_motor_crafting.json new file mode 100644 index 000000000..aab03db5f --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/large_motor_crafting.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + "aaa", + "aaa", + "aaa" + ], + "key": { + "a": { + "item": "superbwarfare:motor" + } + }, + "result": { + "item": "superbwarfare:large_motor", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/speedboat_crafting.json b/src/main/resources/data/superbwarfare/recipes/speedboat_crafting.json index 527f79238..0d4e8880e 100644 --- a/src/main/resources/data/superbwarfare/recipes/speedboat_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/speedboat_crafting.json @@ -29,7 +29,7 @@ "item": "superbwarfare:cell" }, "h": { - "item": "superbwarfare:motor" + "item": "superbwarfare:large_motor" }, "i": { "tag":"forge:ingots/copper" diff --git a/src/main/resources/data/superbwarfare/recipes/wheel_chair_crafting.json b/src/main/resources/data/superbwarfare/recipes/wheel_chair_crafting.json new file mode 100644 index 000000000..20736b8a2 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/wheel_chair_crafting.json @@ -0,0 +1,30 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + " ab", + "cdc" + ], + "key": { + "a": { + "item": "minecraft:minecart" + }, + "b": { + "item": "superbwarfare:cell" + }, + "c": { + "item": "minecraft:black_wool" + }, + "d": { + "item": "superbwarfare:motor" + } + }, + "result": { + "item": "superbwarfare:container", + "nbt": { + "BlockEntityTag": { + "EntityType": "superbwarfare:wheel_chair" + } + } + } +} \ No newline at end of file