Added even more new advancements

src/generated/resources/assets/hybrid-aquatic/lang/en_us.json

@@ -1,12 +1,18 @@
 {
   "advancements.hybrid-aquatic.black_pearl.description": "What the Black Pearl really is... is freedom.",
   "advancements.hybrid-aquatic.black_pearl.title": "The Black Pearl",
+  "advancements.hybrid-aquatic.brine.description": "Dive into a pool of Brine",
+  "advancements.hybrid-aquatic.brine.title": "You Were Supposed To Be A Hero",
+  "advancements.hybrid-aquatic.buoy.description": "Craft a buoy to guide sailors across the sea",
+  "advancements.hybrid-aquatic.buoy.title": "Oh Buoy!",
   "advancements.hybrid-aquatic.diving_suit.description": "Obtain a full set of diving gear",
   "advancements.hybrid-aquatic.diving_suit.title": "Diving In",
   "advancements.hybrid-aquatic.enter_water.description": "Discover an expanded world beneath the waves",
   "advancements.hybrid-aquatic.enter_water.title": "Hybrid Aquatic",
+  "advancements.hybrid-aquatic.glowstick.description": "Craft a glowstick to light your way in the deep sea",
+  "advancements.hybrid-aquatic.glowstick.title": "Better Than Torches!",
   "advancements.hybrid-aquatic.kill_karkinos.description": "Defeat Karkinos",
-  "advancements.hybrid-aquatic.kill_karkinos.title": "Kill Karkinos",
+  "advancements.hybrid-aquatic.kill_karkinos.title": "A Herculean Task",
   "advancements.hybrid-aquatic.ominous_hook.description": "Obtain an Ominous Hook",
   "advancements.hybrid-aquatic.ominous_hook.title": "Hook, Line, and Pincher",
   "advancements.hybrid-aquatic.pearl.description": "Obtain a pearl from a giant clam",

src/generated/resources/data/hybrid-aquatic/advancements/buoy.json

@@ -0,0 +1,39 @@
+{
+  "parent": "hybrid-aquatic:glowstick",
+  "criteria": {
+    "obtain_buoy": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "hybrid-aquatic:buoy"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "display": {
+    "announce_to_chat": true,
+    "background": "minecraft:textures/gui/advancements/backgrounds/adventure.png",
+    "description": {
+      "translate": "advancements.hybrid-aquatic.buoy.description"
+    },
+    "frame": "task",
+    "hidden": true,
+    "icon": {
+      "item": "hybrid-aquatic:buoy"
+    },
+    "show_toast": true,
+    "title": {
+      "translate": "advancements.hybrid-aquatic.buoy.title"
+    }
+  },
+  "requirements": [
+    [
+      "obtain_buoy"
+    ]
+  ],
+  "sends_telemetry_event": true
+}

src/generated/resources/data/hybrid-aquatic/advancements/diving_suit.json

@@ -1,7 +1,7 @@
 {
-  "parent": "hybrid-aquatic:root",
+  "parent": "hybrid-aquatic:buoy",
   "criteria": {
-    "diving_suit": {
+    "obtain_diving_suit": {
       "conditions": {
         "items": [
           {
@@ -48,7 +48,7 @@
   },
   "requirements": [
     [
-      "diving_suit"
+      "obtain_diving_suit"
     ]
   ],
   "sends_telemetry_event": true

src/generated/resources/data/hybrid-aquatic/advancements/glowstick.json

@@ -0,0 +1,39 @@
+{
+  "parent": "hybrid-aquatic:root",
+  "criteria": {
+    "obtain_glowstick": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "hybrid-aquatic:buoy"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "display": {
+    "announce_to_chat": true,
+    "background": "minecraft:textures/gui/advancements/backgrounds/adventure.png",
+    "description": {
+      "translate": "advancements.hybrid-aquatic.glowstick.description"
+    },
+    "frame": "task",
+    "hidden": true,
+    "icon": {
+      "item": "hybrid-aquatic:glowstick"
+    },
+    "show_toast": true,
+    "title": {
+      "translate": "advancements.hybrid-aquatic.glowstick.title"
+    }
+  },
+  "requirements": [
+    [
+      "obtain_glowstick"
+    ]
+  ],
+  "sends_telemetry_event": true
+}

src/generated/resources/data/hybrid-aquatic/advancements/kill_karkinos.json

@@ -23,7 +23,7 @@
       "translate": "advancements.hybrid-aquatic.kill_karkinos.description"
     },
     "frame": "challenge",
-    "hidden": false,
+    "hidden": true,
     "icon": {
       "item": "hybrid-aquatic:karkinos_claw"
     },

src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt

@@ -40,15 +40,29 @@ class LanguageProvider(output: FabricDataOutput) : FabricLanguageProvider(output
         mapOf(
             "advancements.hybrid-aquatic.enter_water.title" to "Hybrid Aquatic",
             "advancements.hybrid-aquatic.enter_water.description" to "Discover an expanded world beneath the waves",
+
+            "advancements.hybrid-aquatic.glowstick.title" to "Better Than Torches!",
+            "advancements.hybrid-aquatic.glowstick.description" to "Craft a glowstick to light your way in the deep sea",
+
+            "advancements.hybrid-aquatic.buoy.title" to "Oh Buoy!",
+            "advancements.hybrid-aquatic.buoy.description" to "Craft a buoy to guide sailors across the sea",
+
             "advancements.hybrid-aquatic.diving_suit.title" to "Diving In",
             "advancements.hybrid-aquatic.diving_suit.description" to "Obtain a full set of diving gear",
+
+            "advancements.hybrid-aquatic.brine.title" to "You Were Supposed To Be A Hero",
+            "advancements.hybrid-aquatic.brine.description" to "Dive into a pool of Brine",
+
             "advancements.hybrid-aquatic.pearl.title" to "Pearly Whites",
             "advancements.hybrid-aquatic.pearl.description" to "Obtain a pearl from a giant clam",
+
             "advancements.hybrid-aquatic.black_pearl.title" to "The Black Pearl",
             "advancements.hybrid-aquatic.black_pearl.description" to "What the Black Pearl really is... is freedom.",
+
             "advancements.hybrid-aquatic.ominous_hook.title" to "Hook, Line, and Pincher",
             "advancements.hybrid-aquatic.ominous_hook.description" to "Obtain an Ominous Hook",
-            "advancements.hybrid-aquatic.kill_karkinos.title" to "Kill Karkinos",
+
+            "advancements.hybrid-aquatic.kill_karkinos.title" to "A Herculean Task",
             "advancements.hybrid-aquatic.kill_karkinos.description" to "Defeat Karkinos",
         ).forEach { (key, translation) ->
             builder.add(key, translation)

src/main/kotlin/dev/hybridlabs/aquatic/data/server/AdvancementProvider.kt

@@ -1,5 +1,6 @@
 package dev.hybridlabs.aquatic.data.server
 
+import dev.hybridlabs.aquatic.block.HybridAquaticBlocks.BRINE
 import dev.hybridlabs.aquatic.entity.HybridAquaticEntityTypes
 import dev.hybridlabs.aquatic.item.HybridAquaticItems
 import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput
@@ -35,8 +36,46 @@ class AdvancementProvider(output: FabricDataOutput) : FabricAdvancementProvider(
             .build(Identifier("hybrid-aquatic", "root"))
         consumer?.accept(rootAdvancement)
 
-        val divingSuitAdvancement = Advancement.Builder.create()
+        val glowstickAdvancement = Advancement.Builder.create()
             .parent(rootAdvancement)
+            .display(
+                HybridAquaticItems.GLOWSTICK,
+                Text.translatable("advancements.hybrid-aquatic.glowstick.title"),
+                Text.translatable("advancements.hybrid-aquatic.glowstick.description"),
+                Identifier("textures/gui/advancements/backgrounds/adventure.png"),
+                AdvancementFrame.TASK,
+                true,
+                true,
+                true
+            )
+            .criterion(
+                "obtain_glowstick",
+                InventoryChangedCriterion.Conditions.items(HybridAquaticItems.BUOY)
+            )
+            .build(Identifier("hybrid-aquatic", "glowstick"))
+        consumer?.accept(glowstickAdvancement)
+
+        val buoyAdvancement = Advancement.Builder.create()
+            .parent(glowstickAdvancement)
+            .display(
+                HybridAquaticItems.BUOY,
+                Text.translatable("advancements.hybrid-aquatic.buoy.title"),
+                Text.translatable("advancements.hybrid-aquatic.buoy.description"),
+                Identifier("textures/gui/advancements/backgrounds/adventure.png"),
+                AdvancementFrame.TASK,
+                true,
+                true,
+                true
+            )
+            .criterion(
+                "obtain_buoy",
+                InventoryChangedCriterion.Conditions.items(HybridAquaticItems.BUOY)
+            )
+            .build(Identifier("hybrid-aquatic", "buoy"))
+        consumer?.accept(buoyAdvancement)
+
+        val divingSuitAdvancement = Advancement.Builder.create()
+            .parent(buoyAdvancement)
             .display(
                 HybridAquaticItems.DIVING_HELMET,
                 Text.translatable("advancements.hybrid-aquatic.diving_suit.title"),
@@ -48,7 +87,7 @@ class AdvancementProvider(output: FabricDataOutput) : FabricAdvancementProvider(
                 false
             )
             .criterion(
-                "diving_suit",
+                "obtain_diving_suit",
                 InventoryChangedCriterion.Conditions.items(
                     HybridAquaticItems.DIVING_HELMET,
                     HybridAquaticItems.DIVING_SUIT,
@@ -59,6 +98,24 @@ class AdvancementProvider(output: FabricDataOutput) : FabricAdvancementProvider(
             .build(Identifier("hybrid-aquatic", "diving_suit"))
         consumer?.accept(divingSuitAdvancement)
 
+        val brineAdvancement = Advancement.Builder.create()
+            .display(
+                HybridAquaticItems.BRINE_BUCKET,
+                Text.translatable("advancements.hybrid-aquatic.brine.title"),
+                Text.translatable("advancements.hybrid-aquatic.brine.description"),
+                Identifier("textures/gui/advancements/backgrounds/adventure.png"),
+                AdvancementFrame.TASK,
+                true,
+                true,
+                true
+            )
+            .criterion(
+                "enter_brine",
+                EnterBlockCriterion.Conditions.block(BRINE)
+            )
+            .build(Identifier("hybrid-aquatic", "brine"))
+        consumer?.accept(divingSuitAdvancement)
+
         val obtainPearlAdvancement = Advancement.Builder.create()
             .parent(rootAdvancement)
             .display(
@@ -126,7 +183,7 @@ class AdvancementProvider(output: FabricDataOutput) : FabricAdvancementProvider(
                 AdvancementFrame.CHALLENGE,
                 true,
                 true,
-                false
+                true
             )
             .criterion(
                 "kill_karkinos",