From 4cc4965f9a504f8fc8bb4e0cd0a1c7f76d7f6c6d Mon Sep 17 00:00:00 2001
From: Bruno Ploumhans <13494793+Technici4n@users.noreply.github.com>
Date: Thu, 19 Dec 2024 01:41:41 +0100
Subject: [PATCH] Fix #920: Armor and sword tags for rubber and quantum tiers
 (#967)

---
 .../resources/data/c/tags/item/tools/melee_weapon.json    | 6 ++++++
 .../resources/data/minecraft/tags/item/chest_armor.json   | 5 +++++
 .../resources/data/minecraft/tags/item/foot_armor.json    | 6 ++++++
 .../resources/data/minecraft/tags/item/head_armor.json    | 6 ++++++
 .../resources/data/minecraft/tags/item/leg_armor.json     | 5 +++++
 .../resources/data/minecraft/tags/item/swords.json        | 3 ++-
 .../datagen/tag/MIItemTagProvider.java                    | 8 +++++++-
 7 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 src/generated/resources/data/c/tags/item/tools/melee_weapon.json
 create mode 100644 src/generated/resources/data/minecraft/tags/item/chest_armor.json
 create mode 100644 src/generated/resources/data/minecraft/tags/item/foot_armor.json
 create mode 100644 src/generated/resources/data/minecraft/tags/item/head_armor.json
 create mode 100644 src/generated/resources/data/minecraft/tags/item/leg_armor.json

diff --git a/src/generated/resources/data/c/tags/item/tools/melee_weapon.json b/src/generated/resources/data/c/tags/item/tools/melee_weapon.json
new file mode 100644
index 000000000..f53ef26b1
--- /dev/null
+++ b/src/generated/resources/data/c/tags/item/tools/melee_weapon.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "modern_industrialization:diesel_chainsaw",
+    "modern_industrialization:quantum_sword"
+  ]
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/minecraft/tags/item/chest_armor.json b/src/generated/resources/data/minecraft/tags/item/chest_armor.json
new file mode 100644
index 000000000..e5c8e1c30
--- /dev/null
+++ b/src/generated/resources/data/minecraft/tags/item/chest_armor.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "modern_industrialization:quantum_chestplate"
+  ]
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/minecraft/tags/item/foot_armor.json b/src/generated/resources/data/minecraft/tags/item/foot_armor.json
new file mode 100644
index 000000000..13dbafb50
--- /dev/null
+++ b/src/generated/resources/data/minecraft/tags/item/foot_armor.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "modern_industrialization:rubber_boots",
+    "modern_industrialization:quantum_boots"
+  ]
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/minecraft/tags/item/head_armor.json b/src/generated/resources/data/minecraft/tags/item/head_armor.json
new file mode 100644
index 000000000..d52894a9e
--- /dev/null
+++ b/src/generated/resources/data/minecraft/tags/item/head_armor.json
@@ -0,0 +1,6 @@
+{
+  "values": [
+    "modern_industrialization:rubber_helmet",
+    "modern_industrialization:quantum_helmet"
+  ]
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/minecraft/tags/item/leg_armor.json b/src/generated/resources/data/minecraft/tags/item/leg_armor.json
new file mode 100644
index 000000000..33bc95bc6
--- /dev/null
+++ b/src/generated/resources/data/minecraft/tags/item/leg_armor.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "modern_industrialization:quantum_leggings"
+  ]
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/minecraft/tags/item/swords.json b/src/generated/resources/data/minecraft/tags/item/swords.json
index 57a3f5a6b..f53ef26b1 100644
--- a/src/generated/resources/data/minecraft/tags/item/swords.json
+++ b/src/generated/resources/data/minecraft/tags/item/swords.json
@@ -1,5 +1,6 @@
 {
   "values": [
-    "modern_industrialization:diesel_chainsaw"
+    "modern_industrialization:diesel_chainsaw",
+    "modern_industrialization:quantum_sword"
   ]
 }
\ No newline at end of file
diff --git a/src/main/java/aztech/modern_industrialization/datagen/tag/MIItemTagProvider.java b/src/main/java/aztech/modern_industrialization/datagen/tag/MIItemTagProvider.java
index 9ed98111d..151cedc60 100644
--- a/src/main/java/aztech/modern_industrialization/datagen/tag/MIItemTagProvider.java
+++ b/src/main/java/aztech/modern_industrialization/datagen/tag/MIItemTagProvider.java
@@ -103,7 +103,13 @@ protected void addTags(HolderLookup.Provider provider) {
         tag(ItemTags.HOES).add(MIItem.DIESEL_CHAINSAW.asItem());
         tag(ItemTags.PICKAXES).add(MIItem.STEAM_MINING_DRILL.asItem(), MIItem.DIESEL_MINING_DRILL.asItem());
         tag(ItemTags.SHOVELS).add(MIItem.STEAM_MINING_DRILL.asItem(), MIItem.DIESEL_MINING_DRILL.asItem());
-        tag(ItemTags.SWORDS).add(MIItem.DIESEL_CHAINSAW.asItem());
+        tag(ItemTags.SWORDS).add(MIItem.DIESEL_CHAINSAW.asItem(), MIItem.QUANTUM_SWORD.asItem());
+        tag(Tags.Items.MELEE_WEAPON_TOOLS).add(MIItem.DIESEL_CHAINSAW.asItem(), MIItem.QUANTUM_SWORD.asItem());
+
+        tag(ItemTags.HEAD_ARMOR).add(MIItem.RUBBER_HELMET.asItem(), MIItem.QUANTUM_HELMET.asItem());
+        tag(ItemTags.CHEST_ARMOR).add(MIItem.QUANTUM_CHESTPLATE.asItem());
+        tag(ItemTags.LEG_ARMOR).add(MIItem.QUANTUM_LEGGINGS.asItem());
+        tag(ItemTags.FOOT_ARMOR).add(MIItem.RUBBER_BOOTS.asItem(), MIItem.QUANTUM_BOOTS.asItem());
 
         tag(ItemTags.COALS).add(ResourceKey.create(Registries.ITEM, MI.id("lignite_coal")));