From 569b671c79f8bf78fb216759b869b67dcbce73b1 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Thu, 12 Sep 2024 21:53:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=93=B6=E7=9F=BF=E5=92=8C?= =?UTF-8?q?=E6=A8=A1=E7=BB=84=E9=85=8D=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2e07f3c482445536d45c00e6abf223465c01c841 | 20 ++++--- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 5 +- .../aea51f45d35dbbd3220b84682ce1417a457a0246 | 6 +-- .../b69ee8a2655365569b979911c0440daa8c470ac2 | 4 +- .../f93f628a3b0902e77de76541bcff68d1e5e3578f | 11 +++- .../blockstates/deepslate_silver_ore.json | 7 +++ .../blockstates/silver_block.json | 7 +++ .../superbwarfare/blockstates/silver_ore.json | 7 +++ .../models/block/deepslate_silver_ore.json | 6 +++ .../models/block/silver_block.json | 6 +++ .../models/block/silver_ore.json | 6 +++ .../models/item/deepslate_silver_ore.json | 3 ++ .../superbwarfare/models/item/raw_silver.json | 6 +++ .../models/item/silver_block.json | 3 ++ .../models/item/silver_ingot.json | 6 +++ .../superbwarfare/models/item/silver_ore.json | 3 ++ .../data/forge/tags/items/ingots.json | 3 +- .../data/forge/tags/items/ingots/silver.json | 5 ++ .../forge/tags/items/ore_rates/singular.json | 4 +- .../resources/data/forge/tags/items/ores.json | 3 +- .../data/forge/tags/items/ores/silver.json | 6 +++ .../tags/items/ores_in_ground/deepslate.json | 5 +- .../tags/items/ores_in_ground/stone.json | 5 +- .../data/forge/tags/items/raw_materials.json | 3 +- .../tags/items/raw_materials/silver.json | 5 ++ .../data/forge/tags/items/storage_blocks.json | 3 +- .../tags/items/storage_blocks/silver.json | 5 ++ .../tags/blocks/mineable/pickaxe.json | 5 +- .../tags/blocks/needs_iron_tool.json | 4 +- .../blocks/deepslate_silver_ore.json | 50 ++++++++++++++++++ .../loot_tables/blocks/silver_block.json | 21 ++++++++ .../loot_tables/blocks/silver_ore.json | 50 ++++++++++++++++++ .../block/DeepslateSilverOreBlock.java | 11 ++++ .../superbwarfare/block/SilverBlock.java | 11 ++++ .../superbwarfare/block/SilverOreBlock.java | 11 ++++ .../datagen/ModBlockLootProvider.java | 3 ++ .../datagen/ModBlockStateProvider.java | 3 ++ .../datagen/ModBlockTagProvider.java | 5 +- .../datagen/ModItemModelProvider.java | 2 + .../datagen/ModItemTagProvider.java | 19 ++++--- .../superbwarfare/entity/Mle1934Entity.java | 1 - .../superbwarfare/entity/MortarEntity.java | 11 ++++ .../superbwarfare/entity/TargetEntity.java | 9 ---- .../superbwarfare/init/ModBlocks.java | 3 ++ .../mcreator/superbwarfare/init/ModItems.java | 5 ++ .../assets/superbwarfare/lang/en_us.json | 5 ++ .../assets/superbwarfare/lang/zh_cn.json | 6 ++- .../textures/block/deepslate_silver_ore.png | Bin 0 -> 684 bytes .../textures/block/silver_block.png | Bin 0 -> 590 bytes .../textures/block/silver_ore.png | Bin 0 -> 590 bytes .../textures/item/raw_silver.png | Bin 0 -> 400 bytes .../textures/item/silver_ingot.png | Bin 0 -> 436 bytes .../deepslate_silver_ore_biome_modifier.json | 6 +++ .../silver_ore_biome_modifier.json | 6 +++ .../recipes/perk/ap_bullet_perk_crafting.json | 24 +++++++++ .../perk/longer_wire_perk_crafting.json | 21 ++++++++ .../perk/poisonous_bullet_perk_crafting.json | 24 +++++++++ .../perk/silver_bullet_perk_crafting.json | 24 +++++++++ .../perk/super_recharge_perk_crafting.json | 27 ++++++++++ .../perk/volt_overload_perk_crafting.json | 30 +++++++++++ .../recipes/silver_block_crafting.json | 21 ++++++++ .../recipes/silver_ingot_blasting.json | 10 ++++ .../recipes/silver_ingot_crafting.json | 13 +++++ .../recipes/silver_ingot_smelting.json | 10 ++++ .../deepslate_silver_ore.json | 18 +++++++ .../configured_feature/silver_ore.json | 18 +++++++ .../placed_feature/deepslate_galena_ore.json | 2 +- .../deepslate_scheelite_ore.json | 2 +- .../placed_feature/deepslate_silver_ore.json | 27 ++++++++++ .../worldgen/placed_feature/galena_ore.json | 2 +- .../placed_feature/scheelite_ore.json | 2 +- .../worldgen/placed_feature/silver_ore.json | 27 ++++++++++ 72 files changed, 653 insertions(+), 49 deletions(-) create mode 100644 src/generated/resources/assets/superbwarfare/blockstates/deepslate_silver_ore.json create mode 100644 src/generated/resources/assets/superbwarfare/blockstates/silver_block.json create mode 100644 src/generated/resources/assets/superbwarfare/blockstates/silver_ore.json create mode 100644 src/generated/resources/assets/superbwarfare/models/block/deepslate_silver_ore.json create mode 100644 src/generated/resources/assets/superbwarfare/models/block/silver_block.json create mode 100644 src/generated/resources/assets/superbwarfare/models/block/silver_ore.json create mode 100644 src/generated/resources/assets/superbwarfare/models/item/deepslate_silver_ore.json create mode 100644 src/generated/resources/assets/superbwarfare/models/item/raw_silver.json create mode 100644 src/generated/resources/assets/superbwarfare/models/item/silver_block.json create mode 100644 src/generated/resources/assets/superbwarfare/models/item/silver_ingot.json create mode 100644 src/generated/resources/assets/superbwarfare/models/item/silver_ore.json create mode 100644 src/generated/resources/data/forge/tags/items/ingots/silver.json create mode 100644 src/generated/resources/data/forge/tags/items/ores/silver.json create mode 100644 src/generated/resources/data/forge/tags/items/raw_materials/silver.json create mode 100644 src/generated/resources/data/forge/tags/items/storage_blocks/silver.json create mode 100644 src/generated/resources/data/superbwarfare/loot_tables/blocks/deepslate_silver_ore.json create mode 100644 src/generated/resources/data/superbwarfare/loot_tables/blocks/silver_block.json create mode 100644 src/generated/resources/data/superbwarfare/loot_tables/blocks/silver_ore.json create mode 100644 src/main/java/net/mcreator/superbwarfare/block/DeepslateSilverOreBlock.java create mode 100644 src/main/java/net/mcreator/superbwarfare/block/SilverBlock.java create mode 100644 src/main/java/net/mcreator/superbwarfare/block/SilverOreBlock.java create mode 100644 src/main/resources/assets/superbwarfare/textures/block/deepslate_silver_ore.png create mode 100644 src/main/resources/assets/superbwarfare/textures/block/silver_block.png create mode 100644 src/main/resources/assets/superbwarfare/textures/block/silver_ore.png create mode 100644 src/main/resources/assets/superbwarfare/textures/item/raw_silver.png create mode 100644 src/main/resources/assets/superbwarfare/textures/item/silver_ingot.png create mode 100644 src/main/resources/data/superbwarfare/forge/biome_modifier/deepslate_silver_ore_biome_modifier.json create mode 100644 src/main/resources/data/superbwarfare/forge/biome_modifier/silver_ore_biome_modifier.json create mode 100644 src/main/resources/data/superbwarfare/recipes/perk/ap_bullet_perk_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/perk/longer_wire_perk_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/perk/poisonous_bullet_perk_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/perk/silver_bullet_perk_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/perk/super_recharge_perk_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/perk/volt_overload_perk_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/silver_block_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/silver_ingot_blasting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/silver_ingot_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/silver_ingot_smelting.json create mode 100644 src/main/resources/data/superbwarfare/worldgen/configured_feature/deepslate_silver_ore.json create mode 100644 src/main/resources/data/superbwarfare/worldgen/configured_feature/silver_ore.json create mode 100644 src/main/resources/data/superbwarfare/worldgen/placed_feature/deepslate_silver_ore.json create mode 100644 src/main/resources/data/superbwarfare/worldgen/placed_feature/silver_ore.json diff --git a/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 index 3bc914030..72da28381 100644 --- a/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 +++ b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 @@ -1,25 +1,29 @@ -// 1.20.1 2024-09-11T15:45:39.7049414 Tags for minecraft:item mod id superbwarfare +// 1.20.1 2024-09-12T20:35:10.8102487 Tags for minecraft:item mod id superbwarfare cf8d49a8d2872286d1a9c3d4a7e1c2b7690db0b8 data/forge/tags/items/dusts.json 0fa06c2ff83bf09797e3ddff90f62d1124e645b4 data/forge/tags/items/dusts/coal_coke.json 295ddf906b7133a0558d03e9a60eea18281fe430 data/forge/tags/items/dusts/iron.json 5ed781a6ce735a9a6555bd1dcc43300c64c2bad0 data/forge/tags/items/dusts/tungsten.json -62b09995c95ece651f234e4a5894d79530c6aa43 data/forge/tags/items/ingots.json +8090ca42d38b4db1ad444641b49b8bae77cbd5ce data/forge/tags/items/ingots.json 6a3ef6343dbc199446979cb92e7421483025b9e0 data/forge/tags/items/ingots/lead.json +b870c0a22be2fdb67b8f4eac9a429a009fd47c10 data/forge/tags/items/ingots/silver.json a31040302a0327e638bbc8cc2dda514e56934f16 data/forge/tags/items/ingots/steel.json 534d88c2973775b785ad048f16cde5121f256acc data/forge/tags/items/ingots/tungsten.json -730bd68337bc56b3d3bbb6c77b97df65c4431c0e data/forge/tags/items/ores.json +de439a73e17071f118f37d948be6768fd4b237fd data/forge/tags/items/ores.json af38bb7460b2d1c0b07f5ac3a4cb1af53a41a456 data/forge/tags/items/ores/lead.json +6b4ec9b667b534e868b5463f06acf89fe114be9a data/forge/tags/items/ores/silver.json 65265b2e95bae5071f132b1aa92d3c90fd8199d8 data/forge/tags/items/ores/tungsten.json -d2d41bac2abe34f201a25dbcf4d4e05e86575b21 data/forge/tags/items/ores_in_ground/deepslate.json -14104824ea79d3ae82663f5066f571b1425469a3 data/forge/tags/items/ores_in_ground/stone.json -acced7f04d0125f1e53cf67a9c3f5f4a35889ee9 data/forge/tags/items/ore_rates/singular.json +91ca1b4d467e94a2f407f7465b3cadade7ff661b data/forge/tags/items/ores_in_ground/deepslate.json +2227e4cdbfc8a9c9af4975fa5ed1360146623768 data/forge/tags/items/ores_in_ground/stone.json +7d161c1baae850baa9fc50e89c73f1eeb51a2e47 data/forge/tags/items/ore_rates/singular.json 140a8470d41a4fe0bb7c9e121a94d926fb6117b1 data/forge/tags/items/plates.json 51189baa4881d4137d853012976d10cc44f3092e data/forge/tags/items/plates/copper.json -b6b0065ecbe36917b777ad86d467ef62dec9d82e data/forge/tags/items/raw_materials.json +6b9abe5e1a7307e68849ab1ddcfe77e145e80cbf data/forge/tags/items/raw_materials.json 08cf183386837d6d22b7ee1315758e479adf82d8 data/forge/tags/items/raw_materials/lead.json +5aa8ba2e6cba7b4c8b34115d4f9528522b71a549 data/forge/tags/items/raw_materials/silver.json 01d117b3c36039399a63c89f32ee0cc0abfee66a data/forge/tags/items/raw_materials/tungsten.json -e3d277bdb108231d7e5c0cb2bf5dfe90beba9beb data/forge/tags/items/storage_blocks.json +1a9ff319ed4af1df0283c5be2f75ab4563eb9363 data/forge/tags/items/storage_blocks.json af6fd64b4a685c353f243763db268f7b2304c009 data/forge/tags/items/storage_blocks/lead.json +30d1daa7590f7364b5bc2dc777a00caf2f5eecb0 data/forge/tags/items/storage_blocks/silver.json 3743c2790deca7e779d3e4b82f092de39b446988 data/forge/tags/items/storage_blocks/steel.json 144e54d908121dee498b2ebba3b24b09fd6f18d9 data/forge/tags/items/storage_blocks/tungsten.json 99a5a3a4bb6b5fb641dcd449937365ea174f3797 data/superbwarfare/tags/items/gun.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index c16d50508..70f6aec56 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,8 +1,9 @@ -// 1.20.1 2024-09-11T15:45:39.7059384 Loot Tables +// 1.20.1 2024-09-12T20:35:10.8112459 Loot Tables 98386b2e65b2afb7cf5b0cabf6a7b0f062c1e640 data/superbwarfare/loot_tables/blocks/barbed_wire.json 811e69929a14e6736015849c220100bb58d914c9 data/superbwarfare/loot_tables/blocks/cemented_carbide_block.json dabbe17417c944567dc6dfcdcba32b8377c24f69 data/superbwarfare/loot_tables/blocks/deepslate_galena_ore.json a7c1af3e194d35a64544902468bd964f45f2f9ef data/superbwarfare/loot_tables/blocks/deepslate_scheelite_ore.json +76fa64ff714374c1655f4d11776fda132287a014 data/superbwarfare/loot_tables/blocks/deepslate_silver_ore.json e80a153391c34dbca9130a140e6401242e3add4c data/superbwarfare/loot_tables/blocks/dragon_teeth.json cdd4acb439988069ca04920cb3905f01b7257362 data/superbwarfare/loot_tables/blocks/galena_ore.json 188ee13e38134e87d07ded14b35c60b488db9ef8 data/superbwarfare/loot_tables/blocks/jump_pad.json @@ -10,5 +11,7 @@ cdd4acb439988069ca04920cb3905f01b7257362 data/superbwarfare/loot_tables/blocks/g 8216c47bb150112820b066eb1edbec51c7e61251 data/superbwarfare/loot_tables/blocks/reforging_table.json 8ae2495a0843798bc13e0d3ca4c010f88a44c7a6 data/superbwarfare/loot_tables/blocks/sandbag.json bce3fc7a50ba51c24ad3a37d2534a7db9cf0db73 data/superbwarfare/loot_tables/blocks/scheelite_ore.json +a223f61202cf9937e8be5b90791925bba09d17b9 data/superbwarfare/loot_tables/blocks/silver_block.json +015f852f7abbf1ecf2d730a61537b4e58b3e17bd data/superbwarfare/loot_tables/blocks/silver_ore.json 83112ebff477e322bd3d23ed4653c7c02b230473 data/superbwarfare/loot_tables/blocks/steel_block.json 71fc892124b5343e10688cabc2fb7c87d83cfef8 data/superbwarfare/loot_tables/blocks/tungsten_block.json diff --git a/src/generated/resources/.cache/aea51f45d35dbbd3220b84682ce1417a457a0246 b/src/generated/resources/.cache/aea51f45d35dbbd3220b84682ce1417a457a0246 index d11b90258..64112e08f 100644 --- a/src/generated/resources/.cache/aea51f45d35dbbd3220b84682ce1417a457a0246 +++ b/src/generated/resources/.cache/aea51f45d35dbbd3220b84682ce1417a457a0246 @@ -1,5 +1,5 @@ -// 1.20.1 2024-09-11T15:45:39.7039453 Tags for minecraft:block mod id superbwarfare +// 1.20.1 2024-09-12T20:35:10.8092525 Tags for minecraft:block mod id superbwarfare 0acfd31854bf15f2c108138b3df7206bd2593e6b data/minecraft/tags/blocks/mineable/axe.json -7d85f8bc9cb66e8997028539021d3a5714b0770d data/minecraft/tags/blocks/mineable/pickaxe.json +70caf9aa5b649b75f0860d9383b55a169f764617 data/minecraft/tags/blocks/mineable/pickaxe.json 3da7f021790388a122717f16f51c7ec5232eebcb data/minecraft/tags/blocks/mineable/shovel.json -a2e985f17413ab603aa0cb47cc17c32a483636ca data/minecraft/tags/blocks/needs_iron_tool.json +f42a8c01336e64b74da966f03d45ee0d60ac5d6b data/minecraft/tags/blocks/needs_iron_tool.json diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index ecb964ddc..7da240cd5 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,4 +1,4 @@ -// 1.20.1 2024-09-09T22:03:46.3738464 Item Models: superbwarfare +// 1.20.1 2024-09-12T20:50:19.5912832 Item Models: superbwarfare 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_47_blueprint.json c993bddc0db9453ffbefa59f9ac9a74dba909038 assets/superbwarfare/models/item/ancient_cpu.json @@ -65,12 +65,14 @@ f5b4fc1445373e6acfaa077e109de693c624eb1e assets/superbwarfare/models/item/nether 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/qbz_95_blueprint.json e821640d80c55763e7e7b62f7b80c60ff56dcc4f assets/superbwarfare/models/item/rare_material_pack.json ce0f0949b0545d8ef08aeaa52dd423dbe592f704 assets/superbwarfare/models/item/raw_cemented_carbide_powder.json +59cbca463403cfc50d964229268638c55dd915fb assets/superbwarfare/models/item/raw_silver.json 5b8f7d5922e49e06bcd4d4d2a2a3dc934548570b assets/superbwarfare/models/item/reforging_table.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/rpg_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/rpk_blueprint.json ce2232fbc6a9186371c6ae6745ec3be2a0a33546 assets/superbwarfare/models/item/scheelite.json c010baff106b3307ec585df4757f7c3d756e9794 assets/superbwarfare/models/item/seeker.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/sentinel_blueprint.json +129239c26d14526d65764dc10ef99864c9ef7fff assets/superbwarfare/models/item/silver_ingot.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/sks_blueprint.json 93a18630b8c0a5aab1f0202f42b8bd5ee7153c38 assets/superbwarfare/models/item/steel_action.json 321bafbe4487eda1a6ca82eec647eabc3230a4e3 assets/superbwarfare/models/item/steel_barrel.json diff --git a/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f b/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f index 3ef41d4d0..3b8d89e71 100644 --- a/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f +++ b/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f @@ -1,28 +1,37 @@ -// 1.20.1 2024-09-11T15:45:39.7059384 Block States: superbwarfare +// 1.20.1 2024-09-12T20:35:10.8102487 Block States: superbwarfare f3b778ca36ca78c3d80f1b778078897f59bdb0c5 assets/superbwarfare/blockstates/barbed_wire.json 0cfad4f53a8047c402edf978d0c8cf6269f063cb assets/superbwarfare/blockstates/cemented_carbide_block.json 62fb0464ca59ac21693639c406e08730427d87b3 assets/superbwarfare/blockstates/deepslate_galena_ore.json b8b7cdea6c8626c74d652d0b300b3afe19c60674 assets/superbwarfare/blockstates/deepslate_scheelite_ore.json +2b24b703de4821bebe71ba53043e6a1a23d71c17 assets/superbwarfare/blockstates/deepslate_silver_ore.json d8a6ec32752f10b1f363f6c78ed2da6dc895d545 assets/superbwarfare/blockstates/galena_ore.json 37d592516f2b685940e46f7d5c524407a200eeac assets/superbwarfare/blockstates/jump_pad.json 3b464a0684d05c28c8485f764c7ad7e86ae48c06 assets/superbwarfare/blockstates/lead_block.json d765539a643378e4f8ce56dc42bcff579d666e8a assets/superbwarfare/blockstates/reforging_table.json 123574c25d10de6d915514af34f0a878c93a07ea assets/superbwarfare/blockstates/scheelite_ore.json +0ea636a9080f56b6cda500a6943e17c7b5443878 assets/superbwarfare/blockstates/silver_block.json +cf801445ce7cec678d5e811b5985506472e6ba4c assets/superbwarfare/blockstates/silver_ore.json a175c908c9aabee3a073844cd58ec9dfe6498bf0 assets/superbwarfare/blockstates/steel_block.json d4bbef5040ef43c362b28ea12ea73fb4a3db9adc assets/superbwarfare/blockstates/tungsten_block.json 5f1c22b64ff3ca4db9987f91a7179c9e705c7601 assets/superbwarfare/models/block/cemented_carbide_block.json 0fe4613a4446ac485eee58bed6d0d8f5b38f6253 assets/superbwarfare/models/block/deepslate_galena_ore.json 84f584f684519f686e976b994f0a2639a98a7851 assets/superbwarfare/models/block/deepslate_scheelite_ore.json +46e93d376cca21d78816459ac3fe63510dda8ca8 assets/superbwarfare/models/block/deepslate_silver_ore.json e9bea7028029623e5dc9d8b0eead6add93c36931 assets/superbwarfare/models/block/galena_ore.json 2909ad43b32b377f3b404d30a4b9d226ef63df7a assets/superbwarfare/models/block/lead_block.json 15dcf7724846b0e19f826f6d7e9241ac81ef5969 assets/superbwarfare/models/block/scheelite_ore.json +455a1b32d0f5bfabc0db86c818b8e0a55a19e5f5 assets/superbwarfare/models/block/silver_block.json +f6e316518c0718e0feb6f81d7d86b3d2fdfaa3b0 assets/superbwarfare/models/block/silver_ore.json ad3ee9a1e2c9302c8dfdecd28091693fca0bcff8 assets/superbwarfare/models/block/steel_block.json b5310729f19d8d9f7090760bbdc1b629ab2b4262 assets/superbwarfare/models/block/tungsten_block.json fe85ea7492fe2006dbb0027914f3688a43c2d2c9 assets/superbwarfare/models/item/cemented_carbide_block.json 321d7f61b596ac9a8b3633f8d1bc3351b7b12c5a assets/superbwarfare/models/item/deepslate_galena_ore.json c83798987b4d4eeadd96357cd12fdfd5d44b2952 assets/superbwarfare/models/item/deepslate_scheelite_ore.json +9b3b9d06b399aeaff5fadf4ede15a03cac92d84b assets/superbwarfare/models/item/deepslate_silver_ore.json dab3d5800ad52100d0af25033d0aed1b5214db46 assets/superbwarfare/models/item/galena_ore.json c776ee36ee2ff9e749aa8e059144b81f480815da assets/superbwarfare/models/item/lead_block.json fe6f5b256dc4f8a16fbc5b42028a5d73300c3cd5 assets/superbwarfare/models/item/scheelite_ore.json +3deaec0a1765587cbb524ed79f3726a7dc11b51e assets/superbwarfare/models/item/silver_block.json +39bd64c9ec437d2a285072adaf0f2f3b4108be6e assets/superbwarfare/models/item/silver_ore.json ba87901d2fc411307812b6d146b166722a469311 assets/superbwarfare/models/item/steel_block.json f93890672b260004a53b1d0a5d9f435346eba1fd assets/superbwarfare/models/item/tungsten_block.json diff --git a/src/generated/resources/assets/superbwarfare/blockstates/deepslate_silver_ore.json b/src/generated/resources/assets/superbwarfare/blockstates/deepslate_silver_ore.json new file mode 100644 index 000000000..d17a78dcc --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/blockstates/deepslate_silver_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "superbwarfare:block/deepslate_silver_ore" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/blockstates/silver_block.json b/src/generated/resources/assets/superbwarfare/blockstates/silver_block.json new file mode 100644 index 000000000..7aa60cac6 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/blockstates/silver_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "superbwarfare:block/silver_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/blockstates/silver_ore.json b/src/generated/resources/assets/superbwarfare/blockstates/silver_ore.json new file mode 100644 index 000000000..25554dae5 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/blockstates/silver_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "superbwarfare:block/silver_ore" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/block/deepslate_silver_ore.json b/src/generated/resources/assets/superbwarfare/models/block/deepslate_silver_ore.json new file mode 100644 index 000000000..c33c59408 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/block/deepslate_silver_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "superbwarfare:block/deepslate_silver_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/block/silver_block.json b/src/generated/resources/assets/superbwarfare/models/block/silver_block.json new file mode 100644 index 000000000..a5a81ce39 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/block/silver_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "superbwarfare:block/silver_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/block/silver_ore.json b/src/generated/resources/assets/superbwarfare/models/block/silver_ore.json new file mode 100644 index 000000000..91c1860fd --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/block/silver_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "superbwarfare:block/silver_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/deepslate_silver_ore.json b/src/generated/resources/assets/superbwarfare/models/item/deepslate_silver_ore.json new file mode 100644 index 000000000..32ff74572 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/deepslate_silver_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "superbwarfare:block/deepslate_silver_ore" +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/raw_silver.json b/src/generated/resources/assets/superbwarfare/models/item/raw_silver.json new file mode 100644 index 000000000..23cd207d3 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/raw_silver.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "superbwarfare:item/raw_silver" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/silver_block.json b/src/generated/resources/assets/superbwarfare/models/item/silver_block.json new file mode 100644 index 000000000..a7bc08d20 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/silver_block.json @@ -0,0 +1,3 @@ +{ + "parent": "superbwarfare:block/silver_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/silver_ingot.json b/src/generated/resources/assets/superbwarfare/models/item/silver_ingot.json new file mode 100644 index 000000000..92925409c --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/silver_ingot.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "superbwarfare:item/silver_ingot" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/silver_ore.json b/src/generated/resources/assets/superbwarfare/models/item/silver_ore.json new file mode 100644 index 000000000..fb8fd1413 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/silver_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "superbwarfare:block/silver_ore" +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots.json b/src/generated/resources/data/forge/tags/items/ingots.json index 0a19ef492..4ed7a194f 100644 --- a/src/generated/resources/data/forge/tags/items/ingots.json +++ b/src/generated/resources/data/forge/tags/items/ingots.json @@ -2,6 +2,7 @@ "values": [ "#forge:ingots/lead", "#forge:ingots/steel", - "#forge:ingots/tungsten" + "#forge:ingots/tungsten", + "#forge:ingots/silver" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots/silver.json b/src/generated/resources/data/forge/tags/items/ingots/silver.json new file mode 100644 index 000000000..e0da7f053 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/silver.json @@ -0,0 +1,5 @@ +{ + "values": [ + "superbwarfare:silver_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ore_rates/singular.json b/src/generated/resources/data/forge/tags/items/ore_rates/singular.json index d501c8fbc..fc3876ad3 100644 --- a/src/generated/resources/data/forge/tags/items/ore_rates/singular.json +++ b/src/generated/resources/data/forge/tags/items/ore_rates/singular.json @@ -3,6 +3,8 @@ "superbwarfare:galena_ore", "superbwarfare:deepslate_galena_ore", "superbwarfare:scheelite_ore", - "superbwarfare:deepslate_scheelite_ore" + "superbwarfare:deepslate_scheelite_ore", + "superbwarfare:silver_ore", + "superbwarfare:deepslate_silver_ore" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores.json b/src/generated/resources/data/forge/tags/items/ores.json index 5138dbfbd..e7e09b8c9 100644 --- a/src/generated/resources/data/forge/tags/items/ores.json +++ b/src/generated/resources/data/forge/tags/items/ores.json @@ -1,6 +1,7 @@ { "values": [ "#forge:ores/lead", - "#forge:ores/tungsten" + "#forge:ores/tungsten", + "#forge:ores/silver" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/silver.json b/src/generated/resources/data/forge/tags/items/ores/silver.json new file mode 100644 index 000000000..1ce3b263a --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/silver.json @@ -0,0 +1,6 @@ +{ + "values": [ + "superbwarfare:silver_ore", + "superbwarfare:deepslate_silver_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores_in_ground/deepslate.json b/src/generated/resources/data/forge/tags/items/ores_in_ground/deepslate.json index 85edde0ca..149565cc8 100644 --- a/src/generated/resources/data/forge/tags/items/ores_in_ground/deepslate.json +++ b/src/generated/resources/data/forge/tags/items/ores_in_ground/deepslate.json @@ -1,6 +1,7 @@ { "values": [ - "superbwarfare:galena_ore", - "superbwarfare:scheelite_ore" + "superbwarfare:deepslate_galena_ore", + "superbwarfare:deepslate_scheelite_ore", + "superbwarfare:deepslate_silver_ore" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores_in_ground/stone.json b/src/generated/resources/data/forge/tags/items/ores_in_ground/stone.json index 2cfc971f0..f47372895 100644 --- a/src/generated/resources/data/forge/tags/items/ores_in_ground/stone.json +++ b/src/generated/resources/data/forge/tags/items/ores_in_ground/stone.json @@ -1,6 +1,7 @@ { "values": [ - "superbwarfare:deepslate_galena_ore", - "superbwarfare:deepslate_scheelite_ore" + "superbwarfare:galena_ore", + "superbwarfare:scheelite_ore", + "superbwarfare:silver_ore" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/raw_materials.json b/src/generated/resources/data/forge/tags/items/raw_materials.json index bd0ef8913..f99c22c73 100644 --- a/src/generated/resources/data/forge/tags/items/raw_materials.json +++ b/src/generated/resources/data/forge/tags/items/raw_materials.json @@ -1,6 +1,7 @@ { "values": [ "#forge:raw_materials/lead", - "#forge:raw_materials/tungsten" + "#forge:raw_materials/tungsten", + "#forge:raw_materials/silver" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/silver.json b/src/generated/resources/data/forge/tags/items/raw_materials/silver.json new file mode 100644 index 000000000..6ae4bdd37 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/raw_materials/silver.json @@ -0,0 +1,5 @@ +{ + "values": [ + "superbwarfare:raw_silver" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks.json b/src/generated/resources/data/forge/tags/items/storage_blocks.json index 1b6d6014e..a5f033999 100644 --- a/src/generated/resources/data/forge/tags/items/storage_blocks.json +++ b/src/generated/resources/data/forge/tags/items/storage_blocks.json @@ -2,6 +2,7 @@ "values": [ "#forge:storage_blocks/lead", "#forge:storage_blocks/steel", - "#forge:storage_blocks/tungsten" + "#forge:storage_blocks/tungsten", + "#forge:storage_blocks/silver" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/silver.json b/src/generated/resources/data/forge/tags/items/storage_blocks/silver.json new file mode 100644 index 000000000..d6c1bef53 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/silver.json @@ -0,0 +1,5 @@ +{ + "values": [ + "superbwarfare:silver_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index fcd8f01d9..85cfffa82 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -9,6 +9,9 @@ "superbwarfare:lead_block", "superbwarfare:steel_block", "superbwarfare:tungsten_block", - "superbwarfare:cemented_carbide_block" + "superbwarfare:cemented_carbide_block", + "superbwarfare:silver_ore", + "superbwarfare:deepslate_silver_ore", + "superbwarfare:silver_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json index 551fc4da3..b01142b0f 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json +++ b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json @@ -4,6 +4,8 @@ "superbwarfare:scheelite_ore", "superbwarfare:deepslate_galena_ore", "superbwarfare:deepslate_scheelite_ore", - "superbwarfare:dragon_teeth" + "superbwarfare:dragon_teeth", + "superbwarfare:silver_ore", + "superbwarfare:deepslate_silver_ore" ] } \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/deepslate_silver_ore.json b/src/generated/resources/data/superbwarfare/loot_tables/blocks/deepslate_silver_ore.json new file mode 100644 index 000000000..04baf6174 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/loot_tables/blocks/deepslate_silver_ore.json @@ -0,0 +1,50 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "superbwarfare:deepslate_silver_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "superbwarfare:raw_silver" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "superbwarfare:blocks/deepslate_silver_ore" +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/silver_block.json b/src/generated/resources/data/superbwarfare/loot_tables/blocks/silver_block.json new file mode 100644 index 000000000..9bd090721 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/loot_tables/blocks/silver_block.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "superbwarfare:silver_block" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "superbwarfare:blocks/silver_block" +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/silver_ore.json b/src/generated/resources/data/superbwarfare/loot_tables/blocks/silver_ore.json new file mode 100644 index 000000000..3ffab5d79 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/loot_tables/blocks/silver_ore.json @@ -0,0 +1,50 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "superbwarfare:silver_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops", + "function": "minecraft:apply_bonus" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "superbwarfare:raw_silver" + } + ] + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "superbwarfare:blocks/silver_ore" +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/block/DeepslateSilverOreBlock.java b/src/main/java/net/mcreator/superbwarfare/block/DeepslateSilverOreBlock.java new file mode 100644 index 000000000..942d791b2 --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/block/DeepslateSilverOreBlock.java @@ -0,0 +1,11 @@ +package net.mcreator.superbwarfare.block; + +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.properties.NoteBlockInstrument; + +public class DeepslateSilverOreBlock extends Block { + public DeepslateSilverOreBlock() { + super(Properties.of().instrument(NoteBlockInstrument.BASEDRUM).sound(SoundType.STONE).strength(3f, 8f).requiresCorrectToolForDrops()); + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/block/SilverBlock.java b/src/main/java/net/mcreator/superbwarfare/block/SilverBlock.java new file mode 100644 index 000000000..655c590d1 --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/block/SilverBlock.java @@ -0,0 +1,11 @@ +package net.mcreator.superbwarfare.block; + +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.properties.NoteBlockInstrument; + +public class SilverBlock extends Block { + public SilverBlock() { + super(Properties.of().instrument(NoteBlockInstrument.BASEDRUM).sound(SoundType.METAL).strength(5f, 6f).requiresCorrectToolForDrops()); + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/block/SilverOreBlock.java b/src/main/java/net/mcreator/superbwarfare/block/SilverOreBlock.java new file mode 100644 index 000000000..daefe080d --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/block/SilverOreBlock.java @@ -0,0 +1,11 @@ +package net.mcreator.superbwarfare.block; + +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.properties.NoteBlockInstrument; + +public class SilverOreBlock extends Block { + public SilverOreBlock() { + super(Properties.of().instrument(NoteBlockInstrument.BASEDRUM).sound(SoundType.STONE).strength(3f, 5f).requiresCorrectToolForDrops()); + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockLootProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockLootProvider.java index 8f47c36ee..12bf1ae14 100644 --- a/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockLootProvider.java +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockLootProvider.java @@ -25,11 +25,14 @@ public class ModBlockLootProvider extends BlockLootSubProvider { this.dropSelf(ModBlocks.STEEL_BLOCK.get()); this.dropSelf(ModBlocks.TUNGSTEN_BLOCK.get()); this.dropSelf(ModBlocks.CEMENTED_CARBIDE_BLOCK.get()); + this.dropSelf(ModBlocks.SILVER_BLOCK.get()); this.add(ModBlocks.GALENA_ORE.get(), this.createOreDrop(ModBlocks.GALENA_ORE.get(), ModItems.GALENA.get())); this.add(ModBlocks.SCHEELITE_ORE.get(), this.createOreDrop(ModBlocks.SCHEELITE_ORE.get(), ModItems.SCHEELITE.get())); + this.add(ModBlocks.SILVER_ORE.get(), this.createOreDrop(ModBlocks.SILVER_ORE.get(), ModItems.RAW_SILVER.get())); this.add(ModBlocks.DEEPSLATE_GALENA_ORE.get(), this.createOreDrop(ModBlocks.DEEPSLATE_GALENA_ORE.get(), ModItems.GALENA.get())); this.add(ModBlocks.DEEPSLATE_SCHEELITE_ORE.get(), this.createOreDrop(ModBlocks.DEEPSLATE_SCHEELITE_ORE.get(), ModItems.SCHEELITE.get())); + this.add(ModBlocks.DEEPSLATE_SILVER_ORE.get(), this.createOreDrop(ModBlocks.DEEPSLATE_SILVER_ORE.get(), ModItems.RAW_SILVER.get())); } @Override diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockStateProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockStateProvider.java index c583563c2..d9b16bc1a 100644 --- a/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockStateProvider.java +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockStateProvider.java @@ -31,6 +31,9 @@ public class ModBlockStateProvider extends BlockStateProvider { blockWithItem(ModBlocks.STEEL_BLOCK); blockWithItem(ModBlocks.TUNGSTEN_BLOCK); blockWithItem(ModBlocks.CEMENTED_CARBIDE_BLOCK); + blockWithItem(ModBlocks.SILVER_ORE); + blockWithItem(ModBlocks.DEEPSLATE_SILVER_ORE); + blockWithItem(ModBlocks.SILVER_BLOCK); } private String name(Block block) { diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockTagProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockTagProvider.java index 8918e6393..42bbca16a 100644 --- a/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockTagProvider.java +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockTagProvider.java @@ -19,13 +19,14 @@ public class ModBlockTagProvider extends BlockTagsProvider { @Override protected void addTags(HolderLookup.Provider pProvider) { this.tag(BlockTags.NEEDS_IRON_TOOL).add(ModBlocks.GALENA_ORE.get(), ModBlocks.SCHEELITE_ORE.get(), - ModBlocks.DEEPSLATE_GALENA_ORE.get(), ModBlocks.DEEPSLATE_SCHEELITE_ORE.get(), ModBlocks.DRAGON_TEETH.get()); + ModBlocks.DEEPSLATE_GALENA_ORE.get(), ModBlocks.DEEPSLATE_SCHEELITE_ORE.get(), ModBlocks.DRAGON_TEETH.get(), + ModBlocks.SILVER_ORE.get(), ModBlocks.DEEPSLATE_SILVER_ORE.get()); this.tag(BlockTags.MINEABLE_WITH_AXE).add(ModBlocks.BARBED_WIRE.get()); this.tag(BlockTags.MINEABLE_WITH_PICKAXE).add(ModBlocks.GALENA_ORE.get(), ModBlocks.SCHEELITE_ORE.get(), ModBlocks.DEEPSLATE_GALENA_ORE.get(), ModBlocks.DEEPSLATE_SCHEELITE_ORE.get(), ModBlocks.DRAGON_TEETH.get(), ModBlocks.REFORGING_TABLE.get(), ModBlocks.LEAD_BLOCK.get(), ModBlocks.STEEL_BLOCK.get(), ModBlocks.TUNGSTEN_BLOCK.get(), - ModBlocks.CEMENTED_CARBIDE_BLOCK.get()); + ModBlocks.CEMENTED_CARBIDE_BLOCK.get(), ModBlocks.SILVER_ORE.get(), ModBlocks.DEEPSLATE_SILVER_ORE.get(), ModBlocks.SILVER_BLOCK.get()); this.tag(BlockTags.MINEABLE_WITH_SHOVEL).add(ModBlocks.SANDBAG.get()); } diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java index af4193c4e..62737ad7c 100644 --- a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java @@ -58,6 +58,8 @@ public class ModItemModelProvider extends ItemModelProvider { simpleItem(ModItems.SCHEELITE); simpleItem(ModItems.DOG_TAG); simpleItem(ModItems.TRANSCRIPT); + simpleItem(ModItems.RAW_SILVER); + simpleItem(ModItems.SILVER_INGOT); simpleItem(ModItems.TUNGSTEN_ROD); simpleItem(ModItems.IRON_BARREL); diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java index fa05a8090..bf9ed536f 100644 --- a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java @@ -31,29 +31,34 @@ public class ModItemTagProvider extends ItemTagsProvider { this.tag(forgeTag("dusts/iron")).add(ModItems.IRON_POWDER.get()); this.tag(forgeTag("dusts/tungsten")).add(ModItems.TUNGSTEN_POWDER.get()); - this.tag(Tags.Items.INGOTS).addTags(forgeTag("ingots/lead"), forgeTag("ingots/steel"), forgeTag("ingots/tungsten")); + this.tag(Tags.Items.INGOTS).addTags(forgeTag("ingots/lead"), forgeTag("ingots/steel"), forgeTag("ingots/tungsten"), forgeTag("ingots/silver")); this.tag(forgeTag("ingots/lead")).add(ModItems.LEAD_INGOT.get()); this.tag(forgeTag("ingots/steel")).add(ModItems.STEEL_INGOT.get()); this.tag(forgeTag("ingots/tungsten")).add(ModItems.TUNGSTEN_INGOT.get()); + this.tag(forgeTag("ingots/silver")).add(ModItems.SILVER_INGOT.get()); - this.tag(Tags.Items.STORAGE_BLOCKS).addTags(forgeTag("storage_blocks/lead"), forgeTag("storage_blocks/steel"), forgeTag("storage_blocks/tungsten")); + this.tag(Tags.Items.STORAGE_BLOCKS).addTags(forgeTag("storage_blocks/lead"), forgeTag("storage_blocks/steel"), forgeTag("storage_blocks/tungsten"), forgeTag("storage_blocks/silver")); this.tag(forgeTag("storage_blocks/lead")).add(ModItems.LEAD_BLOCK.get()); this.tag(forgeTag("storage_blocks/steel")).add(ModItems.STEEL_BLOCK.get()); this.tag(forgeTag("storage_blocks/tungsten")).add(ModItems.TUNGSTEN_BLOCK.get()); + this.tag(forgeTag("storage_blocks/silver")).add(ModItems.SILVER_BLOCK.get()); - this.tag(Tags.Items.ORES).addTags(forgeTag("ores/lead"), forgeTag("ores/tungsten")); + this.tag(Tags.Items.ORES).addTags(forgeTag("ores/lead"), forgeTag("ores/tungsten"), forgeTag("ores/silver")); this.tag(forgeTag("ores/lead")).add(ModItems.GALENA_ORE.get(), ModItems.DEEPSLATE_GALENA_ORE.get()); this.tag(forgeTag("ores/tungsten")).add(ModItems.SCHEELITE_ORE.get(), ModItems.DEEPSLATE_SCHEELITE_ORE.get()); + this.tag(forgeTag("ores/silver")).add(ModItems.SILVER_ORE.get(), ModItems.DEEPSLATE_SILVER_ORE.get()); - this.tag(Tags.Items.RAW_MATERIALS).addTags(forgeTag("raw_materials/lead"), forgeTag("raw_materials/tungsten")); + this.tag(Tags.Items.RAW_MATERIALS).addTags(forgeTag("raw_materials/lead"), forgeTag("raw_materials/tungsten"), forgeTag("raw_materials/silver")); this.tag(forgeTag("raw_materials/lead")).add(ModItems.GALENA.get()); this.tag(forgeTag("raw_materials/tungsten")).add(ModItems.SCHEELITE.get()); + this.tag(forgeTag("raw_materials/silver")).add(ModItems.RAW_SILVER.get()); this.tag(Tags.Items.ORE_RATES_SINGULAR).add(ModItems.GALENA_ORE.get(), ModItems.DEEPSLATE_GALENA_ORE.get(), - ModItems.SCHEELITE_ORE.get(), ModItems.DEEPSLATE_SCHEELITE_ORE.get()); + ModItems.SCHEELITE_ORE.get(), ModItems.DEEPSLATE_SCHEELITE_ORE.get(), + ModItems.SILVER_ORE.get(), ModItems.DEEPSLATE_SILVER_ORE.get()); - this.tag(Tags.Items.ORES_IN_GROUND_DEEPSLATE).add(ModItems.GALENA_ORE.get(), ModItems.SCHEELITE_ORE.get()); - this.tag(Tags.Items.ORES_IN_GROUND_STONE).add(ModItems.DEEPSLATE_GALENA_ORE.get(), ModItems.DEEPSLATE_SCHEELITE_ORE.get()); + this.tag(Tags.Items.ORES_IN_GROUND_STONE).add(ModItems.GALENA_ORE.get(), ModItems.SCHEELITE_ORE.get(), ModItems.SILVER_ORE.get()); + this.tag(Tags.Items.ORES_IN_GROUND_DEEPSLATE).add(ModItems.DEEPSLATE_GALENA_ORE.get(), ModItems.DEEPSLATE_SCHEELITE_ORE.get(), ModItems.DEEPSLATE_SILVER_ORE.get()); this.tag(forgeTag("plates")).addTags(forgeTag("plates/copper")); this.tag(forgeTag("plates/copper")).add(ModItems.COPPER_PLATE.get()); diff --git a/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java b/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java index 27cf2dda5..05364dd00 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/Mle1934Entity.java @@ -53,7 +53,6 @@ public class Mle1934Entity extends PathfinderMob implements GeoEntity, ICannonEn public String animationprocedure = "empty"; protected int interpolationSteps; - protected double serverYRot; protected double serverXRot; diff --git a/src/main/java/net/mcreator/superbwarfare/entity/MortarEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/MortarEntity.java index 881deec32..ac303d37c 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/MortarEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/MortarEntity.java @@ -49,6 +49,10 @@ public class MortarEntity extends LivingEntity implements GeoEntity, AnimatedEnt private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); public String animationProcedure = "empty"; + protected int interpolationSteps; + protected double serverYRot; + protected double serverXRot; + public MortarEntity(PlayMessages.SpawnEntity packet, Level world) { this(ModEntities.MORTAR.get(), world); } @@ -183,6 +187,13 @@ public class MortarEntity extends LivingEntity implements GeoEntity, AnimatedEnt return InteractionResult.sidedSuccess(this.level().isClientSide()); } + @Override + public void lerpTo(double x, double y, double z, float yaw, float pitch, int interpolationSteps, boolean interpolate) { + serverYRot = yaw; + serverXRot = pitch; + this.interpolationSteps = 10; + } + @Override public void travel(Vec3 dir) { this.setXRot(-Mth.clamp((float) this.getAttribute(ModAttributes.MORTAR_PITCH.get()).getBaseValue(), 20, 89)); diff --git a/src/main/java/net/mcreator/superbwarfare/entity/TargetEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/TargetEntity.java index 89261ba20..ee07c8e06 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/TargetEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/TargetEntity.java @@ -213,15 +213,6 @@ public class TargetEntity extends LivingEntity implements GeoEntity, AnimatedEnt protected void pushEntities() { } -// @Override -// protected AABB makeBoundingBox() { -// if (this.entityData.get(DOWN_TIME) > 0) { -// return super.makeBoundingBox().inflate(0, -0.85, 0).move(0, -0.85, 0); -// } -// -// return super.makeBoundingBox(); -// } - @Override public void setNoGravity(boolean ignored) { super.setNoGravity(true); diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModBlocks.java b/src/main/java/net/mcreator/superbwarfare/init/ModBlocks.java index 69c21f35f..987c2b661 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModBlocks.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModBlocks.java @@ -17,10 +17,13 @@ public class ModBlocks { public static final RegistryObject DEEPSLATE_GALENA_ORE = REGISTRY.register("deepslate_galena_ore", DeepslateGalenaOreBlock::new); public static final RegistryObject SCHEELITE_ORE = REGISTRY.register("scheelite_ore", ScheeliteOreBlock::new); public static final RegistryObject DEEPSLATE_SCHEELITE_ORE = REGISTRY.register("deepslate_scheelite_ore", DeepslateScheeliteOreBlock::new); + public static final RegistryObject SILVER_ORE = REGISTRY.register("silver_ore", SilverOreBlock::new); + public static final RegistryObject DEEPSLATE_SILVER_ORE = REGISTRY.register("deepslate_silver_ore", DeepslateSilverOreBlock::new); public static final RegistryObject DRAGON_TEETH = REGISTRY.register("dragon_teeth", DragonTeethBlock::new); public static final RegistryObject REFORGING_TABLE = REGISTRY.register("reforging_table", ReforgingTableBlock::new); public static final RegistryObject LEAD_BLOCK = REGISTRY.register("lead_block", LeadBlock::new); public static final RegistryObject STEEL_BLOCK = REGISTRY.register("steel_block", SteelBlock::new); public static final RegistryObject TUNGSTEN_BLOCK = REGISTRY.register("tungsten_block", TungstenBlock::new); + public static final RegistryObject SILVER_BLOCK = REGISTRY.register("silver_block", SilverBlock::new); public static final RegistryObject CEMENTED_CARBIDE_BLOCK = REGISTRY.register("cemented_carbide_block", CementedCarbideBlock::new); } diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java index 3e6f670f5..bdbbc4fcb 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java @@ -133,6 +133,7 @@ public class ModItems { public static final RegistryObject COPPER_PLATE = ITEMS.register("copper_plate", () -> new Item(new Item.Properties())); public static final RegistryObject STEEL_INGOT = ITEMS.register("steel_ingot", () -> new Item(new Item.Properties())); public static final RegistryObject LEAD_INGOT = ITEMS.register("lead_ingot", () -> new Item(new Item.Properties())); + public static final RegistryObject SILVER_INGOT = ITEMS.register("silver_ingot", () -> new Item(new Item.Properties())); public static final RegistryObject TUNGSTEN_INGOT = ITEMS.register("tungsten_ingot", () -> new Item(new Item.Properties())); public static final RegistryObject CEMENTED_CARBIDE_INGOT = ITEMS.register("cemented_carbide_ingot", () -> new Item(new Item.Properties())); public static final RegistryObject HIGH_ENERGY_EXPLOSIVES = ITEMS.register("high_energy_explosives", () -> new Item(new Item.Properties())); @@ -144,6 +145,7 @@ public class ModItems { public static final RegistryObject RAW_CEMENTED_CARBIDE_POWDER = ITEMS.register("raw_cemented_carbide_powder", () -> new Item(new Item.Properties())); public static final RegistryObject GALENA = ITEMS.register("galena", () -> new Item(new Item.Properties())); public static final RegistryObject SCHEELITE = ITEMS.register("scheelite", () -> new Item(new Item.Properties())); + public static final RegistryObject RAW_SILVER = ITEMS.register("raw_silver", () -> new Item(new Item.Properties())); public static final RegistryObject DOG_TAG = ITEMS.register("dog_tag", DogTag::new); public static final RegistryObject SHIELD_CELL = ITEMS.register("shield_cell", () -> new Item(new Item.Properties().rarity(Rarity.RARE))); public static final RegistryObject TRANSCRIPT = ITEMS.register("transcript", Transcript::new); @@ -211,6 +213,8 @@ public class ModItems { public static final RegistryObject DEEPSLATE_GALENA_ORE = block(ModBlocks.DEEPSLATE_GALENA_ORE); public static final RegistryObject SCHEELITE_ORE = block(ModBlocks.SCHEELITE_ORE); public static final RegistryObject DEEPSLATE_SCHEELITE_ORE = block(ModBlocks.DEEPSLATE_SCHEELITE_ORE); + public static final RegistryObject SILVER_ORE = block(ModBlocks.SILVER_ORE); + public static final RegistryObject DEEPSLATE_SILVER_ORE = block(ModBlocks.DEEPSLATE_SILVER_ORE); public static final RegistryObject JUMP_PAD = block(ModBlocks.JUMP_PAD); public static final RegistryObject SANDBAG = block(ModBlocks.SANDBAG); public static final RegistryObject BARBED_WIRE = block(ModBlocks.BARBED_WIRE); @@ -219,6 +223,7 @@ public class ModItems { public static final RegistryObject LEAD_BLOCK = block(ModBlocks.LEAD_BLOCK); public static final RegistryObject STEEL_BLOCK = block(ModBlocks.STEEL_BLOCK); public static final RegistryObject TUNGSTEN_BLOCK = block(ModBlocks.TUNGSTEN_BLOCK); + public static final RegistryObject SILVER_BLOCK = block(ModBlocks.SILVER_BLOCK); public static final RegistryObject CEMENTED_CARBIDE_BLOCK = block(ModBlocks.CEMENTED_CARBIDE_BLOCK); private static RegistryObject block(RegistryObject block) { diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index 1f540b35a..fd0a5e964 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -174,11 +174,14 @@ "block.superbwarfare.scheelite_ore": "Scheelite 0re", "block.superbwarfare.deepslate_scheelite_ore": "Deepslate Scheelite 0re", "block.superbwarfare.deepslate_galena_ore": "Deepslate Galena 0re", + "block.superbwarfare.silver_ore": "Silver 0re", + "block.superbwarfare.deepslate_silver_ore": "Deepslate Silver 0re", "block.superbwarfare.dragon_teeth": "Dragon Teeth", "block.superbwarfare.reforging_table": "Gun Reforge Table", "block.superbwarfare.lead_block": "Lead Block", "block.superbwarfare.tungsten_block": "Tungsten Block", "block.superbwarfare.steel_block": "Steel Block", + "block.superbwarfare.silver_block": "Silver Block", "block.superbwarfare.cemented_carbide_block": "Cemented Carbide Block", "item.superbwarfare.high_energy_explosives": "High Energy Explosives", @@ -193,9 +196,11 @@ "item.superbwarfare.lead_ingot": "Lead Ingot", "item.superbwarfare.steel_ingot": "Steel Ingot", "item.superbwarfare.tungsten_ingot": "Tungsten Ingot", + "item.superbwarfare.silver_ingot": "Silver Ingot", "item.superbwarfare.cemented_carbide_ingot": "Cemented Carbide Ingot", "item.superbwarfare.galena": "Raw Galena", "item.superbwarfare.scheelite": "Raw Galena", + "item.superbwarfare.raw_silver": "Raw Silver", "item.superbwarfare.ap_bullet": "Ap Bullet", "des.superbwarfare.ap_bullet": "Increased the armor-piercing ratio of bullets", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 7c876876c..66fa3113f 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -174,11 +174,13 @@ "block.superbwarfare.scheelite_ore": "白钨矿石", "block.superbwarfare.deepslate_scheelite_ore": "深层白钨矿石", "block.superbwarfare.deepslate_galena_ore": "深层方铅矿石", + "block.superbwarfare.silver_ore": "银矿石", + "block.superbwarfare.deepslate_silver_ore": "深层银矿石", "block.superbwarfare.dragon_teeth": "龙牙", "block.superbwarfare.reforging_table": "枪械重铸台", "block.superbwarfare.lead_block": "铅块", "block.superbwarfare.tungsten_block": "钨块", - "block.superbwarfare.steel_block": "钢块", + "block.superbwarfare.silver_block": "银块", "block.superbwarfare.cemented_carbide_block": "硬质合金块", "item.superbwarfare.high_energy_explosives": "高能炸药", @@ -193,9 +195,11 @@ "item.superbwarfare.lead_ingot": "铅锭", "item.superbwarfare.steel_ingot": "钢锭", "item.superbwarfare.tungsten_ingot": "钨锭", + "item.superbwarfare.silver_ingot": "银锭", "item.superbwarfare.cemented_carbide_ingot": "硬质合金锭", "item.superbwarfare.galena": "粗方铅矿", "item.superbwarfare.scheelite": "白钨矿", + "item.superbwarfare.raw_silver": "粗银", "item.superbwarfare.ap_bullet": "穿甲弹", "des.superbwarfare.ap_bullet": "增加子弹的穿甲比例", diff --git a/src/main/resources/assets/superbwarfare/textures/block/deepslate_silver_ore.png b/src/main/resources/assets/superbwarfare/textures/block/deepslate_silver_ore.png new file mode 100644 index 0000000000000000000000000000000000000000..eb41193dfcdf4e48e010cf5dc80ba7c774654d38 GIT binary patch literal 684 zcmV;d0#p5oP)y4Ahf+#B&*T2%x(a||aYmm7HLk0$ECYb35CYd#DCGlS81V;PDe zveN|s63J`2*O$1iB4XS2hGnIgEzI-k&1-IM2mCreLn)tr|AwopF23L6@%$Y9+aXoE z#-FZ-5QhLn#>P?`x%?beyGFUPggDrv*Xxo>B^V5b2MQ(1bw9^=V4m*=NQDY2{+ zq0k+n#l@#X!-!+s%K$VQdwTqZas_~@T?1gZu|xm2r_o$j5nWk%27nL((==HqSM)Rh z`N<5&rx!S_eT-NbapIAkF7WdC3x0h6Mif9wiD{a6o<}L2rtLHVC|8y^KD}UjYg13B zl+WSe83#@a%QA=t5eBi{M+h4IAG2Y^b&TOaY*_{il!H#2NABWt+QBu@?cNG z!Al}Jq0QRb{>rD%U-Zr0>r3rRE;Ei&K1%r`6N|+eJkR4%WI)?#^7h>t`N<3)KfI^Y zIRZc_pSIJa?KBZWFgu&2R4R=&5zq#X1e==GwwE=E5Q0QwHSE7pP$U&wDxH`O^jHWPUnbFyGWt1f)67$j*JX+p;EriJE#lx!8A>zl>7xj)lH>( S^AKME0000ckxg&YKoExC^*WpNI<^y%xS`PBME?Li@*%{H3j)*| z632oB2PBXXsDBHZk0wqNCvg&Q*4|wXmJ*6OhtWtg&%C2|$kjM+a0j;|%QZj(&jGMp zuZ`BND4HbGqqyrTxw`mzDTE*nfrYiUDnM?nu*OO$U%q(i-fK4fhX45N3_ut%PX7~w z)Zi40OkP}k0pI}8+5q_c>EkR(hu5jpNT%z-Xg<77heBQ;am%jpib&;)gHC-Ao3IM}I0T8wF4nS!R;N*yv2AskH1``FKQ8(37v^H6;oxR!H zpHR{9?g8oDSco;L`F+cL|P~aZlY&L3J7~pEG0QB0m!Dwb(r~i8>H7bz<@a_AL zEX#IkH<}gz0%2xp*6p=N{qfIVmjKjmXRUFgkmb1q@cPZGimYuV7aTy9k5774%UWx# zbpb3F>G`|&K^Ouc1cVUI`N6$X@1z7ln$8I!L>v2Ov=(&$Xh!~iZoVq51p%}%gb=N@ cH73vVzj)9Ddrx~{dH?_b07*qoM6N<$g7*Rc8vp`;u;g&LB2zMr-Qrq(eqCSlgVVK zl%hCVYXF20XsyYz4A*u4d*k~)0A;gm9s<;AH2|cPNGVZD@%`r=N5>L?)xAOph1Qyq zSzd1)E=HF)m8xYB1OagzqqXMg6Ays?aA40u2+9EKtwVn}pwsPN7h@1_VWR06y^-fUyt)|D#^^Dd1iqnD|A;caiw2>A|2jmhA2zV6#<+B c8`B$re|?}lfQ9hCEC2ui07*qoM6N<$g7~8Ug8%>k literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/superbwarfare/textures/item/raw_silver.png b/src/main/resources/assets/superbwarfare/textures/item/raw_silver.png new file mode 100644 index 0000000000000000000000000000000000000000..ee33d73b66cc47ee29e9dbebabb8678ab2d4da50 GIT binary patch literal 400 zcmV;B0dM|^P)rl08eqP#A@uN^waoE+H=B2TDO~mP$cz5c~;oNc;n- zgU+I$;Nqr(2rg2G(#4P6K@q962^A@d2ri0)mOv4-f)S7&wgQ{JoYL~gJU1J!A*LyTH-E=kG^p!a=HRGI8MGK9WchaiL z(a8l5&z}Gk3VEt_8Gvac$HrEX!-M@$cpRYB`U0S0SyU{GWU?E8y7P)6cOlCP=cO}b zSz&g51us+>I8K9|{2tj%3V^h#;_;&+Lr4h;P(-SfkVL3&D0+t{eSe(Ir05?Qr1{nq uLIBIIQ93ThLIyzu4Lv;GokmaNpW+(^$H~<7dzEGY0000*lD|qqVHn1L2fuR$|3qq;TXzry4s{C-VYPGvLJ@{* zAQfU)pqoRtAQCRkHG~jBLkN-%p=4P>Ssv}Y4dO{lZLMc{;r*W9^F6~0|3-;qS`x{$ zeBZ0zAir-0fYtRif&l|SQhPD2@6jef@$C%&s&&(T4+acUhZ*`I+Bm4y1?ND&u_1|M zT0}%DwYF4hZ4nW9?Z`+CdPGDvV|$|R8x8V>A}iq#)w)TwZZaP_