diff --git a/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 new file mode 100644 index 000000000..47f83d5af --- /dev/null +++ b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 @@ -0,0 +1,21 @@ +// 1.20.1 2024-09-09T21:13:59.7157736 Tags for minecraft:item mod id superbwarfare +cf8d49a8d2872286d1a9c3d4a7e1c2b7690db0b8 data/forge/tags/items/dusts.json +0fa06c2ff83bf09797e3ddff90f62d1124e645b4 data/forge/tags/items/dusts/coal_coke.json +295ddf906b7133a0558d03e9a60eea18281fe430 data/forge/tags/items/dusts/iron.json +5ed781a6ce735a9a6555bd1dcc43300c64c2bad0 data/forge/tags/items/dusts/tungsten.json +62b09995c95ece651f234e4a5894d79530c6aa43 data/forge/tags/items/ingots.json +6a3ef6343dbc199446979cb92e7421483025b9e0 data/forge/tags/items/ingots/lead.json +a31040302a0327e638bbc8cc2dda514e56934f16 data/forge/tags/items/ingots/steel.json +534d88c2973775b785ad048f16cde5121f256acc data/forge/tags/items/ingots/tungsten.json +730bd68337bc56b3d3bbb6c77b97df65c4431c0e data/forge/tags/items/ores.json +af38bb7460b2d1c0b07f5ac3a4cb1af53a41a456 data/forge/tags/items/ores/lead.json +65265b2e95bae5071f132b1aa92d3c90fd8199d8 data/forge/tags/items/ores/tungsten.json +d2d41bac2abe34f201a25dbcf4d4e05e86575b21 data/forge/tags/items/ores_in_ground/deepslate.json +14104824ea79d3ae82663f5066f571b1425469a3 data/forge/tags/items/ores_in_ground/stone.json +acced7f04d0125f1e53cf67a9c3f5f4a35889ee9 data/forge/tags/items/ore_rates/singular.json +140a8470d41a4fe0bb7c9e121a94d926fb6117b1 data/forge/tags/items/plates.json +51189baa4881d4137d853012976d10cc44f3092e data/forge/tags/items/plates/copper.json +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 +99a5a3a4bb6b5fb641dcd449937365ea174f3797 data/superbwarfare/tags/items/gun.json diff --git a/src/generated/resources/.cache/aea51f45d35dbbd3220b84682ce1417a457a0246 b/src/generated/resources/.cache/aea51f45d35dbbd3220b84682ce1417a457a0246 new file mode 100644 index 000000000..28c86aa30 --- /dev/null +++ b/src/generated/resources/.cache/aea51f45d35dbbd3220b84682ce1417a457a0246 @@ -0,0 +1 @@ +// 1.20.1 2024-09-09T20:59:16.1282324 Tags for minecraft:block mod id superbwarfare diff --git a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 index 3782b70c1..c232494f3 100644 --- a/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 +++ b/src/generated/resources/.cache/b69ee8a2655365569b979911c0440daa8c470ac2 @@ -1,30 +1,52 @@ -// 1.20.1 2024-09-09T20:31:27.0722119 Item Models: superbwarfare +// 1.20.1 2024-09-09T20:45:09.8782505 Item Models: superbwarfare 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/aa_12_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ak_47_blueprint.json +c993bddc0db9453ffbefa59f9ac9a74dba909038 assets/superbwarfare/models/item/ancient_cpu.json +4b8fe8fbe5e64c3449ad539317254e4ed7188411 assets/superbwarfare/models/item/ap_head.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/bocek_blueprint.json 1e5b4637c3787516305dd3d1598f401a5e78a954 assets/superbwarfare/models/item/cemented_carbide_action.json b793716e367623d60461fc760de4f012c28fdc53 assets/superbwarfare/models/item/cemented_carbide_barrel.json +b97ce523ca85cddff78abd9fd735295414ee07fd assets/superbwarfare/models/item/cemented_carbide_ingot.json 93010fbed0bd569659abeba111426f8c5b11d173 assets/superbwarfare/models/item/cemented_carbide_spring.json 7ab968b2348594022646fbd90a8e6ecebb16ea46 assets/superbwarfare/models/item/cemented_carbide_trigger.json +42e097f04239673810c7dc5fcf77d1dbc0ec1938 assets/superbwarfare/models/item/coal_iron_powder.json +a52a7f9dc18d5af69903c2249239c15cb6d38c8e assets/superbwarfare/models/item/coal_powder.json 5ccef04175adcc9fa0797caca6bf04526f702d5c assets/superbwarfare/models/item/common_material_pack.json +fc892b610a110980dbc6f8e2c080672b5dc06e99 assets/superbwarfare/models/item/copper_plate.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/devotion_blueprint.json +6f4a829dc159f1740f52265d01730ecb6a840d81 assets/superbwarfare/models/item/dog_tag.json +dd455cf29eed0ef5eb5e90ef3d7140cb8de61efe assets/superbwarfare/models/item/drone.json 831ce33c5a4c90b71a42515f42f16d4c1a946c50 assets/superbwarfare/models/item/empty_perk.json 2419503d8b597c92684d1921895a12fca33fec69 assets/superbwarfare/models/item/epic_material_pack.json +c102839d5f7d4bdc1c6cbfbf4c2c907b70f22052 assets/superbwarfare/models/item/fusee.json +5326409e01ffd1f0a6330299799994e267db2b6b assets/superbwarfare/models/item/galena.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/glock_17_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/glock_18_blueprint.json +8752c2b2b648ff23d6b93eedcc6c0500c695afd7 assets/superbwarfare/models/item/grain.json +e7a6de100f377835831211168d98c8d19434af24 assets/superbwarfare/models/item/he_head.json +d23520b099cb796401635fe75b5b852fc957d4ea assets/superbwarfare/models/item/high_energy_explosives.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/hk_416_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/hunting_rifle_blueprint.json 3c9dcc3393e16ca354b01162316f1ddae92338ec assets/superbwarfare/models/item/iron_action.json 6e7a2bd5ffb78bd218e3a55daba3e9c256470757 assets/superbwarfare/models/item/iron_barrel.json +e04bbd61e716fc5d53c9425aba508fc3287bfd57 assets/superbwarfare/models/item/iron_powder.json 00e7fd942d22c0fbf1f5b70cd5f4d86cc6f5be1d assets/superbwarfare/models/item/iron_spring.json 590c0efcf223fdc2e98660ff3b293a68f87ac02e assets/superbwarfare/models/item/iron_trigger.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/javelin_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/k_98_blueprint.json +ce9e4fd8ea92cfdbdda158776c1b6e1b482a3f2a assets/superbwarfare/models/item/lead_ingot.json f66c351b4843ad4d4e086ccfb7d4d0221227d196 assets/superbwarfare/models/item/legendary_material_pack.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/marlin_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/minigun_blueprint.json +c206cd345f459733399e0be4692586849ef0aac2 assets/superbwarfare/models/item/missile_engine.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mk_14_blueprint.json +db96dbb75327701d7901c2de48a539bda9fe31c4 assets/superbwarfare/models/item/mortar_barrel.json +3922427d3921d3de7195614780ee8f57dfc0ee6f assets/superbwarfare/models/item/mortar_base_plate.json +ac9c6bc308bd741ada7f19d808d0c0722fceb976 assets/superbwarfare/models/item/mortar_bipod.json +9baf936f4340d41a0b5581857313240627b00386 assets/superbwarfare/models/item/mortar_deployer.json +92ce87d9ae2ab3dbb099d39f74ceb49248fe0b1f assets/superbwarfare/models/item/mortar_shells.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/mosin_nagant_blueprint.json +4de8d6e0cddd28963febd35e9b66334a41a25d4c assets/superbwarfare/models/item/motor.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_1911_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_4_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/m_60_blueprint.json @@ -36,18 +58,28 @@ f5b4fc1445373e6acfaa077e109de693c624eb1e assets/superbwarfare/models/item/nether 501149685600161de8708a8199aab644d8ecee8b assets/superbwarfare/models/item/netherite_spring.json 04206db188bacb5041a0bd9fb7fc04551fb99838 assets/superbwarfare/models/item/netherite_trigger.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/ntw_20_blueprint.json +664f19730a1a7cf0ec961fc01a4ba8730a77ec8e assets/superbwarfare/models/item/primer.json +2f3de54bf0df768c5986559060cfc61f5650cc7f assets/superbwarfare/models/item/propeller.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/qbz_95_blueprint.json e821640d80c55763e7e7b62f7b80c60ff56dcc4f assets/superbwarfare/models/item/rare_material_pack.json +ce0f0949b0545d8ef08aeaa52dd423dbe592f704 assets/superbwarfare/models/item/raw_cemented_carbide_powder.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/rpg_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/rpk_blueprint.json +ce2232fbc6a9186371c6ae6745ec3be2a0a33546 assets/superbwarfare/models/item/scheelite.json +c010baff106b3307ec585df4757f7c3d756e9794 assets/superbwarfare/models/item/seeker.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/sentinel_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/sks_blueprint.json 93a18630b8c0a5aab1f0202f42b8bd5ee7153c38 assets/superbwarfare/models/item/steel_action.json 321bafbe4487eda1a6ca82eec647eabc3230a4e3 assets/superbwarfare/models/item/steel_barrel.json +b4e009177af3af6ad6dda54e3e2fed43dc243ff2 assets/superbwarfare/models/item/steel_ingot.json 28e5cc26e694d0cded97b343de94764b28f1651f assets/superbwarfare/models/item/steel_spring.json 7d3c98a32815191ef716a8595dda392a8dfea6ec assets/superbwarfare/models/item/steel_trigger.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/svd_blueprint.json +dbba3ca532b6aa949c84ea8b3f10fe3a0bf472e7 assets/superbwarfare/models/item/target_deployer.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/taser_blueprint.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/trachelium_blueprint.json +cae31335c134b57962bd7b318d02c71655ef5479 assets/superbwarfare/models/item/transcript.json +f391a7df36c738dfaeb2ab82ac077e3442a59b98 assets/superbwarfare/models/item/tungsten_ingot.json +b4e6c184478f8dc764fb7071ac5e30939cd01d9d assets/superbwarfare/models/item/tungsten_powder.json 5b9c46363e960303c72078688249c0db0c45e3a1 assets/superbwarfare/models/item/tungsten_rod.json 13ca8d5676888ff51f3308d88e4bf67691fa34f8 assets/superbwarfare/models/item/vector_blueprint.json diff --git a/src/main/resources/assets/superbwarfare/models/item/ancient_cpu.json b/src/generated/resources/assets/superbwarfare/models/item/ancient_cpu.json similarity index 63% rename from src/main/resources/assets/superbwarfare/models/item/ancient_cpu.json rename to src/generated/resources/assets/superbwarfare/models/item/ancient_cpu.json index 76de3c0b6..a61c25a11 100644 --- a/src/main/resources/assets/superbwarfare/models/item/ancient_cpu.json +++ b/src/generated/resources/assets/superbwarfare/models/item/ancient_cpu.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/ancient_cpu" } diff --git a/src/main/resources/assets/superbwarfare/models/item/ap_head.json b/src/generated/resources/assets/superbwarfare/models/item/ap_head.json similarity index 62% rename from src/main/resources/assets/superbwarfare/models/item/ap_head.json rename to src/generated/resources/assets/superbwarfare/models/item/ap_head.json index 7b270ab68..a1f9eb472 100644 --- a/src/main/resources/assets/superbwarfare/models/item/ap_head.json +++ b/src/generated/resources/assets/superbwarfare/models/item/ap_head.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/ap_head" } diff --git a/src/main/resources/assets/superbwarfare/models/item/cemented_carbide_ingot.json b/src/generated/resources/assets/superbwarfare/models/item/cemented_carbide_ingot.json similarity index 66% rename from src/main/resources/assets/superbwarfare/models/item/cemented_carbide_ingot.json rename to src/generated/resources/assets/superbwarfare/models/item/cemented_carbide_ingot.json index 17cf5460e..3913e4281 100644 --- a/src/main/resources/assets/superbwarfare/models/item/cemented_carbide_ingot.json +++ b/src/generated/resources/assets/superbwarfare/models/item/cemented_carbide_ingot.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/cemented_carbide_ingot" } diff --git a/src/main/resources/assets/superbwarfare/models/item/coal_iron_powder.json b/src/generated/resources/assets/superbwarfare/models/item/coal_iron_powder.json similarity index 65% rename from src/main/resources/assets/superbwarfare/models/item/coal_iron_powder.json rename to src/generated/resources/assets/superbwarfare/models/item/coal_iron_powder.json index d7bdc891d..8534ba2ee 100644 --- a/src/main/resources/assets/superbwarfare/models/item/coal_iron_powder.json +++ b/src/generated/resources/assets/superbwarfare/models/item/coal_iron_powder.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/coal_iron_powder" } diff --git a/src/main/resources/assets/superbwarfare/models/item/coal_powder.json b/src/generated/resources/assets/superbwarfare/models/item/coal_powder.json similarity index 63% rename from src/main/resources/assets/superbwarfare/models/item/coal_powder.json rename to src/generated/resources/assets/superbwarfare/models/item/coal_powder.json index f3ae985ee..a2e931651 100644 --- a/src/main/resources/assets/superbwarfare/models/item/coal_powder.json +++ b/src/generated/resources/assets/superbwarfare/models/item/coal_powder.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/coal_powder" } diff --git a/src/main/resources/assets/superbwarfare/models/item/copperplate.json b/src/generated/resources/assets/superbwarfare/models/item/copper_plate.json similarity index 63% rename from src/main/resources/assets/superbwarfare/models/item/copperplate.json rename to src/generated/resources/assets/superbwarfare/models/item/copper_plate.json index fce809586..21c369469 100644 --- a/src/main/resources/assets/superbwarfare/models/item/copperplate.json +++ b/src/generated/resources/assets/superbwarfare/models/item/copper_plate.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/copper_plate" } diff --git a/src/main/resources/assets/superbwarfare/models/item/dog_tag.json b/src/generated/resources/assets/superbwarfare/models/item/dog_tag.json similarity index 62% rename from src/main/resources/assets/superbwarfare/models/item/dog_tag.json rename to src/generated/resources/assets/superbwarfare/models/item/dog_tag.json index bf28eb8b6..939ec38e7 100644 --- a/src/main/resources/assets/superbwarfare/models/item/dog_tag.json +++ b/src/generated/resources/assets/superbwarfare/models/item/dog_tag.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/dog_tag" } diff --git a/src/generated/resources/assets/superbwarfare/models/item/drone.json b/src/generated/resources/assets/superbwarfare/models/item/drone.json new file mode 100644 index 000000000..1a28b4d3f --- /dev/null +++ b/src/generated/resources/assets/superbwarfare/models/item/drone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "superbwarfare:item/drone" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/models/item/fusee.json b/src/generated/resources/assets/superbwarfare/models/item/fusee.json similarity index 61% rename from src/main/resources/assets/superbwarfare/models/item/fusee.json rename to src/generated/resources/assets/superbwarfare/models/item/fusee.json index 2187d3889..dae4955e5 100644 --- a/src/main/resources/assets/superbwarfare/models/item/fusee.json +++ b/src/generated/resources/assets/superbwarfare/models/item/fusee.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/fusee" } diff --git a/src/main/resources/assets/superbwarfare/models/item/galena.json b/src/generated/resources/assets/superbwarfare/models/item/galena.json similarity index 61% rename from src/main/resources/assets/superbwarfare/models/item/galena.json rename to src/generated/resources/assets/superbwarfare/models/item/galena.json index fc2b14d99..89ad01ddd 100644 --- a/src/main/resources/assets/superbwarfare/models/item/galena.json +++ b/src/generated/resources/assets/superbwarfare/models/item/galena.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/galena" } diff --git a/src/main/resources/assets/superbwarfare/models/item/grain.json b/src/generated/resources/assets/superbwarfare/models/item/grain.json similarity index 61% rename from src/main/resources/assets/superbwarfare/models/item/grain.json rename to src/generated/resources/assets/superbwarfare/models/item/grain.json index 2dc1cd27e..7f393ba8d 100644 --- a/src/main/resources/assets/superbwarfare/models/item/grain.json +++ b/src/generated/resources/assets/superbwarfare/models/item/grain.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/grain" } diff --git a/src/main/resources/assets/superbwarfare/models/item/he_head.json b/src/generated/resources/assets/superbwarfare/models/item/he_head.json similarity index 62% rename from src/main/resources/assets/superbwarfare/models/item/he_head.json rename to src/generated/resources/assets/superbwarfare/models/item/he_head.json index a15eacf5a..30c3b14ac 100644 --- a/src/main/resources/assets/superbwarfare/models/item/he_head.json +++ b/src/generated/resources/assets/superbwarfare/models/item/he_head.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/he_head" } diff --git a/src/main/resources/assets/superbwarfare/models/item/high_energy_explosives.json b/src/generated/resources/assets/superbwarfare/models/item/high_energy_explosives.json similarity index 66% rename from src/main/resources/assets/superbwarfare/models/item/high_energy_explosives.json rename to src/generated/resources/assets/superbwarfare/models/item/high_energy_explosives.json index 690e18aa4..422db23b7 100644 --- a/src/main/resources/assets/superbwarfare/models/item/high_energy_explosives.json +++ b/src/generated/resources/assets/superbwarfare/models/item/high_energy_explosives.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/high_energy_explosives" } diff --git a/src/main/resources/assets/superbwarfare/models/item/iron_powder.json b/src/generated/resources/assets/superbwarfare/models/item/iron_powder.json similarity index 63% rename from src/main/resources/assets/superbwarfare/models/item/iron_powder.json rename to src/generated/resources/assets/superbwarfare/models/item/iron_powder.json index 63c6466a3..0a21722e8 100644 --- a/src/main/resources/assets/superbwarfare/models/item/iron_powder.json +++ b/src/generated/resources/assets/superbwarfare/models/item/iron_powder.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/iron_powder" } diff --git a/src/main/resources/assets/superbwarfare/models/item/lead_ingot.json b/src/generated/resources/assets/superbwarfare/models/item/lead_ingot.json similarity index 63% rename from src/main/resources/assets/superbwarfare/models/item/lead_ingot.json rename to src/generated/resources/assets/superbwarfare/models/item/lead_ingot.json index a30d1c29b..962d94b73 100644 --- a/src/main/resources/assets/superbwarfare/models/item/lead_ingot.json +++ b/src/generated/resources/assets/superbwarfare/models/item/lead_ingot.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/lead_ingot" } diff --git a/src/main/resources/assets/superbwarfare/models/item/missile_engine.json b/src/generated/resources/assets/superbwarfare/models/item/missile_engine.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/missile_engine.json rename to src/generated/resources/assets/superbwarfare/models/item/missile_engine.json index ea89d278f..98b237a97 100644 --- a/src/main/resources/assets/superbwarfare/models/item/missile_engine.json +++ b/src/generated/resources/assets/superbwarfare/models/item/missile_engine.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/missile_engine" } diff --git a/src/main/resources/assets/superbwarfare/models/item/mortar_barrel.json b/src/generated/resources/assets/superbwarfare/models/item/mortar_barrel.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/mortar_barrel.json rename to src/generated/resources/assets/superbwarfare/models/item/mortar_barrel.json index cc482761d..29e244c77 100644 --- a/src/main/resources/assets/superbwarfare/models/item/mortar_barrel.json +++ b/src/generated/resources/assets/superbwarfare/models/item/mortar_barrel.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/mortar_barrel" } diff --git a/src/main/resources/assets/superbwarfare/models/item/mortar_base_plate.json b/src/generated/resources/assets/superbwarfare/models/item/mortar_base_plate.json similarity index 65% rename from src/main/resources/assets/superbwarfare/models/item/mortar_base_plate.json rename to src/generated/resources/assets/superbwarfare/models/item/mortar_base_plate.json index edcac69c3..ea7a907c3 100644 --- a/src/main/resources/assets/superbwarfare/models/item/mortar_base_plate.json +++ b/src/generated/resources/assets/superbwarfare/models/item/mortar_base_plate.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/mortar_base_plate" } diff --git a/src/main/resources/assets/superbwarfare/models/item/mortar_bipod.json b/src/generated/resources/assets/superbwarfare/models/item/mortar_bipod.json similarity index 63% rename from src/main/resources/assets/superbwarfare/models/item/mortar_bipod.json rename to src/generated/resources/assets/superbwarfare/models/item/mortar_bipod.json index 9d4cdfd9d..476a4baff 100644 --- a/src/main/resources/assets/superbwarfare/models/item/mortar_bipod.json +++ b/src/generated/resources/assets/superbwarfare/models/item/mortar_bipod.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/mortar_bipod" } diff --git a/src/main/resources/assets/superbwarfare/models/item/mortar_deployer.json b/src/generated/resources/assets/superbwarfare/models/item/mortar_deployer.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/mortar_deployer.json rename to src/generated/resources/assets/superbwarfare/models/item/mortar_deployer.json index 0155d9233..2317598c6 100644 --- a/src/main/resources/assets/superbwarfare/models/item/mortar_deployer.json +++ b/src/generated/resources/assets/superbwarfare/models/item/mortar_deployer.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/mortar_deployer" } diff --git a/src/main/resources/assets/superbwarfare/models/item/mortar_shells.json b/src/generated/resources/assets/superbwarfare/models/item/mortar_shells.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/mortar_shells.json rename to src/generated/resources/assets/superbwarfare/models/item/mortar_shells.json index b07b9ad20..c78ab8143 100644 --- a/src/main/resources/assets/superbwarfare/models/item/mortar_shells.json +++ b/src/generated/resources/assets/superbwarfare/models/item/mortar_shells.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/mortar_shells" } diff --git a/src/main/resources/assets/superbwarfare/models/item/motor.json b/src/generated/resources/assets/superbwarfare/models/item/motor.json similarity index 61% rename from src/main/resources/assets/superbwarfare/models/item/motor.json rename to src/generated/resources/assets/superbwarfare/models/item/motor.json index 2043d1f06..a248dd769 100644 --- a/src/main/resources/assets/superbwarfare/models/item/motor.json +++ b/src/generated/resources/assets/superbwarfare/models/item/motor.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/motor" } diff --git a/src/main/resources/assets/superbwarfare/models/item/primer.json b/src/generated/resources/assets/superbwarfare/models/item/primer.json similarity index 61% rename from src/main/resources/assets/superbwarfare/models/item/primer.json rename to src/generated/resources/assets/superbwarfare/models/item/primer.json index 04012bdc9..75c790997 100644 --- a/src/main/resources/assets/superbwarfare/models/item/primer.json +++ b/src/generated/resources/assets/superbwarfare/models/item/primer.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/primer" } diff --git a/src/main/resources/assets/superbwarfare/models/item/propeller.json b/src/generated/resources/assets/superbwarfare/models/item/propeller.json similarity index 62% rename from src/main/resources/assets/superbwarfare/models/item/propeller.json rename to src/generated/resources/assets/superbwarfare/models/item/propeller.json index db20b847f..ddac1b562 100644 --- a/src/main/resources/assets/superbwarfare/models/item/propeller.json +++ b/src/generated/resources/assets/superbwarfare/models/item/propeller.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/propeller" } diff --git a/src/main/resources/assets/superbwarfare/models/item/raw_cemented_carbide_powder.json b/src/generated/resources/assets/superbwarfare/models/item/raw_cemented_carbide_powder.json similarity index 68% rename from src/main/resources/assets/superbwarfare/models/item/raw_cemented_carbide_powder.json rename to src/generated/resources/assets/superbwarfare/models/item/raw_cemented_carbide_powder.json index 64c87fb3a..83cf7abc4 100644 --- a/src/main/resources/assets/superbwarfare/models/item/raw_cemented_carbide_powder.json +++ b/src/generated/resources/assets/superbwarfare/models/item/raw_cemented_carbide_powder.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/raw_cemented_carbide_powder" } diff --git a/src/main/resources/assets/superbwarfare/models/item/scheelite.json b/src/generated/resources/assets/superbwarfare/models/item/scheelite.json similarity index 62% rename from src/main/resources/assets/superbwarfare/models/item/scheelite.json rename to src/generated/resources/assets/superbwarfare/models/item/scheelite.json index 30ed2200e..870a5dda8 100644 --- a/src/main/resources/assets/superbwarfare/models/item/scheelite.json +++ b/src/generated/resources/assets/superbwarfare/models/item/scheelite.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/scheelite" } diff --git a/src/main/resources/assets/superbwarfare/models/item/seeker.json b/src/generated/resources/assets/superbwarfare/models/item/seeker.json similarity index 61% rename from src/main/resources/assets/superbwarfare/models/item/seeker.json rename to src/generated/resources/assets/superbwarfare/models/item/seeker.json index 088ef004e..1aefc6748 100644 --- a/src/main/resources/assets/superbwarfare/models/item/seeker.json +++ b/src/generated/resources/assets/superbwarfare/models/item/seeker.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/seeker" } diff --git a/src/main/resources/assets/superbwarfare/models/item/ingot_steel.json b/src/generated/resources/assets/superbwarfare/models/item/steel_ingot.json similarity index 63% rename from src/main/resources/assets/superbwarfare/models/item/ingot_steel.json rename to src/generated/resources/assets/superbwarfare/models/item/steel_ingot.json index adbede0ca..1f8308dcf 100644 --- a/src/main/resources/assets/superbwarfare/models/item/ingot_steel.json +++ b/src/generated/resources/assets/superbwarfare/models/item/steel_ingot.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/steel_ingot" } diff --git a/src/main/resources/assets/superbwarfare/models/item/target_deployer.json b/src/generated/resources/assets/superbwarfare/models/item/target_deployer.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/target_deployer.json rename to src/generated/resources/assets/superbwarfare/models/item/target_deployer.json index a62f287fc..b8cb7af2b 100644 --- a/src/main/resources/assets/superbwarfare/models/item/target_deployer.json +++ b/src/generated/resources/assets/superbwarfare/models/item/target_deployer.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/target_deployer" } diff --git a/src/main/resources/assets/superbwarfare/models/item/transcript.json b/src/generated/resources/assets/superbwarfare/models/item/transcript.json similarity index 63% rename from src/main/resources/assets/superbwarfare/models/item/transcript.json rename to src/generated/resources/assets/superbwarfare/models/item/transcript.json index e21f2cd58..50b9d1aea 100644 --- a/src/main/resources/assets/superbwarfare/models/item/transcript.json +++ b/src/generated/resources/assets/superbwarfare/models/item/transcript.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/transcript" } diff --git a/src/main/resources/assets/superbwarfare/models/item/tungsten_ingot.json b/src/generated/resources/assets/superbwarfare/models/item/tungsten_ingot.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/tungsten_ingot.json rename to src/generated/resources/assets/superbwarfare/models/item/tungsten_ingot.json index e95aef3a4..11393b911 100644 --- a/src/main/resources/assets/superbwarfare/models/item/tungsten_ingot.json +++ b/src/generated/resources/assets/superbwarfare/models/item/tungsten_ingot.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/tungsten_ingot" } diff --git a/src/main/resources/assets/superbwarfare/models/item/tungsten_powder.json b/src/generated/resources/assets/superbwarfare/models/item/tungsten_powder.json similarity index 64% rename from src/main/resources/assets/superbwarfare/models/item/tungsten_powder.json rename to src/generated/resources/assets/superbwarfare/models/item/tungsten_powder.json index 09a884d53..546b51036 100644 --- a/src/main/resources/assets/superbwarfare/models/item/tungsten_powder.json +++ b/src/generated/resources/assets/superbwarfare/models/item/tungsten_powder.json @@ -1,5 +1,5 @@ { - "parent": "item/generated", + "parent": "minecraft:item/generated", "textures": { "layer0": "superbwarfare:item/tungsten_powder" } diff --git a/src/generated/resources/data/forge/tags/items/dusts.json b/src/generated/resources/data/forge/tags/items/dusts.json new file mode 100644 index 000000000..1a47202e6 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#forge:dusts/coal_coke", + "#forge:dusts/tungsten" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/coal_coke.json b/src/generated/resources/data/forge/tags/items/dusts/coal_coke.json new file mode 100644 index 000000000..383ee00b8 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/coal_coke.json @@ -0,0 +1,5 @@ +{ + "values": [ + "superbwarfare:coal_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/iron.json b/src/generated/resources/data/forge/tags/items/dusts/iron.json new file mode 100644 index 000000000..47d2213b1 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/iron.json @@ -0,0 +1,5 @@ +{ + "values": [ + "superbwarfare:iron_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/dusts/tungsten.json b/src/generated/resources/data/forge/tags/items/dusts/tungsten.json new file mode 100644 index 000000000..10d289ef3 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/dusts/tungsten.json @@ -0,0 +1,5 @@ +{ + "values": [ + "superbwarfare:tungsten_powder" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots.json b/src/generated/resources/data/forge/tags/items/ingots.json new file mode 100644 index 000000000..0a19ef492 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots.json @@ -0,0 +1,7 @@ +{ + "values": [ + "#forge:ingots/lead", + "#forge:ingots/steel", + "#forge:ingots/tungsten" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots/lead.json b/src/generated/resources/data/forge/tags/items/ingots/lead.json new file mode 100644 index 000000000..478dd5d11 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/lead.json @@ -0,0 +1,5 @@ +{ + "values": [ + "superbwarfare:lead_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots/steel.json b/src/generated/resources/data/forge/tags/items/ingots/steel.json new file mode 100644 index 000000000..bfc14f6e2 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/steel.json @@ -0,0 +1,5 @@ +{ + "values": [ + "superbwarfare:steel_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ingots/tungsten.json b/src/generated/resources/data/forge/tags/items/ingots/tungsten.json new file mode 100644 index 000000000..abc438f31 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ingots/tungsten.json @@ -0,0 +1,5 @@ +{ + "values": [ + "superbwarfare:tungsten_ingot" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ore_rates/singular.json b/src/generated/resources/data/forge/tags/items/ore_rates/singular.json new file mode 100644 index 000000000..d501c8fbc --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ore_rates/singular.json @@ -0,0 +1,8 @@ +{ + "values": [ + "superbwarfare:galena_ore", + "superbwarfare:deepslate_galena_ore", + "superbwarfare:scheelite_ore", + "superbwarfare:deepslate_scheelite_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores.json b/src/generated/resources/data/forge/tags/items/ores.json new file mode 100644 index 000000000..5138dbfbd --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#forge:ores/lead", + "#forge:ores/tungsten" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/lead.json b/src/generated/resources/data/forge/tags/items/ores/lead.json new file mode 100644 index 000000000..b8f2be6ac --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/lead.json @@ -0,0 +1,6 @@ +{ + "values": [ + "superbwarfare:galena_ore", + "superbwarfare:deepslate_galena_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores/tungsten.json b/src/generated/resources/data/forge/tags/items/ores/tungsten.json new file mode 100644 index 000000000..205fed423 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores/tungsten.json @@ -0,0 +1,6 @@ +{ + "values": [ + "superbwarfare:scheelite_ore", + "superbwarfare:deepslate_scheelite_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores_in_ground/deepslate.json b/src/generated/resources/data/forge/tags/items/ores_in_ground/deepslate.json new file mode 100644 index 000000000..85edde0ca --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores_in_ground/deepslate.json @@ -0,0 +1,6 @@ +{ + "values": [ + "superbwarfare:galena_ore", + "superbwarfare:scheelite_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/ores_in_ground/stone.json b/src/generated/resources/data/forge/tags/items/ores_in_ground/stone.json new file mode 100644 index 000000000..2cfc971f0 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/ores_in_ground/stone.json @@ -0,0 +1,6 @@ +{ + "values": [ + "superbwarfare:deepslate_galena_ore", + "superbwarfare:deepslate_scheelite_ore" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/plates.json b/src/generated/resources/data/forge/tags/items/plates.json new file mode 100644 index 000000000..e00de8919 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/plates.json @@ -0,0 +1,5 @@ +{ + "values": [ + "#forge:plates/copper" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/plates/copper.json b/src/generated/resources/data/forge/tags/items/plates/copper.json new file mode 100644 index 000000000..ab930128a --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/plates/copper.json @@ -0,0 +1,5 @@ +{ + "values": [ + "superbwarfare:copper_plate" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/raw_materials.json b/src/generated/resources/data/forge/tags/items/raw_materials.json new file mode 100644 index 000000000..bd0ef8913 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/raw_materials.json @@ -0,0 +1,6 @@ +{ + "values": [ + "#forge:raw_materials/lead", + "#forge:raw_materials/tungsten" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/lead.json b/src/generated/resources/data/forge/tags/items/raw_materials/lead.json new file mode 100644 index 000000000..a4baa13f2 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/raw_materials/lead.json @@ -0,0 +1,5 @@ +{ + "values": [ + "superbwarfare:galena" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/raw_materials/tungsten.json b/src/generated/resources/data/forge/tags/items/raw_materials/tungsten.json new file mode 100644 index 000000000..4614fd5a3 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/raw_materials/tungsten.json @@ -0,0 +1,5 @@ +{ + "values": [ + "superbwarfare:scheelite" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/tags/items/gun.json b/src/generated/resources/data/superbwarfare/tags/items/gun.json similarity index 91% rename from src/main/resources/data/superbwarfare/tags/items/gun.json rename to src/generated/resources/data/superbwarfare/tags/items/gun.json index aa486886c..b4a99966c 100644 --- a/src/main/resources/data/superbwarfare/tags/items/gun.json +++ b/src/generated/resources/data/superbwarfare/tags/items/gun.json @@ -1,36 +1,35 @@ { - "replace": false, "values": [ "superbwarfare:taser", - "superbwarfare:trachelium", - "superbwarfare:hunting_rifle", - "superbwarfare:m_79", - "superbwarfare:abekiri", - "superbwarfare:devotion", - "superbwarfare:m_4", - "superbwarfare:aa_12", - "superbwarfare:bocek", - "superbwarfare:hk_416", - "superbwarfare:rpk", - "superbwarfare:sks", - "superbwarfare:ntw_20", - "superbwarfare:vector", - "superbwarfare:minigun", - "superbwarfare:mk_14", - "superbwarfare:sentinel", - "superbwarfare:m_60", - "superbwarfare:svd", - "superbwarfare:marlin", - "superbwarfare:m_870", - "superbwarfare:m_98b", - "superbwarfare:ak_47", - "superbwarfare:rpg", "superbwarfare:glock_17", "superbwarfare:glock_18", "superbwarfare:m_1911", + "superbwarfare:abekiri", + "superbwarfare:trachelium", + "superbwarfare:vector", + "superbwarfare:ak_47", + "superbwarfare:sks", + "superbwarfare:m_4", + "superbwarfare:hk_416", "superbwarfare:qbz_95", + "superbwarfare:mk_14", + "superbwarfare:marlin", "superbwarfare:k_98", "superbwarfare:mosin_nagant", - "superbwarfare:javelin" + "superbwarfare:svd", + "superbwarfare:m_98b", + "superbwarfare:sentinel", + "superbwarfare:hunting_rifle", + "superbwarfare:ntw_20", + "superbwarfare:m_870", + "superbwarfare:aa_12", + "superbwarfare:devotion", + "superbwarfare:rpk", + "superbwarfare:m_60", + "superbwarfare:minigun", + "superbwarfare:m_79", + "superbwarfare:rpg", + "superbwarfare:javelin", + "superbwarfare:bocek" ] } \ No newline at end of file diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/DataGenerators.java b/src/main/java/net/mcreator/superbwarfare/datagen/DataGenerators.java index d537fd005..8ae461a6e 100644 --- a/src/main/java/net/mcreator/superbwarfare/datagen/DataGenerators.java +++ b/src/main/java/net/mcreator/superbwarfare/datagen/DataGenerators.java @@ -25,7 +25,7 @@ public class DataGenerators { // generator.addProvider(event.includeServer(), new ModWorldGenProvider(packOutput, lookupProvider)); // generator.addProvider(event.includeServer(), new ModBlockStateProvider(packOutput, existingFileHelper)); generator.addProvider(event.includeServer(), new ModItemModelProvider(packOutput, existingFileHelper)); -// ModBlockTagProvider tagProvider = generator.addProvider(event.includeServer(), new ModBlockTagProvider(packOutput, lookupProvider, existingFileHelper)); -// generator.addProvider(event.includeServer(), new ModItemTagProvider(packOutput, lookupProvider, tagProvider.contentsGetter(), existingFileHelper)); + ModBlockTagProvider tagProvider = generator.addProvider(event.includeServer(), new ModBlockTagProvider(packOutput, lookupProvider, existingFileHelper)); + generator.addProvider(event.includeServer(), new ModItemTagProvider(packOutput, lookupProvider, tagProvider.contentsGetter(), existingFileHelper)); } } diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockTagProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockTagProvider.java new file mode 100644 index 000000000..45c5eb8e6 --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModBlockTagProvider.java @@ -0,0 +1,21 @@ +package net.mcreator.superbwarfare.datagen; + +import net.mcreator.superbwarfare.ModUtils; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraftforge.common.data.BlockTagsProvider; +import net.minecraftforge.common.data.ExistingFileHelper; + +import javax.annotation.Nullable; +import java.util.concurrent.CompletableFuture; + +public class ModBlockTagProvider extends BlockTagsProvider { + public ModBlockTagProvider(PackOutput output, CompletableFuture lookupProvider, @Nullable ExistingFileHelper existingFileHelper) { + super(output, lookupProvider, ModUtils.MODID, existingFileHelper); + } + + @Override + protected void addTags(HolderLookup.Provider pProvider) { + + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java index 551c304af..f24fa1d59 100644 --- a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemModelProvider.java @@ -22,6 +22,42 @@ public class ModItemModelProvider extends ItemModelProvider { protected void registerModels() { simpleItem(ModItems.EMPTY_PERK, "perk/"); + simpleItem(ModItems.MORTAR_SHELLS); + + // misc + simpleItem(ModItems.ANCIENT_CPU); + simpleItem(ModItems.PROPELLER); + simpleItem(ModItems.MOTOR); + simpleItem(ModItems.DRONE); + + simpleItem(ModItems.TARGET_DEPLOYER); + simpleItem(ModItems.MORTAR_DEPLOYER); + simpleItem(ModItems.MORTAR_BARREL); + simpleItem(ModItems.MORTAR_BASE_PLATE); + simpleItem(ModItems.MORTAR_BIPOD); + simpleItem(ModItems.SEEKER); + simpleItem(ModItems.MISSILE_ENGINE); + simpleItem(ModItems.FUSEE); + simpleItem(ModItems.PRIMER); + simpleItem(ModItems.AP_HEAD); + simpleItem(ModItems.HE_HEAD); + simpleItem(ModItems.COPPER_PLATE); + simpleItem(ModItems.STEEL_INGOT); + simpleItem(ModItems.LEAD_INGOT); + simpleItem(ModItems.TUNGSTEN_INGOT); + simpleItem(ModItems.CEMENTED_CARBIDE_INGOT); + simpleItem(ModItems.HIGH_ENERGY_EXPLOSIVES); + simpleItem(ModItems.GRAIN); + simpleItem(ModItems.IRON_POWDER); + simpleItem(ModItems.TUNGSTEN_POWDER); + simpleItem(ModItems.COAL_POWDER); + simpleItem(ModItems.COAL_IRON_POWDER); + simpleItem(ModItems.RAW_CEMENTED_CARBIDE_POWDER); + simpleItem(ModItems.GALENA); + simpleItem(ModItems.SCHEELITE); + simpleItem(ModItems.DOG_TAG); + simpleItem(ModItems.TRANSCRIPT); + simpleItem(ModItems.TUNGSTEN_ROD); simpleItem(ModItems.IRON_BARREL); simpleItem(ModItems.IRON_ACTION); diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java new file mode 100644 index 000000000..0c6fddda0 --- /dev/null +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java @@ -0,0 +1,63 @@ +package net.mcreator.superbwarfare.datagen; + +import net.mcreator.superbwarfare.ModUtils; +import net.mcreator.superbwarfare.init.ModItems; +import net.mcreator.superbwarfare.init.ModTags; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.ItemTagsProvider; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraftforge.common.Tags; +import net.minecraftforge.common.data.ExistingFileHelper; + +import javax.annotation.Nullable; +import java.util.concurrent.CompletableFuture; + +public class ModItemTagProvider extends ItemTagsProvider { + public ModItemTagProvider(PackOutput p_275343_, CompletableFuture p_275729_, + CompletableFuture> p_275322_, @Nullable ExistingFileHelper existingFileHelper) { + super(p_275343_, p_275729_, p_275322_, ModUtils.MODID, existingFileHelper); + } + + @SuppressWarnings("unchecked") + @Override + protected void addTags(HolderLookup.Provider pProvider) { + this.tag(Tags.Items.DUSTS).addTags(forgeTag("dusts/coal_coke"), forgeTag("dusts/tungsten")); + this.tag(forgeTag("dusts/coal_coke")).add(ModItems.COAL_POWDER.get()); + this.tag(forgeTag("dusts/iron")).add(ModItems.IRON_POWDER.get()); + this.tag(forgeTag("dusts/tungsten")).add(ModItems.TUNGSTEN_POWDER.get()); + + this.tag(Tags.Items.INGOTS).addTags(forgeTag("ingots/lead"), forgeTag("ingots/steel"), forgeTag("ingots/tungsten")); + this.tag(forgeTag("ingots/lead")).add(ModItems.LEAD_INGOT.get()); + this.tag(forgeTag("ingots/steel")).add(ModItems.STEEL_INGOT.get()); + this.tag(forgeTag("ingots/tungsten")).add(ModItems.TUNGSTEN_INGOT.get()); + + this.tag(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()); + + this.tag(Tags.Items.RAW_MATERIALS).addTags(forgeTag("raw_materials/lead"), forgeTag("raw_materials/tungsten")); + this.tag(forgeTag("raw_materials/lead")).add(ModItems.GALENA.get()); + this.tag(forgeTag("raw_materials/tungsten")).add(ModItems.SCHEELITE.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()); + + this.tag(Tags.Items.ORES_IN_GROUND_DEEPSLATE).add(ModItems.GALENA_ORE.get(), ModItems.SCHEELITE_ORE.get()); + this.tag(Tags.Items.ORES_IN_GROUND_STONE).add(ModItems.DEEPSLATE_GALENA_ORE.get(), ModItems.DEEPSLATE_SCHEELITE_ORE.get()); + + this.tag(forgeTag("plates")).addTags(forgeTag("plates/copper")); + this.tag(forgeTag("plates/copper")).add(ModItems.COPPER_PLATE.get()); + + ModItems.GUNS.getEntries().forEach(registryObject -> this.tag(ModTags.Items.GUN).add(registryObject.get())); + + } + + private static TagKey forgeTag(String name) { + return ItemTags.create(new ResourceLocation("forge", name)); + } +} diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java index 928c6f52e..face04ef0 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModItems.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModItems.java @@ -130,8 +130,8 @@ public class ModItems { public static final RegistryObject PRIMER = ITEMS.register("primer", () -> new Item(new Item.Properties())); public static final RegistryObject AP_HEAD = ITEMS.register("ap_head", () -> new Item(new Item.Properties())); public static final RegistryObject HE_HEAD = ITEMS.register("he_head", () -> new Item(new Item.Properties())); - public static final RegistryObject COPPERPLATE = ITEMS.register("copperplate", () -> new Item(new Item.Properties())); - public static final RegistryObject INGOT_STEEL = ITEMS.register("ingot_steel", () -> new Item(new Item.Properties())); + public static final RegistryObject COPPER_PLATE = ITEMS.register("copper_plate", () -> new Item(new Item.Properties())); + public static final RegistryObject STEEL_INGOT = ITEMS.register("steel_ingot", () -> new Item(new Item.Properties())); public static final RegistryObject LEAD_INGOT = ITEMS.register("lead_ingot", () -> new Item(new Item.Properties())); public static final RegistryObject TUNGSTEN_INGOT = ITEMS.register("tungsten_ingot", () -> new Item(new Item.Properties())); public static final RegistryObject CEMENTED_CARBIDE_INGOT = ITEMS.register("cemented_carbide_ingot", () -> new Item(new Item.Properties())); diff --git a/src/main/java/net/mcreator/superbwarfare/item/Knife.java b/src/main/java/net/mcreator/superbwarfare/item/Knife.java index d57eaa39a..5a75b9c67 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/Knife.java +++ b/src/main/java/net/mcreator/superbwarfare/item/Knife.java @@ -31,7 +31,7 @@ public class Knife extends SwordItem { } public Ingredient getRepairIngredient() { - return Ingredient.of(new ItemStack(ModItems.INGOT_STEEL.get())); + return Ingredient.of(new ItemStack(ModItems.STEEL_INGOT.get())); } }, 3, -1.8f, new Item.Properties()); } diff --git a/src/main/resources/assets/superbwarfare/models/item/drone.json b/src/main/resources/assets/superbwarfare/models/item/drone.json deleted file mode 100644 index 1c70e062c..000000000 --- a/src/main/resources/assets/superbwarfare/models/item/drone.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "superbwarfare:item/drone_icon" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/superbwarfare/textures/item/drone_icon.png b/src/main/resources/assets/superbwarfare/textures/item/drone.png similarity index 100% rename from src/main/resources/assets/superbwarfare/textures/item/drone_icon.png rename to src/main/resources/assets/superbwarfare/textures/item/drone.png diff --git a/src/main/resources/data/forge/tags/items/dusts.json b/src/main/resources/data/forge/tags/items/dusts.json deleted file mode 100644 index 49715d54e..000000000 --- a/src/main/resources/data/forge/tags/items/dusts.json +++ /dev/null @@ -1 +0,0 @@ -{"values":["#forge:dusts/iron","#forge:dusts/tungsten"]} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dusts/coal_coke.json b/src/main/resources/data/forge/tags/items/dusts/coal_coke.json deleted file mode 100644 index 5a37618f1..000000000 --- a/src/main/resources/data/forge/tags/items/dusts/coal_coke.json +++ /dev/null @@ -1 +0,0 @@ -{"values":["superbwarfare:coal_powder"]} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dusts/iron.json b/src/main/resources/data/forge/tags/items/dusts/iron.json deleted file mode 100644 index a6d14294e..000000000 --- a/src/main/resources/data/forge/tags/items/dusts/iron.json +++ /dev/null @@ -1 +0,0 @@ -{"values":["superbwarfare:iron_powder"]} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/dusts/tungsten.json b/src/main/resources/data/forge/tags/items/dusts/tungsten.json deleted file mode 100644 index 2220957d6..000000000 --- a/src/main/resources/data/forge/tags/items/dusts/tungsten.json +++ /dev/null @@ -1 +0,0 @@ -{"values":["superbwarfare:tungsten_powder"]} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ingots.json b/src/main/resources/data/forge/tags/items/ingots.json deleted file mode 100644 index 06c2e567c..000000000 --- a/src/main/resources/data/forge/tags/items/ingots.json +++ /dev/null @@ -1 +0,0 @@ -{"values":["#forge:ingots/lead","#forge:ingots/steel","#forge:ingots/tungsten"]} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ingots/lead.json b/src/main/resources/data/forge/tags/items/ingots/lead.json deleted file mode 100644 index edb7f2545..000000000 --- a/src/main/resources/data/forge/tags/items/ingots/lead.json +++ /dev/null @@ -1 +0,0 @@ -{"values":["superbwarfare:lead_ingot"]} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ingots/steel.json b/src/main/resources/data/forge/tags/items/ingots/steel.json deleted file mode 100644 index 1ee2d6296..000000000 --- a/src/main/resources/data/forge/tags/items/ingots/steel.json +++ /dev/null @@ -1 +0,0 @@ -{"values":["superbwarfare:ingot_steel"]} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ingots/tungsten.json b/src/main/resources/data/forge/tags/items/ingots/tungsten.json deleted file mode 100644 index 0e3045c11..000000000 --- a/src/main/resources/data/forge/tags/items/ingots/tungsten.json +++ /dev/null @@ -1 +0,0 @@ -{"values":["superbwarfare:tungsten_ingot"]} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ore_rates/singular.json b/src/main/resources/data/forge/tags/items/ore_rates/singular.json deleted file mode 100644 index 6a3953fdb..000000000 --- a/src/main/resources/data/forge/tags/items/ore_rates/singular.json +++ /dev/null @@ -1 +0,0 @@ -{"values":["superbwarfare:galena_ore","superbwarfare:deepslate_galena_ore","superbwarfare:scheelite_ore","superbwarfare:deepslate_scheelite_ore"]} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ores.json b/src/main/resources/data/forge/tags/items/ores.json deleted file mode 100644 index 6d80d901c..000000000 --- a/src/main/resources/data/forge/tags/items/ores.json +++ /dev/null @@ -1 +0,0 @@ -{"values":["#forge:ores/lead","#forge:ores/tungsten"]} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ores/lead.json b/src/main/resources/data/forge/tags/items/ores/lead.json deleted file mode 100644 index 48096b54d..000000000 --- a/src/main/resources/data/forge/tags/items/ores/lead.json +++ /dev/null @@ -1 +0,0 @@ -{"values":["superbwarfare:galena_ore","superbwarfare:deepslate_galena_ore"]} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ores/tungsten.json b/src/main/resources/data/forge/tags/items/ores/tungsten.json deleted file mode 100644 index 97f473492..000000000 --- a/src/main/resources/data/forge/tags/items/ores/tungsten.json +++ /dev/null @@ -1 +0,0 @@ -{"values":["superbwarfare:scheelite_ore","superbwarfare:deepslate_scheelite_ore"]} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ores_in_ground/deepslate.json b/src/main/resources/data/forge/tags/items/ores_in_ground/deepslate.json deleted file mode 100644 index f1c77e9f0..000000000 --- a/src/main/resources/data/forge/tags/items/ores_in_ground/deepslate.json +++ /dev/null @@ -1 +0,0 @@ -{"values":["superbwarfare:deepslate_galena_ore","superbwarfare:deepslate_scheelite_ore"]} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/ores_in_ground/stone.json b/src/main/resources/data/forge/tags/items/ores_in_ground/stone.json deleted file mode 100644 index 38b031756..000000000 --- a/src/main/resources/data/forge/tags/items/ores_in_ground/stone.json +++ /dev/null @@ -1 +0,0 @@ -{"values":["superbwarfare:galena_ore","superbwarfare:scheelite_ore"]} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/plates.json b/src/main/resources/data/forge/tags/items/plates.json deleted file mode 100644 index 17392b436..000000000 --- a/src/main/resources/data/forge/tags/items/plates.json +++ /dev/null @@ -1 +0,0 @@ -{"values":["#forge:plates/copper"]} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/plates/copper.json b/src/main/resources/data/forge/tags/items/plates/copper.json deleted file mode 100644 index a27714e10..000000000 --- a/src/main/resources/data/forge/tags/items/plates/copper.json +++ /dev/null @@ -1 +0,0 @@ -{"values":["superbwarfare:copperplate"]} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/raw_materials.json b/src/main/resources/data/forge/tags/items/raw_materials.json deleted file mode 100644 index 166e172ec..000000000 --- a/src/main/resources/data/forge/tags/items/raw_materials.json +++ /dev/null @@ -1 +0,0 @@ -{"values":["#forge:raw_materials/lead","#forge:raw_materials/tungsten"]} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/raw_materials/lead.json b/src/main/resources/data/forge/tags/items/raw_materials/lead.json deleted file mode 100644 index db2326c08..000000000 --- a/src/main/resources/data/forge/tags/items/raw_materials/lead.json +++ /dev/null @@ -1 +0,0 @@ -{"values":["superbwarfare:galena"]} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/raw_materials/tungsten.json b/src/main/resources/data/forge/tags/items/raw_materials/tungsten.json deleted file mode 100644 index 51d78e582..000000000 --- a/src/main/resources/data/forge/tags/items/raw_materials/tungsten.json +++ /dev/null @@ -1 +0,0 @@ -{"values":["superbwarfare:scheelite"]} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/recipes/m1911_smithing.json b/src/main/resources/data/superbwarfare/recipes/m1911_smithing.json index b722f94f2..9aa2b78b6 100644 --- a/src/main/resources/data/superbwarfare/recipes/m1911_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/m1911_smithing.json @@ -7,7 +7,7 @@ "item": "superbwarfare:common_material_pack" }, "addition": { - "item": "superbwarfare:ingot_steel" + "item": "superbwarfare:steel_ingot" }, "result": { "item": "superbwarfare:m_1911" diff --git a/src/main/resources/data/superbwarfare/recipes/m4_smithing.json b/src/main/resources/data/superbwarfare/recipes/m4_smithing.json index 33b74200c..8104e51c4 100644 --- a/src/main/resources/data/superbwarfare/recipes/m4_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/m4_smithing.json @@ -7,7 +7,7 @@ "item": "superbwarfare:rare_material_pack" }, "addition": { - "item": "superbwarfare:ingot_steel" + "item": "superbwarfare:steel_ingot" }, "result": { "item": "superbwarfare:m_4" diff --git a/src/main/resources/data/superbwarfare/recipes/m870_smithing.json b/src/main/resources/data/superbwarfare/recipes/m870_smithing.json index 58357978e..e8945ff3a 100644 --- a/src/main/resources/data/superbwarfare/recipes/m870_smithing.json +++ b/src/main/resources/data/superbwarfare/recipes/m870_smithing.json @@ -7,7 +7,7 @@ "item": "superbwarfare:rare_material_pack" }, "addition": { - "item": "superbwarfare:ingot_steel" + "item": "superbwarfare:steel_ingot" }, "result": { "item": "superbwarfare:m_870" diff --git a/src/main/resources/data/superbwarfare/recipes/shield_cell_crafting.json b/src/main/resources/data/superbwarfare/recipes/shield_cell_crafting.json index df70bfc4c..1d50db2b4 100644 --- a/src/main/resources/data/superbwarfare/recipes/shield_cell_crafting.json +++ b/src/main/resources/data/superbwarfare/recipes/shield_cell_crafting.json @@ -11,7 +11,7 @@ "item": "minecraft:light_blue_concrete" }, "b": { - "item": "superbwarfare:copperplate" + "item": "superbwarfare:copper_plate" }, "c": { "tag": "forge:stained_glass_panes"