From 3a118f1aa6278c822ac2a3315a1be82696bc0f74 Mon Sep 17 00:00:00 2001
From: Ben Maurer <ben.a.maurer@gmail.com>
Date: Sun, 8 Aug 2021 12:01:30 -0500
Subject: [PATCH] - Added holy_radiance, agent_p - Removed duplicate flying
 jack from canopy folder

---
 .../advancements/agent_p.json}                | 20 +++++------
 data/locations/advancements/hellmart.json     |  2 +-
 .../locations/advancements/holy_radiance.json | 36 +++++++++++++++++++
 data/locations/advancements/landmarks.json    | 18 ++++++++++
 4 files changed, 65 insertions(+), 11 deletions(-)
 rename data/{canopy/advancements/im_flying_jack.json => locations/advancements/agent_p.json} (58%)
 create mode 100644 data/locations/advancements/holy_radiance.json
 create mode 100644 data/locations/advancements/landmarks.json

diff --git a/data/canopy/advancements/im_flying_jack.json b/data/locations/advancements/agent_p.json
similarity index 58%
rename from data/canopy/advancements/im_flying_jack.json
rename to data/locations/advancements/agent_p.json
index 9c333b7..cdbf5ef 100644
--- a/data/canopy/advancements/im_flying_jack.json
+++ b/data/locations/advancements/agent_p.json
@@ -1,15 +1,15 @@
 {
     "display": {
         "icon": {
-            "item": "minecraft:ladder"
+            "item": "minecraft:cyan_concrete"
         },
-        "title": "I'm Flying, Jack!",
-        "description": "Summit spawn mountain",
+        "title": "Agent P",
+        "description": "A platypus? (at spawn)",
         "frame": "task",
         "show_toast": false,
         "announce_to_chat": true
     },    
-    "parent": "locations:root",
+    "parent": "locations:landmarks",
     "criteria": {
         "be_near": {
             "trigger": "minecraft:location",
@@ -17,16 +17,16 @@
                 "dimension": "minecraft:overworld",
                 "position": {
 			"x": {
-			    "min": 35,
-                            "max": 50
+			    "min": -54,
+                            "max": -45
 			},
                         "y": {
-                            "min": 160,
-                            "max": 180
+                            "min": 124,
+                            "max": 131
                         },
                         "z": {
-                            "min": -240,
-                            "max": -220
+                            "min": -370,
+                            "max": -362
                         }
                 }
             }
diff --git a/data/locations/advancements/hellmart.json b/data/locations/advancements/hellmart.json
index d673a6e..e2465e1 100644
--- a/data/locations/advancements/hellmart.json
+++ b/data/locations/advancements/hellmart.json
@@ -9,7 +9,7 @@
         "show_toast": false,
         "announce_to_chat": true
     },    
-    "parent": "locations:root",
+    "parent": "locations:landmarks",
     "criteria": {
         "be_near": {
             "trigger": "minecraft:location",
diff --git a/data/locations/advancements/holy_radiance.json b/data/locations/advancements/holy_radiance.json
new file mode 100644
index 0000000..1bdc3a1
--- /dev/null
+++ b/data/locations/advancements/holy_radiance.json
@@ -0,0 +1,36 @@
+{
+    "display": {
+        "icon": {
+            "item": "minecraft:cooked_mutton"
+        },
+        "title": "Blessed by Her Holy Radiance",
+        "description": Bore witness to the anime sheep.",
+        "frame": "task",
+        "show_toast": false,
+        "announce_to_chat": true
+    },    
+    "parent": "locations:landmarks",
+    "criteria": {
+        "be_near": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "dimension": "minecraft:overworld",
+                "position": {
+			"x": {
+			    "min": 3777,
+                            "max": 3895
+			},
+                        "y": {
+                            "min": 60,
+                            "max": 400
+                        },
+                        "z": {
+                            "min": 1670,
+                            "max": 1870
+                        }
+                }
+            }
+        }
+    }
+}
+
diff --git a/data/locations/advancements/landmarks.json b/data/locations/advancements/landmarks.json
new file mode 100644
index 0000000..72283a0
--- /dev/null
+++ b/data/locations/advancements/landmarks.json
@@ -0,0 +1,18 @@
+{
+    "display": {
+        "icon": {
+            "item": "minecraft:elytra"
+        },
+        "title": "Server Landmarks",
+        "description": "Visit special places around The Canopy",
+        "frame": "task",
+        "show_toast": false,
+        "announce_to_chat": false
+    },
+    "parent": "locations:root",
+	"criteria": {
+        "instant": {
+            "trigger": "minecraft:tick"
+        }
+    }
+}