[Changes] Advancement order

src/main/generated/data/betterend/advancements/all_the_biomes.json

@@ -1,5 +1,5 @@
 {
-  "parent": "betterend:root",
+  "parent": "betterend:enter_end",
   "criteria": {
     "bclib:the_blue": {
       "conditions": {
@@ -468,88 +468,88 @@
   },
   "requirements": [
     [
-      "betterend:sulphur_springs"
+      "betterend:amber_land"
-    ],
-    [
-      "betterend:neon_oasis"
-    ],
-    [
-      "betterend:jade_cave"
-    ],
-    [
-      "bclib:the_yellow"
-    ],
-    [
-      "betterend:ice_starfield"
-    ],
-    [
-      "betterend:blossoming_spires"
-    ],
-    [
-      "betterend:dry_shrubland"
-    ],
-    [
-      "betterend:megalake"
-    ],
-    [
-      "betterend:dragon_graveyards"
-    ],
-    [
-      "betterend:umbrella_jungle"
-    ],
-    [
-      "betterend:painted_mountains"
-    ],
-    [
-      "betterend:crystal_mountains"
-    ],
-    [
-      "betterend:lush_aurora_cave"
-    ],
-    [
-      "betterend:empty_smaragdant_cave"
-    ],
-    [
-      "betterend:umbra_valley"
-    ],
-    [
-      "betterend:empty_aurora_cave"
     ],
     [
       "betterend:megalake_grove"
     ],
     [
-      "betterend:amber_land"
+      "betterend:empty_aurora_cave"
     ],
     [
-      "betterend:lush_smaragdant_cave"
+      "betterend:neon_oasis"
     ],
     [
-      "betterend:empty_end_cave"
+      "betterend:dry_shrubland"
     ],
     [
-      "betterend:lantern_woods"
+      "betterend:sulphur_springs"
-    ],
-    [
-      "betterend:glowing_grasslands"
-    ],
-    [
-      "betterend:shadow_forest"
-    ],
-    [
-      "bclib:the_blue"
-    ],
-    [
-      "betterend:chorus_forest"
-    ],
-    [
-      "betterend:dust_wastelands"
     ],
     [
       "betterend:foggy_mushroomland"
     ],
+    [
+      "betterend:megalake"
+    ],
+    [
+      "betterend:jade_cave"
+    ],
+    [
+      "betterend:crystal_mountains"
+    ],
+    [
+      "betterend:lantern_woods"
+    ],
+    [
+      "betterend:blossoming_spires"
+    ],
+    [
+      "betterend:chorus_forest"
+    ],
     [
       "bclib:the_gray"
+    ],
+    [
+      "betterend:empty_smaragdant_cave"
+    ],
+    [
+      "bclib:the_blue"
+    ],
+    [
+      "betterend:lush_smaragdant_cave"
+    ],
+    [
+      "betterend:painted_mountains"
+    ],
+    [
+      "betterend:umbrella_jungle"
+    ],
+    [
+      "betterend:dust_wastelands"
+    ],
+    [
+      "betterend:ice_starfield"
+    ],
+    [
+      "betterend:umbra_valley"
+    ],
+    [
+      "betterend:glowing_grasslands"
+    ],
+    [
+      "bclib:the_yellow"
+    ],
+    [
+      "betterend:shadow_forest"
+    ],
+    [
+      "betterend:empty_end_cave"
+    ],
+    [
+      "betterend:lush_aurora_cave"
+    ],
+    [
+      "betterend:dragon_graveyards"
     ]
   ],
   "rewards": {

src/main/generated/data/betterend/advancements/enter_end.json

@@ -0,0 +1,31 @@
+{
+  "parent": "betterend:root",
+  "criteria": {
+    "entered_end": {
+      "conditions": {
+        "to": "minecraft:the_end"
+      },
+      "trigger": "minecraft:changed_dimension"
+    }
+  },
+  "display": {
+    "announce_to_chat": true,
+    "description": {
+      "translate": "advancements.betterend.enter_end.description"
+    },
+    "frame": "task",
+    "hidden": false,
+    "icon": {
+      "item": "betterend:cave_moss"
+    },
+    "show_toast": true,
+    "title": {
+      "translate": "advancements.betterend.enter_end.title"
+    }
+  },
+  "requirements": [
+    [
+      "entered_end"
+    ]
+  ]
+}

src/main/generated/data/betterend/advancements/root.json

@@ -1,10 +1,16 @@
 {
   "criteria": {
-    "entered_end": {
+    "welcome": {
       "conditions": {
-        "to": "minecraft:the_end"
+        "player": [
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {}
+          }
+        ]
       },
-      "trigger": "minecraft:changed_dimension"
+      "trigger": "minecraft:location"
     }
   },
   "display": {
@@ -16,16 +22,16 @@
     "frame": "task",
     "hidden": false,
     "icon": {
-      "item": "betterend:cave_moss"
+      "item": "betterend:end_mycelium"
     },
-    "show_toast": false,
+    "show_toast": true,
     "title": {
       "translate": "advancements.betterend.root.title"
     }
   },
   "requirements": [
     [
-      "entered_end"
+      "welcome"
     ]
   ]
 }

src/main/java/org/betterx/datagen/betterend/advancement/EndAdvancementDataProvider.java

@@ -12,6 +12,8 @@ import org.betterx.betterend.world.biome.EndBiome;
 import net.minecraft.advancements.FrameType;
 import net.minecraft.advancements.RequirementsStrategy;
 import net.minecraft.advancements.critereon.ChangeDimensionTrigger;
+import net.minecraft.advancements.critereon.LocationPredicate;
+import net.minecraft.advancements.critereon.PlayerTrigger;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.Level;
@@ -31,12 +33,23 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
     protected void bootstrap() {
         ResourceLocation root = AdvancementManager.Builder
                 .create(BetterEnd.makeID("root"))
-                .startDisplay(EndBlocks.CAVE_MOSS)
+                .startDisplay(EndBlocks.END_MYCELIUM)
                 .frame(FrameType.TASK)
-                .hideToast()
                 .hideFromChat()
                 .background(new ResourceLocation("textures/gui/advancements/backgrounds/end.png"))
                 .endDisplay()
+                .addCriterion(
+                        "welcome",
+                        PlayerTrigger.TriggerInstance.located(LocationPredicate.ANY)
+                )
+                .requirements(RequirementsStrategy.OR)
+                .build();
+
+        ResourceLocation enterEnd = AdvancementManager.Builder
+                .create(BetterEnd.makeID("enter_end"))
+                .startDisplay(EndBlocks.CAVE_MOSS)
+                .endDisplay()
+                .parent(root)
                 .addCriterion(
                         "entered_end",
                         ChangeDimensionTrigger
@@ -77,7 +90,7 @@ public class EndAdvancementDataProvider extends AdvancementDataProvider {
 
         ResourceLocation allTheBiomes = AdvancementManager.Builder
                 .create(BetterEnd.makeID("all_the_biomes"))
-                .parent(root)
+                .parent(enterEnd)
                 .startDisplay(EndItems.AETERNIUM_BOOTS)
                 .frame(FrameType.CHALLENGE)
                 .endDisplay()

src/main/resources/assets/betterend/lang/de_de.json

@@ -645,7 +645,9 @@
   "betterend.infusion.east": "Östlicher Sockel",
   "betterend.infusion.north_east": "Nordöstlicher Sockel",
   "advancements.betterend.root.title": "BetterEnd",
-  "advancements.betterend.root.description": "Pfad der Eweigkeit",
+  "advancements.betterend.root.description": "Betrete eine Welt mit einem besseren Ende",
+  "advancements.betterend.enter_end.title": "Unendliche Weiten",
+  "advancements.betterend.enter_end.description": "Pfad der Eweigkeit",
   "advancements.betterend.portal.title": "Die Ewigkeit und zurück",
   "advancements.betterend.portal.description": "Entdecke ein verlorenes seit Ewigkeiten verlorenes Portal",
   "advancements.betterend.portal_on.title": "Wege der Ewigkeit",

src/main/resources/assets/betterend/lang/en_us.json

@@ -844,7 +844,9 @@
   "betterend.infusion.east": "Eastern Pedestal",
   "betterend.infusion.north_east": "North-East Pedestal",
   "advancements.betterend.root.title": "BetterEnd",
-  "advancements.betterend.root.description": "Discover the BetterEnd",
+  "advancements.betterend.root.description": "Enter a world that has a better End",
+  "advancements.betterend.enter_end.title": "Face the Void",
+  "advancements.betterend.enter_end.description": "Discover the BetterEnd",
   "advancements.betterend.portal.title": "On Eternal Paths",
   "advancements.betterend.portal.description": "Discover a portal lost for eternity",
   "advancements.betterend.portal_on.title": "Eternal Light",