kalle/superb-warfare
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

mortar shell更名

Browse source
This commit is contained in:
17146 2025-02-22 22:08:10 +08:00
parent ea8c9d36d9
commit 2b11c42d1d
16 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2
View file

@ -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/aa_12_blueprint.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_12_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_12_blueprint.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_47_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 831ce33c5a4c90b71a42515f42f16d4c1a946c50 assets/superbwarfare/models/item/empty_perk.json
2419503d8b597c92684d1921895a12fca33fec69 assets/superbwarfare/models/item/epic_material_pack.json 2419503d8b597c92684d1921895a12fca33fec69 assets/superbwarfare/models/item/epic_material_pack.json
b6f96946b54f44fdd2d8b809945b8d1ae5e776e2 assets/superbwarfare/models/item/firing_parameters.json b6f96946b54f44fdd2d8b809945b8d1ae5e776e2 assets/superbwarfare/models/item/firing_parameters.json
5cac903f67f5fdb82d75cc67f06885db814c38fb assets/superbwarfare/models/item/fumo_25.json
c102839d5f7d4bdc1c6cbfbf4c2c907b70f22052 assets/superbwarfare/models/item/fusee.json c102839d5f7d4bdc1c6cbfbf4c2c907b70f22052 assets/superbwarfare/models/item/fusee.json
5326409e01ffd1f0a6330299799994e267db2b6b assets/superbwarfare/models/item/galena.json 5326409e01ffd1f0a6330299799994e267db2b6b assets/superbwarfare/models/item/galena.json
4bf506de247afbbec816f6637030f637e68ce0d4 assets/superbwarfare/models/item/ge_helmet_m_35.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 3922427d3921d3de7195614780ee8f57dfc0ee6f assets/superbwarfare/models/item/mortar_base_plate.json
ac9c6bc308bd741ada7f19d808d0c0722fceb976 assets/superbwarfare/models/item/mortar_bipod.json ac9c6bc308bd741ada7f19d808d0c0722fceb976 assets/superbwarfare/models/item/mortar_bipod.json
9baf936f4340d41a0b5581857313240627b00386 assets/superbwarfare/models/item/mortar_deployer.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 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mosin_nagant_blueprint.json
4de8d6e0cddd28963febd35e9b66334a41a25d4c assets/superbwarfare/models/item/motor.json 4de8d6e0cddd28963febd35e9b66334a41a25d4c assets/superbwarfare/models/item/motor.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mp_443_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mp_443_blueprint.json

2
src/generated/resources/assets/superbwarfare/models/item/mortar_shells.json → src/generated/resources/assets/superbwarfare/models/item/mortar_shell.json
View file

@ -1,6 +1,6 @@
{ {
"parent": "minecraft:item/generated", "parent": "minecraft:item/generated",
"textures": { "textures": {
"layer0": "superbwarfare:item/mortar_shells" "layer0": "superbwarfare:item/mortar_shell"
} }
} }

2
src/main/java/com/atsuishio/superbwarfare/datagen/ModItemModelProvider.java
View file

@ -23,7 +23,7 @@ public class ModItemModelProvider extends ItemModelProvider {
protected void registerModels() { protected void registerModels() {
simpleItem(ModItems.EMPTY_PERK, "perk/"); simpleItem(ModItems.EMPTY_PERK, "perk/");
simpleItem(ModItems.MORTAR_SHELLS); simpleItem(ModItems.MORTAR_SHELL);
// misc // misc
simpleItem(ModItems.ANCIENT_CPU); simpleItem(ModItems.ANCIENT_CPU);

4
src/main/java/com/atsuishio/superbwarfare/entity/MortarEntity.java
View file

@ -120,11 +120,11 @@ public class MortarEntity extends VehicleEntity implements GeoEntity, AnimatedEn
public InteractionResult interact(Player player, InteractionHand hand) { public InteractionResult interact(Player player, InteractionHand hand) {
ItemStack mainHandItem = player.getMainHandItem(); 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); this.entityData.set(FIRE_TIME, 25);
if (!player.isCreative()) { 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()) { if (!this.level().isClientSide()) {
this.level().playSound(null, this.getX(), this.getY(), this.getZ(), ModSounds.MORTAR_LOAD.get(), SoundSource.PLAYERS, 1f, 1f); this.level().playSound(null, this.getX(), this.getY(), this.getZ(), ModSounds.MORTAR_LOAD.get(), SoundSource.PLAYERS, 1f, 1f);

2
src/main/java/com/atsuishio/superbwarfare/entity/projectile/MortarShellEntity.java
View file

@ -113,7 +113,7 @@ public class MortarShellEntity extends ThrowableItemProjectile implements GeoEnt
@Override @Override
protected Item getDefaultItem() { protected Item getDefaultItem() {
return ModItems.MORTAR_SHELLS.get(); return ModItems.MORTAR_SHELL.get();
} }
@Override @Override

4
src/main/java/com/atsuishio/superbwarfare/entity/vehicle/DroneEntity.java
View file

@ -322,7 +322,7 @@ public class DroneEntity extends MobileVehicleEntity implements GeoEntity {
// 返还神风弹药 // 返还神风弹药
if (this.entityData.get(KAMIKAZE_MODE) == 1) { 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) { } else if (this.entityData.get(KAMIKAZE_MODE) == 2) {
ItemHandlerHelper.giveItemToPlayer(player, new ItemStack(ModItems.C4_BOMB.get())); 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); 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()) { if (!player.isCreative()) {
stack.shrink(1); stack.shrink(1);

2
src/main/java/com/atsuishio/superbwarfare/init/ModItems.java
View file

@ -98,7 +98,7 @@ public class ModItems {
public static final RegistryObject<Item> TASER_ELECTRODE = AMMO.register("taser_electrode", () -> new Item(new Item.Properties())); public static final RegistryObject<Item> TASER_ELECTRODE = AMMO.register("taser_electrode", () -> new Item(new Item.Properties()));
public static final RegistryObject<Item> GRENADE_40MM = AMMO.register("grenade_40mm", () -> new Item(new Item.Properties())); public static final RegistryObject<Item> GRENADE_40MM = AMMO.register("grenade_40mm", () -> new Item(new Item.Properties()));
public static final RegistryObject<Item> JAVELIN_MISSILE = AMMO.register("javelin_missile", () -> new Item(new Item.Properties())); public static final RegistryObject<Item> JAVELIN_MISSILE = AMMO.register("javelin_missile", () -> new Item(new Item.Properties()));
public static final RegistryObject<Item> MORTAR_SHELLS = AMMO.register("mortar_shells", () -> new Item(new Item.Properties())); public static final RegistryObject<Item> MORTAR_SHELL = AMMO.register("mortar_shell", MortarShell::new);
public static final RegistryObject<Item> ROCKET = AMMO.register("rocket", Rocket::new); public static final RegistryObject<Item> ROCKET = AMMO.register("rocket", Rocket::new);
public static final RegistryObject<Item> LUNGE_MINE = AMMO.register("lunge_mine", LungeMine::new); public static final RegistryObject<Item> LUNGE_MINE = AMMO.register("lunge_mine", LungeMine::new);
public static final RegistryObject<Item> HE_5_INCHES = AMMO.register("he_5_inches", () -> new CannonShellItem(new Item.Properties().rarity(Rarity.RARE))); public static final RegistryObject<Item> HE_5_INCHES = AMMO.register("he_5_inches", () -> new CannonShellItem(new Item.Properties().rarity(Rarity.RARE)));

4
src/main/java/com/atsuishio/superbwarfare/init/ModVillagers.java
View file

@ -149,7 +149,7 @@ public class ModVillagers {
trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 2), trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 2),
new ItemStack(ModItems.RGO_GRENADE.get(), 1), 16, 5, 0.05f)); new ItemStack(ModItems.RGO_GRENADE.get(), 1), 16, 5, 0.05f));
trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 3), 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), trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 4),
new ItemStack(ModItems.CLAYMORE_MINE.get(), 1), 16, 5, 0.05f)); new ItemStack(ModItems.CLAYMORE_MINE.get(), 1), 16, 5, 0.05f));
trades.get(4).add(new BasicItemListing(new ItemStack(Items.EMERALD, 4), 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)); new ItemStack(Items.EMERALD, 1), 32, 5, 0.05f));
trades.get(4).add(new BasicItemListing(new ItemStack(ModItems.RGO_GRENADE.get(), 1), trades.get(4).add(new BasicItemListing(new ItemStack(ModItems.RGO_GRENADE.get(), 1),
new ItemStack(Items.EMERALD, 1), 32, 5, 0.05f)); 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)); new ItemStack(Items.EMERALD, 2), 32, 5, 0.05f));
trades.get(4).add(new BasicItemListing(new ItemStack(ModItems.CLAYMORE_MINE.get(), 1), trades.get(4).add(new BasicItemListing(new ItemStack(ModItems.CLAYMORE_MINE.get(), 1),
new ItemStack(Items.EMERALD, 2), 32, 5, 0.05f)); new ItemStack(Items.EMERALD, 2), 32, 5, 0.05f));

10
src/main/java/com/atsuishio/superbwarfare/item/common/ammo/MortarShell.java Normal file
View file

@ -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());
}
}

2
src/main/resources/assets/superbwarfare/lang/en_us.json
View file

@ -131,7 +131,7 @@
"item.superbwarfare.buckshot": "Buckshot", "item.superbwarfare.buckshot": "Buckshot",
"item.superbwarfare.taser_electrode": "Taser Electrode", "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.grenade_40mm": "40mm Gun Grenade",
"item.superbwarfare.rocket": "RPG Rocket", "item.superbwarfare.rocket": "RPG Rocket",
"item.superbwarfare.sniper_ammo": "Sniper Ammo *2", "item.superbwarfare.sniper_ammo": "Sniper Ammo *2",

2
src/main/resources/assets/superbwarfare/lang/zh_cn.json
View file

@ -131,7 +131,7 @@
"item.superbwarfare.buckshot": "霰弹弹丸", "item.superbwarfare.buckshot": "霰弹弹丸",
"item.superbwarfare.taser_electrode": "泰瑟枪电极", "item.superbwarfare.taser_electrode": "泰瑟枪电极",
"item.superbwarfare.mortar_shells": "迫击炮弹", "item.superbwarfare.mortar_shell": "迫击炮弹",
"item.superbwarfare.grenade_40mm": "40mm枪榴弹", "item.superbwarfare.grenade_40mm": "40mm枪榴弹",
"item.superbwarfare.rocket": "RPG火箭", "item.superbwarfare.rocket": "RPG火箭",
"item.superbwarfare.sniper_ammo": "狙击枪弹药 *2", "item.superbwarfare.sniper_ammo": "狙击枪弹药 *2",

0
src/main/resources/assets/superbwarfare/textures/item/mortar_shells.png → src/main/resources/assets/superbwarfare/textures/item/mortar_shell.png
View file

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 275 B

After

Width:  |  Height:  |  Size: 275 B

2
src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_common.json
View file

@ -445,7 +445,7 @@
}, },
{ {
"type": "minecraft:item", "type": "minecraft:item",
"name": "superbwarfare:mortar_shells", "name": "superbwarfare:mortar_shell",
"weight": 6, "weight": 6,
"functions": [ "functions": [
{ {

2
src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_epic.json
View file

@ -417,7 +417,7 @@
}, },
{ {
"type": "minecraft:item", "type": "minecraft:item",
"name": "superbwarfare:mortar_shells", "name": "superbwarfare:mortar_shell",
"weight": 6, "weight": 6,
"functions": [ "functions": [
{ {

2
src/main/resources/data/superbwarfare/loot_tables/chests/blue_print_rare.json
View file

@ -571,7 +571,7 @@
}, },
{ {
"type": "minecraft:item", "type": "minecraft:item",
"name": "superbwarfare:mortar_shells", "name": "superbwarfare:mortar_shell",
"weight": 6, "weight": 6,
"functions": [ "functions": [
{ {

2
src/main/resources/data/superbwarfare/recipes/mortar_he_shells.json → src/main/resources/data/superbwarfare/recipes/mortar_shell_crafting.json
View file

@ -21,7 +21,7 @@
} }
}, },
"result": { "result": {
"item": "superbwarfare:mortar_shells", "item": "superbwarfare:mortar_shell",
"count": 4 "count": 4
} }
} }