1.21 advancements compat refactor

src/packs/advancements/common/beet.yaml

@@ -0,0 +1,10 @@
+id: 'skyvoid_advancements_common'
+name: 'SkyBlock Advancements Base'
+author: 'EpyonProjects'
+version: 1.0.0
+
+data_pack:
+  load: .
+
+resource_pack:
+  load: .

src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/apple.json → src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/apple.json

@@ -16,7 +16,7 @@
     "announce_to_chat": true,
     "hidden": false
   },
-  "parent": "skyvoid_advancements:overworld/wood",
+  "parent": "skyvoid_advancements:overworld/sapling",
   "criteria": {
     "apple": {
       "trigger": "minecraft:inventory_changed",

src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/copper.json → src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/copper.json

@@ -13,7 +13,7 @@
     },
     "frame": "task",
     "show_toast": true,
-    "announce_to_chat": true,
+    "announce_to_chat": false,
     "hidden": false
   },
   "parent": "skyvoid_advancements:overworld/zombie_hunter",

src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/creeper_hunter.json → src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/creeper_hunter.json

@@ -13,7 +13,7 @@
     },
     "frame": "task",
     "show_toast": true,
-    "announce_to_chat": true,
+    "announce_to_chat": false,
     "hidden": false
   },
   "parent": "skyvoid_advancements:overworld/mob_farm",

src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/witch.json → src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/witch.json

@@ -16,7 +16,7 @@
     },
     "frame": "task",
     "show_toast": true,
-    "announce_to_chat": false,
+    "announce_to_chat": true,
     "hidden": false
   },
   "parent": "skyvoid_advancements:overworld/mob_farm",

src/packs/extras/skyvoid_advancements/data/skyvoid_advancements/advancement/overworld/zombie_villager.json → src/packs/advancements/common/data/skyvoid_advancements/advancement/overworld/zombie_villager.json

@@ -18,7 +18,7 @@
     },
     "frame": "task",
     "show_toast": true,
-    "announce_to_chat": false,
+    "announce_to_chat": true,
     "hidden": false
   },
   "parent": "skyvoid_advancements:overworld/witch",

src/packs/extras/skyvoid_advancements/skyvoid_1_21/data/skyvoid_advancements/advancement/overworld/witch.json → src/packs/advancements/common/skyvoid_1_21/data/skyvoid_advancements/advancement/overworld/witch.json

@@ -16,7 +16,7 @@
     },
     "frame": "task",
     "show_toast": true,
-    "announce_to_chat": false,
+    "announce_to_chat": true,
     "hidden": false
   },
   "parent": "skyvoid_advancements:overworld/mob_farm",

src/packs/extras/skyvoid_advancements/skyvoid_1_21/data/skyvoid_advancements/advancement/overworld/zombie_villager.json → src/packs/advancements/common/skyvoid_1_21/data/skyvoid_advancements/advancement/overworld/zombie_villager.json

@@ -18,7 +18,7 @@
     },
     "frame": "task",
     "show_toast": true,
-    "announce_to_chat": false,
+    "announce_to_chat": true,
     "hidden": false
   },
   "parent": "skyvoid_advancements:overworld/witch",

src/packs/advancements/skyvoid_one_block/README.md

@@ -0,0 +1,21 @@
+Interact:	[![Static Badge](https://img.shields.io/badge/_-Discord-black?logo=discord&logoColor=%235865F2&labelColor=black&color=%235865F2)](https://discord.gg/mzWSZuGatd)
+[![Github Badge](https://img.shields.io/badge/_-GitHub-black?logo=github&logoColor=white&labelColor=%23181717&color=white&)](https://github.com/BPR02/SkyBlock_Collection)  
+Download: [![Smithed Badge](https://img.shields.io/badge/_-Smithed-black?logo=hackthebox&logoColor=%231b48c4&labelColor=black&color=%231b48c4)](https://smithed.net/packs/skyblock-advancements)
+[![Modrinth Badge](https://img.shields.io/badge/_-Modrinth-black?logo=modrinth&logoColor=%2300AF5C&labelColor=black&color=%2300AF5C)](https://modrinth.com/datapack/skyblock-advancements)  
+Support: [![PayPal Badge](https://img.shields.io/badge/_%20-Paypal-black?logo=paypal&logoColor=%230079C1&labelColor=black&color=%230079C1)](https://www.paypal.com/paypalme/epyonprojects)
+[![BisectHosting Badge](https://img.shields.io/badge/Rent%20a%20Server-black?logo=bisecthosting&logoColor=%2306ddff&labelColor=%23030525&color=%2337e3f3)](https://www.bisecthosting.com/skyvoid)
+
+# One Block Advancements
+This data pack modifies the story and nether advancements to better guide the progression in a one block world. It rearranges vanilla advancements and adds extra advancements, it's perfect for skyblock maps such as [Vanilla One Block](https://smithed.net/packs/vanilla-one-block)!
+
+## Rearranged for One Block Progression
+The advancements in the story tab are rearranged and rewritten to support the one block progression instead of the vanilla progression. Some examples include moving the iron ingot advancement after a new advancement to kill a zombie since the first iron doesn't come from iron ore, but instead from killing zombies.
+
+![Iron Ingot Advancement](https://raw.githubusercontent.com/BPR02/SkyBlock_Collection/main/images/iron_ingot_advancement.png)
+
+## Guided Experience
+There are several added advancements that help players progress through the game without needing to already know random quirks in the game. Some examples include describing the first steps, how to obtain more blocks, and how to progress towards a normal SkyBlock experience. Most of these advancements give hints at these quirks instead of directly stating what they should do.
+
+![Cobblestone Generator Advancement](https://raw.githubusercontent.com/BPR02/SkyBlock_Collection/main/images/cobblestone_gen_advancement.png)
+
+![Cauldron Advancement](https://raw.githubusercontent.com/BPR02/SkyBlock_Collection/main/images/cauldron_advancement.png)

src/packs/advancements/skyvoid_one_block/beet.yaml

@@ -0,0 +1,10 @@
+id: 'skyvoid_advancements_one_block'
+name: 'One Block Advancements'
+author: 'EpyonProjects'
+version: 1.0.0
+
+require:
+  - src.plugins.advancements.generate
+
+data_pack:
+  load: .

src/packs/advancements/skyvoid_one_block/data/minecraft/advancement/story/lava_bucket.json

@@ -0,0 +1,34 @@
+{
+  "display": {
+    "icon": {
+      "id": "minecraft:lava_bucket"
+    },
+    "title": {
+      "translate": "advancements.story.lava_bucket.title"
+    },
+    "description": {
+      "translate": "advancements.skyvoid.overworld.lava_bucket.description",
+      "fallback": "Obtain your first bucket of lava"
+    },
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true,
+    "hidden": false
+  },
+  "parent": "minecraft:story/follow_ender_eye",
+  "criteria": {
+    "lava_bucket": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:lava_bucket"
+            ]
+          }
+        ]
+      }
+    }
+  },
+  "sends_telemetry_event": true
+}

src/packs/advancements/skyvoid_one_block/data/minecraft/advancement/story/mine_stone.json

@@ -0,0 +1,35 @@
+{
+  "display": {
+    "icon": {
+      "id": "minecraft:wooden_pickaxe"
+    },
+    "title": {
+      "translate": "advancements.skyvoid.overworld.wooden_pickaxe.title",
+      "fallback": "Time to Mine!"
+    },
+    "description": {
+      "translate": "advancements.skyvoid.overworld.wooden_pickaxe.description",
+      "fallback": "Use planks and sticks to make a pickaxe"
+    },
+    "frame": "task",
+    "show_toast": true,
+    "announce_to_chat": true,
+    "hidden": false
+  },
+  "parent": "minecraft:story/root",
+  "criteria": {
+    "wooden_pickaxe": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:wooden_pickaxe"
+            ]
+          }
+        ]
+      }
+    }
+  },
+  "sends_telemetry_event": true
+}

src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/cobble_gen.json

@@ -0,0 +1,78 @@
+{
+  "display": {
+    "icon": {
+      "id": "minecraft:cobblestone"
+    },
+    "title": {
+      "translate": "advancements.skyvoid.overworld.cobblestone_generator.title",
+      "fallback": "Welcome to SkyBlock"
+    },
+    "description": [
+      {
+        "translate": "advancements.skyvoid.overworld.cobblestone_generator.description",
+        "fallback": "Build a Cobblestone Generator by placing Water and Lava 2 spaces apart and allow them to flow into each other\n\nExample:\n"
+      },
+      {
+        "translate": "skyvoid.second",
+        "fallback": "%1$s",
+        "with": [
+          [
+            {
+              "text": " "
+            },
+            {
+              "text": "W",
+              "color": "#3399FF"
+            },
+            {
+              "text": " _ _ ",
+              "color": "white"
+            },
+            {
+              "text": "L",
+              "color": "#FF7D33"
+            },
+            {
+              "text": "\n "
+            },
+            {
+              "text": "D",
+              "color": "#796052"
+            },
+            {
+              "text": " _ ",
+              "color": "white"
+            },
+            {
+              "text": "D D",
+              "color": "#796052"
+            }
+          ],
+          {
+            "translate": "gui.skyvoid.advancement.cobblestone_generator",
+            "color": "white",
+            "font": "skyvoid:advancements"
+          }
+        ]
+      }
+    ],
+    "frame": "goal",
+    "show_toast": true,
+    "announce_to_chat": true,
+    "hidden": false
+  },
+  "parent": "minecraft:story/mine_stone",
+  "criteria": {
+    "cobblestone": {
+      "conditions": {
+        "items": [
+          {
+            "items": "minecraft:cobblestone"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "sends_telemetry_event": true
+}

src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/emerald_foxes.json

@@ -0,0 +1,34 @@
+{
+    "display": {
+      "icon": {
+        "id": "minecraft:emerald"
+      },
+      "title": {
+        "translate": "advancements.skyvoid.overworld.emerald_foxes.title",
+        "fallback": "My First Emerald"
+      },
+      "description": {
+        "translate": "advancements.skyvoid.overworld.emerald_foxes.description",
+        "fallback": "Obtain your first Emerald from a Fox"
+      },
+      "frame": "goal",
+      "show_toast": true,
+      "announce_to_chat": true,
+      "hidden": false
+    },
+    "parent": "skyvoid_advancements:overworld/snow",
+    "criteria": {
+      "emerald": {
+        "trigger": "minecraft:inventory_changed",
+        "conditions": {
+          "items": [
+            {
+              "items": [
+                "minecraft:emerald"
+              ]
+            }
+          ]
+        }
+      }
+    }
+  }

src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/iron_shovel.json

@@ -0,0 +1,34 @@
+{
+    "display": {
+      "icon": {
+        "id": "minecraft:iron_shovel"
+      },
+      "title": {
+        "translate": "advancements.skyvoid.overworld.iron_shovel.title",
+        "fallback": "Digging"
+      },
+      "description": {
+        "translate": "advancements.skyvoid.overworld.iron_shovel.description",
+        "fallback": "Steal a shovel from a corpse"
+      },
+      "frame": "task",
+      "show_toast": true,
+      "announce_to_chat": true,
+      "hidden": false
+    },
+    "parent": "skyvoid_advancements:overworld/jump",
+    "criteria": {
+      "iron_shovel": {
+        "trigger": "minecraft:inventory_changed",
+        "conditions": {
+          "items": [
+            {
+              "items": [
+                "minecraft:iron_shovel"
+              ]
+            }
+          ]
+        }
+      }
+    }
+  }

src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/jump.json

@@ -0,0 +1,25 @@
+{
+  "display": {
+    "icon": {
+      "id": "minecraft:potion"
+    },
+    "title": {
+      "translate": "advancements.skyvoid.overworld.jump.title",
+      "fallback": "Geronimo!"
+    },
+    "description": {
+      "translate": "advancements.skyvoid.overworld.jump.description",
+      "fallback": "Once you reach 2 hearts, jump off and try to spawn a zombie holding a shovel"
+    },
+    "frame": "goal",
+    "show_toast": true,
+    "announce_to_chat": true,
+    "hidden": false
+  },
+  "parent": "skyvoid_advancements:overworld/save",
+  "criteria": {
+    "jump": {
+      "trigger": "minecraft:impossible"
+    }
+  }
+}

src/packs/advancements/skyvoid_one_block/data/skyvoid_advancements/advancement/overworld/moss.json

@@ -0,0 +1,30 @@
+{
+  "display": {
+    "icon": {
+      "id": "minecraft:moss_block"
+    },
+    "title": {
+      "translate": "advancements.skyvoid.overworld.moss.title",
+      "fallback": "Greener Grass"
+    },
+    "description": {
+      "translate": "advancements.skyvoid.overworld.moss.description",
+      "fallback": "Purchase a Moss Block to grow your first tree"
+    },
+    "frame": "goal",
+    "show_toast": true,
+    "announce_to_chat": true,
+    "hidden": false
+  },
+  "parent": "skyvoid_advancements:overworld/emerald_foxes",
+  "criteria": {
+    "moss_block": {
+      "trigger": "minecraft:villager_trade",
+      "conditions": {
+        "item": {
+          "items": "minecraft:moss_block"
+        }
+      }
+    }
+  }
+}