From 27cecb76cb08a948d4092e91c6d76d02aa6f1ad9 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Wed, 19 Jun 2024 23:43:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BC=B9=E8=8D=AF=E8=A1=A5?= =?UTF-8?q?=E7=BB=99=E9=9F=B3=E6=95=88=EF=BC=8C=E8=B0=83=E6=95=B4=E6=88=98?= =?UTF-8?q?=E5=88=A9=E5=93=81=E8=A1=A8=E5=92=8C=E9=83=A8=E5=88=86=E9=85=8D?= =?UTF-8?q?=E6=96=B9=EF=BC=8C=E7=AE=80=E5=8C=96=E6=91=A7=E6=AF=81=E8=BF=AB?= =?UTF-8?q?=E5=87=BB=E7=82=AE=E5=90=8E=E7=9A=84=E7=89=A9=E5=93=81=E6=8E=89?= =?UTF-8?q?=E8=90=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mcreator/target/entity/MortarEntity.java | 12 +- .../item/common/ammo/AmmoSupplierItem.java | 2 +- src/main/resources/assets/target/sounds.json | 2 +- .../target/loot_modifiers/common_chest.json | 2 +- .../target/loot_modifiers/common_chest_2.json | 2 +- .../target/loot_modifiers/common_chest_3.json | 2 +- .../target/loot_modifiers/common_chest_4.json | 2 +- .../target/loot_modifiers/common_chest_5.json | 2 +- .../target/loot_modifiers/common_chest_6.json | 2 +- .../target/loot_modifiers/epic_chest.json | 2 +- .../target/loot_modifiers/epic_chest_2.json | 2 +- .../target/loot_modifiers/epic_chest_3.json | 2 +- .../target/loot_modifiers/epic_chest_4.json | 2 +- .../target/loot_modifiers/rare_chest.json | 2 +- .../target/loot_modifiers/rare_chest_10.json | 2 +- .../target/loot_modifiers/rare_chest_2.json | 2 +- .../target/loot_modifiers/rare_chest_3.json | 2 +- .../target/loot_modifiers/rare_chest_4.json | 2 +- .../target/loot_modifiers/rare_chest_5.json | 2 +- .../target/loot_modifiers/rare_chest_6.json | 2 +- .../target/loot_modifiers/rare_chest_7.json | 2 +- .../target/loot_modifiers/rare_chest_8.json | 2 +- .../target/loot_modifiers/rare_chest_9.json | 2 +- ...mmon_chest.json => blue_print_common.json} | 119 ++++++++- .../blue_print_epic.json} | 251 ++++++++++++------ .../blue_print_rare.json} | 251 ++++++++++++++---- .../data/target/recipes/marlin_smithing.json | 2 +- .../data/target/recipes/mortar_he_shells.json | 2 +- .../data/target/recipes/sks_smithing.json | 2 +- 29 files changed, 514 insertions(+), 169 deletions(-) rename src/main/resources/data/target/loot_tables/chests/{blueprint_common_chest.json => blue_print_common.json} (67%) rename src/main/resources/data/target/loot_tables/{blue_print_rare.json => chests/blue_print_epic.json} (70%) rename src/main/resources/data/target/loot_tables/{blue_print_epic.json => chests/blue_print_rare.json} (56%) diff --git a/src/main/java/net/mcreator/target/entity/MortarEntity.java b/src/main/java/net/mcreator/target/entity/MortarEntity.java index 394cefbb4..b360465fe 100644 --- a/src/main/java/net/mcreator/target/entity/MortarEntity.java +++ b/src/main/java/net/mcreator/target/entity/MortarEntity.java @@ -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); } } } diff --git a/src/main/java/net/mcreator/target/item/common/ammo/AmmoSupplierItem.java b/src/main/java/net/mcreator/target/item/common/ammo/AmmoSupplierItem.java index 468ce3de0..5218aebdc 100644 --- a/src/main/java/net/mcreator/target/item/common/ammo/AmmoSupplierItem.java +++ b/src/main/java/net/mcreator/target/item/common/ammo/AmmoSupplierItem.java @@ -26,7 +26,7 @@ public abstract class AmmoSupplierItem extends Item { @Override public InteractionResultHolder 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 -> { diff --git a/src/main/resources/assets/target/sounds.json b/src/main/resources/assets/target/sounds.json index a9bcebb93..7374f9686 100644 --- a/src/main/resources/assets/target/sounds.json +++ b/src/main/resources/assets/target/sounds.json @@ -1207,7 +1207,7 @@ } ] }, - "bulletsupply": { + "bullet_supply": { "sounds": [ { "name": "target:bullet_supply", diff --git a/src/main/resources/data/target/loot_modifiers/common_chest.json b/src/main/resources/data/target/loot_modifiers/common_chest.json index f26345a7d..2079b29ed 100644 --- a/src/main/resources/data/target/loot_modifiers/common_chest.json +++ b/src/main/resources/data/target/loot_modifiers/common_chest.json @@ -6,5 +6,5 @@ "loot_table_id": "minecraft:chests/simple_dungeon" } ], - "lootTable": "target:chests/blueprint_common_chest" + "lootTable": "target:chests/blue_print_common" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_modifiers/common_chest_2.json b/src/main/resources/data/target/loot_modifiers/common_chest_2.json index 98da97a33..f2fb565ee 100644 --- a/src/main/resources/data/target/loot_modifiers/common_chest_2.json +++ b/src/main/resources/data/target/loot_modifiers/common_chest_2.json @@ -6,5 +6,5 @@ "loot_table_id": "minecraft:chests/abandoned_mineshaft" } ], - "lootTable": "target:chests/blueprint_common_chest" + "lootTable": "target:chests/blue_print_common" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_modifiers/common_chest_3.json b/src/main/resources/data/target/loot_modifiers/common_chest_3.json index 27b40f68f..e1f57aa85 100644 --- a/src/main/resources/data/target/loot_modifiers/common_chest_3.json +++ b/src/main/resources/data/target/loot_modifiers/common_chest_3.json @@ -6,5 +6,5 @@ "loot_table_id": "minecraft:chests/shipwreck_map" } ], - "lootTable": "target:chests/blueprint_common_chest" + "lootTable": "target:chests/blue_print_common" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_modifiers/common_chest_4.json b/src/main/resources/data/target/loot_modifiers/common_chest_4.json index 72a48dc40..2360d126d 100644 --- a/src/main/resources/data/target/loot_modifiers/common_chest_4.json +++ b/src/main/resources/data/target/loot_modifiers/common_chest_4.json @@ -6,5 +6,5 @@ "loot_table_id": "minecraft:chests/shipwreck_supply" } ], - "lootTable": "target:chests/blueprint_common_chest" + "lootTable": "target:chests/blue_print_common" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_modifiers/common_chest_5.json b/src/main/resources/data/target/loot_modifiers/common_chest_5.json index 73ff266c3..307c3e53b 100644 --- a/src/main/resources/data/target/loot_modifiers/common_chest_5.json +++ b/src/main/resources/data/target/loot_modifiers/common_chest_5.json @@ -6,5 +6,5 @@ "loot_table_id": "minecraft:chests/shipwreck_treasure" } ], - "lootTable": "target:chests/blueprint_common_chest" + "lootTable": "target:chests/blue_print_common" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_modifiers/common_chest_6.json b/src/main/resources/data/target/loot_modifiers/common_chest_6.json index 9dd487a14..238ede415 100644 --- a/src/main/resources/data/target/loot_modifiers/common_chest_6.json +++ b/src/main/resources/data/target/loot_modifiers/common_chest_6.json @@ -6,5 +6,5 @@ "loot_table_id": "minecraft:chests/ruined_portal" } ], - "lootTable": "target:chests/blueprint_common_chest" + "lootTable": "target:chests/blue_print_common" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_modifiers/epic_chest.json b/src/main/resources/data/target/loot_modifiers/epic_chest.json index cb0c583f5..901ce9fd6 100644 --- a/src/main/resources/data/target/loot_modifiers/epic_chest.json +++ b/src/main/resources/data/target/loot_modifiers/epic_chest.json @@ -6,5 +6,5 @@ "loot_table_id": "minecraft:chests/pillager_outpost" } ], - "lootTable": "target:blue_print_epic" + "lootTable": "target:chests/blue_print_epic" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_modifiers/epic_chest_2.json b/src/main/resources/data/target/loot_modifiers/epic_chest_2.json index 259d34ece..17d216942 100644 --- a/src/main/resources/data/target/loot_modifiers/epic_chest_2.json +++ b/src/main/resources/data/target/loot_modifiers/epic_chest_2.json @@ -6,5 +6,5 @@ "loot_table_id": "minecraft:chests/stronghold_library" } ], - "lootTable": "target:blue_print_epic" + "lootTable": "target:chests/blue_print_epic" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_modifiers/epic_chest_3.json b/src/main/resources/data/target/loot_modifiers/epic_chest_3.json index 82a807a62..836c69850 100644 --- a/src/main/resources/data/target/loot_modifiers/epic_chest_3.json +++ b/src/main/resources/data/target/loot_modifiers/epic_chest_3.json @@ -6,5 +6,5 @@ "loot_table_id": "minecraft:chests/woodland_mansion" } ], - "lootTable": "target:blue_print_epic" + "lootTable": "target:chests/blue_print_epic" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_modifiers/epic_chest_4.json b/src/main/resources/data/target/loot_modifiers/epic_chest_4.json index 4ed9e59d6..55cee1209 100644 --- a/src/main/resources/data/target/loot_modifiers/epic_chest_4.json +++ b/src/main/resources/data/target/loot_modifiers/epic_chest_4.json @@ -6,5 +6,5 @@ "loot_table_id": "minecraft:chests/end_city_treasure" } ], - "lootTable": "target:blue_print_epic" + "lootTable": "target:chests/blue_print_epic" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_modifiers/rare_chest.json b/src/main/resources/data/target/loot_modifiers/rare_chest.json index 3b3e18bb8..0594286ed 100644 --- a/src/main/resources/data/target/loot_modifiers/rare_chest.json +++ b/src/main/resources/data/target/loot_modifiers/rare_chest.json @@ -6,5 +6,5 @@ "loot_table_id": "minecraft:chests/ancient_city" } ], - "lootTable": "target:blue_print_rare" + "lootTable": "target:chests/blue_print_rare" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_modifiers/rare_chest_10.json b/src/main/resources/data/target/loot_modifiers/rare_chest_10.json index 753355012..30f042eff 100644 --- a/src/main/resources/data/target/loot_modifiers/rare_chest_10.json +++ b/src/main/resources/data/target/loot_modifiers/rare_chest_10.json @@ -6,5 +6,5 @@ "loot_table_id": "minecraft:chests/jungle_temple_dispenser" } ], - "lootTable": "target:blue_print_rare" + "lootTable": "target:chests/blue_print_rare" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_modifiers/rare_chest_2.json b/src/main/resources/data/target/loot_modifiers/rare_chest_2.json index b0c08bbe1..553b652b7 100644 --- a/src/main/resources/data/target/loot_modifiers/rare_chest_2.json +++ b/src/main/resources/data/target/loot_modifiers/rare_chest_2.json @@ -6,5 +6,5 @@ "loot_table_id": "minecraft:chests/ancient_city_ice_box" } ], - "lootTable": "target:blue_print_rare" + "lootTable": "target:chests/blue_print_rare" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_modifiers/rare_chest_3.json b/src/main/resources/data/target/loot_modifiers/rare_chest_3.json index 37890149b..8b6e36c83 100644 --- a/src/main/resources/data/target/loot_modifiers/rare_chest_3.json +++ b/src/main/resources/data/target/loot_modifiers/rare_chest_3.json @@ -6,5 +6,5 @@ "loot_table_id": "minecraft:chests/bastion_bridge" } ], - "lootTable": "target:blue_print_rare" + "lootTable": "target:chests/blue_print_rare" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_modifiers/rare_chest_4.json b/src/main/resources/data/target/loot_modifiers/rare_chest_4.json index 4f13d758c..f4086361e 100644 --- a/src/main/resources/data/target/loot_modifiers/rare_chest_4.json +++ b/src/main/resources/data/target/loot_modifiers/rare_chest_4.json @@ -6,5 +6,5 @@ "loot_table_id": "minecraft:chests/bastion_hoglin_stable" } ], - "lootTable": "target:blue_print_rare" + "lootTable": "target:chests/blue_print_rare" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_modifiers/rare_chest_5.json b/src/main/resources/data/target/loot_modifiers/rare_chest_5.json index 20851654e..d6c800b3a 100644 --- a/src/main/resources/data/target/loot_modifiers/rare_chest_5.json +++ b/src/main/resources/data/target/loot_modifiers/rare_chest_5.json @@ -6,5 +6,5 @@ "loot_table_id": "minecraft:chests/bastion_other" } ], - "lootTable": "target:blue_print_rare" + "lootTable": "target:chests/blue_print_rare" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_modifiers/rare_chest_6.json b/src/main/resources/data/target/loot_modifiers/rare_chest_6.json index 2cd752b96..15f6c726d 100644 --- a/src/main/resources/data/target/loot_modifiers/rare_chest_6.json +++ b/src/main/resources/data/target/loot_modifiers/rare_chest_6.json @@ -6,5 +6,5 @@ "loot_table_id": "minecraft:chests/buried_treasure" } ], - "lootTable": "target:blue_print_rare" + "lootTable": "target:chests/blue_print_rare" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_modifiers/rare_chest_7.json b/src/main/resources/data/target/loot_modifiers/rare_chest_7.json index 6763bd00f..4444780d0 100644 --- a/src/main/resources/data/target/loot_modifiers/rare_chest_7.json +++ b/src/main/resources/data/target/loot_modifiers/rare_chest_7.json @@ -6,5 +6,5 @@ "loot_table_id": "minecraft:chests/desert_pyramid" } ], - "lootTable": "target:blue_print_rare" + "lootTable": "target:chests/blue_print_rare" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_modifiers/rare_chest_8.json b/src/main/resources/data/target/loot_modifiers/rare_chest_8.json index a34c6c06c..55189d8ad 100644 --- a/src/main/resources/data/target/loot_modifiers/rare_chest_8.json +++ b/src/main/resources/data/target/loot_modifiers/rare_chest_8.json @@ -6,5 +6,5 @@ "loot_table_id": "minecraft:chests/igloo" } ], - "lootTable": "target:blue_print_rare" + "lootTable": "target:chests/blue_print_rare" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_modifiers/rare_chest_9.json b/src/main/resources/data/target/loot_modifiers/rare_chest_9.json index eeba80c41..eefd6c034 100644 --- a/src/main/resources/data/target/loot_modifiers/rare_chest_9.json +++ b/src/main/resources/data/target/loot_modifiers/rare_chest_9.json @@ -6,5 +6,5 @@ "loot_table_id": "minecraft:chests/jungle_temple" } ], - "lootTable": "target:blue_print_rare" + "lootTable": "target:chests/blue_print_rare" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_tables/chests/blueprint_common_chest.json b/src/main/resources/data/target/loot_tables/chests/blue_print_common.json similarity index 67% rename from src/main/resources/data/target/loot_tables/chests/blueprint_common_chest.json rename to src/main/resources/data/target/loot_tables/chests/blue_print_common.json index 95f9a3dc6..d879c077d 100644 --- a/src/main/resources/data/target/loot_tables/chests/blueprint_common_chest.json +++ b/src/main/resources/data/target/loot_tables/chests/blue_print_common.json @@ -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" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_tables/blue_print_rare.json b/src/main/resources/data/target/loot_tables/chests/blue_print_epic.json similarity index 70% rename from src/main/resources/data/target/loot_tables/blue_print_rare.json rename to src/main/resources/data/target/loot_tables/chests/blue_print_epic.json index 69fcba22b..840b74df0 100644 --- a/src/main/resources/data/target/loot_tables/blue_print_rare.json +++ b/src/main/resources/data/target/loot_tables/chests/blue_print_epic.json @@ -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" } \ No newline at end of file diff --git a/src/main/resources/data/target/loot_tables/blue_print_epic.json b/src/main/resources/data/target/loot_tables/chests/blue_print_rare.json similarity index 56% rename from src/main/resources/data/target/loot_tables/blue_print_epic.json rename to src/main/resources/data/target/loot_tables/chests/blue_print_rare.json index 4b06405f1..a9eab2e31 100644 --- a/src/main/resources/data/target/loot_tables/blue_print_epic.json +++ b/src/main/resources/data/target/loot_tables/chests/blue_print_rare.json @@ -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,49 +259,7 @@ { "type": "minecraft:item", "name": "target:sentinel_blueprint", - "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, + "weight": 5, "functions": [ { "function": "set_count", @@ -229,7 +271,124 @@ ] } ] + }, + { + "rolls": 2, + "entries": [ + { + "type": "minecraft:item", + "name": "target:handgun_ammo", + "weight": 12, + "functions": [ + { + "function": "set_count", + "count": { + "min": 8, + "max": 20 + } + } + ] + }, + { + "type": "minecraft:item", + "name": "target:rifle_ammo", + "weight": 20, + "functions": [ + { + "function": "set_count", + "count": { + "min": 8, + "max": 16 + } + } + ] + }, + { + "type": "minecraft:item", + "name": "target:sniper_ammo", + "weight": 10, + "functions": [ + { + "function": "set_count", + "count": { + "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 + } + } + ] + } + ] } ], - "random_sequence": "target:blue_print_epic" + "random_sequence": "target:chests/blue_print_rare" } \ No newline at end of file diff --git a/src/main/resources/data/target/recipes/marlin_smithing.json b/src/main/resources/data/target/recipes/marlin_smithing.json index 31115d011..5f08c883c 100644 --- a/src/main/resources/data/target/recipes/marlin_smithing.json +++ b/src/main/resources/data/target/recipes/marlin_smithing.json @@ -7,7 +7,7 @@ "item": "target:rare_material_pack" }, "addition": { - "item": "target:ingot_steel" + "tag": "minecraft:logs" }, "result": { "item": "target:marlin" diff --git a/src/main/resources/data/target/recipes/mortar_he_shells.json b/src/main/resources/data/target/recipes/mortar_he_shells.json index 39ab1e225..de6fefa0a 100644 --- a/src/main/resources/data/target/recipes/mortar_he_shells.json +++ b/src/main/resources/data/target/recipes/mortar_he_shells.json @@ -22,6 +22,6 @@ }, "result": { "item": "target:mortar_shells", - "count": 1 + "count": 2 } } \ No newline at end of file diff --git a/src/main/resources/data/target/recipes/sks_smithing.json b/src/main/resources/data/target/recipes/sks_smithing.json index cab1b51ac..9e617697f 100644 --- a/src/main/resources/data/target/recipes/sks_smithing.json +++ b/src/main/resources/data/target/recipes/sks_smithing.json @@ -7,7 +7,7 @@ "item": "target:rare_material_pack" }, "addition": { - "item": "target:ingot_steel" + "tag": "minecraft:logs" }, "result": { "item": "target:sks"