From 2b11c42d1dd3d9fe22357eadc06c83fcdf79bd72 Mon Sep 17 00:00:00 2001 From: 17146 <1714673995@qq.com> Date: Sat, 22 Feb 2025 22:08:10 +0800 Subject: [PATCH] =?UTF-8?q?mortar=20shell=E6=9B=B4=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.cache/b69ee8a2655365569b979911c0440daa8c470ac2 | 5 ++--- .../item/{mortar_shells.json => mortar_shell.json} | 2 +- .../superbwarfare/datagen/ModItemModelProvider.java | 2 +- .../superbwarfare/entity/MortarEntity.java | 4 ++-- .../entity/projectile/MortarShellEntity.java | 2 +- .../superbwarfare/entity/vehicle/DroneEntity.java | 4 ++-- .../com/atsuishio/superbwarfare/init/ModItems.java | 2 +- .../atsuishio/superbwarfare/init/ModVillagers.java | 4 ++-- .../superbwarfare/item/common/ammo/MortarShell.java | 10 ++++++++++ .../resources/assets/superbwarfare/lang/en_us.json | 2 +- .../resources/assets/superbwarfare/lang/zh_cn.json | 2 +- .../item/{mortar_shells.png => mortar_shell.png} | Bin .../loot_tables/chests/blue_print_common.json | 2 +- .../loot_tables/chests/blue_print_epic.json | 2 +- .../loot_tables/chests/blue_print_rare.json | 2 +- ...ar_he_shells.json => mortar_shell_crafting.json} | 2 +- 16 files changed, 28 insertions(+), 19 deletions(-) rename src/generated/resources/assets/superbwarfare/models/item/{mortar_shells.json => mortar_shell.json} (56%) create mode 100644 src/main/java/com/atsuishio/superbwarfare/item/common/ammo/MortarShell.java rename src/main/resources/assets/superbwarfare/textures/item/{mortar_shells.png => mortar_shell.png} (100%) rename src/main/resources/data/superbwarfare/recipes/{mortar_he_shells.json => mortar_shell_crafting.json} (90%) diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index 50ad4a3ad..c5322b292 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,4 +1,4 @@ -// 1.20.1 2025-01-28T15:44:32.1906572 Item Models: superbwarfare +// 1.20.1 2025-02-22T22:02:50.7777089 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 @@ -27,7 +27,6 @@ dd455cf29eed0ef5eb5e90ef3d7140cb8de61efe assets/superbwarfare/models/item/drone. 831ce33c5a4c90b71a42515f42f16d4c1a946c50 assets/superbwarfare/models/item/empty_perk.json 2419503d8b597c92684d1921895a12fca33fec69 assets/superbwarfare/models/item/epic_material_pack.json b6f96946b54f44fdd2d8b809945b8d1ae5e776e2 assets/superbwarfare/models/item/firing_parameters.json -5cac903f67f5fdb82d75cc67f06885db814c38fb assets/superbwarfare/models/item/fumo_25.json c102839d5f7d4bdc1c6cbfbf4c2c907b70f22052 assets/superbwarfare/models/item/fusee.json 5326409e01ffd1f0a6330299799994e267db2b6b assets/superbwarfare/models/item/galena.json 4bf506de247afbbec816f6637030f637e68ce0d4 assets/superbwarfare/models/item/ge_helmet_m_35.json @@ -64,7 +63,7 @@ db96dbb75327701d7901c2de48a539bda9fe31c4 assets/superbwarfare/models/item/mortar 3922427d3921d3de7195614780ee8f57dfc0ee6f assets/superbwarfare/models/item/mortar_base_plate.json ac9c6bc308bd741ada7f19d808d0c0722fceb976 assets/superbwarfare/models/item/mortar_bipod.json 9baf936f4340d41a0b5581857313240627b00386 assets/superbwarfare/models/item/mortar_deployer.json -92ce87d9ae2ab3dbb099d39f74ceb49248fe0b1f assets/superbwarfare/models/item/mortar_shells.json +41381cc65305bbfc1324a08b580125073d198e11 assets/superbwarfare/models/item/mortar_shell.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mosin_nagant_blueprint.json 4de8d6e0cddd28963febd35e9b66334a41a25d4c assets/superbwarfare/models/item/motor.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mp_443_blueprint.json diff --git a/src/generated/resources/assets/superbwarfare/models/item/mortar_shells.json b/src/generated/resources/assets/superbwarfare/models/item/mortar_shell.json similarity index 56% rename from src/generated/resources/assets/superbwarfare/models/item/mortar_shells.json rename to src/generated/resources/assets/superbwarfare/models/item/mortar_shell.json index c78ab8143..1fa0ed6e1 100644 --- a/src/generated/resources/assets/superbwarfare/models/item/mortar_shells.json +++ b/src/generated/resources/assets/superbwarfare/models/item/mortar_shell.json @@ -1,6 +1,6 @@ { "parent": "minecraft:item/generated", "textures": { - "layer0": "superbwarfare:item/mortar_shells" + "layer0": "superbwarfare:item/mortar_shell" } } \ 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 89e3803f3..ff0b7d24b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java @@ -23,7 +23,7 @@ public class ModItemModelProvider extends ItemModelProvider { protected void registerModels() { simpleItem(ModItems.EMPTY_PERK, "perk/"); - simpleItem(ModItems.MORTAR_SHELLS); + simpleItem(ModItems.MORTAR_SHELL); // misc simpleItem(ModItems.ANCIENT_CPU); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/MortarEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/MortarEntity.java index 7f682f966..cbda4be49 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/MortarEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/MortarEntity.java @@ -120,11 +120,11 @@ public class MortarEntity extends VehicleEntity implements GeoEntity, AnimatedEn public InteractionResult interact(Player player, InteractionHand hand) { ItemStack mainHandItem = player.getMainHandItem(); - if (mainHandItem.getItem() == ModItems.MORTAR_SHELLS.get() && !player.isShiftKeyDown() && this.entityData.get(FIRE_TIME) == 0) { + if (mainHandItem.getItem() == ModItems.MORTAR_SHELL.get() && !player.isShiftKeyDown() && this.entityData.get(FIRE_TIME) == 0) { this.entityData.set(FIRE_TIME, 25); if (!player.isCreative()) { - player.getInventory().clearOrCountMatchingItems(p -> ModItems.MORTAR_SHELLS.get() == p.getItem(), 1, player.inventoryMenu.getCraftSlots()); + player.getInventory().clearOrCountMatchingItems(p -> ModItems.MORTAR_SHELL.get() == p.getItem(), 1, player.inventoryMenu.getCraftSlots()); } if (!this.level().isClientSide()) { this.level().playSound(null, this.getX(), this.getY(), this.getZ(), ModSounds.MORTAR_LOAD.get(), SoundSource.PLAYERS, 1f, 1f); diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/MortarShellEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/MortarShellEntity.java index a36983290..4d935c708 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/projectile/MortarShellEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/projectile/MortarShellEntity.java @@ -113,7 +113,7 @@ public class MortarShellEntity extends ThrowableItemProjectile implements GeoEnt @Override protected Item getDefaultItem() { - return ModItems.MORTAR_SHELLS.get(); + return ModItems.MORTAR_SHELL.get(); } @Override diff --git a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/DroneEntity.java b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/DroneEntity.java index 800ba11ad..19228832a 100644 --- a/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/DroneEntity.java +++ b/src/main/java/com/atsuishio/superbwarfare/entity/vehicle/DroneEntity.java @@ -322,7 +322,7 @@ public class DroneEntity extends MobileVehicleEntity implements GeoEntity { // 返还神风弹药 if (this.entityData.get(KAMIKAZE_MODE) == 1) { - ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(ModItems.MORTAR_SHELLS.get())); + ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(ModItems.MORTAR_SHELL.get())); } else if (this.entityData.get(KAMIKAZE_MODE) == 2) { ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(ModItems.C4_BOMB.get())); } @@ -346,7 +346,7 @@ public class DroneEntity extends MobileVehicleEntity implements GeoEntity { serverPlayer.level().playSound(null, serverPlayer.getOnPos(), ModSounds.BULLET_SUPPLY.get(), SoundSource.PLAYERS, 0.5F, 1); } } - } else if (stack.getItem() == ModItems.MORTAR_SHELLS.get() && this.entityData.get(AMMO) == 0 && this.entityData.get(KAMIKAZE_MODE) == 0) { + } else if (stack.getItem() == ModItems.MORTAR_SHELL.get() && this.entityData.get(AMMO) == 0 && this.entityData.get(KAMIKAZE_MODE) == 0) { // 迫击炮神风 if (!player.isCreative()) { stack.shrink(1); diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java index 2214f6f2d..d4e449b2b 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModItems.java @@ -98,7 +98,7 @@ public class ModItems { public static final RegistryObject TASER_ELECTRODE = AMMO.register("taser_electrode", () -> new Item(new Item.Properties())); public static final RegistryObject GRENADE_40MM = AMMO.register("grenade_40mm", () -> new Item(new Item.Properties())); public static final RegistryObject JAVELIN_MISSILE = AMMO.register("javelin_missile", () -> new Item(new Item.Properties())); - public static final RegistryObject MORTAR_SHELLS = AMMO.register("mortar_shells", () -> new Item(new Item.Properties())); + public static final RegistryObject MORTAR_SHELL = AMMO.register("mortar_shell", MortarShell::new); public static final RegistryObject ROCKET = AMMO.register("rocket", Rocket::new); public static final RegistryObject LUNGE_MINE = AMMO.register("lunge_mine", LungeMine::new); public static final RegistryObject HE_5_INCHES = AMMO.register("he_5_inches", () -> new CannonShellItem(new Item.Properties().rarity(Rarity.RARE))); diff --git a/src/main/java/com/atsuishio/superbwarfare/init/ModVillagers.java b/src/main/java/com/atsuishio/superbwarfare/init/ModVillagers.java index a92446e11..25b71ebb0 100644 --- a/src/main/java/com/atsuishio/superbwarfare/init/ModVillagers.java +++ b/src/main/java/com/atsuishio/superbwarfare/init/ModVillagers.java @@ -149,7 +149,7 @@ public class ModVillagers { trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 2), new ItemStack(ModItems.RGO_GRENADE.get(), 1), 16, 5, 0.05f)); trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 3), - new ItemStack(ModItems.MORTAR_SHELLS.get(), 1), 16, 5, 0.05f)); + new ItemStack(ModItems.MORTAR_SHELL.get(), 1), 16, 5, 0.05f)); trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 4), new ItemStack(ModItems.CLAYMORE_MINE.get(), 1), 16, 5, 0.05f)); trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 4), @@ -163,7 +163,7 @@ public class ModVillagers { new ItemStack(Items.EMERALD, 1), 32, 5, 0.05f)); trades.get(4).add(new BasicItemListing(new ItemStack(ModItems.RGO_GRENADE.get(), 1), new ItemStack(Items.EMERALD, 1), 32, 5, 0.05f)); - trades.get(4).add(new BasicItemListing(new ItemStack(ModItems.MORTAR_SHELLS.get(), 3), + trades.get(4).add(new BasicItemListing(new ItemStack(ModItems.MORTAR_SHELL.get(), 3), new ItemStack(Items.EMERALD, 2), 32, 5, 0.05f)); trades.get(4).add(new BasicItemListing(new ItemStack(ModItems.CLAYMORE_MINE.get(), 1), new ItemStack(Items.EMERALD, 2), 32, 5, 0.05f)); diff --git a/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/MortarShell.java b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/MortarShell.java new file mode 100644 index 000000000..cc33bc61a --- /dev/null +++ b/src/main/java/com/atsuishio/superbwarfare/item/common/ammo/MortarShell.java @@ -0,0 +1,10 @@ +package com.atsuishio.superbwarfare.item.common.ammo; + +import net.minecraft.world.item.Item; + +public class MortarShell extends Item { + + public MortarShell() { + super(new Properties()); + } +} diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 726a708b0..f7ea7ef20 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -131,7 +131,7 @@ "item.superbwarfare.buckshot": "Buckshot", "item.superbwarfare.taser_electrode": "Taser Electrode", - "item.superbwarfare.mortar_shells": "Mortar Shell", + "item.superbwarfare.mortar_shell": "Mortar Shell", "item.superbwarfare.grenade_40mm": "40mm Gun Grenade", "item.superbwarfare.rocket": "RPG Rocket", "item.superbwarfare.sniper_ammo": "Sniper Ammo *2", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 5845a0754..fc3268520 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -131,7 +131,7 @@ "item.superbwarfare.buckshot": "霰弹弹丸", "item.superbwarfare.taser_electrode": "泰瑟枪电极", - "item.superbwarfare.mortar_shells": "迫击炮弹", + "item.superbwarfare.mortar_shell": "迫击炮弹", "item.superbwarfare.grenade_40mm": "40mm枪榴弹", "item.superbwarfare.rocket": "RPG火箭", "item.superbwarfare.sniper_ammo": "狙击枪弹药 *2", diff --git a/src/main/resources/assets/superbwarfare/textures/item/mortar_shells.png b/src/main/resources/assets/superbwarfare/textures/item/mortar_shell.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/mortar_shells.png rename to src/main/resources/assets/superbwarfare/textures/item/mortar_shell.png diff --git a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_common.json b/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_common.json index bff8106e8..15befc5e1 100644 --- a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_common.json +++ b/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_common.json @@ -445,7 +445,7 @@ }, { "type": "minecraft:item", - "name": "superbwarfare:mortar_shells", + "name": "superbwarfare:mortar_shell", "weight": 6, "functions": [ { diff --git a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_epic.json b/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_epic.json index de573c797..28956e57a 100644 --- a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_epic.json +++ b/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_epic.json @@ -417,7 +417,7 @@ }, { "type": "minecraft:item", - "name": "superbwarfare:mortar_shells", + "name": "superbwarfare:mortar_shell", "weight": 6, "functions": [ { diff --git a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_rare.json b/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_rare.json index b7409c031..5f694ffd6 100644 --- a/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_rare.json +++ b/src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_rare.json @@ -571,7 +571,7 @@ }, { "type": "minecraft:item", - "name": "superbwarfare:mortar_shells", + "name": "superbwarfare:mortar_shell", "weight": 6, "functions": [ { diff --git a/src/main/resources/data/superbwarfare/recipes/mortar_he_shells.json b/src/main/resources/data/superbwarfare/recipes/mortar_shell_crafting.json similarity index 90% rename from src/main/resources/data/superbwarfare/recipes/mortar_he_shells.json rename to src/main/resources/data/superbwarfare/recipes/mortar_shell_crafting.json index 74021b8d6..f8c3dccdf 100644 --- a/src/main/resources/data/superbwarfare/recipes/mortar_he_shells.json +++ b/src/main/resources/data/superbwarfare/recipes/mortar_shell_crafting.json @@ -21,7 +21,7 @@ } }, "result": { - "item": "superbwarfare:mortar_shells", + "item": "superbwarfare:mortar_shell", "count": 4 } } \ No newline at end of file