diff --git a/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 index 47f83d5af..48f251db5 100644 --- a/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 +++ b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 @@ -1,4 +1,4 @@ -// 1.20.1 2024-09-09T21:13:59.7157736 Tags for minecraft:item mod id superbwarfare +// 1.20.1 2024-09-09T21:35:56.3770147 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 @@ -19,3 +19,9 @@ b6b0065ecbe36917b777ad86d467ef62dec9d82e data/forge/tags/items/raw_materials.jso 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 +62eb408544731ce4cfcd119d8a6cc74731189ac0 data/superbwarfare/tags/items/handgun.json +b404c6fd99d2ca68c6738f225cb7d68ee443c10a data/superbwarfare/tags/items/machine_gun.json +d5dba8cfbb1e4208a1917cf0cf1ab85a82c6827e data/superbwarfare/tags/items/rifle.json +acd4d19dfadb71a1cec43e9c0f4a38fe8d3cf8cb data/superbwarfare/tags/items/shotgun.json +4aca0fa3f8b9f2a4920041e35e46dae7e93d5482 data/superbwarfare/tags/items/smg.json +13a23684e04832bea5dfbd2c0a9d9ed52dcb3422 data/superbwarfare/tags/items/sniper_rifle.json diff --git a/src/main/resources/data/superbwarfare/tags/items/handgun.json b/src/generated/resources/data/superbwarfare/tags/items/handgun.json similarity index 87% rename from src/main/resources/data/superbwarfare/tags/items/handgun.json rename to src/generated/resources/data/superbwarfare/tags/items/handgun.json index 24e7271bc..1f9d227b3 100644 --- a/src/main/resources/data/superbwarfare/tags/items/handgun.json +++ b/src/generated/resources/data/superbwarfare/tags/items/handgun.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "superbwarfare:trachelium", "superbwarfare:glock_17", diff --git a/src/main/resources/data/superbwarfare/tags/items/machine_gun.json b/src/generated/resources/data/superbwarfare/tags/items/machine_gun.json similarity index 86% rename from src/main/resources/data/superbwarfare/tags/items/machine_gun.json rename to src/generated/resources/data/superbwarfare/tags/items/machine_gun.json index b539f7abe..e213306ac 100644 --- a/src/main/resources/data/superbwarfare/tags/items/machine_gun.json +++ b/src/generated/resources/data/superbwarfare/tags/items/machine_gun.json @@ -1,9 +1,8 @@ { - "replace": false, "values": [ + "superbwarfare:minigun", "superbwarfare:devotion", "superbwarfare:rpk", - "superbwarfare:minigun", "superbwarfare:m_60" ] } \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/tags/items/rifle.json b/src/generated/resources/data/superbwarfare/tags/items/rifle.json similarity index 91% rename from src/main/resources/data/superbwarfare/tags/items/rifle.json rename to src/generated/resources/data/superbwarfare/tags/items/rifle.json index 33f698fde..4d5ffb480 100644 --- a/src/main/resources/data/superbwarfare/tags/items/rifle.json +++ b/src/generated/resources/data/superbwarfare/tags/items/rifle.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "superbwarfare:m_4", "superbwarfare:hk_416", diff --git a/src/generated/resources/data/superbwarfare/tags/items/shotgun.json b/src/generated/resources/data/superbwarfare/tags/items/shotgun.json new file mode 100644 index 000000000..a208906cd --- /dev/null +++ b/src/generated/resources/data/superbwarfare/tags/items/shotgun.json @@ -0,0 +1,7 @@ +{ + "values": [ + "superbwarfare:abekiri", + "superbwarfare:m_870", + "superbwarfare:aa_12" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/tags/items/smg.json b/src/generated/resources/data/superbwarfare/tags/items/smg.json similarity index 70% rename from src/main/resources/data/superbwarfare/tags/items/smg.json rename to src/generated/resources/data/superbwarfare/tags/items/smg.json index ed259864f..8efc69d00 100644 --- a/src/main/resources/data/superbwarfare/tags/items/smg.json +++ b/src/generated/resources/data/superbwarfare/tags/items/smg.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "superbwarfare:vector" ] diff --git a/src/main/resources/data/superbwarfare/tags/items/sniper_rifle.json b/src/generated/resources/data/superbwarfare/tags/items/sniper_rifle.json similarity index 91% rename from src/main/resources/data/superbwarfare/tags/items/sniper_rifle.json rename to src/generated/resources/data/superbwarfare/tags/items/sniper_rifle.json index c42ceaf03..923e6b3ec 100644 --- a/src/main/resources/data/superbwarfare/tags/items/sniper_rifle.json +++ b/src/generated/resources/data/superbwarfare/tags/items/sniper_rifle.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "superbwarfare:hunting_rifle", "superbwarfare:ntw_20", diff --git a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java index 0c6fddda0..999881c3b 100644 --- a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java @@ -54,7 +54,14 @@ public class ModItemTagProvider extends ItemTagsProvider { this.tag(forgeTag("plates/copper")).add(ModItems.COPPER_PLATE.get()); ModItems.GUNS.getEntries().forEach(registryObject -> this.tag(ModTags.Items.GUN).add(registryObject.get())); - + this.tag(ModTags.Items.SMG).add(ModItems.VECTOR.get()); + this.tag(ModTags.Items.HANDGUN).add(ModItems.TRACHELIUM.get(), ModItems.GLOCK_17.get(), ModItems.GLOCK_18.get(), ModItems.M_1911.get()); + this.tag(ModTags.Items.RIFLE).add(ModItems.M_4.get(), ModItems.HK_416.get(), ModItems.SKS.get(), + ModItems.MK_14.get(), ModItems.MARLIN.get(), ModItems.AK_47.get(), ModItems.QBZ_95.get()); + this.tag(ModTags.Items.SNIPER_RIFLE).add(ModItems.HUNTING_RIFLE.get(), ModItems.NTW_20.get(), ModItems.SENTINEL.get(), + ModItems.SVD.get(), ModItems.M_98B.get(), ModItems.K_98.get(), ModItems.MOSIN_NAGANT.get()); + this.tag(ModTags.Items.SHOTGUN).add(ModItems.ABEKIRI.get(), ModItems.M_870.get(), ModItems.AA_12.get()); + this.tag(ModTags.Items.MACHINE_GUN).add(ModItems.MINIGUN.get(), ModItems.DEVOTION.get(), ModItems.RPK.get(), ModItems.M_60.get()); } private static TagKey forgeTag(String name) { diff --git a/src/main/java/net/mcreator/superbwarfare/init/ModTags.java b/src/main/java/net/mcreator/superbwarfare/init/ModTags.java index 0624c8a42..3b1ab93dd 100644 --- a/src/main/java/net/mcreator/superbwarfare/init/ModTags.java +++ b/src/main/java/net/mcreator/superbwarfare/init/ModTags.java @@ -24,13 +24,8 @@ public class ModTags { public static final TagKey SHOTGUN = tag("shotgun"); public static final TagKey NORMAL_GUN = tag("normal_gun"); - public static final TagKey LEGENDARY_GUN = tag("legendary_gun"); - public static final TagKey SPECIAL_GUN = tag("special_gun"); public static final TagKey OPEN_BOLT = tag("open_bolt"); - public static final TagKey CAN_RELOAD = tag("can_reload"); - public static final TagKey CAN_SHOOT_BULLET = tag("can_shoot_bullet"); - private static TagKey tag(String name) { return ItemTags.create(new ResourceLocation(ModUtils.MODID, name)); } diff --git a/src/main/resources/data/superbwarfare/tags/items/can_reload.json b/src/main/resources/data/superbwarfare/tags/items/can_reload.json deleted file mode 100644 index 6bdc5821e..000000000 --- a/src/main/resources/data/superbwarfare/tags/items/can_reload.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "replace": false, - "values": [ - "superbwarfare:trachelium", - "superbwarfare:hunting_rifle", - "superbwarfare:m_79", - "superbwarfare:abekiri", - "superbwarfare:devotion", - "superbwarfare:m_4", - "superbwarfare:aa_12", - "superbwarfare:hk_416", - "superbwarfare:rpk", - "superbwarfare:sks", - "superbwarfare:ntw_20", - "superbwarfare:vector", - "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:qbz_95", - "superbwarfare:k_98", - "superbwarfare:mosin_nagant" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/tags/items/can_shoot_bullet.json b/src/main/resources/data/superbwarfare/tags/items/can_shoot_bullet.json deleted file mode 100644 index d1586ebba..000000000 --- a/src/main/resources/data/superbwarfare/tags/items/can_shoot_bullet.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "replace": false, - "values": [ - "superbwarfare:trachelium", - "superbwarfare:hunting_rifle", - "superbwarfare:abekiri", - "superbwarfare:devotion", - "superbwarfare:m_4", - "superbwarfare:aa_12", - "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:glock_17", - "superbwarfare:glock_18", - "superbwarfare:m_1911", - "superbwarfare:qbz_95", - "superbwarfare:k_98", - "superbwarfare:mosin_nagant" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/tags/items/legendary_gun.json b/src/main/resources/data/superbwarfare/tags/items/legendary_gun.json deleted file mode 100644 index c0f8762e1..000000000 --- a/src/main/resources/data/superbwarfare/tags/items/legendary_gun.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "replace": false, - "values": [ - "superbwarfare:trachelium", - "superbwarfare:aa_12", - "superbwarfare:sentinel", - "superbwarfare:bocek", - "superbwarfare:ntw_20", - "superbwarfare:minigun", - "superbwarfare:javelin" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/superbwarfare/tags/items/shotgun.json b/src/main/resources/data/superbwarfare/tags/items/shotgun.json deleted file mode 100644 index 7155833b2..000000000 --- a/src/main/resources/data/superbwarfare/tags/items/shotgun.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "superbwarfare:abekiri", - "superbwarfare:aa_12", - "superbwarfare:m_870" - ] -} \ No newline at end of file