添加银矿和模组配方

This commit is contained in:
Atsuihsio 2024-09-12 21:53:52 +08:00
parent 4ae291db84
commit 569b671c79
72 changed files with 653 additions and 49 deletions

View file

@ -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 cf8d49a8d2872286d1a9c3d4a7e1c2b7690db0b8 data/forge/tags/items/dusts.json
0fa06c2ff83bf09797e3ddff90f62d1124e645b4 data/forge/tags/items/dusts/coal_coke.json 0fa06c2ff83bf09797e3ddff90f62d1124e645b4 data/forge/tags/items/dusts/coal_coke.json
295ddf906b7133a0558d03e9a60eea18281fe430 data/forge/tags/items/dusts/iron.json 295ddf906b7133a0558d03e9a60eea18281fe430 data/forge/tags/items/dusts/iron.json
5ed781a6ce735a9a6555bd1dcc43300c64c2bad0 data/forge/tags/items/dusts/tungsten.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 6a3ef6343dbc199446979cb92e7421483025b9e0 data/forge/tags/items/ingots/lead.json
b870c0a22be2fdb67b8f4eac9a429a009fd47c10 data/forge/tags/items/ingots/silver.json
a31040302a0327e638bbc8cc2dda514e56934f16 data/forge/tags/items/ingots/steel.json a31040302a0327e638bbc8cc2dda514e56934f16 data/forge/tags/items/ingots/steel.json
534d88c2973775b785ad048f16cde5121f256acc data/forge/tags/items/ingots/tungsten.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 af38bb7460b2d1c0b07f5ac3a4cb1af53a41a456 data/forge/tags/items/ores/lead.json
6b4ec9b667b534e868b5463f06acf89fe114be9a data/forge/tags/items/ores/silver.json
65265b2e95bae5071f132b1aa92d3c90fd8199d8 data/forge/tags/items/ores/tungsten.json 65265b2e95bae5071f132b1aa92d3c90fd8199d8 data/forge/tags/items/ores/tungsten.json
d2d41bac2abe34f201a25dbcf4d4e05e86575b21 data/forge/tags/items/ores_in_ground/deepslate.json 91ca1b4d467e94a2f407f7465b3cadade7ff661b data/forge/tags/items/ores_in_ground/deepslate.json
14104824ea79d3ae82663f5066f571b1425469a3 data/forge/tags/items/ores_in_ground/stone.json 2227e4cdbfc8a9c9af4975fa5ed1360146623768 data/forge/tags/items/ores_in_ground/stone.json
acced7f04d0125f1e53cf67a9c3f5f4a35889ee9 data/forge/tags/items/ore_rates/singular.json 7d161c1baae850baa9fc50e89c73f1eeb51a2e47 data/forge/tags/items/ore_rates/singular.json
140a8470d41a4fe0bb7c9e121a94d926fb6117b1 data/forge/tags/items/plates.json 140a8470d41a4fe0bb7c9e121a94d926fb6117b1 data/forge/tags/items/plates.json
51189baa4881d4137d853012976d10cc44f3092e data/forge/tags/items/plates/copper.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 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 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 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 3743c2790deca7e779d3e4b82f092de39b446988 data/forge/tags/items/storage_blocks/steel.json
144e54d908121dee498b2ebba3b24b09fd6f18d9 data/forge/tags/items/storage_blocks/tungsten.json 144e54d908121dee498b2ebba3b24b09fd6f18d9 data/forge/tags/items/storage_blocks/tungsten.json
99a5a3a4bb6b5fb641dcd449937365ea174f3797 data/superbwarfare/tags/items/gun.json 99a5a3a4bb6b5fb641dcd449937365ea174f3797 data/superbwarfare/tags/items/gun.json

View file

@ -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 98386b2e65b2afb7cf5b0cabf6a7b0f062c1e640 data/superbwarfare/loot_tables/blocks/barbed_wire.json
811e69929a14e6736015849c220100bb58d914c9 data/superbwarfare/loot_tables/blocks/cemented_carbide_block.json 811e69929a14e6736015849c220100bb58d914c9 data/superbwarfare/loot_tables/blocks/cemented_carbide_block.json
dabbe17417c944567dc6dfcdcba32b8377c24f69 data/superbwarfare/loot_tables/blocks/deepslate_galena_ore.json dabbe17417c944567dc6dfcdcba32b8377c24f69 data/superbwarfare/loot_tables/blocks/deepslate_galena_ore.json
a7c1af3e194d35a64544902468bd964f45f2f9ef data/superbwarfare/loot_tables/blocks/deepslate_scheelite_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 e80a153391c34dbca9130a140e6401242e3add4c data/superbwarfare/loot_tables/blocks/dragon_teeth.json
cdd4acb439988069ca04920cb3905f01b7257362 data/superbwarfare/loot_tables/blocks/galena_ore.json cdd4acb439988069ca04920cb3905f01b7257362 data/superbwarfare/loot_tables/blocks/galena_ore.json
188ee13e38134e87d07ded14b35c60b488db9ef8 data/superbwarfare/loot_tables/blocks/jump_pad.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 8216c47bb150112820b066eb1edbec51c7e61251 data/superbwarfare/loot_tables/blocks/reforging_table.json
8ae2495a0843798bc13e0d3ca4c010f88a44c7a6 data/superbwarfare/loot_tables/blocks/sandbag.json 8ae2495a0843798bc13e0d3ca4c010f88a44c7a6 data/superbwarfare/loot_tables/blocks/sandbag.json
bce3fc7a50ba51c24ad3a37d2534a7db9cf0db73 data/superbwarfare/loot_tables/blocks/scheelite_ore.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 83112ebff477e322bd3d23ed4653c7c02b230473 data/superbwarfare/loot_tables/blocks/steel_block.json
71fc892124b5343e10688cabc2fb7c87d83cfef8 data/superbwarfare/loot_tables/blocks/tungsten_block.json 71fc892124b5343e10688cabc2fb7c87d83cfef8 data/superbwarfare/loot_tables/blocks/tungsten_block.json

View file

@ -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 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 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

View file

@ -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/aa_12_blueprint.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_47_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_47_blueprint.json
c993bddc0db9453ffbefa59f9ac9a74dba909038 assets/superbwarfare/models/item/ancient_cpu.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 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/qbz_95_blueprint.json
e821640d80c55763e7e7b62f7b80c60ff56dcc4f assets/superbwarfare/models/item/rare_material_pack.json e821640d80c55763e7e7b62f7b80c60ff56dcc4f assets/superbwarfare/models/item/rare_material_pack.json
ce0f0949b0545d8ef08aeaa52dd423dbe592f704 assets/superbwarfare/models/item/raw_cemented_carbide_powder.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 5b8f7d5922e49e06bcd4d4d2a2a3dc934548570b assets/superbwarfare/models/item/reforging_table.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/rpg_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/rpg_blueprint.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/rpk_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/rpk_blueprint.json
ce2232fbc6a9186371c6ae6745ec3be2a0a33546 assets/superbwarfare/models/item/scheelite.json ce2232fbc6a9186371c6ae6745ec3be2a0a33546 assets/superbwarfare/models/item/scheelite.json
c010baff106b3307ec585df4757f7c3d756e9794 assets/superbwarfare/models/item/seeker.json c010baff106b3307ec585df4757f7c3d756e9794 assets/superbwarfare/models/item/seeker.json
13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/sentinel_blueprint.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 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/sks_blueprint.json
93a18630b8c0a5aab1f0202f42b8bd5ee7153c38 assets/superbwarfare/models/item/steel_action.json 93a18630b8c0a5aab1f0202f42b8bd5ee7153c38 assets/superbwarfare/models/item/steel_action.json
321bafbe4487eda1a6ca82eec647eabc3230a4e3 assets/superbwarfare/models/item/steel_barrel.json 321bafbe4487eda1a6ca82eec647eabc3230a4e3 assets/superbwarfare/models/item/steel_barrel.json

View file

@ -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 f3b778ca36ca78c3d80f1b778078897f59bdb0c5 assets/superbwarfare/blockstates/barbed_wire.json
0cfad4f53a8047c402edf978d0c8cf6269f063cb assets/superbwarfare/blockstates/cemented_carbide_block.json 0cfad4f53a8047c402edf978d0c8cf6269f063cb assets/superbwarfare/blockstates/cemented_carbide_block.json
62fb0464ca59ac21693639c406e08730427d87b3 assets/superbwarfare/blockstates/deepslate_galena_ore.json 62fb0464ca59ac21693639c406e08730427d87b3 assets/superbwarfare/blockstates/deepslate_galena_ore.json
b8b7cdea6c8626c74d652d0b300b3afe19c60674 assets/superbwarfare/blockstates/deepslate_scheelite_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 d8a6ec32752f10b1f363f6c78ed2da6dc895d545 assets/superbwarfare/blockstates/galena_ore.json
37d592516f2b685940e46f7d5c524407a200eeac assets/superbwarfare/blockstates/jump_pad.json 37d592516f2b685940e46f7d5c524407a200eeac assets/superbwarfare/blockstates/jump_pad.json
3b464a0684d05c28c8485f764c7ad7e86ae48c06 assets/superbwarfare/blockstates/lead_block.json 3b464a0684d05c28c8485f764c7ad7e86ae48c06 assets/superbwarfare/blockstates/lead_block.json
d765539a643378e4f8ce56dc42bcff579d666e8a assets/superbwarfare/blockstates/reforging_table.json d765539a643378e4f8ce56dc42bcff579d666e8a assets/superbwarfare/blockstates/reforging_table.json
123574c25d10de6d915514af34f0a878c93a07ea assets/superbwarfare/blockstates/scheelite_ore.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 a175c908c9aabee3a073844cd58ec9dfe6498bf0 assets/superbwarfare/blockstates/steel_block.json
d4bbef5040ef43c362b28ea12ea73fb4a3db9adc assets/superbwarfare/blockstates/tungsten_block.json d4bbef5040ef43c362b28ea12ea73fb4a3db9adc assets/superbwarfare/blockstates/tungsten_block.json
5f1c22b64ff3ca4db9987f91a7179c9e705c7601 assets/superbwarfare/models/block/cemented_carbide_block.json 5f1c22b64ff3ca4db9987f91a7179c9e705c7601 assets/superbwarfare/models/block/cemented_carbide_block.json
0fe4613a4446ac485eee58bed6d0d8f5b38f6253 assets/superbwarfare/models/block/deepslate_galena_ore.json 0fe4613a4446ac485eee58bed6d0d8f5b38f6253 assets/superbwarfare/models/block/deepslate_galena_ore.json
84f584f684519f686e976b994f0a2639a98a7851 assets/superbwarfare/models/block/deepslate_scheelite_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 e9bea7028029623e5dc9d8b0eead6add93c36931 assets/superbwarfare/models/block/galena_ore.json
2909ad43b32b377f3b404d30a4b9d226ef63df7a assets/superbwarfare/models/block/lead_block.json 2909ad43b32b377f3b404d30a4b9d226ef63df7a assets/superbwarfare/models/block/lead_block.json
15dcf7724846b0e19f826f6d7e9241ac81ef5969 assets/superbwarfare/models/block/scheelite_ore.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 ad3ee9a1e2c9302c8dfdecd28091693fca0bcff8 assets/superbwarfare/models/block/steel_block.json
b5310729f19d8d9f7090760bbdc1b629ab2b4262 assets/superbwarfare/models/block/tungsten_block.json b5310729f19d8d9f7090760bbdc1b629ab2b4262 assets/superbwarfare/models/block/tungsten_block.json
fe85ea7492fe2006dbb0027914f3688a43c2d2c9 assets/superbwarfare/models/item/cemented_carbide_block.json fe85ea7492fe2006dbb0027914f3688a43c2d2c9 assets/superbwarfare/models/item/cemented_carbide_block.json
321d7f61b596ac9a8b3633f8d1bc3351b7b12c5a assets/superbwarfare/models/item/deepslate_galena_ore.json 321d7f61b596ac9a8b3633f8d1bc3351b7b12c5a assets/superbwarfare/models/item/deepslate_galena_ore.json
c83798987b4d4eeadd96357cd12fdfd5d44b2952 assets/superbwarfare/models/item/deepslate_scheelite_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 dab3d5800ad52100d0af25033d0aed1b5214db46 assets/superbwarfare/models/item/galena_ore.json
c776ee36ee2ff9e749aa8e059144b81f480815da assets/superbwarfare/models/item/lead_block.json c776ee36ee2ff9e749aa8e059144b81f480815da assets/superbwarfare/models/item/lead_block.json
fe6f5b256dc4f8a16fbc5b42028a5d73300c3cd5 assets/superbwarfare/models/item/scheelite_ore.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 ba87901d2fc411307812b6d146b166722a469311 assets/superbwarfare/models/item/steel_block.json
f93890672b260004a53b1d0a5d9f435346eba1fd assets/superbwarfare/models/item/tungsten_block.json f93890672b260004a53b1d0a5d9f435346eba1fd assets/superbwarfare/models/item/tungsten_block.json

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "superbwarfare:block/deepslate_silver_ore"
}
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "superbwarfare:block/silver_block"
}
}
}

View file

@ -0,0 +1,7 @@
{
"variants": {
"": {
"model": "superbwarfare:block/silver_ore"
}
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "superbwarfare:block/deepslate_silver_ore"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "superbwarfare:block/silver_block"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "minecraft:block/cube_all",
"textures": {
"all": "superbwarfare:block/silver_ore"
}
}

View file

@ -0,0 +1,3 @@
{
"parent": "superbwarfare:block/deepslate_silver_ore"
}

View file

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

View file

@ -0,0 +1,3 @@
{
"parent": "superbwarfare:block/silver_block"
}

View file

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

View file

@ -0,0 +1,3 @@
{
"parent": "superbwarfare:block/silver_ore"
}

View file

@ -2,6 +2,7 @@
"values": [ "values": [
"#forge:ingots/lead", "#forge:ingots/lead",
"#forge:ingots/steel", "#forge:ingots/steel",
"#forge:ingots/tungsten" "#forge:ingots/tungsten",
"#forge:ingots/silver"
] ]
} }

View file

@ -0,0 +1,5 @@
{
"values": [
"superbwarfare:silver_ingot"
]
}

View file

@ -3,6 +3,8 @@
"superbwarfare:galena_ore", "superbwarfare:galena_ore",
"superbwarfare:deepslate_galena_ore", "superbwarfare:deepslate_galena_ore",
"superbwarfare:scheelite_ore", "superbwarfare:scheelite_ore",
"superbwarfare:deepslate_scheelite_ore" "superbwarfare:deepslate_scheelite_ore",
"superbwarfare:silver_ore",
"superbwarfare:deepslate_silver_ore"
] ]
} }

View file

@ -1,6 +1,7 @@
{ {
"values": [ "values": [
"#forge:ores/lead", "#forge:ores/lead",
"#forge:ores/tungsten" "#forge:ores/tungsten",
"#forge:ores/silver"
] ]
} }

View file

@ -0,0 +1,6 @@
{
"values": [
"superbwarfare:silver_ore",
"superbwarfare:deepslate_silver_ore"
]
}

View file

@ -1,6 +1,7 @@
{ {
"values": [ "values": [
"superbwarfare:galena_ore", "superbwarfare:deepslate_galena_ore",
"superbwarfare:scheelite_ore" "superbwarfare:deepslate_scheelite_ore",
"superbwarfare:deepslate_silver_ore"
] ]
} }

View file

@ -1,6 +1,7 @@
{ {
"values": [ "values": [
"superbwarfare:deepslate_galena_ore", "superbwarfare:galena_ore",
"superbwarfare:deepslate_scheelite_ore" "superbwarfare:scheelite_ore",
"superbwarfare:silver_ore"
] ]
} }

View file

@ -1,6 +1,7 @@
{ {
"values": [ "values": [
"#forge:raw_materials/lead", "#forge:raw_materials/lead",
"#forge:raw_materials/tungsten" "#forge:raw_materials/tungsten",
"#forge:raw_materials/silver"
] ]
} }

View file

@ -0,0 +1,5 @@
{
"values": [
"superbwarfare:raw_silver"
]
}

View file

@ -2,6 +2,7 @@
"values": [ "values": [
"#forge:storage_blocks/lead", "#forge:storage_blocks/lead",
"#forge:storage_blocks/steel", "#forge:storage_blocks/steel",
"#forge:storage_blocks/tungsten" "#forge:storage_blocks/tungsten",
"#forge:storage_blocks/silver"
] ]
} }

View file

@ -0,0 +1,5 @@
{
"values": [
"superbwarfare:silver_block"
]
}

View file

@ -9,6 +9,9 @@
"superbwarfare:lead_block", "superbwarfare:lead_block",
"superbwarfare:steel_block", "superbwarfare:steel_block",
"superbwarfare:tungsten_block", "superbwarfare:tungsten_block",
"superbwarfare:cemented_carbide_block" "superbwarfare:cemented_carbide_block",
"superbwarfare:silver_ore",
"superbwarfare:deepslate_silver_ore",
"superbwarfare:silver_block"
] ]
} }

View file

@ -4,6 +4,8 @@
"superbwarfare:scheelite_ore", "superbwarfare:scheelite_ore",
"superbwarfare:deepslate_galena_ore", "superbwarfare:deepslate_galena_ore",
"superbwarfare:deepslate_scheelite_ore", "superbwarfare:deepslate_scheelite_ore",
"superbwarfare:dragon_teeth" "superbwarfare:dragon_teeth",
"superbwarfare:silver_ore",
"superbwarfare:deepslate_silver_ore"
] ]
} }

View file

@ -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"
}

View file

@ -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"
}

View file

@ -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"
}

View file

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

View file

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

View file

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

View file

@ -25,11 +25,14 @@ public class ModBlockLootProvider extends BlockLootSubProvider {
this.dropSelf(ModBlocks.STEEL_BLOCK.get()); this.dropSelf(ModBlocks.STEEL_BLOCK.get());
this.dropSelf(ModBlocks.TUNGSTEN_BLOCK.get()); this.dropSelf(ModBlocks.TUNGSTEN_BLOCK.get());
this.dropSelf(ModBlocks.CEMENTED_CARBIDE_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.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.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_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_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 @Override

View file

@ -31,6 +31,9 @@ public class ModBlockStateProvider extends BlockStateProvider {
blockWithItem(ModBlocks.STEEL_BLOCK); blockWithItem(ModBlocks.STEEL_BLOCK);
blockWithItem(ModBlocks.TUNGSTEN_BLOCK); blockWithItem(ModBlocks.TUNGSTEN_BLOCK);
blockWithItem(ModBlocks.CEMENTED_CARBIDE_BLOCK); blockWithItem(ModBlocks.CEMENTED_CARBIDE_BLOCK);
blockWithItem(ModBlocks.SILVER_ORE);
blockWithItem(ModBlocks.DEEPSLATE_SILVER_ORE);
blockWithItem(ModBlocks.SILVER_BLOCK);
} }
private String name(Block block) { private String name(Block block) {

View file

@ -19,13 +19,14 @@ public class ModBlockTagProvider extends BlockTagsProvider {
@Override @Override
protected void addTags(HolderLookup.Provider pProvider) { protected void addTags(HolderLookup.Provider pProvider) {
this.tag(BlockTags.NEEDS_IRON_TOOL).add(ModBlocks.GALENA_ORE.get(), ModBlocks.SCHEELITE_ORE.get(), 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_AXE).add(ModBlocks.BARBED_WIRE.get());
this.tag(BlockTags.MINEABLE_WITH_PICKAXE).add(ModBlocks.GALENA_ORE.get(), ModBlocks.SCHEELITE_ORE.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.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.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()); this.tag(BlockTags.MINEABLE_WITH_SHOVEL).add(ModBlocks.SANDBAG.get());
} }

View file

@ -58,6 +58,8 @@ public class ModItemModelProvider extends ItemModelProvider {
simpleItem(ModItems.SCHEELITE); simpleItem(ModItems.SCHEELITE);
simpleItem(ModItems.DOG_TAG); simpleItem(ModItems.DOG_TAG);
simpleItem(ModItems.TRANSCRIPT); simpleItem(ModItems.TRANSCRIPT);
simpleItem(ModItems.RAW_SILVER);
simpleItem(ModItems.SILVER_INGOT);
simpleItem(ModItems.TUNGSTEN_ROD); simpleItem(ModItems.TUNGSTEN_ROD);
simpleItem(ModItems.IRON_BARREL); simpleItem(ModItems.IRON_BARREL);

View file

@ -31,29 +31,34 @@ public class ModItemTagProvider extends ItemTagsProvider {
this.tag(forgeTag("dusts/iron")).add(ModItems.IRON_POWDER.get()); this.tag(forgeTag("dusts/iron")).add(ModItems.IRON_POWDER.get());
this.tag(forgeTag("dusts/tungsten")).add(ModItems.TUNGSTEN_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/lead")).add(ModItems.LEAD_INGOT.get());
this.tag(forgeTag("ingots/steel")).add(ModItems.STEEL_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/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/lead")).add(ModItems.LEAD_BLOCK.get());
this.tag(forgeTag("storage_blocks/steel")).add(ModItems.STEEL_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/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/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/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/lead")).add(ModItems.GALENA.get());
this.tag(forgeTag("raw_materials/tungsten")).add(ModItems.SCHEELITE.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(), 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.GALENA_ORE.get(), ModItems.SCHEELITE_ORE.get(), ModItems.SILVER_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_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")).addTags(forgeTag("plates/copper"));
this.tag(forgeTag("plates/copper")).add(ModItems.COPPER_PLATE.get()); this.tag(forgeTag("plates/copper")).add(ModItems.COPPER_PLATE.get());

View file

@ -53,7 +53,6 @@ public class Mle1934Entity extends PathfinderMob implements GeoEntity, ICannonEn
public String animationprocedure = "empty"; public String animationprocedure = "empty";
protected int interpolationSteps; protected int interpolationSteps;
protected double serverYRot; protected double serverYRot;
protected double serverXRot; protected double serverXRot;

View file

@ -49,6 +49,10 @@ public class MortarEntity extends LivingEntity implements GeoEntity, AnimatedEnt
private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this); private final AnimatableInstanceCache cache = GeckoLibUtil.createInstanceCache(this);
public String animationProcedure = "empty"; public String animationProcedure = "empty";
protected int interpolationSteps;
protected double serverYRot;
protected double serverXRot;
public MortarEntity(PlayMessages.SpawnEntity packet, Level world) { public MortarEntity(PlayMessages.SpawnEntity packet, Level world) {
this(ModEntities.MORTAR.get(), world); this(ModEntities.MORTAR.get(), world);
} }
@ -183,6 +187,13 @@ public class MortarEntity extends LivingEntity implements GeoEntity, AnimatedEnt
return InteractionResult.sidedSuccess(this.level().isClientSide()); 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 @Override
public void travel(Vec3 dir) { public void travel(Vec3 dir) {
this.setXRot(-Mth.clamp((float) this.getAttribute(ModAttributes.MORTAR_PITCH.get()).getBaseValue(), 20, 89)); this.setXRot(-Mth.clamp((float) this.getAttribute(ModAttributes.MORTAR_PITCH.get()).getBaseValue(), 20, 89));

View file

@ -213,15 +213,6 @@ public class TargetEntity extends LivingEntity implements GeoEntity, AnimatedEnt
protected void pushEntities() { 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 @Override
public void setNoGravity(boolean ignored) { public void setNoGravity(boolean ignored) {
super.setNoGravity(true); super.setNoGravity(true);

View file

@ -17,10 +17,13 @@ public class ModBlocks {
public static final RegistryObject<Block> DEEPSLATE_GALENA_ORE = REGISTRY.register("deepslate_galena_ore", DeepslateGalenaOreBlock::new); public static final RegistryObject<Block> DEEPSLATE_GALENA_ORE = REGISTRY.register("deepslate_galena_ore", DeepslateGalenaOreBlock::new);
public static final RegistryObject<Block> SCHEELITE_ORE = REGISTRY.register("scheelite_ore", ScheeliteOreBlock::new); public static final RegistryObject<Block> SCHEELITE_ORE = REGISTRY.register("scheelite_ore", ScheeliteOreBlock::new);
public static final RegistryObject<Block> DEEPSLATE_SCHEELITE_ORE = REGISTRY.register("deepslate_scheelite_ore", DeepslateScheeliteOreBlock::new); public static final RegistryObject<Block> DEEPSLATE_SCHEELITE_ORE = REGISTRY.register("deepslate_scheelite_ore", DeepslateScheeliteOreBlock::new);
public static final RegistryObject<Block> SILVER_ORE = REGISTRY.register("silver_ore", SilverOreBlock::new);
public static final RegistryObject<Block> DEEPSLATE_SILVER_ORE = REGISTRY.register("deepslate_silver_ore", DeepslateSilverOreBlock::new);
public static final RegistryObject<Block> DRAGON_TEETH = REGISTRY.register("dragon_teeth", DragonTeethBlock::new); public static final RegistryObject<Block> DRAGON_TEETH = REGISTRY.register("dragon_teeth", DragonTeethBlock::new);
public static final RegistryObject<Block> REFORGING_TABLE = REGISTRY.register("reforging_table", ReforgingTableBlock::new); public static final RegistryObject<Block> REFORGING_TABLE = REGISTRY.register("reforging_table", ReforgingTableBlock::new);
public static final RegistryObject<Block> LEAD_BLOCK = REGISTRY.register("lead_block", LeadBlock::new); public static final RegistryObject<Block> LEAD_BLOCK = REGISTRY.register("lead_block", LeadBlock::new);
public static final RegistryObject<Block> STEEL_BLOCK = REGISTRY.register("steel_block", SteelBlock::new); public static final RegistryObject<Block> STEEL_BLOCK = REGISTRY.register("steel_block", SteelBlock::new);
public static final RegistryObject<Block> TUNGSTEN_BLOCK = REGISTRY.register("tungsten_block", TungstenBlock::new); public static final RegistryObject<Block> TUNGSTEN_BLOCK = REGISTRY.register("tungsten_block", TungstenBlock::new);
public static final RegistryObject<Block> SILVER_BLOCK = REGISTRY.register("silver_block", SilverBlock::new);
public static final RegistryObject<Block> CEMENTED_CARBIDE_BLOCK = REGISTRY.register("cemented_carbide_block", CementedCarbideBlock::new); public static final RegistryObject<Block> CEMENTED_CARBIDE_BLOCK = REGISTRY.register("cemented_carbide_block", CementedCarbideBlock::new);
} }

View file

@ -133,6 +133,7 @@ public class ModItems {
public static final RegistryObject<Item> COPPER_PLATE = ITEMS.register("copper_plate", () -> new Item(new Item.Properties())); public static final RegistryObject<Item> COPPER_PLATE = ITEMS.register("copper_plate", () -> new Item(new Item.Properties()));
public static final RegistryObject<Item> STEEL_INGOT = ITEMS.register("steel_ingot", () -> new Item(new Item.Properties())); public static final RegistryObject<Item> STEEL_INGOT = ITEMS.register("steel_ingot", () -> new Item(new Item.Properties()));
public static final RegistryObject<Item> LEAD_INGOT = ITEMS.register("lead_ingot", () -> new Item(new Item.Properties())); public static final RegistryObject<Item> LEAD_INGOT = ITEMS.register("lead_ingot", () -> new Item(new Item.Properties()));
public static final RegistryObject<Item> SILVER_INGOT = ITEMS.register("silver_ingot", () -> new Item(new Item.Properties()));
public static final RegistryObject<Item> TUNGSTEN_INGOT = ITEMS.register("tungsten_ingot", () -> new Item(new Item.Properties())); public static final RegistryObject<Item> TUNGSTEN_INGOT = ITEMS.register("tungsten_ingot", () -> new Item(new Item.Properties()));
public static final RegistryObject<Item> CEMENTED_CARBIDE_INGOT = ITEMS.register("cemented_carbide_ingot", () -> new Item(new Item.Properties())); public static final RegistryObject<Item> CEMENTED_CARBIDE_INGOT = ITEMS.register("cemented_carbide_ingot", () -> new Item(new Item.Properties()));
public static final RegistryObject<Item> HIGH_ENERGY_EXPLOSIVES = ITEMS.register("high_energy_explosives", () -> new Item(new Item.Properties())); public static final RegistryObject<Item> HIGH_ENERGY_EXPLOSIVES = ITEMS.register("high_energy_explosives", () -> new Item(new Item.Properties()));
@ -144,6 +145,7 @@ public class ModItems {
public static final RegistryObject<Item> RAW_CEMENTED_CARBIDE_POWDER = ITEMS.register("raw_cemented_carbide_powder", () -> new Item(new Item.Properties())); public static final RegistryObject<Item> RAW_CEMENTED_CARBIDE_POWDER = ITEMS.register("raw_cemented_carbide_powder", () -> new Item(new Item.Properties()));
public static final RegistryObject<Item> GALENA = ITEMS.register("galena", () -> new Item(new Item.Properties())); public static final RegistryObject<Item> GALENA = ITEMS.register("galena", () -> new Item(new Item.Properties()));
public static final RegistryObject<Item> SCHEELITE = ITEMS.register("scheelite", () -> new Item(new Item.Properties())); public static final RegistryObject<Item> SCHEELITE = ITEMS.register("scheelite", () -> new Item(new Item.Properties()));
public static final RegistryObject<Item> RAW_SILVER = ITEMS.register("raw_silver", () -> new Item(new Item.Properties()));
public static final RegistryObject<Item> DOG_TAG = ITEMS.register("dog_tag", DogTag::new); public static final RegistryObject<Item> DOG_TAG = ITEMS.register("dog_tag", DogTag::new);
public static final RegistryObject<Item> SHIELD_CELL = ITEMS.register("shield_cell", () -> new Item(new Item.Properties().rarity(Rarity.RARE))); public static final RegistryObject<Item> SHIELD_CELL = ITEMS.register("shield_cell", () -> new Item(new Item.Properties().rarity(Rarity.RARE)));
public static final RegistryObject<Item> TRANSCRIPT = ITEMS.register("transcript", Transcript::new); public static final RegistryObject<Item> TRANSCRIPT = ITEMS.register("transcript", Transcript::new);
@ -211,6 +213,8 @@ public class ModItems {
public static final RegistryObject<Item> DEEPSLATE_GALENA_ORE = block(ModBlocks.DEEPSLATE_GALENA_ORE); public static final RegistryObject<Item> DEEPSLATE_GALENA_ORE = block(ModBlocks.DEEPSLATE_GALENA_ORE);
public static final RegistryObject<Item> SCHEELITE_ORE = block(ModBlocks.SCHEELITE_ORE); public static final RegistryObject<Item> SCHEELITE_ORE = block(ModBlocks.SCHEELITE_ORE);
public static final RegistryObject<Item> DEEPSLATE_SCHEELITE_ORE = block(ModBlocks.DEEPSLATE_SCHEELITE_ORE); public static final RegistryObject<Item> DEEPSLATE_SCHEELITE_ORE = block(ModBlocks.DEEPSLATE_SCHEELITE_ORE);
public static final RegistryObject<Item> SILVER_ORE = block(ModBlocks.SILVER_ORE);
public static final RegistryObject<Item> DEEPSLATE_SILVER_ORE = block(ModBlocks.DEEPSLATE_SILVER_ORE);
public static final RegistryObject<Item> JUMP_PAD = block(ModBlocks.JUMP_PAD); public static final RegistryObject<Item> JUMP_PAD = block(ModBlocks.JUMP_PAD);
public static final RegistryObject<Item> SANDBAG = block(ModBlocks.SANDBAG); public static final RegistryObject<Item> SANDBAG = block(ModBlocks.SANDBAG);
public static final RegistryObject<Item> BARBED_WIRE = block(ModBlocks.BARBED_WIRE); public static final RegistryObject<Item> BARBED_WIRE = block(ModBlocks.BARBED_WIRE);
@ -219,6 +223,7 @@ public class ModItems {
public static final RegistryObject<Item> LEAD_BLOCK = block(ModBlocks.LEAD_BLOCK); public static final RegistryObject<Item> LEAD_BLOCK = block(ModBlocks.LEAD_BLOCK);
public static final RegistryObject<Item> STEEL_BLOCK = block(ModBlocks.STEEL_BLOCK); public static final RegistryObject<Item> STEEL_BLOCK = block(ModBlocks.STEEL_BLOCK);
public static final RegistryObject<Item> TUNGSTEN_BLOCK = block(ModBlocks.TUNGSTEN_BLOCK); public static final RegistryObject<Item> TUNGSTEN_BLOCK = block(ModBlocks.TUNGSTEN_BLOCK);
public static final RegistryObject<Item> SILVER_BLOCK = block(ModBlocks.SILVER_BLOCK);
public static final RegistryObject<Item> CEMENTED_CARBIDE_BLOCK = block(ModBlocks.CEMENTED_CARBIDE_BLOCK); public static final RegistryObject<Item> CEMENTED_CARBIDE_BLOCK = block(ModBlocks.CEMENTED_CARBIDE_BLOCK);
private static RegistryObject<Item> block(RegistryObject<Block> block) { private static RegistryObject<Item> block(RegistryObject<Block> block) {

View file

@ -174,11 +174,14 @@
"block.superbwarfare.scheelite_ore": "Scheelite 0re", "block.superbwarfare.scheelite_ore": "Scheelite 0re",
"block.superbwarfare.deepslate_scheelite_ore": "Deepslate Scheelite 0re", "block.superbwarfare.deepslate_scheelite_ore": "Deepslate Scheelite 0re",
"block.superbwarfare.deepslate_galena_ore": "Deepslate Galena 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.dragon_teeth": "Dragon Teeth",
"block.superbwarfare.reforging_table": "Gun Reforge Table", "block.superbwarfare.reforging_table": "Gun Reforge Table",
"block.superbwarfare.lead_block": "Lead Block", "block.superbwarfare.lead_block": "Lead Block",
"block.superbwarfare.tungsten_block": "Tungsten Block", "block.superbwarfare.tungsten_block": "Tungsten Block",
"block.superbwarfare.steel_block": "Steel Block", "block.superbwarfare.steel_block": "Steel Block",
"block.superbwarfare.silver_block": "Silver Block",
"block.superbwarfare.cemented_carbide_block": "Cemented Carbide Block", "block.superbwarfare.cemented_carbide_block": "Cemented Carbide Block",
"item.superbwarfare.high_energy_explosives": "High Energy Explosives", "item.superbwarfare.high_energy_explosives": "High Energy Explosives",
@ -193,9 +196,11 @@
"item.superbwarfare.lead_ingot": "Lead Ingot", "item.superbwarfare.lead_ingot": "Lead Ingot",
"item.superbwarfare.steel_ingot": "Steel Ingot", "item.superbwarfare.steel_ingot": "Steel Ingot",
"item.superbwarfare.tungsten_ingot": "Tungsten Ingot", "item.superbwarfare.tungsten_ingot": "Tungsten Ingot",
"item.superbwarfare.silver_ingot": "Silver Ingot",
"item.superbwarfare.cemented_carbide_ingot": "Cemented Carbide Ingot", "item.superbwarfare.cemented_carbide_ingot": "Cemented Carbide Ingot",
"item.superbwarfare.galena": "Raw Galena", "item.superbwarfare.galena": "Raw Galena",
"item.superbwarfare.scheelite": "Raw Galena", "item.superbwarfare.scheelite": "Raw Galena",
"item.superbwarfare.raw_silver": "Raw Silver",
"item.superbwarfare.ap_bullet": "Ap Bullet", "item.superbwarfare.ap_bullet": "Ap Bullet",
"des.superbwarfare.ap_bullet": "Increased the armor-piercing ratio of bullets", "des.superbwarfare.ap_bullet": "Increased the armor-piercing ratio of bullets",

View file

@ -174,11 +174,13 @@
"block.superbwarfare.scheelite_ore": "白钨矿石", "block.superbwarfare.scheelite_ore": "白钨矿石",
"block.superbwarfare.deepslate_scheelite_ore": "深层白钨矿石", "block.superbwarfare.deepslate_scheelite_ore": "深层白钨矿石",
"block.superbwarfare.deepslate_galena_ore": "深层方铅矿石", "block.superbwarfare.deepslate_galena_ore": "深层方铅矿石",
"block.superbwarfare.silver_ore": "银矿石",
"block.superbwarfare.deepslate_silver_ore": "深层银矿石",
"block.superbwarfare.dragon_teeth": "龙牙", "block.superbwarfare.dragon_teeth": "龙牙",
"block.superbwarfare.reforging_table": "枪械重铸台", "block.superbwarfare.reforging_table": "枪械重铸台",
"block.superbwarfare.lead_block": "铅块", "block.superbwarfare.lead_block": "铅块",
"block.superbwarfare.tungsten_block": "钨块", "block.superbwarfare.tungsten_block": "钨块",
"block.superbwarfare.steel_block": "钢块", "block.superbwarfare.silver_block": "银块",
"block.superbwarfare.cemented_carbide_block": "硬质合金块", "block.superbwarfare.cemented_carbide_block": "硬质合金块",
"item.superbwarfare.high_energy_explosives": "高能炸药", "item.superbwarfare.high_energy_explosives": "高能炸药",
@ -193,9 +195,11 @@
"item.superbwarfare.lead_ingot": "铅锭", "item.superbwarfare.lead_ingot": "铅锭",
"item.superbwarfare.steel_ingot": "钢锭", "item.superbwarfare.steel_ingot": "钢锭",
"item.superbwarfare.tungsten_ingot": "钨锭", "item.superbwarfare.tungsten_ingot": "钨锭",
"item.superbwarfare.silver_ingot": "银锭",
"item.superbwarfare.cemented_carbide_ingot": "硬质合金锭", "item.superbwarfare.cemented_carbide_ingot": "硬质合金锭",
"item.superbwarfare.galena": "粗方铅矿", "item.superbwarfare.galena": "粗方铅矿",
"item.superbwarfare.scheelite": "白钨矿", "item.superbwarfare.scheelite": "白钨矿",
"item.superbwarfare.raw_silver": "粗银",
"item.superbwarfare.ap_bullet": "穿甲弹", "item.superbwarfare.ap_bullet": "穿甲弹",
"des.superbwarfare.ap_bullet": "增加子弹的穿甲比例", "des.superbwarfare.ap_bullet": "增加子弹的穿甲比例",

Binary file not shown.

After

Width:  |  Height:  |  Size: 684 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 590 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 590 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 400 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 436 B

View file

@ -0,0 +1,6 @@
{
"type": "forge:add_features",
"biomes": "#is_overworld",
"features": "superbwarfare:deepslate_silver_ore",
"step": "underground_ores"
}

View file

@ -0,0 +1,6 @@
{
"type": "forge:add_features",
"biomes": "#is_overworld",
"features": "superbwarfare:silver_ore",
"step": "underground_ores"
}

View file

@ -0,0 +1,24 @@
{
"type": "minecraft:crafting_shaped",
"category": "equipment",
"pattern": [
"cbc",
"bab",
"cbc"
],
"key": {
"a": {
"item": "superbwarfare:empty_perk"
},
"b": {
"tag":"forge:storage_blocks/tungsten"
},
"c": {
"tag":"forge:ingots/tungsten"
}
},
"result": {
"item": "superbwarfare:ap_bullet",
"count": 1
}
}

View file

@ -0,0 +1,21 @@
{
"type": "minecraft:crafting_shaped",
"category": "equipment",
"pattern": [
"bbb",
"bab",
"bbb"
],
"key": {
"a": {
"item": "superbwarfare:empty_perk"
},
"b": {
"item":"minecraft:string"
}
},
"result": {
"item": "superbwarfare:longer_wire",
"count": 1
}
}

View file

@ -0,0 +1,24 @@
{
"type": "minecraft:crafting_shaped",
"category": "equipment",
"pattern": [
"cbc",
"bab",
"cbc"
],
"key": {
"a": {
"item": "superbwarfare:empty_perk"
},
"b": {
"tag":"forge:storage_blocks/lead"
},
"c": {
"item":"minecraft:spider_eye"
}
},
"result": {
"item": "superbwarfare:poisonous_bullet",
"count": 1
}
}

View file

@ -0,0 +1,24 @@
{
"type": "minecraft:crafting_shaped",
"category": "equipment",
"pattern": [
"cbc",
"bab",
"cbc"
],
"key": {
"a": {
"item": "superbwarfare:empty_perk"
},
"b": {
"tag":"forge:storage_blocks/silver"
},
"c": {
"tag":"forge:ingots/silver"
}
},
"result": {
"item": "superbwarfare:silver_bullet",
"count": 1
}
}

View file

@ -0,0 +1,27 @@
{
"type": "minecraft:crafting_shaped",
"category": "equipment",
"pattern": [
"ccc",
"bab",
"ddd"
],
"key": {
"a": {
"item": "superbwarfare:empty_perk"
},
"b": {
"item": "superbwarfare:shield_cell"
},
"c": {
"item": "minecraft:daylight_detector"
},
"d": {
"item": "minecraft:gold_ingot"
}
},
"result": {
"item": "superbwarfare:super_recharge",
"count": 1
}
}

View file

@ -0,0 +1,30 @@
{
"type": "minecraft:crafting_shaped",
"category": "equipment",
"pattern": [
"cec",
"bab",
"bdb"
],
"key": {
"a": {
"item": "superbwarfare:empty_perk"
},
"b": {
"item": "superbwarfare:shield_cell"
},
"c": {
"item": "minecraft:lightning_rod"
},
"d": {
"tag": "forge:dusts/coal_coke"
},
"e": {
"item": "minecraft:iron_ingot"
}
},
"result": {
"item": "superbwarfare:volt_overload",
"count": 1
}
}

View file

@ -0,0 +1,21 @@
{
"type": "minecraft:crafting_shaped",
"category": "equipment",
"pattern": [
"aaa",
"aba",
"aaa"
],
"key": {
"a": {
"item": "superbwarfare:silver_ingot"
},
"b": {
"tag":"forge:ingots/silver"
}
},
"result": {
"item": "superbwarfare:silver_block",
"count": 1
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:blasting",
"category": "misc",
"experience": 0.7,
"cookingtime": 100,
"ingredient": {
"item": "superbwarfare:raw_silver"
},
"result": "superbwarfare:silver_ingot"
}

View file

@ -0,0 +1,13 @@
{
"type": "minecraft:crafting_shapeless",
"category":"misc",
"ingredients": [
{
"item":"superbwarfare:silver_block"
}
],
"result": {
"item": "superbwarfare:silver_ingot",
"count": 9
}
}

View file

@ -0,0 +1,10 @@
{
"type": "minecraft:smelting",
"category": "misc",
"experience": 0.7,
"cookingtime": 200,
"ingredient": {
"item": "superbwarfare:raw_silver"
},
"result": "superbwarfare:silver_ingot"
}

View file

@ -0,0 +1,18 @@
{
"type": "minecraft:ore",
"config": {
"size": 6,
"discard_chance_on_air_exposure": 0,
"targets": [
{
"target": {
"predicate_type": "tag_match",
"tag": "deepslate_ore_replaceables"
},
"state": {
"Name": "superbwarfare:deepslate_silver_ore"
}
}
]
}
}

View file

@ -0,0 +1,18 @@
{
"type": "minecraft:ore",
"config": {
"size": 3,
"discard_chance_on_air_exposure": 0,
"targets": [
{
"target": {
"predicate_type": "tag_match",
"tag": "stone_ore_replaceables"
},
"state": {
"Name": "superbwarfare:silver_ore"
}
}
]
}
}

View file

@ -3,7 +3,7 @@
"placement": [ "placement": [
{ {
"type": "minecraft:count", "type": "minecraft:count",
"count": 9 "count": 8
}, },
{ {
"type": "minecraft:in_square" "type": "minecraft:in_square"

View file

@ -3,7 +3,7 @@
"placement": [ "placement": [
{ {
"type": "minecraft:count", "type": "minecraft:count",
"count": 5 "count": 6
}, },
{ {
"type": "minecraft:in_square" "type": "minecraft:in_square"

View file

@ -0,0 +1,27 @@
{
"feature": "superbwarfare:deepslate_silver_ore",
"placement": [
{
"type": "minecraft:count",
"count": 6
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:height_range",
"height": {
"type": "minecraft:uniform",
"min_inclusive": {
"absolute": -64
},
"max_inclusive": {
"absolute": 0
}
}
},
{
"type": "minecraft:biome"
}
]
}

View file

@ -3,7 +3,7 @@
"placement": [ "placement": [
{ {
"type": "minecraft:count", "type": "minecraft:count",
"count": 8 "count": 6
}, },
{ {
"type": "minecraft:in_square" "type": "minecraft:in_square"

View file

@ -3,7 +3,7 @@
"placement": [ "placement": [
{ {
"type": "minecraft:count", "type": "minecraft:count",
"count": 1 "count": 3
}, },
{ {
"type": "minecraft:in_square" "type": "minecraft:in_square"

View file

@ -0,0 +1,27 @@
{
"feature": "superbwarfare:silver_ore",
"placement": [
{
"type": "minecraft:count",
"count": 3
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:height_range",
"height": {
"type": "minecraft:uniform",
"min_inclusive": {
"absolute": 1
},
"max_inclusive": {
"absolute": 48
}
}
},
{
"type": "minecraft:biome"
}
]
}