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

修复弹药补给音效，调整战利品表和部分配方，简化摧毁迫击炮后的物品掉落

Browse source
This commit is contained in:
Atsuihsio 2024-06-19 23:43:44 +08:00
parent c9bea4933b
commit 27cecb76cb
29 changed files with 514 additions and 169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/net/mcreator/target/entity/MortarEntity.java
View file

@ -286,15 +286,9 @@ public class MortarEntity extends PathfinderMob implements GeoEntity, AnimatedEn
var y = this.getY();
var z = this.getZ();
level.explode(null, x, y, z, 0, Level.ExplosionInteraction.NONE);
ItemEntity barrel = new ItemEntity(level, x, (y + 1), z, new ItemStack(TargetModItems.MORTAR_BARREL.get()));
barrel.setPickUpDelay(10);
level.addFreshEntity(barrel);
ItemEntity bipod = new ItemEntity(level, x, (y + 1), z, new ItemStack(TargetModItems.MORTAR_BIPOD.get()));
bipod.setPickUpDelay(10);
level.addFreshEntity(bipod);
ItemEntity plate = new ItemEntity(level, x, (y + 1), z, new ItemStack(TargetModItems.MORTAR_BASE_PLATE.get()));
plate.setPickUpDelay(10);
level.addFreshEntity(plate);
ItemEntity mortar = new ItemEntity(level, x, (y + 1), z, new ItemStack(TargetModItems.MORTAR_DEPLOYER.get()));
mortar.setPickUpDelay(10);
level.addFreshEntity(mortar);
}
}
}

2
src/main/java/net/mcreator/target/item/common/ammo/AmmoSupplierItem.java
View file

@ -26,7 +26,7 @@ public abstract class AmmoSupplierItem extends Item {
@Override
public InteractionResultHolder<ItemStack> use(Level level, Player player, InteractionHand hand) {
ItemStack stack = player.getItemInHand(hand);
player.getCooldowns().addCooldown(this, 20);
player.getCooldowns().addCooldown(this, 10);
stack.shrink(1);
player.getCapability(TargetModVariables.PLAYER_VARIABLES_CAPABILITY, null).ifPresent(capability -> {

2
src/main/resources/assets/target/sounds.json
View file

@ -1207,7 +1207,7 @@
}
]
},
"bulletsupply": {
"bullet_supply": {
"sounds": [
{
"name": "target:bullet_supply",

2
src/main/resources/data/target/loot_modifiers/common_chest.json
View file

@ -6,5 +6,5 @@
"loot_table_id": "minecraft:chests/simple_dungeon"
}
],
"lootTable": "target:chests/blueprint_common_chest"
"lootTable": "target:chests/blue_print_common"
}

2
src/main/resources/data/target/loot_modifiers/common_chest_2.json
View file

@ -6,5 +6,5 @@
"loot_table_id": "minecraft:chests/abandoned_mineshaft"
}
],
"lootTable": "target:chests/blueprint_common_chest"
"lootTable": "target:chests/blue_print_common"
}

2
src/main/resources/data/target/loot_modifiers/common_chest_3.json
View file

@ -6,5 +6,5 @@
"loot_table_id": "minecraft:chests/shipwreck_map"
}
],
"lootTable": "target:chests/blueprint_common_chest"
"lootTable": "target:chests/blue_print_common"
}

2
src/main/resources/data/target/loot_modifiers/common_chest_4.json
View file

@ -6,5 +6,5 @@
"loot_table_id": "minecraft:chests/shipwreck_supply"
}
],
"lootTable": "target:chests/blueprint_common_chest"
"lootTable": "target:chests/blue_print_common"
}

2
src/main/resources/data/target/loot_modifiers/common_chest_5.json
View file

@ -6,5 +6,5 @@
"loot_table_id": "minecraft:chests/shipwreck_treasure"
}
],
"lootTable": "target:chests/blueprint_common_chest"
"lootTable": "target:chests/blue_print_common"
}

2
src/main/resources/data/target/loot_modifiers/common_chest_6.json
View file

@ -6,5 +6,5 @@
"loot_table_id": "minecraft:chests/ruined_portal"
}
],
"lootTable": "target:chests/blueprint_common_chest"
"lootTable": "target:chests/blue_print_common"
}

2
src/main/resources/data/target/loot_modifiers/epic_chest.json
View file

@ -6,5 +6,5 @@
"loot_table_id": "minecraft:chests/pillager_outpost"
}
],
"lootTable": "target:blue_print_epic"
"lootTable": "target:chests/blue_print_epic"
}

2
src/main/resources/data/target/loot_modifiers/epic_chest_2.json
View file

@ -6,5 +6,5 @@
"loot_table_id": "minecraft:chests/stronghold_library"
}
],
"lootTable": "target:blue_print_epic"
"lootTable": "target:chests/blue_print_epic"
}

2
src/main/resources/data/target/loot_modifiers/epic_chest_3.json
View file

@ -6,5 +6,5 @@
"loot_table_id": "minecraft:chests/woodland_mansion"
}
],
"lootTable": "target:blue_print_epic"
"lootTable": "target:chests/blue_print_epic"
}

2
src/main/resources/data/target/loot_modifiers/epic_chest_4.json
View file

@ -6,5 +6,5 @@
"loot_table_id": "minecraft:chests/end_city_treasure"
}
],
"lootTable": "target:blue_print_epic"
"lootTable": "target:chests/blue_print_epic"
}

2
src/main/resources/data/target/loot_modifiers/rare_chest.json
View file

@ -6,5 +6,5 @@
"loot_table_id": "minecraft:chests/ancient_city"
}
],
"lootTable": "target:blue_print_rare"
"lootTable": "target:chests/blue_print_rare"
}

2
src/main/resources/data/target/loot_modifiers/rare_chest_10.json
View file

@ -6,5 +6,5 @@
"loot_table_id": "minecraft:chests/jungle_temple_dispenser"
}
],
"lootTable": "target:blue_print_rare"
"lootTable": "target:chests/blue_print_rare"
}

2
src/main/resources/data/target/loot_modifiers/rare_chest_2.json
View file

@ -6,5 +6,5 @@
"loot_table_id": "minecraft:chests/ancient_city_ice_box"
}
],
"lootTable": "target:blue_print_rare"
"lootTable": "target:chests/blue_print_rare"
}

2
src/main/resources/data/target/loot_modifiers/rare_chest_3.json
View file

@ -6,5 +6,5 @@
"loot_table_id": "minecraft:chests/bastion_bridge"
}
],
"lootTable": "target:blue_print_rare"
"lootTable": "target:chests/blue_print_rare"
}

2
src/main/resources/data/target/loot_modifiers/rare_chest_4.json
View file

@ -6,5 +6,5 @@
"loot_table_id": "minecraft:chests/bastion_hoglin_stable"
}
],
"lootTable": "target:blue_print_rare"
"lootTable": "target:chests/blue_print_rare"
}

2
src/main/resources/data/target/loot_modifiers/rare_chest_5.json
View file

@ -6,5 +6,5 @@
"loot_table_id": "minecraft:chests/bastion_other"
}
],
"lootTable": "target:blue_print_rare"
"lootTable": "target:chests/blue_print_rare"
}

2
src/main/resources/data/target/loot_modifiers/rare_chest_6.json
View file

@ -6,5 +6,5 @@
"loot_table_id": "minecraft:chests/buried_treasure"
}
],
"lootTable": "target:blue_print_rare"
"lootTable": "target:chests/blue_print_rare"
}

2
src/main/resources/data/target/loot_modifiers/rare_chest_7.json
View file

@ -6,5 +6,5 @@
"loot_table_id": "minecraft:chests/desert_pyramid"
}
],
"lootTable": "target:blue_print_rare"
"lootTable": "target:chests/blue_print_rare"
}

2
src/main/resources/data/target/loot_modifiers/rare_chest_8.json
View file

@ -6,5 +6,5 @@
"loot_table_id": "minecraft:chests/igloo"
}
],
"lootTable": "target:blue_print_rare"
"lootTable": "target:chests/blue_print_rare"
}

2
src/main/resources/data/target/loot_modifiers/rare_chest_9.json
View file

@ -6,5 +6,5 @@
"loot_table_id": "minecraft:chests/jungle_temple"
}
],
"lootTable": "target:blue_print_rare"
"lootTable": "target:chests/blue_print_rare"
}

119
src/main/resources/data/target/loot_tables/chests/blueprint_common_chest.json → src/main/resources/data/target/loot_tables/chests/blue_print_common.json
View file

@ -243,7 +243,124 @@
]
}
]
},
{
"rolls": 2,
"entries": [
{
"type": "minecraft:item",
"name": "target:handgun_ammo",
"weight": 12,
"functions": [
{
"function": "set_count",
"count": {
"min": 4,
"max": 10
}
}
]
},
{
"type": "minecraft:item",
"name": "target:rifle_ammo",
"weight": 20,
"functions": [
{
"function": "set_count",
"count": {
"min": 4,
"max": 8
}
}
]
},
{
"type": "minecraft:item",
"name": "target:sniper_ammo",
"weight": 10,
"functions": [
{
"function": "set_count",
"count": {
"min": 2,
"max": 5
}
}
]
},
{
"type": "minecraft:item",
"name": "target:shotgun_ammo",
"weight": 17,
"functions": [
{
"function": "set_count",
"count": {
"min": 2,
"max": 6
}
}
]
},
{
"type": "minecraft:item",
"name": "target:grenade_40mm",
"weight": 6,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 3
}
}
]
},
{
"type": "minecraft:item",
"name": "target:rocket",
"weight": 4,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 2
}
}
]
},
{
"type": "minecraft:item",
"name": "target:mortar_shells",
"weight": 6,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 4
}
}
]
},
{
"type": "minecraft:item",
"name": "target:claymore_mine",
"weight": 3,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 3
}
}
]
}
]
}
],
"random_sequence": "target:chests/blueprint_common_chest"
"random_sequence": "target:chests/blue_print_common"
}

251
src/main/resources/data/target/loot_tables/blue_print_rare.json → src/main/resources/data/target/loot_tables/chests/blue_print_epic.json
View file

@ -4,76 +4,6 @@
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "target:m_79_blueprint",
"weight": 14,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 1
}
}
]
},
{
"type": "minecraft:item",
"name": "target:m_4_blueprint",
"weight": 15,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 1
}
}
]
},
{
"type": "minecraft:item",
"name": "target:sks_blueprint",
"weight": 15,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 1
}
}
]
},
{
"type": "minecraft:item",
"name": "target:marlin_blueprint",
"weight": 15,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 1
}
}
]
},
{
"type": "minecraft:item",
"name": "target:ak_47_blueprint",
"weight": 15,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 1
}
}
]
},
{
"type": "minecraft:item",
"name": "target:hunting_rifle_blueprint",
@ -186,20 +116,6 @@
}
]
},
{
"type": "minecraft:item",
"name": "target:m_870_blueprint",
"weight": 15,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 1
}
}
]
},
{
"type": "minecraft:item",
"name": "target:m_98b_blueprint",
@ -231,7 +147,7 @@
{
"type": "minecraft:item",
"name": "target:trachelium_blueprint",
"weight": 5,
"weight": 60,
"functions": [
{
"function": "set_count",
@ -245,7 +161,7 @@
{
"type": "minecraft:item",
"name": "target:aa_12_blueprint",
"weight": 5,
"weight": 60,
"functions": [
{
"function": "set_count",
@ -259,7 +175,49 @@
{
"type": "minecraft:item",
"name": "target:sentinel_blueprint",
"weight": 5,
"weight": 60,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 1
}
}
]
},
{
"type": "minecraft:item",
"name": "target:kraber_blueprint",
"weight": 30,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 1
}
}
]
},
{
"type": "minecraft:item",
"name": "target:bocek_blueprint",
"weight": 30,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 1
}
}
]
},
{
"type": "minecraft:item",
"name": "target:minigun_blueprint",
"weight": 30,
"functions": [
{
"function": "set_count",
@ -271,7 +229,124 @@
]
}
]
},
{
"rolls": 2,
"entries": [
{
"type": "minecraft:item",
"name": "target:handgun_ammo",
"weight": 12,
"functions": [
{
"function": "set_count",
"count": {
"min": 16,
"max": 40
}
}
]
},
{
"type": "minecraft:item",
"name": "target:rifle_ammo",
"weight": 20,
"functions": [
{
"function": "set_count",
"count": {
"min": 16,
"max": 32
}
}
]
},
{
"type": "minecraft:item",
"name": "target:sniper_ammo",
"weight": 10,
"functions": [
{
"function": "set_count",
"count": {
"min": 8,
"max": 20
}
}
]
},
{
"type": "minecraft:item",
"name": "target:shotgun_ammo",
"weight": 17,
"functions": [
{
"function": "set_count",
"count": {
"min": 8,
"max": 24
}
}
]
},
{
"type": "minecraft:item",
"name": "target:grenade_40mm",
"weight": 6,
"functions": [
{
"function": "set_count",
"count": {
"min": 4,
"max": 12
}
}
]
},
{
"type": "minecraft:item",
"name": "target:rocket",
"weight": 4,
"functions": [
{
"function": "set_count",
"count": {
"min": 4,
"max": 8
}
}
]
},
{
"type": "minecraft:item",
"name": "target:mortar_shells",
"weight": 6,
"functions": [
{
"function": "set_count",
"count": {
"min": 4,
"max": 8
}
}
]
},
{
"type": "minecraft:item",
"name": "target:claymore_mine",
"weight": 3,
"functions": [
{
"function": "set_count",
"count": {
"min": 4,
"max": 12
}
}
]
}
]
}
],
"random_sequence": "target:blue_print_rare"
"random_sequence": "target:chests/blue_print_epic"
}

191
src/main/resources/data/target/loot_tables/blue_print_epic.json → src/main/resources/data/target/loot_tables/chests/blue_print_rare.json
View file

@ -4,6 +4,76 @@
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"name": "target:m_79_blueprint",
"weight": 14,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 1
}
}
]
},
{
"type": "minecraft:item",
"name": "target:m_4_blueprint",
"weight": 15,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 1
}
}
]
},
{
"type": "minecraft:item",
"name": "target:sks_blueprint",
"weight": 15,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 1
}
}
]
},
{
"type": "minecraft:item",
"name": "target:marlin_blueprint",
"weight": 15,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 1
}
}
]
},
{
"type": "minecraft:item",
"name": "target:ak_47_blueprint",
"weight": 15,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 1
}
}
]
},
{
"type": "minecraft:item",
"name": "target:hunting_rifle_blueprint",
@ -116,6 +186,20 @@
}
]
},
{
"type": "minecraft:item",
"name": "target:m_870_blueprint",
"weight": 15,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 1
}
}
]
},
{
"type": "minecraft:item",
"name": "target:m_98b_blueprint",
@ -147,7 +231,7 @@
{
"type": "minecraft:item",
"name": "target:trachelium_blueprint",
"weight": 60,
"weight": 5,
"functions": [
{
"function": "set_count",
@ -161,7 +245,7 @@
{
"type": "minecraft:item",
"name": "target:aa_12_blueprint",
"weight": 60,
"weight": 5,
"functions": [
{
"function": "set_count",
@ -175,7 +259,7 @@
{
"type": "minecraft:item",
"name": "target:sentinel_blueprint",
"weight": 60,
"weight": 5,
"functions": [
{
"function": "set_count",
@ -185,45 +269,120 @@
}
}
]
}
]
},
{
"rolls": 2,
"entries": [
{
"type": "minecraft:item",
"name": "target:kraber_blueprint",
"weight": 30,
"name": "target:handgun_ammo",
"weight": 12,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 1
"min": 8,
"max": 20
}
}
]
},
{
"type": "minecraft:item",
"name": "target:bocek_blueprint",
"weight": 30,
"name": "target:rifle_ammo",
"weight": 20,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 1
"min": 8,
"max": 16
}
}
]
},
{
"type": "minecraft:item",
"name": "target:minigun_blueprint",
"weight": 30,
"name": "target:sniper_ammo",
"weight": 10,
"functions": [
{
"function": "set_count",
"count": {
"min": 1,
"max": 1
"min": 4,
"max": 10
}
}
]
},
{
"type": "minecraft:item",
"name": "target:shotgun_ammo",
"weight": 17,
"functions": [
{
"function": "set_count",
"count": {
"min": 4,
"max": 12
}
}
]
},
{
"type": "minecraft:item",
"name": "target:grenade_40mm",
"weight": 6,
"functions": [
{
"function": "set_count",
"count": {
"min": 2,
"max": 6
}
}
]
},
{
"type": "minecraft:item",
"name": "target:rocket",
"weight": 4,
"functions": [
{
"function": "set_count",
"count": {
"min": 2,
"max": 4
}
}
]
},
{
"type": "minecraft:item",
"name": "target:mortar_shells",
"weight": 6,
"functions": [
{
"function": "set_count",
"count": {
"min": 2,
"max": 8
}
}
]
},
{
"type": "minecraft:item",
"name": "target:claymore_mine",
"weight": 3,
"functions": [
{
"function": "set_count",
"count": {
"min": 2,
"max": 6
}
}
]
@ -231,5 +390,5 @@
]
}
],
"random_sequence": "target:blue_print_epic"
"random_sequence": "target:chests/blue_print_rare"
}

2
src/main/resources/data/target/recipes/marlin_smithing.json
View file

@ -7,7 +7,7 @@
"item": "target:rare_material_pack"
},
"addition": {
"item": "target:ingot_steel"
"tag": "minecraft:logs"
},
"result": {
"item": "target:marlin"

2
src/main/resources/data/target/recipes/mortar_he_shells.json
View file

@ -22,6 +22,6 @@
},
"result": {
"item": "target:mortar_shells",
"count": 1
"count": 2
}
}

2
src/main/resources/data/target/recipes/sks_smithing.json
View file

@ -7,7 +7,7 @@
"item": "target:rare_material_pack"
},
"addition": {
"item": "target:ingot_steel"
"tag": "minecraft:logs"
},
"result": {
"item": "target:sks"