From 4e743379362d33478492399dcb0aa291cee8ab39 Mon Sep 17 00:00:00 2001
From: "Joseph T. McQuigg" <J.T.McQuigg12@gmail.com>
Date: Thu, 1 Aug 2024 00:05:17 -0400
Subject: [PATCH] Make advancements not all challenges. Closes #21

---
 .../adventure/inside_quicksand.json           |  2 +-
 .../little_house_on_the_prairie.json          |  2 +-
 .../biomeswevegone/adventure/root.json        |  2 +-
 .../husbandry/berrily_alive.json              |  2 +-
 .../biomeswevegone/husbandry/forager.json     |  2 +-
 .../husbandry/granny_smith.json               |  2 +-
 .../husbandry/hot_diggity_not_dog.json        |  2 +-
 .../husbandry/johnny_appleseed.json           |  2 +-
 .../husbandry/just_like_grandmas.json         |  2 +-
 .../generators/AdvancementGenerator.java      | 22 +++++++++----------
 10 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/adventure/inside_quicksand.json b/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/adventure/inside_quicksand.json
index 9accb1842..2126e308a 100644
--- a/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/adventure/inside_quicksand.json
+++ b/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/adventure/inside_quicksand.json
@@ -20,7 +20,7 @@
     "description": {
       "translate": "advancements.biomeswevegone.adventure.inside_quicksand.description"
     },
-    "frame": "challenge",
+    "frame": "task",
     "hidden": false,
     "icon": {
       "item": "biomeswevegone:quicksand"
diff --git a/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/adventure/little_house_on_the_prairie.json b/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/adventure/little_house_on_the_prairie.json
index 574670924..b698d3565 100644
--- a/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/adventure/little_house_on_the_prairie.json
+++ b/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/adventure/little_house_on_the_prairie.json
@@ -40,7 +40,7 @@
     "description": {
       "translate": "advancements.biomeswevegone.adventure.little_house_on_the_prairie.description"
     },
-    "frame": "challenge",
+    "frame": "task",
     "hidden": false,
     "icon": {
       "item": "biomeswevegone:prairie_grass"
diff --git a/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/adventure/root.json b/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/adventure/root.json
index 33f1f6aaf..5e36e8a2d 100644
--- a/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/adventure/root.json
+++ b/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/adventure/root.json
@@ -840,7 +840,7 @@
     "description": {
       "translate": "advancements.biomeswevegone.adventure.root.description"
     },
-    "frame": "challenge",
+    "frame": "task",
     "hidden": false,
     "icon": {
       "item": "biomeswevegone:bwg_logo"
diff --git a/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/berrily_alive.json b/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/berrily_alive.json
index cb8b201c1..e21e492a7 100644
--- a/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/berrily_alive.json
+++ b/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/berrily_alive.json
@@ -19,7 +19,7 @@
     "description": {
       "translate": "advancements.biomeswevegone.husbandry.berrily_alive.description"
     },
-    "frame": "challenge",
+    "frame": "task",
     "hidden": false,
     "icon": {
       "item": "biomeswevegone:blueberries"
diff --git a/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/forager.json b/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/forager.json
index 381330148..63cf2668a 100644
--- a/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/forager.json
+++ b/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/forager.json
@@ -19,7 +19,7 @@
     "description": {
       "translate": "advancements.biomeswevegone.husbandry.forager.description"
     },
-    "frame": "challenge",
+    "frame": "task",
     "hidden": false,
     "icon": {
       "item": "biomeswevegone:white_puffball_cap"
diff --git a/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/granny_smith.json b/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/granny_smith.json
index 50aa5af5e..6811ce9d6 100644
--- a/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/granny_smith.json
+++ b/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/granny_smith.json
@@ -19,7 +19,7 @@
     "description": {
       "translate": "advancements.biomeswevegone.husbandry.granny_smith.description"
     },
-    "frame": "challenge",
+    "frame": "task",
     "hidden": false,
     "icon": {
       "item": "biomeswevegone:green_apple"
diff --git a/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/hot_diggity_not_dog.json b/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/hot_diggity_not_dog.json
index a5a6cfa3f..e6481da5b 100644
--- a/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/hot_diggity_not_dog.json
+++ b/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/hot_diggity_not_dog.json
@@ -30,7 +30,7 @@
     "description": {
       "translate": "advancements.biomeswevegone.husbandry.hot_diggity_not_dog.description"
     },
-    "frame": "challenge",
+    "frame": "task",
     "hidden": false,
     "icon": {
       "item": "biomeswevegone:cattail_sprout"
diff --git a/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/johnny_appleseed.json b/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/johnny_appleseed.json
index acf8d088d..b8f67a08f 100644
--- a/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/johnny_appleseed.json
+++ b/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/johnny_appleseed.json
@@ -43,7 +43,7 @@
     "description": {
       "translate": "advancements.biomeswevegone.husbandry.johnny_appleseed.description"
     },
-    "frame": "challenge",
+    "frame": "task",
     "hidden": false,
     "icon": {
       "item": "minecraft:golden_apple"
diff --git a/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/just_like_grandmas.json b/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/just_like_grandmas.json
index 6cf206cb5..46c6a5f51 100644
--- a/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/just_like_grandmas.json
+++ b/Common/src/main/generated/resources/data/biomeswevegone/advancements/biomeswevegone/husbandry/just_like_grandmas.json
@@ -31,7 +31,7 @@
     "description": {
       "translate": "advancements.biomeswevegone.husbandry.just_like_grandmas.description"
     },
-    "frame": "challenge",
+    "frame": "goal",
     "hidden": false,
     "icon": {
       "item": "biomeswevegone:green_apple_pie"
diff --git a/Forge/src/main/java/net/potionstudios/biomeswevegone/forge/datagen/generators/AdvancementGenerator.java b/Forge/src/main/java/net/potionstudios/biomeswevegone/forge/datagen/generators/AdvancementGenerator.java
index f0ce315e5..e56857037 100644
--- a/Forge/src/main/java/net/potionstudios/biomeswevegone/forge/datagen/generators/AdvancementGenerator.java
+++ b/Forge/src/main/java/net/potionstudios/biomeswevegone/forge/datagen/generators/AdvancementGenerator.java
@@ -45,7 +45,7 @@ public void generate(HolderLookup.@NotNull Provider arg, @NotNull Consumer<Advan
                             translateAble("adventure.root.title"),
                             translateAble("adventure.root.description"),
                             BiomesWeveGone.id("textures/block/lush_dirt.png"),
-                            FrameType.CHALLENGE, false, false, false
+                            FrameType.TASK, false, false, false
                     ).save(consumer, BiomesWeveGone.id(BiomesWeveGone.MOD_ID + "/adventure/root"), existingFileHelper);
 
         VanillaAdventureAdvancements.addBiomes(Advancement.Builder.advancement(), BWGBiomes.BIOME_FACTORIES.keySet().stream().sorted().toList())
@@ -70,10 +70,8 @@ public void generate(HolderLookup.@NotNull Provider arg, @NotNull Consumer<Advan
                         translateAble("adventure.inside_quicksand.title"),
                         translateAble("adventure.inside_quicksand.description"),
                         BiomesWeveGone.id("textures/block/lush_dirt.png"),
-                        FrameType.CHALLENGE,
-                        true,
-                        true,
-                        false
+                        FrameType.TASK,
+                        true, true, false
                 )
                 .save(consumer, BiomesWeveGone.id(BiomesWeveGone.MOD_ID + "/adventure/inside_quicksand"), existingFileHelper);
 
@@ -87,7 +85,7 @@ public void generate(HolderLookup.@NotNull Provider arg, @NotNull Consumer<Advan
                         translateAble("adventure.little_house_on_the_prairie.title"),
                         translateAble("adventure.little_house_on_the_prairie.description"),
                         BiomesWeveGone.id("textures/block/lush_dirt.png"),
-                        FrameType.CHALLENGE, true, true, false
+                        FrameType.TASK, true, true, false
                 )
                 .save(consumer, BiomesWeveGone.id(BiomesWeveGone.MOD_ID + "/adventure/little_house_on_the_prairie"), existingFileHelper);
 
@@ -109,7 +107,7 @@ public void generate(HolderLookup.@NotNull Provider arg, @NotNull Consumer<Advan
                         BWGItems.GREEN_APPLE.get(),
                         translateAble("husbandry.granny_smith.title"),
                         translateAble("husbandry.granny_smith.description"),
-                        null, FrameType.CHALLENGE, true, true, false)
+                        null, FrameType.TASK, true, true, false)
                 .save(consumer, BiomesWeveGone.id(BiomesWeveGone.MOD_ID + "/husbandry/granny_smith"), existingFileHelper);
 
         Advancement.Builder.advancement()
@@ -119,7 +117,7 @@ public void generate(HolderLookup.@NotNull Provider arg, @NotNull Consumer<Advan
                         BWGItems.WHITE_PUFFBALL_CAP.get(),
                         translateAble("husbandry.forager.title"),
                         translateAble("husbandry.forager.description"),
-                        null, FrameType.CHALLENGE, true, true, false)
+                        null, FrameType.TASK, true, true, false)
                 .save(consumer, BiomesWeveGone.id(BiomesWeveGone.MOD_ID + "/husbandry/forager"), existingFileHelper);
 
         Advancement.Builder.advancement()
@@ -129,7 +127,7 @@ public void generate(HolderLookup.@NotNull Provider arg, @NotNull Consumer<Advan
                         BWGItems.BLUEBERRIES.get(),
                         translateAble("husbandry.berrily_alive.title"),
                         translateAble("husbandry.berrily_alive.description"),
-                        null, FrameType.CHALLENGE, true, true, false)
+                        null, FrameType.TASK, true, true, false)
                 .save(consumer, BiomesWeveGone.id(BiomesWeveGone.MOD_ID + "/husbandry/berrily_alive"), existingFileHelper);
 
         Advancement.Builder.advancement()
@@ -143,7 +141,7 @@ public void generate(HolderLookup.@NotNull Provider arg, @NotNull Consumer<Advan
                         BWGItems.GREEN_APPLE_PIE.get(),
                         translateAble("husbandry.just_like_grandmas.title"),
                         translateAble("husbandry.just_like_grandmas.description"),
-                        null, FrameType.CHALLENGE, true, true, false)
+                        null, FrameType.GOAL, true, true, false)
                 .save(consumer, BiomesWeveGone.id(BiomesWeveGone.MOD_ID + "/husbandry/just_like_grandmas"), existingFileHelper);
 
         Advancement.Builder.advancement()
@@ -156,7 +154,7 @@ public void generate(HolderLookup.@NotNull Provider arg, @NotNull Consumer<Advan
                         Items.GOLDEN_APPLE,
                         translateAble("husbandry.johnny_appleseed.title"),
                         translateAble("husbandry.johnny_appleseed.description"),
-                        null, FrameType.CHALLENGE, true, true, false)
+                        null, FrameType.TASK, true, true, false)
                 .save(consumer, BiomesWeveGone.id(BiomesWeveGone.MOD_ID + "/husbandry/johnny_appleseed"), existingFileHelper);
 
         Advancement.Builder.advancement()
@@ -166,7 +164,7 @@ public void generate(HolderLookup.@NotNull Provider arg, @NotNull Consumer<Advan
                         BWGItems.CATTAIL_SPROUT.get(),
                         translateAble("husbandry.hot_diggity_not_dog.title"),
                         translateAble("husbandry.hot_diggity_not_dog.description"),
-                        null, FrameType.CHALLENGE, true, true, false)
+                        null, FrameType.TASK, true, true, false)
                 .save(consumer, BiomesWeveGone.id(BiomesWeveGone.MOD_ID + "/husbandry/hot_diggity_not_dog"), existingFileHelper);
     }