From 2cf08cf092047eac16d6a2405ad5f63a8c6a4aa3 Mon Sep 17 00:00:00 2001
From: f-raZ0R <MonkeyCityOwner@gmail.com>
Date: Tue, 15 Oct 2024 11:55:05 -0400
Subject: [PATCH] fix bag of holding advancement

---
 .../unlocks/items/bag_of_holding.json         | 25 +++----------------
 .../tags/items/pure_resource_blocks.json      |  5 ++++
 .../spectrum/tags/items/pure_resources.json   |  5 ++++
 .../tags/items/unlocks_bag_of_holding.json    |  9 +++++++
 4 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100644 src/main/resources/data/spectrum/tags/items/unlocks_bag_of_holding.json

diff --git a/src/main/resources/data/spectrum/advancements/unlocks/items/bag_of_holding.json b/src/main/resources/data/spectrum/advancements/unlocks/items/bag_of_holding.json
index fce1cdcc65..a9c2cd2880 100644
--- a/src/main/resources/data/spectrum/advancements/unlocks/items/bag_of_holding.json
+++ b/src/main/resources/data/spectrum/advancements/unlocks/items/bag_of_holding.json
@@ -6,32 +6,13 @@
         "advancement_identifier": "spectrum:place_pedestal"
       }
     },
-    "collected_ender_eye": {
-      "trigger": "revelationary:advancement_gotten",
-      "conditions": {
-        "advancement_identifier": "spectrum:hidden/collect_vanilla/ender_eye"
-      }
-    },
-    "collected_warp_flux": {
+    "obtain_center_ingredient": {
       "trigger": "minecraft:inventory_changed",
-      "conditions": {
-        "items": [
-          {
-            "items": [
-              "malum:warp_flux"
-            ]
-          }
-        ]
-      }
+      "conditions": { "items": [{ "tag": "spectrum:unlocks_bag_of_holding" }] }
     },
     "gotten_radiating_ender": {
       "trigger": "revelationary:advancement_gotten",
       "conditions": { "advancement_identifier": "spectrum:get_radiating_ender" }
     }
-  },
-  "requirements": [
-    [ "placed_pedestal" ],
-    [ "collected_ender_eye", "collected_warp_flux" ],
-    [ "gotten_radiating_ender" ]
-  ]
+  }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/spectrum/tags/items/pure_resource_blocks.json b/src/main/resources/data/spectrum/tags/items/pure_resource_blocks.json
index 875d459fbd..4fe8f54331 100644
--- a/src/main/resources/data/spectrum/tags/items/pure_resource_blocks.json
+++ b/src/main/resources/data/spectrum/tags/items/pure_resource_blocks.json
@@ -34,6 +34,11 @@
     {
       "id": "spectrum:pure_globette_end_block",
       "required": false
+    },
+
+    {
+      "id": "spectrum:pure_zinc_block",
+      "required": false
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/spectrum/tags/items/pure_resources.json b/src/main/resources/data/spectrum/tags/items/pure_resources.json
index 05b777a9a7..208b9af0d4 100644
--- a/src/main/resources/data/spectrum/tags/items/pure_resources.json
+++ b/src/main/resources/data/spectrum/tags/items/pure_resources.json
@@ -33,6 +33,11 @@
     {
       "id": "spectrum:pure_globette_end",
       "required": false
+    },
+
+    {
+      "id": "spectrum:pure_zinc",
+      "required": false
     }
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/data/spectrum/tags/items/unlocks_bag_of_holding.json b/src/main/resources/data/spectrum/tags/items/unlocks_bag_of_holding.json
new file mode 100644
index 0000000000..103497adc0
--- /dev/null
+++ b/src/main/resources/data/spectrum/tags/items/unlocks_bag_of_holding.json
@@ -0,0 +1,9 @@
+{
+  "values": [
+    "minecraft:ender_eye",
+    {
+      "id": "malum:warp_flux",
+      "required": false
+    }
+  ]
+}
\ No newline at end of file