From 8200a17fe91ba132b682bbf79ab80b0e22626ad9 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Wed, 11 Sep 2024 15:56:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=91=E5=B1=9E=E9=94=AD=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E6=96=B9=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../2e07f3c482445536d45c00e6abf223465c01c841 | 6 ++++- .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 6 ++++- .../aea51f45d35dbbd3220b84682ce1417a457a0246 | 4 ++-- .../f93f628a3b0902e77de76541bcff68d1e5e3578f | 14 +++++++++++- .../blockstates/cemented_carbide_block.json | 7 ++++++ .../superbwarfare/blockstates/lead_block.json | 7 ++++++ .../blockstates/steel_block.json | 7 ++++++ .../blockstates/tungsten_block.json | 7 ++++++ .../models/block/cemented_carbide_block.json | 6 +++++ .../models/block/lead_block.json | 6 +++++ .../models/block/steel_block.json | 6 +++++ .../models/block/tungsten_block.json | 6 +++++ .../models/item/cemented_carbide_block.json | 3 +++ .../superbwarfare/models/item/lead_block.json | 3 +++ .../models/item/steel_block.json | 3 +++ .../models/item/tungsten_block.json | 3 +++ .../data/forge/tags/items/storage_blocks.json | 7 ++++++ .../forge/tags/items/storage_blocks/lead.json | 5 +++++ .../tags/items/storage_blocks/steel.json | 5 +++++ .../tags/items/storage_blocks/tungsten.json | 5 +++++ .../tags/blocks/mineable/pickaxe.json | 6 ++++- .../blocks/cemented_carbide_block.json | 21 ++++++++++++++++++ .../loot_tables/blocks/lead_block.json | 21 ++++++++++++++++++ .../loot_tables/blocks/steel_block.json | 21 ++++++++++++++++++ .../loot_tables/blocks/tungsten_block.json | 21 ++++++++++++++++++ .../block/CementedCarbideBlock.java | 11 +++++++++ .../superbwarfare/block/LeadBlock.java | 11 +++++++++ .../superbwarfare/block/SteelBlock.java | 11 +++++++++ .../superbwarfare/block/TungstenBlock.java | 11 +++++++++ .../datagen/ModBlockLootProvider.java | 4 ++++ .../datagen/ModBlockStateProvider.java | 5 ++++- .../datagen/ModBlockTagProvider.java | 3 ++- .../datagen/ModItemTagProvider.java | 5 +++++ .../superbwarfare/init/ModBlocks.java | 5 ++++- .../mcreator/superbwarfare/init/ModItems.java | 4 ++++ .../assets/superbwarfare/lang/en_us.json | 4 ++++ .../assets/superbwarfare/lang/zh_cn.json | 4 ++++ .../textures/block/cemented_carbide_block.png | Bin 0 -> 623 bytes .../textures/block/lead_block.png | Bin 0 -> 515 bytes .../textures/block/steel_block.png | Bin 0 -> 563 bytes .../textures/block/tungsten_block.png | Bin 0 -> 602 bytes .../cemented_carbide_block_crafting.json | 18 +++++++++++++++ ..._from_cemented_carbide_block_crafting.json | 13 +++++++++++ .../recipes/lead_block_crafting.json | 21 ++++++++++++++++++ .../recipes/lead_ingot_crafting.json | 13 +++++++++++ .../recipes/steel_block_crafting.json | 21 ++++++++++++++++++ .../recipes/steel_ingot_crafting.json | 13 +++++++++++ .../recipes/tungsten_block_crafting.json | 21 ++++++++++++++++++ .../recipes/tungsten_ingot_crafting.json | 13 +++++++++++ .../configured_feature/galena_ore.json | 2 +- 50 files changed, 409 insertions(+), 10 deletions(-) create mode 100644 src/generated/resources/assets/superbwarfare/blockstates/cemented_carbide_block.json create mode 100644 src/generated/resources/assets/superbwarfare/blockstates/lead_block.json create mode 100644 src/generated/resources/assets/superbwarfare/blockstates/steel_block.json create mode 100644 src/generated/resources/assets/superbwarfare/blockstates/tungsten_block.json create mode 100644 src/generated/resources/assets/superbwarfare/models/block/cemented_carbide_block.json create mode 100644 src/generated/resources/assets/superbwarfare/models/block/lead_block.json create mode 100644 src/generated/resources/assets/superbwarfare/models/block/steel_block.json create mode 100644 src/generated/resources/assets/superbwarfare/models/block/tungsten_block.json create mode 100644 src/generated/resources/assets/superbwarfare/models/item/cemented_carbide_block.json create mode 100644 src/generated/resources/assets/superbwarfare/models/item/lead_block.json create mode 100644 src/generated/resources/assets/superbwarfare/models/item/steel_block.json create mode 100644 src/generated/resources/assets/superbwarfare/models/item/tungsten_block.json create mode 100644 src/generated/resources/data/forge/tags/items/storage_blocks.json create mode 100644 src/generated/resources/data/forge/tags/items/storage_blocks/lead.json create mode 100644 src/generated/resources/data/forge/tags/items/storage_blocks/steel.json create mode 100644 src/generated/resources/data/forge/tags/items/storage_blocks/tungsten.json create mode 100644 src/generated/resources/data/superbwarfare/loot_tables/blocks/cemented_carbide_block.json create mode 100644 src/generated/resources/data/superbwarfare/loot_tables/blocks/lead_block.json create mode 100644 src/generated/resources/data/superbwarfare/loot_tables/blocks/steel_block.json create mode 100644 src/generated/resources/data/superbwarfare/loot_tables/blocks/tungsten_block.json create mode 100644 src/main/java/net/mcreator/superbwarfare/block/CementedCarbideBlock.java create mode 100644 src/main/java/net/mcreator/superbwarfare/block/LeadBlock.java create mode 100644 src/main/java/net/mcreator/superbwarfare/block/SteelBlock.java create mode 100644 src/main/java/net/mcreator/superbwarfare/block/TungstenBlock.java create mode 100644 src/main/resources/assets/superbwarfare/textures/block/cemented_carbide_block.png create mode 100644 src/main/resources/assets/superbwarfare/textures/block/lead_block.png create mode 100644 src/main/resources/assets/superbwarfare/textures/block/steel_block.png create mode 100644 src/main/resources/assets/superbwarfare/textures/block/tungsten_block.png create mode 100644 src/main/resources/data/superbwarfare/recipes/cemented_carbide_block_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/cemented_carbide_from_cemented_carbide_block_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/lead_block_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/lead_ingot_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/steel_block_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/steel_ingot_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/tungsten_block_crafting.json create mode 100644 src/main/resources/data/superbwarfare/recipes/tungsten_ingot_crafting.json diff --git a/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 index 5beeb8c3b..3bc914030 100644 --- a/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 +++ b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 @@ -1,4 +1,4 @@ -// 1.20.1 2024-09-09T21:58:39.0898222 Tags for minecraft:item mod id superbwarfare +// 1.20.1 2024-09-11T15:45:39.7049414 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 @@ -18,6 +18,10 @@ acced7f04d0125f1e53cf67a9c3f5f4a35889ee9 data/forge/tags/items/ore_rates/singula b6b0065ecbe36917b777ad86d467ef62dec9d82e data/forge/tags/items/raw_materials.json 08cf183386837d6d22b7ee1315758e479adf82d8 data/forge/tags/items/raw_materials/lead.json 01d117b3c36039399a63c89f32ee0cc0abfee66a data/forge/tags/items/raw_materials/tungsten.json +e3d277bdb108231d7e5c0cb2bf5dfe90beba9beb data/forge/tags/items/storage_blocks.json +af6fd64b4a685c353f243763db268f7b2304c009 data/forge/tags/items/storage_blocks/lead.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 62eb408544731ce4cfcd119d8a6cc74731189ac0 data/superbwarfare/tags/items/handgun.json b404c6fd99d2ca68c6738f225cb7d68ee443c10a data/superbwarfare/tags/items/machine_gun.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d index fc48a76ee..c16d50508 100644 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -1,10 +1,14 @@ -// 1.20.1 2024-09-09T21:45:30.1964838 Loot Tables +// 1.20.1 2024-09-11T15:45:39.7059384 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 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 +26265463564b351c59c97d0ef8d2711e69c84a38 data/superbwarfare/loot_tables/blocks/lead_block.json 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 +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 06d1c4801..d11b90258 100644 --- a/src/generated/resources/.cache/aea51f45d35dbbd3220b84682ce1417a457a0246 +++ b/src/generated/resources/.cache/aea51f45d35dbbd3220b84682ce1417a457a0246 @@ -1,5 +1,5 @@ -// 1.20.1 2024-09-09T21:25:11.1944167 Tags for minecraft:block mod id superbwarfare +// 1.20.1 2024-09-11T15:45:39.7039453 Tags for minecraft:block mod id superbwarfare 0acfd31854bf15f2c108138b3df7206bd2593e6b data/minecraft/tags/blocks/mineable/axe.json -3cf5817099a12d0d4c445475ab0f14246a5dfd87 data/minecraft/tags/blocks/mineable/pickaxe.json +7d85f8bc9cb66e8997028539021d3a5714b0770d data/minecraft/tags/blocks/mineable/pickaxe.json 3da7f021790388a122717f16f51c7ec5232eebcb data/minecraft/tags/blocks/mineable/shovel.json a2e985f17413ab603aa0cb47cc17c32a483636ca data/minecraft/tags/blocks/needs_iron_tool.json diff --git a/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f b/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f index 9828fa4d9..3ef41d4d0 100644 --- a/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f +++ b/src/generated/resources/.cache/f93f628a3b0902e77de76541bcff68d1e5e3578f @@ -1,16 +1,28 @@ -// 1.20.1 2024-09-09T22:01:45.0001015 Block States: superbwarfare +// 1.20.1 2024-09-11T15:45:39.7059384 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 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 +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 e9bea7028029623e5dc9d8b0eead6add93c36931 assets/superbwarfare/models/block/galena_ore.json +2909ad43b32b377f3b404d30a4b9d226ef63df7a assets/superbwarfare/models/block/lead_block.json 15dcf7724846b0e19f826f6d7e9241ac81ef5969 assets/superbwarfare/models/block/scheelite_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 dab3d5800ad52100d0af25033d0aed1b5214db46 assets/superbwarfare/models/item/galena_ore.json +c776ee36ee2ff9e749aa8e059144b81f480815da assets/superbwarfare/models/item/lead_block.json fe6f5b256dc4f8a16fbc5b42028a5d73300c3cd5 assets/superbwarfare/models/item/scheelite_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/cemented_carbide_block.json b/src/generated/resources/assets/superbwarfare/blockstates/cemented_carbide_block.json new file mode 100644 index 000000000..c2585d1df --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/blockstates/cemented_carbide_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "superbwarfare:block/cemented_carbide_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/blockstates/lead_block.json b/src/generated/resources/assets/superbwarfare/blockstates/lead_block.json new file mode 100644 index 000000000..ed02bd48f --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/blockstates/lead_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "superbwarfare:block/lead_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/blockstates/steel_block.json b/src/generated/resources/assets/superbwarfare/blockstates/steel_block.json new file mode 100644 index 000000000..37a966b30 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/blockstates/steel_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "superbwarfare:block/steel_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/blockstates/tungsten_block.json b/src/generated/resources/assets/superbwarfare/blockstates/tungsten_block.json new file mode 100644 index 000000000..699f8180b --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/blockstates/tungsten_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "superbwarfare:block/tungsten_block" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/block/cemented_carbide_block.json b/src/generated/resources/assets/superbwarfare/models/block/cemented_carbide_block.json new file mode 100644 index 000000000..ac818b2d8 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/block/cemented_carbide_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "superbwarfare:block/cemented_carbide_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/block/lead_block.json b/src/generated/resources/assets/superbwarfare/models/block/lead_block.json new file mode 100644 index 000000000..33314c16b --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/block/lead_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "superbwarfare:block/lead_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/block/steel_block.json b/src/generated/resources/assets/superbwarfare/models/block/steel_block.json new file mode 100644 index 000000000..115c4c6e8 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/block/steel_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "superbwarfare:block/steel_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/block/tungsten_block.json b/src/generated/resources/assets/superbwarfare/models/block/tungsten_block.json new file mode 100644 index 000000000..43ce07647 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/block/tungsten_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "superbwarfare:block/tungsten_block" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/cemented_carbide_block.json b/src/generated/resources/assets/superbwarfare/models/item/cemented_carbide_block.json new file mode 100644 index 000000000..78b45ca34 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/cemented_carbide_block.json @@ -0,0 +1,3 @@ +{ + "parent": "superbwarfare:block/cemented_carbide_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/lead_block.json b/src/generated/resources/assets/superbwarfare/models/item/lead_block.json new file mode 100644 index 000000000..7f47a8348 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/lead_block.json @@ -0,0 +1,3 @@ +{ + "parent": "superbwarfare:block/lead_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/steel_block.json b/src/generated/resources/assets/superbwarfare/models/item/steel_block.json new file mode 100644 index 000000000..2f4fec6c8 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/steel_block.json @@ -0,0 +1,3 @@ +{ + "parent": "superbwarfare:block/steel_block" +} \ No newline at end of file diff --git a/src/generated/resources/assets/superbwarfare/models/item/tungsten_block.json b/src/generated/resources/assets/superbwarfare/models/item/tungsten_block.json new file mode 100644 index 000000000..90f7d3af1 --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/tungsten_block.json @@ -0,0 +1,3 @@ +{ + "parent": "superbwarfare:block/tungsten_block" +} \ 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 new file mode 100644 index 000000000..1b6d6014e --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#forge:storage_blocks/lead", + "#forge:storage_blocks/steel", + "#forge:storage_blocks/tungsten" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/lead.json b/src/generated/resources/data/forge/tags/items/storage_blocks/lead.json new file mode 100644 index 000000000..d9eb998c3 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/lead.json @@ -0,0 +1,5 @@ +{ + "values": [ + "superbwarfare:lead_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/steel.json b/src/generated/resources/data/forge/tags/items/storage_blocks/steel.json new file mode 100644 index 000000000..38f856dd3 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/steel.json @@ -0,0 +1,5 @@ +{ + "values": [ + "superbwarfare:steel_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/storage_blocks/tungsten.json b/src/generated/resources/data/forge/tags/items/storage_blocks/tungsten.json new file mode 100644 index 000000000..ebd65d156 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/storage_blocks/tungsten.json @@ -0,0 +1,5 @@ +{ + "values": [ + "superbwarfare:tungsten_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 b3bcfdb0a..fcd8f01d9 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -5,6 +5,10 @@ "superbwarfare:deepslate_galena_ore", "superbwarfare:deepslate_scheelite_ore", "superbwarfare:dragon_teeth", - "superbwarfare:reforging_table" + "superbwarfare:reforging_table", + "superbwarfare:lead_block", + "superbwarfare:steel_block", + "superbwarfare:tungsten_block", + "superbwarfare:cemented_carbide_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/cemented_carbide_block.json b/src/generated/resources/data/superbwarfare/loot_tables/blocks/cemented_carbide_block.json new file mode 100644 index 000000000..160b75961 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/loot_tables/blocks/cemented_carbide_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:cemented_carbide_block" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "superbwarfare:blocks/cemented_carbide_block" +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/lead_block.json b/src/generated/resources/data/superbwarfare/loot_tables/blocks/lead_block.json new file mode 100644 index 000000000..bf4fd0419 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/loot_tables/blocks/lead_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:lead_block" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "superbwarfare:blocks/lead_block" +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/steel_block.json b/src/generated/resources/data/superbwarfare/loot_tables/blocks/steel_block.json new file mode 100644 index 000000000..659e81586 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/loot_tables/blocks/steel_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:steel_block" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "superbwarfare:blocks/steel_block" +} \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/loot_tables/blocks/tungsten_block.json b/src/generated/resources/data/superbwarfare/loot_tables/blocks/tungsten_block.json new file mode 100644 index 000000000..cc2e78c68 --- /dev/null +++ b/src/generated/resources/data/superbwarfare/loot_tables/blocks/tungsten_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:tungsten_block" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "superbwarfare:blocks/tungsten_block" +} \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/block/CementedCarbideBlock.java b/src/main/java/net/mcreator/superbwarfare/block/CementedCarbideBlock.java new file mode 100644 index 000000000..3bb36b1c7 --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/block/CementedCarbideBlock.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 CementedCarbideBlock extends Block { + public CementedCarbideBlock() { + super(Properties.of().instrument(NoteBlockInstrument.BASEDRUM).sound(SoundType.METAL).strength(5f, 6f).requiresCorrectToolForDrops()); + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/block/LeadBlock.java b/src/main/java/net/mcreator/superbwarfare/block/LeadBlock.java new file mode 100644 index 000000000..f48318d23 --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/block/LeadBlock.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 LeadBlock extends Block { + public LeadBlock() { + super(Properties.of().instrument(NoteBlockInstrument.BASEDRUM).sound(SoundType.METAL).strength(5f, 6f).requiresCorrectToolForDrops()); + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/block/SteelBlock.java b/src/main/java/net/mcreator/superbwarfare/block/SteelBlock.java new file mode 100644 index 000000000..da8a760f4 --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/block/SteelBlock.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 SteelBlock extends Block { + public SteelBlock() { + super(Properties.of().instrument(NoteBlockInstrument.BASEDRUM).sound(SoundType.METAL).strength(5f, 6f).requiresCorrectToolForDrops()); + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/block/TungstenBlock.java b/src/main/java/net/mcreator/superbwarfare/block/TungstenBlock.java new file mode 100644 index 000000000..c14a0c413 --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/block/TungstenBlock.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 TungstenBlock extends Block { + public TungstenBlock() { + super(Properties.of().instrument(NoteBlockInstrument.BASEDRUM).sound(SoundType.METAL).strength(5f, 6f).requiresCorrectToolForDrops()); + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockLootProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockLootProvider.java index 07ed440cf..8f47c36ee 100644 --- a/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockLootProvider.java +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockLootProvider.java @@ -21,6 +21,10 @@ public class ModBlockLootProvider extends BlockLootSubProvider { this.dropSelf(ModBlocks.JUMP_PAD.get()); this.dropSelf(ModBlocks.DRAGON_TEETH.get()); this.dropSelf(ModBlocks.REFORGING_TABLE.get()); + this.dropSelf(ModBlocks.LEAD_BLOCK.get()); + this.dropSelf(ModBlocks.STEEL_BLOCK.get()); + this.dropSelf(ModBlocks.TUNGSTEN_BLOCK.get()); + this.dropSelf(ModBlocks.CEMENTED_CARBIDE_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())); diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockStateProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockStateProvider.java index a4963c996..c583563c2 100644 --- a/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockStateProvider.java +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockStateProvider.java @@ -5,7 +5,6 @@ import net.mcreator.superbwarfare.init.ModBlocks; import net.minecraft.data.PackOutput; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.block.Block; - import net.minecraftforge.client.model.generators.BlockStateProvider; import net.minecraftforge.client.model.generators.ModelFile; import net.minecraftforge.common.data.ExistingFileHelper; @@ -28,6 +27,10 @@ public class ModBlockStateProvider extends BlockStateProvider { blockWithItem(ModBlocks.DEEPSLATE_GALENA_ORE); blockWithItem(ModBlocks.SCHEELITE_ORE); blockWithItem(ModBlocks.DEEPSLATE_SCHEELITE_ORE); + blockWithItem(ModBlocks.LEAD_BLOCK); + blockWithItem(ModBlocks.STEEL_BLOCK); + blockWithItem(ModBlocks.TUNGSTEN_BLOCK); + blockWithItem(ModBlocks.CEMENTED_CARBIDE_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 4d86c527a..8918e6393 100644 --- a/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockTagProvider.java +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockTagProvider.java @@ -24,7 +24,8 @@ public class ModBlockTagProvider extends BlockTagsProvider { 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.REFORGING_TABLE.get(), ModBlocks.LEAD_BLOCK.get(), ModBlocks.STEEL_BLOCK.get(), ModBlocks.TUNGSTEN_BLOCK.get(), + ModBlocks.CEMENTED_CARBIDE_BLOCK.get()); this.tag(BlockTags.MINEABLE_WITH_SHOVEL).add(ModBlocks.SANDBAG.get()); } diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java index 959525b76..fa05a8090 100644 --- a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java @@ -36,6 +36,11 @@ public class ModItemTagProvider extends ItemTagsProvider { this.tag(forgeTag("ingots/steel")).add(ModItems.STEEL_INGOT.get()); this.tag(forgeTag("ingots/tungsten")).add(ModItems.TUNGSTEN_INGOT.get()); + this.tag(Tags.Items.STORAGE_BLOCKS).addTags(forgeTag("storage_blocks/lead"), forgeTag("storage_blocks/steel"), forgeTag("storage_blocks/tungsten")); + 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(Tags.Items.ORES).addTags(forgeTag("ores/lead"), forgeTag("ores/tungsten")); 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()); diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModBlocks.java b/src/main/java/net/mcreator/superbwarfare/init/ModBlocks.java index d2d864b2e..69c21f35f 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModBlocks.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModBlocks.java @@ -19,5 +19,8 @@ public class ModBlocks { public static final RegistryObject DEEPSLATE_SCHEELITE_ORE = REGISTRY.register("deepslate_scheelite_ore", DeepslateScheeliteOreBlock::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 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 face04ef0..3e6f670f5 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java @@ -216,6 +216,10 @@ public class ModItems { public static final RegistryObject BARBED_WIRE = block(ModBlocks.BARBED_WIRE); public static final RegistryObject DRAGON_TEETH = block(ModBlocks.DRAGON_TEETH); public static final RegistryObject REFORGING_TABLE = block(ModBlocks.REFORGING_TABLE); + 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 CEMENTED_CARBIDE_BLOCK = block(ModBlocks.CEMENTED_CARBIDE_BLOCK); private static RegistryObject block(RegistryObject block) { return BLOCKS.register(block.getId().getPath(), () -> new BlockItem(block.get(), new Item.Properties())); diff --git a/src/main/resources/assets/superbwarfare/lang/en_us.json b/src/main/resources/assets/superbwarfare/lang/en_us.json index c0152da86..1f540b35a 100644 --- a/src/main/resources/assets/superbwarfare/lang/en_us.json +++ b/src/main/resources/assets/superbwarfare/lang/en_us.json @@ -176,6 +176,10 @@ "block.superbwarfare.deepslate_galena_ore": "Deepslate Galena 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.cemented_carbide_block": "Cemented Carbide Block", "item.superbwarfare.high_energy_explosives": "High Energy Explosives", "item.superbwarfare.grain": "Grain", diff --git a/src/main/resources/assets/superbwarfare/lang/zh_cn.json b/src/main/resources/assets/superbwarfare/lang/zh_cn.json index 90dc2ab5f..7c876876c 100644 --- a/src/main/resources/assets/superbwarfare/lang/zh_cn.json +++ b/src/main/resources/assets/superbwarfare/lang/zh_cn.json @@ -176,6 +176,10 @@ "block.superbwarfare.deepslate_galena_ore": "深层方铅矿石", "block.superbwarfare.dragon_teeth": "龙牙", "block.superbwarfare.reforging_table": "枪械重铸台", + "block.superbwarfare.lead_block": "铅块", + "block.superbwarfare.tungsten_block": "钨块", + "block.superbwarfare.steel_block": "钢块", + "block.superbwarfare.cemented_carbide_block": "硬质合金块", "item.superbwarfare.high_energy_explosives": "高能炸药", "item.superbwarfare.grain": "推进药柱", diff --git a/src/main/resources/assets/superbwarfare/textures/block/cemented_carbide_block.png b/src/main/resources/assets/superbwarfare/textures/block/cemented_carbide_block.png new file mode 100644 index 0000000000000000000000000000000000000000..308f69c8cb1c46fb70846f143874b73ba01be21e GIT binary patch literal 623 zcmV-#0+9WQP)ckxgq8Q51%s`!PwU$xIT{ByC-!1%H)b#YzQ1S4ycx zQKa|_qzgCV4{_lyaHAqFL|dDFBsJ+InVHPoxz|NQQSe`h^te5+w~F zBue3Vj3c}f4orqI%x2arNj*4YXZz`5rP5kzVFkh=z=7cJI7gA^FZb^2g+;pEwXJ)1 zx@!uUjBsiUxFP_KkBhP|8a27T&fU%Z;Rq?fSvQ$v+mH5>G5z!LB*OOs;h0Qptu8uE z`QrI&KnP(9Bw$RDr1{NT8$S=DAYefUHYZJNNg<8=_I3E+;RX=JBS0&K!}(=T3sdAG z^aJad#8xR5eF?;|`uiOXMAMO1R-Q8LdSD%KVu4y9fnG0Cibf*@mKrTU>Jq@w;Yl+H zlsBg<{+tF@SHny9VAvNDX)=IjYe`jzr~kOG=-x?mIU^kMYFCn2;YI;^iN}dK^AuIZnZ;C)9XbgjaRKmL8sXUWSjz|alX7#b&B3m1ay|e z%d4U>ozq#Svdm1UXju&co5a~{HhcVJ_hN)~6QbA4~Q4F(_H#7er&`L!>C3=lYy+d!y1_W*ChD%WR zfBwvi-NgWHluaT>aqRHxx9@!cK$0Y0gCr)1A6iOg0j9v*J9jqg~%+q|u}5&%@| z+1XWNM7HtdAU-D z#z+RB04SB^)6)x;Gm>N^A}|aIQ02?ZFL2+8wT*XXPGgfij@ep}9EZ%z-o389_rB?{ z4VXl0EnC~QoTdR#L_`o^RUd}7t}D6efkp;E%MpCbA%YP>65#Q;l0m`-5Y09KhHU`} zfN(_q=L^SiFe2jL4VzcU3`r4bqiU5bsj3WAFB_3;s8A#KR*5%hw1%MZEV8Z zj(BBpT=opN(((NB6%o5>1Tqs6B2XpSBvl1c)h+Mm=f9HADJ@@Z;W_{S002ovPDHLk FV1h_e=LY}) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/superbwarfare/textures/block/steel_block.png b/src/main/resources/assets/superbwarfare/textures/block/steel_block.png new file mode 100644 index 0000000000000000000000000000000000000000..661607a72e90570c7e2740d3b0405a95416a64a7 GIT binary patch literal 563 zcmV-30?hr1P)skiAY@K@f${%+B7sM%bxn$a_R`>c~o+0+AA>a?_Wj$LNwEY`#C}f^=f^4`?Ic7N(lfFm>D2uda0(_>~`D5;+@o~j#YJZ^a20X|n1LLgIX+xGhUdOm*(AjZhdL@0RUn6IwBpPYOGkTnYkX4%Z<^Eu!lgct=t2!V)( zVNlJB#d~+Fsu}<@vpYfv%t1tAi~x!!qRC`3o4pDl094q--S_wR3r36r5D^n0=S)PZ z2Eg6j?dd_37-RL6#R0(ce$0%S%nSe#0SFwVOe*)7>E%L;H#5KslDi84RRxeza>sLm zJBUzB&N>W(s?KIJ7Lm4X0aR60DBb;Eb$9ITO#syOQ&)yz05FbYN{I+1L{$M&%?_0B zc3lTxv)S-!wJP(@&(Hh5SIvFjk7MrpKIhy#G|T1ho0}hIrkcCHlj&?aj{S5xJv}`I z&@@d!DoQE2`|}gZ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/superbwarfare/textures/block/tungsten_block.png b/src/main/resources/assets/superbwarfare/textures/block/tungsten_block.png new file mode 100644 index 0000000000000000000000000000000000000000..bc2f4de92dcdb6005cea8b66ac1960014a282181 GIT binary patch literal 602 zcmV-g0;TckeJL7WREfSxeRuQ6fr3uB7CnqgP5&mbGFC z5=3=9_s%_fyyKi(UF}$F`rS2STSRpA^Ew27aBvVKdV@XyNkkz8rLtbHbk3J+d8P^g zMa}>+HPps4^Ad@XQhzXD!2s4eolN}=3#=4svCvD)ECc{+jFPI=QvaljoatTzF>{O& z01M%~#s6e%x-%*9auzHy#s66_RtVuka@OTV!Galpl%lGtX5oxYA>38Qi1tc0nNFnm zbD8ws18ACNV>qbmnrOAtmd+<7$+|SYxQ;RX{vZIYHP=l8fQgUa9nWSnW6ZbF<>aOr zUsUJgEAM@b;pF7K)_Oj>_0GvW&!^LAyI6U)``r34nN9&rCKD!(DTWxGvrl%OYOOyz_IFllX>dC@e^yV2bCEp4{R{#J207*qoM6N<$g2XroRR910 literal 0 HcmV?d00001 diff --git a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_block_crafting.json b/src/main/resources/data/superbwarfare/recipes/cemented_carbide_block_crafting.json new file mode 100644 index 000000000..eac622ec3 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/cemented_carbide_block_crafting.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + "aaa", + "aaa", + "aaa" + ], + "key": { + "a": { + "item": "superbwarfare:cemented_carbide_ingot" + } + }, + "result": { + "item": "superbwarfare:cemented_carbide_block", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/cemented_carbide_from_cemented_carbide_block_crafting.json b/src/main/resources/data/superbwarfare/recipes/cemented_carbide_from_cemented_carbide_block_crafting.json new file mode 100644 index 000000000..4f13f79f2 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/cemented_carbide_from_cemented_carbide_block_crafting.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category":"misc", + "ingredients": [ + { + "item":"superbwarfare:cemented_carbide_block" + } + ], + "result": { + "item": "superbwarfare:cemented_carbide_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/lead_block_crafting.json b/src/main/resources/data/superbwarfare/recipes/lead_block_crafting.json new file mode 100644 index 000000000..b1c04ef31 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/lead_block_crafting.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "superbwarfare:lead_ingot" + }, + "b": { + "tag":"forge:ingots/lead" + } + }, + "result": { + "item": "superbwarfare:lead_block", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/lead_ingot_crafting.json b/src/main/resources/data/superbwarfare/recipes/lead_ingot_crafting.json new file mode 100644 index 000000000..0888bbd84 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/lead_ingot_crafting.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category":"misc", + "ingredients": [ + { + "item":"superbwarfare:lead_block" + } + ], + "result": { + "item": "superbwarfare:lead_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/steel_block_crafting.json b/src/main/resources/data/superbwarfare/recipes/steel_block_crafting.json new file mode 100644 index 000000000..e438e15e1 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/steel_block_crafting.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "superbwarfare:steel_ingot" + }, + "b": { + "tag":"forge:ingots/steel" + } + }, + "result": { + "item": "superbwarfare:steel_block", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/steel_ingot_crafting.json b/src/main/resources/data/superbwarfare/recipes/steel_ingot_crafting.json new file mode 100644 index 000000000..4c3f792b5 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/steel_ingot_crafting.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category":"misc", + "ingredients": [ + { + "item":"superbwarfare:steel_block" + } + ], + "result": { + "item": "superbwarfare:steel_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/tungsten_block_crafting.json b/src/main/resources/data/superbwarfare/recipes/tungsten_block_crafting.json new file mode 100644 index 000000000..c11280950 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/tungsten_block_crafting.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "equipment", + "pattern": [ + "aaa", + "aba", + "aaa" + ], + "key": { + "a": { + "item": "superbwarfare:tungsten_ingot" + }, + "b": { + "tag":"forge:ingots/tungsten" + } + }, + "result": { + "item": "superbwarfare:tungsten_block", + "count": 1 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/tungsten_ingot_crafting.json b/src/main/resources/data/superbwarfare/recipes/tungsten_ingot_crafting.json new file mode 100644 index 000000000..93d471838 --- /dev/null +++ b/src/main/resources/data/superbwarfare/recipes/tungsten_ingot_crafting.json @@ -0,0 +1,13 @@ +{ + "type": "minecraft:crafting_shapeless", + "category":"misc", + "ingredients": [ + { + "item":"superbwarfare:tungsten_block" + } + ], + "result": { + "item": "superbwarfare:tungsten_ingot", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/worldgen/configured_feature/galena_ore.json b/src/main/resources/data/superbwarfare/worldgen/configured_feature/galena_ore.json index b1c47e6cd..36ab69e19 100644 --- a/src/main/resources/data/superbwarfare/worldgen/configured_feature/galena_ore.json +++ b/src/main/resources/data/superbwarfare/worldgen/configured_feature/galena_ore.json @@ -1,7 +1,7 @@ { "type": "minecraft:ore", "config": { - "size": 9, + "size": 6, "discard_chance_on_air_exposure": 0, "targets": [ {