From d0d61a878f802a544331f7d003416a69935b2737 Mon Sep 17 00:00:00 2001
From: Ellpeck <me@ellpeck.de>
Date: Wed, 6 Jan 2021 22:08:18 +0100
Subject: [PATCH] Reordered advancements a bit to account for proper
 progression

---
 .../naturesaura/advancements/aura_bottle_nether.json |  2 +-
 .../data/naturesaura/advancements/end_flower.json    | 12 +++++++-----
 .../data/naturesaura/advancements/tainted_gold.json  |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/resources/data/naturesaura/advancements/aura_bottle_nether.json b/src/main/resources/data/naturesaura/advancements/aura_bottle_nether.json
index a166d3ab..b0d939eb 100644
--- a/src/main/resources/data/naturesaura/advancements/aura_bottle_nether.json
+++ b/src/main/resources/data/naturesaura/advancements/aura_bottle_nether.json
@@ -11,7 +11,7 @@
             "translate": "advancement.naturesaura.aura_bottle_nether.desc"
         }
     },
-    "parent": "naturesaura:wood_stand",
+    "parent": "naturesaura:altar",
     "criteria": {
         "bottle": {
             "trigger": "minecraft:inventory_changed",
diff --git a/src/main/resources/data/naturesaura/advancements/end_flower.json b/src/main/resources/data/naturesaura/advancements/end_flower.json
index 331c29a8..529a929f 100644
--- a/src/main/resources/data/naturesaura/advancements/end_flower.json
+++ b/src/main/resources/data/naturesaura/advancements/end_flower.json
@@ -12,12 +12,14 @@
     },
     "parent": "naturesaura:wood_stand",
     "criteria": {
-        "killed_dragon": {
-            "trigger": "minecraft:player_killed_entity",
+        "materials": {
+            "trigger": "minecraft:inventory_changed",
             "conditions": {
-                "entity": {
-                    "type": "ender_dragon"
-                }
+                "items": [
+                    {
+                        "item": "naturesaura:end_flower"
+                    }
+                ]
             }
         }
     }
diff --git a/src/main/resources/data/naturesaura/advancements/tainted_gold.json b/src/main/resources/data/naturesaura/advancements/tainted_gold.json
index be2efbb6..3c3fcbe0 100644
--- a/src/main/resources/data/naturesaura/advancements/tainted_gold.json
+++ b/src/main/resources/data/naturesaura/advancements/tainted_gold.json
@@ -10,7 +10,7 @@
             "translate": "advancement.naturesaura.tainted_gold.desc"
         }
     },
-    "parent": "naturesaura:altar",
+    "parent": "naturesaura:aura_bottle_nether",
     "criteria": {
         "materials": {
             "trigger": "minecraft:inventory_changed",