From ce72300d70f6330ce3884e11469538cd9a68faa2 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Tue, 28 Jan 2025 21:55:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84BMP2=EF=BC=8C=E6=94=B9?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle.properties | 2 +- .../b69ee8a2655365569b979911c0440daa8c470ac2 | 4 +- .../models/item/medium_armament_module.json | 6 +++ .../superbwarfare/models/item/track.json | 6 +++ .../datagen/ModItemModelProvider.java | 2 + .../entity/projectile/WgMissileEntity.java | 9 ++--- .../entity/vehicle/Bmp2Entity.java | 7 +++- .../entity/vehicle/Lav150Entity.java | 5 +++ .../entity/vehicle/SpeedboatEntity.java | 2 +- .../entity/vehicle/Tom6Entity.java | 9 ++++- .../entity/vehicle/WheelChairEntity.java | 7 ++++ .../event/ClientSoundHandler.java | 4 +- .../event/LivingEventHandler.java | 17 +++++++- .../superbwarfare/init/ModItems.java | 2 + .../superbwarfare/init/ModSounds.java | 3 +- .../assets/superbwarfare/lang/en_us.json | 2 + .../assets/superbwarfare/lang/zh_cn.json | 2 + .../assets/superbwarfare/sounds.json | 16 ++++++++ .../superbwarfare/sounds/bmp/bmp_step.ogg | Bin 0 -> 9784 bytes .../superbwarfare/sounds/wheel_step.ogg | Bin 0 -> 9489 bytes .../textures/item/light_armament_module.png | Bin 731 -> 733 bytes .../textures/item/medium_armament_module.png | Bin 0 -> 675 bytes .../superbwarfare/textures/item/track.png | Bin 0 -> 266 bytes .../superbwarfare/recipes/ah_6_crafting.json | 2 +- .../superbwarfare/recipes/bmp_2_crafting.json | 37 ++++++++++++++++++ ...javelin_missile_to_wire_guide_missile.json | 13 ++++++ .../recipes/lav_150_crafting.json | 2 +- .../medium_armament_module_crafting.json | 27 +++++++++++++ .../recipes/missile_engine_crafting.json | 2 +- .../superbwarfare/recipes/tom_6_crafting.json | 7 +--- .../superbwarfare/recipes/track_crafting.json | 24 ++++++++++++ ...wire_guide_missile_to_javelin_missile.json | 13 ++++++ 32 files changed, 208 insertions(+), 24 deletions(-) create mode 100644 src/generated/resources/assets/superbwarfare/models/item/medium_armament_module.json create mode 100644 src/generated/resources/assets/superbwarfare/models/item/track.json create mode 100644 src/main/resources/assets/superbwarfare/sounds/bmp/bmp_step.ogg create mode 100644 src/main/resources/assets/superbwarfare/sounds/wheel_step.ogg create mode 100644 src/main/resources/assets/superbwarfare/textures/item/medium_armament_module.png create mode 100644 src/main/resources/assets/superbwarfare/textures/item/track.png create mode 100644 src/main/resources/data/superbwarfare/recipes/bmp_2_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/javelin_missile_to_wire_guide_missile.json create mode 100644 src/main/resources/data/superbwarfare/recipes/medium_armament_module_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/track_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/wire_guide_missile_to_javelin_missile.json diff --git a/gradle.properties b/gradle.properties index 50dd38749..43c7265bd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,5 +13,5 @@ mod_description=A Warfare Mod minecraft_version=1.20.1 jei_version=15.2.0.27 cloth_config_version=11.1.106 -mod_version=0.4.6 +mod_version=0.5.0 mod_authors=Atsuishio, Roki27, Light_Quanta \ No newline at end of file diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index 78d299cc5..50ad4a3ad 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,4 +1,4 @@ -// 1.20.1 2025-01-27T23:57:54.4907094 Item Models: superbwarfare +// 1.20.1 2025-01-28T15:44:32.1906572 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 @@ -54,6 +54,7 @@ f66c351b4843ad4d4e086ccfb7d4d0221227d196 assets/superbwarfare/models/item/legend ec76dc1a79f4c0e502fee53be8aa8e04420845fc assets/superbwarfare/models/item/light_armament_module.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m2hb_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/marlin_blueprint.json +0033cd03b0203cd3fa071fb5354c74d33bc1afa8 assets/superbwarfare/models/item/medium_armament_module.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/minigun_blueprint.json c206cd345f459733399e0be4692586849ef0aac2 assets/superbwarfare/models/item/missile_engine.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mk_14_blueprint.json @@ -106,6 +107,7 @@ b4e009177af3af6ad6dda54e3e2fed43dc243ff2 assets/superbwarfare/models/item/steel_ dbba3ca532b6aa949c84ea8b3f10fe3a0bf472e7 assets/superbwarfare/models/item/target_deployer.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/taser_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/trachelium_blueprint.json +a6d50c9f0c57dc33828a35f45f3f9ca59725c1a1 assets/superbwarfare/models/item/track.json cae31335c134b57962bd7b318d02c71655ef5479 assets/superbwarfare/models/item/transcript.json f391a7df36c738dfaeb2ab82ac077e3442a59b98 assets/superbwarfare/models/item/tungsten_ingot.json b4e6c184478f8dc764fb7071ac5e30939cd01d9d assets/superbwarfare/models/item/tungsten_powder.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/medium_armament_module.json b/src/generated/resources/assets/superbwarfare/models/item/medium_armament_module.json new file mode 100644 index 000000000..31f109d71 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/medium_armament_module.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "superbwarfare:item/medium_armament_module" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/track.json b/src/generated/resources/assets/superbwarfare/models/item/track.json new file mode 100644 index 000000000..89004e51b --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/track.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "superbwarfare:item/track" + } +} \ 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 38bd8217b..4c0f66604 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -32,8 +32,10 @@ public class ModItemModelProvider extends ItemModelProvider { simpleItem(ModItems.MOTOR); simpleItem(ModItems.LARGE_MOTOR); simpleItem(ModItems.WHEEL); + simpleItem(ModItems.TRACK); simpleItem(ModItems.DRONE); simpleItem(ModItems.LIGHT_ARMAMENT_MODULE); + simpleItem(ModItems.MEDIUM_ARMAMENT_MODULE); simpleItem(ModItems.TARGET_DEPLOYER); simpleItem(ModItems.MORTAR_DEPLOYER); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/WgMissileEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/WgMissileEntity.java index 8b067cad9..ec02b0665 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/WgMissileEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/WgMissileEntity.java @@ -109,8 +109,6 @@ public class WgMissileEntity extends ThrowableItemProjectile implements GeoEntit entity, this.explosion_damage, this.explosion_radius); } } - - this.discard(); } @Override @@ -121,7 +119,6 @@ public class WgMissileEntity extends ThrowableItemProjectile implements GeoEntit ModDamageTypes.causeProjectileBoomDamage(this.level().registryAccess(), this, this.getOwner()), this, this.explosion_damage, this.explosion_radius); } - this.discard(); } @Override @@ -148,15 +145,15 @@ public class WgMissileEntity extends ThrowableItemProjectile implements GeoEntit Vec3 toVec = shooter.getEyePosition().vectorTo(this.getEyePosition()).normalize(); Vec3 addVec = lookVec.add(toVec.scale(-0.85)).normalize(); double angle = Mth.abs((float) VectorTool.calculateAngle(lookVec, toVec)); - setDeltaMovement(getDeltaMovement().add(addVec.scale(Math.min(0.1 + 0.15 * angle, tickCount < 15 ? 0.04 : 0.2)))); + setDeltaMovement(getDeltaMovement().add(addVec.scale(Math.min(0.1 + 0.15 * angle + distanceTo(getOwner()) * 0.003, tickCount < 15 ? 0.04 : 0.4)))); // 控制速度 - if (this.getDeltaMovement().length() < 2.1) { + if (this.getDeltaMovement().length() < 2.8) { this.setDeltaMovement(this.getDeltaMovement().multiply(1.06, 1.06, 1.06)); } - if (this.getDeltaMovement().length() > 2.4) { + if (this.getDeltaMovement().length() > 3) { this.setDeltaMovement(this.getDeltaMovement().multiply(0.9, 0.9, 0.9)); } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java index 205af5819..6248d8a17 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Bmp2Entity.java @@ -201,6 +201,11 @@ public class Bmp2Entity extends ContainerMobileEntity implements GeoEntity, ICha return true; } + @Override + protected void playStepSound(BlockPos pPos, BlockState pState) { + this.playSound(ModSounds.BMP_STEP.get(), Mth.abs(this.entityData.get(POWER)) * 8, random.nextFloat() * 0.15f + 1f); + } + public double getSubmergedHeight(Entity entity) { for (FluidType fluidType : ForgeRegistries.FLUID_TYPES.get().getValues()) { if (entity.level().getFluidState(entity.blockPosition()).getFluidType() == fluidType) @@ -319,7 +324,7 @@ public class Bmp2Entity extends ContainerMobileEntity implements GeoEntity, ICha this.setDeltaMovement(this.getDeltaMovement().multiply(f0, 0.85, f0)); } else if (this.isInWater()) { - float f1 = 0.74f + 0.09f * Mth.abs(90 - (float) calculateAngle(this.getDeltaMovement(), this.getViewVector(1))) / 90; + float f1 = 0.61f + 0.08f * Mth.abs(90 - (float) calculateAngle(this.getDeltaMovement(), this.getViewVector(1))) / 90; this.setDeltaMovement(this.getDeltaMovement().add(this.getViewVector(1).normalize().scale(0.04 * this.getDeltaMovement().horizontalDistance()))); this.setDeltaMovement(this.getDeltaMovement().multiply(f1, 0.85, f1)); } else { diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java index 81749dd2f..84dac656b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Lav150Entity.java @@ -123,6 +123,11 @@ public class Lav150Entity extends ContainerMobileEntity implements GeoEntity, IC this.entityData.set(LOADED_COAX_AMMO, compound.getInt("LoadedCoaxAmmo")); } + @Override + protected void playStepSound(BlockPos pPos, BlockState pState) { + this.playSound(ModSounds.BMP_STEP.get(), Mth.abs(this.entityData.get(POWER)) * 3, random.nextFloat() * 0.15f + 1.05f); + } + @Override public Packet getAddEntityPacket() { return NetworkHooks.getEntitySpawningPacket(this); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java index 05ae29b83..8e9432807 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/SpeedboatEntity.java @@ -565,6 +565,6 @@ public class SpeedboatEntity extends ContainerMobileEntity implements GeoEntity, @Override public int zoomFov() { - return 3; + return 1; } } diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Tom6Entity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Tom6Entity.java index 274350152..c4556f05b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Tom6Entity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/Tom6Entity.java @@ -9,6 +9,7 @@ import com.atsuishio.superbwarfare.init.ModSounds; import com.atsuishio.superbwarfare.tools.CustomExplosion; import com.atsuishio.superbwarfare.tools.EntityFindUtil; import com.atsuishio.superbwarfare.tools.ParticleTool; +import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientGamePacketListener; @@ -30,6 +31,7 @@ import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Items; import net.minecraft.world.level.Explosion; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; import net.minecraftforge.event.ForgeEventFactory; import net.minecraftforge.network.NetworkHooks; import net.minecraftforge.network.PlayMessages; @@ -80,6 +82,11 @@ public class Tom6Entity extends MobileVehicleEntity implements GeoEntity { this.entityData.set(MELON, compound.getBoolean("Melon")); } + @Override + protected void playStepSound(BlockPos pPos, BlockState pState) { + this.playSound(ModSounds.WHEEL_STEP.get(), (float) (getDeltaMovement().length() * 0.5), random.nextFloat() * 0.1f + 1f); + } + @Override public Packet getAddEntityPacket() { return NetworkHooks.getEntitySpawningPacket(this); @@ -312,7 +319,7 @@ public class Tom6Entity extends MobileVehicleEntity implements GeoEntity { if (entityData.get(MELON)) { CustomExplosion explosion = new CustomExplosion(this.level(), this, ModDamageTypes.causeCustomExplosionDamage(this.level().registryAccess(), this, attacker), VehicleConfig.TOM_6_BOMB_EXPLOSION_DAMAGE.get(), - this.getX(), this.getY(), this.getZ(), VehicleConfig.TOM_6_BOMB_EXPLOSION_DAMAGE.get(), ExplosionDestroyConfig.EXPLOSION_DESTROY.get() ? Explosion.BlockInteraction.DESTROY : Explosion.BlockInteraction.KEEP).setDamageMultiplier(1); + this.getX(), this.getY(), this.getZ(), VehicleConfig.TOM_6_BOMB_EXPLOSION_RADIUS.get().floatValue(), ExplosionDestroyConfig.EXPLOSION_DESTROY.get() ? Explosion.BlockInteraction.DESTROY : Explosion.BlockInteraction.KEEP).setDamageMultiplier(1); explosion.explode(); ForgeEventFactory.onExplosionStart(this.level(), explosion); explosion.finalizeExplosion(false); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/WheelChairEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/WheelChairEntity.java index 0e3048e35..e8d264c6f 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/WheelChairEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/WheelChairEntity.java @@ -9,6 +9,7 @@ import com.atsuishio.superbwarfare.tools.CustomExplosion; import com.atsuishio.superbwarfare.tools.EntityFindUtil; import com.atsuishio.superbwarfare.tools.ParticleTool; import net.minecraft.client.Minecraft; +import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.game.ClientGamePacketListener; @@ -24,6 +25,7 @@ import net.minecraft.world.entity.animal.WaterAnimal; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Explosion; import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.Vec3; import net.minecraftforge.network.NetworkHooks; import net.minecraftforge.network.PlayMessages; @@ -83,6 +85,11 @@ public class WheelChairEntity extends MobileVehicleEntity implements GeoEntity { super.readAdditionalSaveData(compound); } + @Override + protected void playStepSound(BlockPos pPos, BlockState pState) { + this.playSound(ModSounds.WHEEL_STEP.get(), (float) (getDeltaMovement().length() * 0.5), random.nextFloat() * 0.15f + 1); + } + @Override protected float getEyeHeight(Pose pPose, EntityDimensions pSize) { return 0.75F; diff --git a/src/main/java/com/atsuishio/superbwarfare/event/ClientSoundHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/ClientSoundHandler.java index 2013bca26..3f9bd9dea 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/ClientSoundHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/ClientSoundHandler.java @@ -60,7 +60,7 @@ public class ClientSoundHandler { if (e instanceof Lav150Entity lav150) { distanceReduce = (float) Math.max((1 - distance / 64), 0); if (player.getVehicle() == lav150) { - player.playSound(ModSounds.LAV_ENGINE_1P.get(), 2 * (Mth.abs(mobileVehicle.getEntityData().get(POWER)) - 0.006f), (float) ((2 * Math.random() - 1) * 0.1f + 0.95f)); + player.playSound(ModSounds.LAV_ENGINE_1P.get(), 1 * (Mth.abs(mobileVehicle.getEntityData().get(POWER)) - 0.006f), (float) ((2 * Math.random() - 1) * 0.1f + 0.95f)); } else { player.level().playLocalSound(BlockPos.containing(engineSoundPos), engineSound, mobileVehicle.getSoundSource(), 5 * (Mth.abs(mobileVehicle.getEntityData().get(POWER)) - 0.006f) * distanceReduce * distanceReduce, (float) ((2 * Math.random() - 1) * 0.1f + 1), false); } @@ -68,7 +68,7 @@ public class ClientSoundHandler { if (e instanceof Bmp2Entity bmp2) { distanceReduce = (float) Math.max((1 - distance / 64), 0); if (player.getVehicle() == bmp2) { - player.playSound(ModSounds.BMP_ENGINE_1P.get(), 2 * (Mth.abs(mobileVehicle.getEntityData().get(POWER)) + Mth.abs(0.08f * mobileVehicle.getEntityData().get(DELTA_ROT)) - 0.004f), (float) ((2 * Math.random() - 1) * 0.1f + 0.95f)); + player.playSound(ModSounds.BMP_ENGINE_1P.get(), 1 * (Mth.abs(mobileVehicle.getEntityData().get(POWER)) + Mth.abs(0.08f * mobileVehicle.getEntityData().get(DELTA_ROT)) - 0.004f), (float) ((2 * Math.random() - 1) * 0.1f + 0.95f)); } else { player.level().playLocalSound(BlockPos.containing(engineSoundPos), engineSound, mobileVehicle.getSoundSource(), 5 * (Mth.abs(mobileVehicle.getEntityData().get(POWER)) + Mth.abs(0.08f * mobileVehicle.getEntityData().get(DELTA_ROT)) - 0.004f) * distanceReduce * distanceReduce, (float) ((2 * Math.random() - 1) * 0.1f + 1), false); } diff --git a/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java b/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java index cfab5cffe..3e9015fbf 100644 --- a/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java +++ b/src/main/java/com/atsuishio/superbwarfare/event/LivingEventHandler.java @@ -57,7 +57,13 @@ public class LivingEventHandler { public static void onEntityAttacked(LivingAttackEvent event) { if (!event.getSource().is(ModDamageTypes.VEHICLE_EXPLOSION) && event.getEntity().getVehicle() instanceof VehicleEntity vehicle) { if (event.getEntity().getVehicle() instanceof IArmedVehicleEntity iArmedVehicle && iArmedVehicle.hidePassenger()) { - vehicle.hurt(event.getSource(),event.getAmount()); + if (!(event.getSource().is(DamageTypes.EXPLOSION) + || event.getSource().is(DamageTypes.PLAYER_EXPLOSION) + || event.getSource().is(ModDamageTypes.CUSTOM_EXPLOSION) + || event.getSource().is(ModDamageTypes.MINE) + || event.getSource().is(ModDamageTypes.PROJECTILE_BOOM))) { + vehicle.hurt(event.getSource(),event.getAmount()); + } event.setCanceled(true); } } @@ -103,7 +109,14 @@ public class LivingEventHandler { event.setCanceled(true); } } else { - vehicle.hurt(event.getSource(),0.7f * event.getAmount()); + if (!(event.getSource().is(DamageTypes.EXPLOSION) + || event.getSource().is(DamageTypes.PLAYER_EXPLOSION) + || event.getSource().is(ModDamageTypes.CUSTOM_EXPLOSION) + || event.getSource().is(ModDamageTypes.MINE) + || event.getSource().is(ModDamageTypes.PROJECTILE_BOOM))) { + vehicle.hurt(event.getSource(),0.7f * event.getAmount()); + } + event.setAmount(0.3f * event.getAmount()); } } diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java index 4fa50c606..0b12c9a24 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java @@ -126,6 +126,7 @@ public class ModItems { 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 WHEEL = ITEMS.register("wheel", () -> new Item(new Item.Properties())); + public static final RegistryObject TRACK = ITEMS.register("track", () -> 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); @@ -233,6 +234,7 @@ public class ModItems { public static final RegistryObject MLE_1934_BLUEPRINT = ITEMS.register("mle_1934_blueprint", () -> new BlueprintItem(RarityTool.LEGENDARY)); public static final RegistryObject ANNIHILATOR_BLUEPRINT = ITEMS.register("annihilator_blueprint", () -> new BlueprintItem(RarityTool.LEGENDARY)); public static final RegistryObject LIGHT_ARMAMENT_MODULE = ITEMS.register("light_armament_module", () -> new BlueprintItem(Rarity.RARE)); + public static final RegistryObject MEDIUM_ARMAMENT_MODULE = ITEMS.register("medium_armament_module", () -> new BlueprintItem(Rarity.EPIC)); /** * Block diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModSounds.java b/src/main/java/com/atsuishio/superbwarfare/init/ModSounds.java index cceec19f0..41a151722 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModSounds.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModSounds.java @@ -410,6 +410,7 @@ public class ModSounds { public static final RegistryObject BMP_MISSILE_FIRE_1P = REGISTRY.register("bmp_missile_fire_1p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("bmp_missile_fire_1p"))); public static final RegistryObject BMP_MISSILE_FIRE_3P = REGISTRY.register("bmp_missile_fire_3p", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("bmp_missile_fire_3p"))); public static final RegistryObject BMP_MISSILE_RELOAD = REGISTRY.register("bmp_missile_reload", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("bmp_missile_reload"))); - + public static final RegistryObject BMP_STEP = REGISTRY.register("bmp_step", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("bmp_step"))); + public static final RegistryObject WHEEL_STEP = REGISTRY.register("wheel_step", () -> SoundEvent.createVariableRangeEvent(ModUtils.loc("wheel_step"))); } diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 5893a32d2..bd37040b0 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -194,6 +194,7 @@ "item.superbwarfare.motor": "Motor", "item.superbwarfare.large_motor": "Large Motor", "item.superbwarfare.wheel": "Wheel", + "item.superbwarfare.track": "Track", "item.superbwarfare.hand_grenade": "Hand Grenade", "item.superbwarfare.rgo_grenade": "RGO Grenade", "item.superbwarfare.transcript": "Transcript", @@ -203,6 +204,7 @@ "des.superbwarfare.transcript.total": "Total: ", "item.superbwarfare.beam_test": "[ZzzzBoom!]", "item.superbwarfare.light_armament_module": "Light Armament Module", + "item.superbwarfare.medium_armament_module": "Medium Armament Module", "attribute.superbwarfare.bullet_resistance": "Bullet Resistance", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 314fa2426..94ac649f8 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -194,6 +194,7 @@ "item.superbwarfare.motor": "马达", "item.superbwarfare.large_motor": "大型电动机", "item.superbwarfare.wheel": "车轮", + "item.superbwarfare.track": "履带", "item.superbwarfare.hand_grenade": "M67手榴弹", "item.superbwarfare.rgo_grenade": "RGO手榴弹", "item.superbwarfare.transcript": "成绩单", @@ -203,6 +204,7 @@ "des.superbwarfare.transcript.total": "总环数：", "item.superbwarfare.beam_test": "[滋崩]", "item.superbwarfare.light_armament_module": "轻型武装模块", + "item.superbwarfare.medium_armament_module": "中型武装模块", "attribute.superbwarfare.bullet_resistance": "子弹防护", diff --git a/src/main/resources/assets/superbwarfare/sounds.json b/src/main/resources/assets/superbwarfare/sounds.json index 9d3d8b683..1fc0cbee0 100644 --- a/src/main/resources/assets/superbwarfare/sounds.json +++ b/src/main/resources/assets/superbwarfare/sounds.json @@ -2811,5 +2811,21 @@ "stream": false } ] + }, + "bmp_step": { + "sounds": [ + { + "name": "superbwarfare:bmp/bmp_step", + "stream": false + } + ] + }, + "wheel_step": { + "sounds": [ + { + "name": "superbwarfare:wheel_step", + "stream": false + } + ] } } \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/sounds/bmp/bmp_step.ogg b/src/main/resources/assets/superbwarfare/sounds/bmp/bmp_step.ogg new file mode 100644 index 0000000000000000000000000000000000000000..d037162ca2297194016ad0ca947e89b08b7fb990 GIT binary patch literal 9784 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/superbwarfare/sounds/wheel_step.ogg b/src/main/resources/assets/superbwarfare/sounds/wheel_step.ogg new file mode 100644 index 0000000000000000000000000000000000000000..c019bf31f65c03d17d30511d79f38e7c39e7efe4 GIT binary patch literal 9489 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 Uv!s=|umAu607*qoM6N<$f;BQX<^TWy diff --git a/src/main/resources/assets/superbwarfare/textures/item/medium_armament_module.png b/src/main/resources/assets/superbwarfare/textures/item/medium_armament_module.png new file mode 100644 index 0000000000000000000000000000000000000000..c8ae9e0102b912389fe3edc20627b0a1574313a7 GIT binary patch literal 675 zcmV;U0$lxxP)+9foo_E7w~!NT;|;d7@(fm%djp$2 z0T-aBv|7v5UOr08>-Ab0FB{J5gzo%yy9MW5IfpT( zj9uF=my0rfSpdrUDIg+UuxL2X$W)!D=p6yN^P9~^2|M3HUbpM?ihw!oyr8oHb95f) zD8O8u2RhV%spq_Izuj)i*cbtG-g!Zz03kRJGzbui^8ir;=9cp>_W^U?c>yUvD9!_f z03kUK5H(tp@m(v%-GN%D*pCeZ?C8_EVXW^Xt6zPS6(nG=C1- z9B!LKy8e*YC-W`^6z504I{{8*R)w$lv`H-mIOorN0~$k6gj3&~uI;cP#D|Us##pTn zFxG%Wp5mC5)lSF@Qbdw@F=t)jT?&j%5CWKLiLnn5VNT^@({r}1CN!pwML6d`O7{e0 z4UiRUbFeS^ZpiZwEzYUTrqc-7h>U%jw-#kD1hAbJR0k*^`v94-d;cLh3j9}LZJ_4cut{32%*askRq5!TJ;F{P6 z7_9*iya2TnSglsZaohP*uop#99oGbqjUf!F1cdwtPC=(q{b;Pugf_%Nu4eH#NvaY zMXOe2&Pwudk#f4B;;(dOy+j)$gMiZw5#|HAeg)?mXC6GW`_cR>;@&!?i~O4ol>+_2 N;OXk;vd$@?2>`LfX#4;G literal 0 HcmV?d00001 diff --git a/src/main/resources/data/superbwarfare/recipes/ah_6_crafting.json b/src/main/resources/data/superbwarfare/recipes/ah_6_crafting.json index 3ad07866b..71afb08cc 100644 --- a/src/main/resources/data/superbwarfare/recipes/ah_6_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/ah_6_crafting.json @@ -20,7 +20,7 @@ "item": "minecraft:compass" }, "e": { - "item":"superbwarfare:steel_block" + "tag": "forge:storage_blocks/steel" }, "f": { "item": "minecraft:chest" diff --git a/src/main/resources/data/superbwarfare/recipes/bmp_2_crafting.json b/src/main/resources/data/superbwarfare/recipes/bmp_2_crafting.json new file mode 100644 index 000000000..cf5143781 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/bmp_2_crafting.json @@ -0,0 +1,37 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "dbf", + "eee", + "hgh" + ], + "key": { + "b": { + "item": "superbwarfare:light_armament_module" + }, + "d": { + "item": "superbwarfare:cell" + }, + "e": { + "tag": "forge:storage_blocks/steel" + }, + "f": { + "item": "superbwarfare:medium_armament_module" + }, + "g": { + "item": "superbwarfare:large_motor" + }, + "h": { + "item": "superbwarfare:track" + } + }, + "result": { + "item": "superbwarfare:container", + "nbt": { + "BlockEntityTag": { + "EntityType": "superbwarfare:bmp_2" + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/javelin_missile_to_wire_guide_missile.json b/src/main/resources/data/superbwarfare/recipes/javelin_missile_to_wire_guide_missile.json new file mode 100644 index 000000000..4715ec933 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/javelin_missile_to_wire_guide_missile.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "superbwarfare:javelin_missile" + } + ], + "result": { + "item": "superbwarfare:wire_guide_missile", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/lav_150_crafting.json b/src/main/resources/data/superbwarfare/recipes/lav_150_crafting.json index 5fa465fe9..76c0fd440 100644 --- a/src/main/resources/data/superbwarfare/recipes/lav_150_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/lav_150_crafting.json @@ -14,7 +14,7 @@ "item": "superbwarfare:cell" }, "e": { - "item":"superbwarfare:steel_block" + "tag": "forge:storage_blocks/steel" }, "f": { "item": "minecraft:chest" diff --git a/src/main/resources/data/superbwarfare/recipes/medium_armament_module_crafting.json b/src/main/resources/data/superbwarfare/recipes/medium_armament_module_crafting.json new file mode 100644 index 000000000..e01c271bb --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/medium_armament_module_crafting.json @@ -0,0 +1,27 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "pattern": [ + "ddd", + "abc", + "ddd" + ], + "key": { + "a": { + "item": "superbwarfare:cemented_carbide_barrel" + }, + "b": { + "item": "superbwarfare:epic_material_pack" + }, + "c": { + "item": "superbwarfare:light_armament_module" + }, + "d": { + "item":"superbwarfare:cemented_carbide_ingot" + } + }, + "result": { + "item": "superbwarfare:medium_armament_module", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/missile_engine_crafting.json b/src/main/resources/data/superbwarfare/recipes/missile_engine_crafting.json index 9caa0889a..1508a32a8 100644 --- a/src/main/resources/data/superbwarfare/recipes/missile_engine_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/missile_engine_crafting.json @@ -11,7 +11,7 @@ "item": "minecraft:copper_ingot" }, "b": { - "item": "minecraft:blast_furnace" + "item": "minecraft:hopper" }, "c": { "item": "minecraft:iron_ingot" diff --git a/src/main/resources/data/superbwarfare/recipes/tom_6_crafting.json b/src/main/resources/data/superbwarfare/recipes/tom_6_crafting.json index b0da4d091..f2c377a2f 100644 --- a/src/main/resources/data/superbwarfare/recipes/tom_6_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/tom_6_crafting.json @@ -4,7 +4,7 @@ "pattern": [ "aaa", "aba", - "cdc" + " c " ], "key": { "a": { @@ -14,10 +14,7 @@ "item": "superbwarfare:cell" }, "c": { - "item": "superbwarfare:wheel" - }, - "d": { - "item": "minecraft:dropper" + "item": "minecraft:minecart" } }, "result": { diff --git a/src/main/resources/data/superbwarfare/recipes/track_crafting.json b/src/main/resources/data/superbwarfare/recipes/track_crafting.json new file mode 100644 index 000000000..21dc53d51 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/track_crafting.json @@ -0,0 +1,24 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + "aaa", + "bcb", + "aaa" + ], + "key": { + "a": { + "tag":"forge:ingots/steel" + }, + "b": { + "item": "superbwarfare:wheel" + }, + "c": { + "tag": "forge:storage_blocks/steel" + } + }, + "result": { + "item": "superbwarfare:track", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/wire_guide_missile_to_javelin_missile.json b/src/main/resources/data/superbwarfare/recipes/wire_guide_missile_to_javelin_missile.json new file mode 100644 index 000000000..ed6a826a2 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/wire_guide_missile_to_javelin_missile.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category": "misc", + "ingredients": [ + { + "item": "superbwarfare:wire_guide_missile" + } + ], + "result": { + "item": "superbwarfare:javelin_missile", + "count": 1 + } +} \ No newline at end of file