From e95d9f7204035dadf147209a66148b285711b4c5 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Mon, 9 Sep 2024 22:03:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=89=A9=E4=BD=99tag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.cache/2e07f3c482445536d45c00e6abf223465c01c841 | 8 +++++++- .../data/superbwarfare/tags/items/normal_gun.json | 1 - .../data/superbwarfare/tags/items/open_bolt.json | 3 +-- .../superbwarfare/tags/items/use_handgun_ammo.json | 1 - .../superbwarfare/tags/items/use_rifle_ammo.json | 9 ++++----- .../superbwarfare/tags/items/use_shotgun_ammo.json | 7 +++++++ .../superbwarfare/tags/items/use_sniper_ammo.json | 1 - .../superbwarfare/datagen/ModItemTagProvider.java | 13 +++++++++++++ .../superbwarfare/tags/items/use_shotgun_ammo.json | 8 -------- 9 files changed, 32 insertions(+), 19 deletions(-) rename src/{main => generated}/resources/data/superbwarfare/tags/items/normal_gun.json (97%) rename src/{main => generated}/resources/data/superbwarfare/tags/items/open_bolt.json (96%) rename src/{main => generated}/resources/data/superbwarfare/tags/items/use_handgun_ammo.json (89%) rename src/{main => generated}/resources/data/superbwarfare/tags/items/use_rifle_ammo.json (78%) create mode 100644 src/generated/resources/data/superbwarfare/tags/items/use_shotgun_ammo.json rename src/{main => generated}/resources/data/superbwarfare/tags/items/use_sniper_ammo.json (91%) delete mode 100644 src/main/resources/data/superbwarfare/tags/items/use_shotgun_ammo.json diff --git a/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 index 48f251db5..5beeb8c3b 100644 --- a/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 +++ b/src/generated/resources/.cache/2e07f3c482445536d45c00e6abf223465c01c841 @@ -1,4 +1,4 @@ -// 1.20.1 2024-09-09T21:35:56.3770147 Tags for minecraft:item mod id superbwarfare +// 1.20.1 2024-09-09T21:58:39.0898222 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 @@ -21,7 +21,13 @@ b6b0065ecbe36917b777ad86d467ef62dec9d82e data/forge/tags/items/raw_materials.jso 99a5a3a4bb6b5fb641dcd449937365ea174f3797 data/superbwarfare/tags/items/gun.json 62eb408544731ce4cfcd119d8a6cc74731189ac0 data/superbwarfare/tags/items/handgun.json b404c6fd99d2ca68c6738f225cb7d68ee443c10a data/superbwarfare/tags/items/machine_gun.json +4dc20b4a6b2978aba06811a61d1a8e693e1f7b04 data/superbwarfare/tags/items/normal_gun.json +2885fc6c956890f0134e4e015e989dc1c9c1e86d data/superbwarfare/tags/items/open_bolt.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 +89139144b7557cfd8fdeca93b0af28e69bb18d76 data/superbwarfare/tags/items/use_handgun_ammo.json +bd822d9189f80478841e951c75133c368e7cd5d0 data/superbwarfare/tags/items/use_rifle_ammo.json +acd4d19dfadb71a1cec43e9c0f4a38fe8d3cf8cb data/superbwarfare/tags/items/use_shotgun_ammo.json +13a23684e04832bea5dfbd2c0a9d9ed52dcb3422 data/superbwarfare/tags/items/use_sniper_ammo.json diff --git a/src/main/resources/data/superbwarfare/tags/items/normal_gun.json b/src/generated/resources/data/superbwarfare/tags/items/normal_gun.json similarity index 97% rename from src/main/resources/data/superbwarfare/tags/items/normal_gun.json rename to src/generated/resources/data/superbwarfare/tags/items/normal_gun.json index e3a0bfedb..85e98b055 100644 --- a/src/main/resources/data/superbwarfare/tags/items/normal_gun.json +++ b/src/generated/resources/data/superbwarfare/tags/items/normal_gun.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "superbwarfare:abekiri", "superbwarfare:ak_47", diff --git a/src/main/resources/data/superbwarfare/tags/items/open_bolt.json b/src/generated/resources/data/superbwarfare/tags/items/open_bolt.json similarity index 96% rename from src/main/resources/data/superbwarfare/tags/items/open_bolt.json rename to src/generated/resources/data/superbwarfare/tags/items/open_bolt.json index e733a390d..8cf8e5852 100644 --- a/src/main/resources/data/superbwarfare/tags/items/open_bolt.json +++ b/src/generated/resources/data/superbwarfare/tags/items/open_bolt.json @@ -1,10 +1,9 @@ { - "replace": false, "values": [ "superbwarfare:abekiri", - "superbwarfare:m_60", "superbwarfare:ak_47", "superbwarfare:svd", + "superbwarfare:m_60", "superbwarfare:mk_14", "superbwarfare:vector", "superbwarfare:sks", diff --git a/src/main/resources/data/superbwarfare/tags/items/use_handgun_ammo.json b/src/generated/resources/data/superbwarfare/tags/items/use_handgun_ammo.json similarity index 89% rename from src/main/resources/data/superbwarfare/tags/items/use_handgun_ammo.json rename to src/generated/resources/data/superbwarfare/tags/items/use_handgun_ammo.json index c2966d660..d5ec69495 100644 --- a/src/main/resources/data/superbwarfare/tags/items/use_handgun_ammo.json +++ b/src/generated/resources/data/superbwarfare/tags/items/use_handgun_ammo.json @@ -1,5 +1,4 @@ { - "replace": false, "values": [ "superbwarfare:trachelium", "superbwarfare:glock_17", diff --git a/src/main/resources/data/superbwarfare/tags/items/use_rifle_ammo.json b/src/generated/resources/data/superbwarfare/tags/items/use_rifle_ammo.json similarity index 78% rename from src/main/resources/data/superbwarfare/tags/items/use_rifle_ammo.json rename to src/generated/resources/data/superbwarfare/tags/items/use_rifle_ammo.json index 76a6de289..ed4637ea3 100644 --- a/src/main/resources/data/superbwarfare/tags/items/use_rifle_ammo.json +++ b/src/generated/resources/data/superbwarfare/tags/items/use_rifle_ammo.json @@ -1,16 +1,15 @@ { - "replace": false, "values": [ - "superbwarfare:devotion", "superbwarfare:m_4", "superbwarfare:hk_416", - "superbwarfare:rpk", "superbwarfare:sks", "superbwarfare:minigun", - "superbwarfare:mk_14", + "superbwarfare:devotion", "superbwarfare:m_60", + "superbwarfare:mk_14", "superbwarfare:marlin", "superbwarfare:ak_47", - "superbwarfare:qbz_95" + "superbwarfare:qbz_95", + "superbwarfare:rpk" ] } \ No newline at end of file diff --git a/src/generated/resources/data/superbwarfare/tags/items/use_shotgun_ammo.json b/src/generated/resources/data/superbwarfare/tags/items/use_shotgun_ammo.json new file mode 100644 index 000000000..a208906cd --- /dev/null +++ b/src/generated/resources/data/superbwarfare/tags/items/use_shotgun_ammo.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/use_sniper_ammo.json b/src/generated/resources/data/superbwarfare/tags/items/use_sniper_ammo.json similarity index 91% rename from src/main/resources/data/superbwarfare/tags/items/use_sniper_ammo.json rename to src/generated/resources/data/superbwarfare/tags/items/use_sniper_ammo.json index c42ceaf03..923e6b3ec 100644 --- a/src/main/resources/data/superbwarfare/tags/items/use_sniper_ammo.json +++ b/src/generated/resources/data/superbwarfare/tags/items/use_sniper_ammo.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 999881c3b..959525b76 100644 --- a/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java +++ b/src/main/java/net/mcreator/superbwarfare/datagen/ModItemTagProvider.java @@ -62,6 +62,19 @@ public class ModItemTagProvider extends ItemTagsProvider { 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()); + this.tag(ModTags.Items.NORMAL_GUN).add(ModItems.ABEKIRI.get(), ModItems.AK_47.get(), ModItems.SVD.get(), ModItems.M_60.get(), ModItems.MK_14.get(), ModItems.VECTOR.get(), + ModItems.SKS.get(), ModItems.RPK.get(), ModItems.HK_416.get(), ModItems.AA_12.get(), ModItems.M_4.get(), ModItems.DEVOTION.get(), ModItems.TRACHELIUM.get(), + ModItems.HUNTING_RIFLE.get(), ModItems.NTW_20.get(), ModItems.M_98B.get(), ModItems.SENTINEL.get(), ModItems.M_870.get(), ModItems.MARLIN.get(), ModItems.GLOCK_17.get(), + ModItems.GLOCK_18.get(), ModItems.M_1911.get(), ModItems.QBZ_95.get(), ModItems.K_98.get(), ModItems.MOSIN_NAGANT.get()); + this.tag(ModTags.Items.OPEN_BOLT).add(ModItems.ABEKIRI.get(), ModItems.AK_47.get(), ModItems.SVD.get(), ModItems.M_60.get(), ModItems.MK_14.get(), ModItems.VECTOR.get(), + ModItems.SKS.get(), ModItems.RPK.get(), ModItems.HK_416.get(), ModItems.AA_12.get(), ModItems.M_4.get(), ModItems.DEVOTION.get(), ModItems.NTW_20.get(), + ModItems.M_98B.get(), ModItems.SENTINEL.get(),ModItems.GLOCK_17.get(),ModItems.GLOCK_18.get(), ModItems.M_1911.get(), ModItems.QBZ_95.get()); + this.tag(ModTags.Items.USE_HANDGUN_AMMO).add(ModItems.TRACHELIUM.get(), ModItems.GLOCK_17.get(), ModItems.GLOCK_18.get(), ModItems.M_1911.get(), ModItems.VECTOR.get()); + this.tag(ModTags.Items.USE_RIFLE_AMMO).add(ModItems.M_4.get(), ModItems.HK_416.get(), ModItems.SKS.get(),ModItems.MINIGUN.get(),ModItems.DEVOTION.get(),ModItems.M_60.get(), + ModItems.MK_14.get(), ModItems.MARLIN.get(), ModItems.AK_47.get(), ModItems.QBZ_95.get(), ModItems.RPK.get()); + this.tag(ModTags.Items.USE_SHOTGUN_AMMO).add(ModItems.ABEKIRI.get(), ModItems.M_870.get(), ModItems.AA_12.get()); + this.tag(ModTags.Items.USE_SNIPER_AMMO).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()); } private static TagKey forgeTag(String name) { diff --git a/src/main/resources/data/superbwarfare/tags/items/use_shotgun_ammo.json b/src/main/resources/data/superbwarfare/tags/items/use_shotgun_ammo.json deleted file mode 100644 index 7155833b2..000000000 --- a/src/main/resources/data/superbwarfare/tags/items/use_shotgun_ammo.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "superbwarfare:abekiri", - "superbwarfare:aa_12", - "superbwarfare:m_870" - ] -} \ No newline at end of file