From 3d157af0a8c051900090c69af3b2d604a654732e Mon Sep 17 00:00:00 2001
From: Ben Maurer <ben.a.maurer@gmail.com>
Date: Fri, 26 Aug 2022 21:33:27 +0000
Subject: [PATCH] Adding in bases group and updating location tab advancements
 to use new location triggers.

---
 data/disabled/market.json                     | 36 ------------
 data/locations/advancements/bases.json        | 18 ++++++
 data/locations/advancements/market.json       | 57 +++++++++++++++++++
 .../locations/advancements/state_farmers.json | 57 +++++++++++++++++++
 4 files changed, 132 insertions(+), 36 deletions(-)
 delete mode 100644 data/disabled/market.json
 create mode 100644 data/locations/advancements/bases.json
 create mode 100644 data/locations/advancements/market.json
 create mode 100644 data/locations/advancements/state_farmers.json

diff --git a/data/disabled/market.json b/data/disabled/market.json
deleted file mode 100644
index 766c940..0000000
--- a/data/disabled/market.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "display": {
-        "icon": {
-            "item": "minecraft:diamond"
-        },
-        "title": "Spawn Market",
-        "description": "Check out the spawn market at E 30",
-        "frame": "task",
-        "show_toast": true,
-        "announce_to_chat": true
-    },    
-    "parent": "locations:root",
-    "criteria": {
-        "be_near": {
-            "trigger": "minecraft:location",
-            "conditions": {
-                "dimension": "minecraft:overworld",
-                "position": {
-			"x": {
-			    "min": 40,
-                            "max": 450
-			},
-                        "y": {
-                            "min": 62,
-                            "max": 125
-                        },
-                        "z": {
-                            "min": -215,
-                            "max": 13
-                        }
-                }
-            }
-        }
-    }
-}
-
diff --git a/data/locations/advancements/bases.json b/data/locations/advancements/bases.json
new file mode 100644
index 0000000..d9a5331
--- /dev/null
+++ b/data/locations/advancements/bases.json
@@ -0,0 +1,18 @@
+{
+    "display": {
+        "icon": {
+            "item": "minecraft:red_bed"
+        },
+        "title": "Bases",
+        "description": "Visit bases of your fellow Canopeans!",
+        "frame": "task",
+        "show_toast": false,
+        "announce_to_chat": false
+    },
+    "parent": "locations:root",
+	"criteria": {
+        "instant": {
+            "trigger": "minecraft:tick"
+        }
+    }
+}
diff --git a/data/locations/advancements/market.json b/data/locations/advancements/market.json
new file mode 100644
index 0000000..1e44780
--- /dev/null
+++ b/data/locations/advancements/market.json
@@ -0,0 +1,57 @@
+{
+    "display": {
+        "icon": {
+            "item": "minecraft:diamond"
+        },
+        "title": "Spawn Market",
+        "description": "Check out the spawn market at E 30",
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true
+    },    
+    "parent": "locations:root",
+    "criteria": {
+		"Market_Hub": {
+			"trigger": "minecraft:location",
+			"conditions": {
+				"player": [{
+						"condition": "minecraft:entity_properties",
+						"entity": "this",
+						"predicate": {
+							"location": {
+								"dimension": "minecraft:overworld",
+								"position": {
+									"x": {
+			    						"min": -493,
+                            			"max": -383
+									},
+                        			"y": {
+                            			"min": 68,
+                            			"max": 100
+                        			},
+                        			"z": {
+                            			"min": -24,
+                            			"max": 86
+                        			}
+                				}
+							}
+						}
+					},
+					{
+						"condition": "minecraft:inverted",
+						"term": {
+							"condition": "minecraft:entity_properties",
+							"entity": "this",
+							"predicate": {
+								"type_specific": {
+									"type": "player",
+									"gamemode": "spectator"
+								}
+							}
+						}
+					}
+				]
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/data/locations/advancements/state_farmers.json b/data/locations/advancements/state_farmers.json
new file mode 100644
index 0000000..39f8673
--- /dev/null
+++ b/data/locations/advancements/state_farmers.json
@@ -0,0 +1,57 @@
+{
+    "display": {
+        "icon": {
+            "item": "minecraft:redstone"
+        },
+        "title": "Like a good neighbor... stay over there.",
+        "description": "Visit the State Farmers at S 237",
+        "frame": "task",
+        "show_toast": true,
+        "announce_to_chat": true
+    },    
+    "parent": "locations:bases",
+    "criteria": {
+		"State_Farmers": {
+			"trigger": "minecraft:location",
+			"conditions": {
+				"player": [{
+						"condition": "minecraft:entity_properties",
+						"entity": "this",
+						"predicate": {
+							"location": {
+								"dimension": "minecraft:overworld",
+								"position": {
+									"x": {
+			    						"min": 571,
+                            			"max": 633
+									},
+                        			"y": {
+                            			"min": 60,
+                            			"max": 75
+                        			},
+                        			"z": {
+                            			"min": 1871,
+                            			"max": 1933
+                        			}
+                				}
+							}
+						}
+					},
+					{
+						"condition": "minecraft:inverted",
+						"term": {
+							"condition": "minecraft:entity_properties",
+							"entity": "this",
+							"predicate": {
+								"type_specific": {
+									"type": "player",
+									"gamemode": "spectator"
+								}
+							}
+						}
+					}
+				]
+			}
+		}
+	}
+}
\ No newline at end of file