From 864bd571e81277f1a9038054f32a75a3f799daf2 Mon Sep 17 00:00:00 2001
From: Ben Maurer <ben.a.maurer@gmail.com>
Date: Mon, 2 Aug 2021 22:11:23 -0500
Subject: [PATCH] -Fixes to previous

---
 .../advancements/alright_i_give_up.json       | 97 +++++++++++++------
 data/canopy/advancements/far_out_man.json     | 97 +++++++++++++------
 2 files changed, 132 insertions(+), 62 deletions(-)

diff --git a/data/canopy/advancements/alright_i_give_up.json b/data/canopy/advancements/alright_i_give_up.json
index bdec460..8f534c3 100644
--- a/data/canopy/advancements/alright_i_give_up.json
+++ b/data/canopy/advancements/alright_i_give_up.json
@@ -1,32 +1,67 @@
 {
-    "display": {
-        "icon": {
-            "item": "minecraft:elytra"
-        },
-        "title": "... Alright, I Give Up.",
-        "description": "And you thought 100,000 was far...",
-        "frame": "challenge",
-        "show_toast": false,
-        "announce_to_chat": true
-    },    
-    "parent": "canopy:yeet",
-    "criteria": {
-        "be_near": {
-            "trigger": "minecraft:location",
-            "conditions": {
-                "dimension": "minecraft:the_end",
-                "position": {
-			"x": {
-			    "min": 1000000,
-                            "max": -1000000
-			},
-                        "z": {
-                            "min": 1000000,
-                            "max": -1000000
-                        }
-                }
-            }
-        }
-    }
-}
-
+	"display": {
+		"icon": {
+			"item": "minecraft:elytra"
+		},
+		"title": "... Alright, I Give Up.",
+		"description": "And you thought 100,000 was far...",
+		"frame": "challenge",
+		"show_toast": false,
+		"announce_to_chat": true
+	},
+	"parent": "canopy:far_out_man",
+	"criteria": {
+		"outer_pos_x": {
+			"trigger": "minecraft:location",
+			"conditions": {
+				"dimension": "the_end",
+				"position": {
+					"x": {
+						"min": 1000000.0
+					}
+				}
+			}
+		},
+		"outer_pos_z": {
+			"trigger": "minecraft:location",
+			"conditions": {
+				"dimension": "the_end",
+				"position": {
+					"z": {
+						"min": 1000000.0
+					}
+				}
+			}
+		},
+		"outer_neg_x": {
+			"trigger": "minecraft:location",
+			"conditions": {
+				"dimension": "the_end",
+				"position": {
+					"x": {
+						"max": -1000000.0
+					}
+				}
+			}
+		},
+		"outer_neg_z": {
+			"trigger": "minecraft:location",
+			"conditions": {
+				"dimension": "the_end",
+				"position": {
+					"z": {
+						"max": -1000000.0
+					}
+				}
+			}
+		}
+	},
+	"requirements": [
+		[
+			"outer_pos_x",
+			"outer_pos_z",
+			"outer_neg_x",
+			"outer_neg_z"
+		]
+	]
+}
\ No newline at end of file
diff --git a/data/canopy/advancements/far_out_man.json b/data/canopy/advancements/far_out_man.json
index 998131f..5e944c9 100644
--- a/data/canopy/advancements/far_out_man.json
+++ b/data/canopy/advancements/far_out_man.json
@@ -1,32 +1,67 @@
 {
-    "display": {
-        "icon": {
-            "item": "minecraft:elytra"
-        },
-        "title": "Far Out Man.",
-        "description": "Reach 100,000 in The End.",
-        "frame": "challenge",
-        "show_toast": false,
-        "announce_to_chat": true
-    },    
-    "parent": "canopy:yeet",
-    "criteria": {
-        "be_near": {
-            "trigger": "minecraft:location",
-            "conditions": {
-                "dimension": "minecraft:the_end",
-                "position": {
-			"x": {
-			    "min": 100000,
-                            "max": -100000
-			},
-                        "z": {
-                            "min": 100000,
-                            "max": -100000
-                        }
-                }
-            }
-        }
-    }
-}
-
+	"display": {
+		"icon": {
+			"item": "minecraft:elytra"
+		},
+		"title": "Far Out Man.",
+		"description": "Reach 100,000 in The End.",
+		"frame": "challenge",
+		"show_toast": false,
+		"announce_to_chat": true
+	},
+	"parent": "canopy:yeet",
+	"criteria": {
+		"outer_pos_x": {
+			"trigger": "minecraft:location",
+			"conditions": {
+				"dimension": "the_end",
+				"position": {
+					"x": {
+						"min": 1000000.0
+					}
+				}
+			}
+		},
+		"outer_pos_z": {
+			"trigger": "minecraft:location",
+			"conditions": {
+				"dimension": "the_end",
+				"position": {
+					"z": {
+						"min": 1000000.0
+					}
+				}
+			}
+		},
+		"outer_neg_x": {
+			"trigger": "minecraft:location",
+			"conditions": {
+				"dimension": "the_end",
+				"position": {
+					"x": {
+						"max": -1000000.0
+					}
+				}
+			}
+		},
+		"outer_neg_z": {
+			"trigger": "minecraft:location",
+			"conditions": {
+				"dimension": "the_end",
+				"position": {
+					"z": {
+						"max": -1000000.0
+					}
+				}
+			}
+		}
+	},
+	"requirements": [
+		[
+			"outer_pos_x",
+			"outer_pos_z",
+			"outer_neg_x",
+			"outer_neg_z"
+		]
+	]
+}
\ No newline at end of file