Rearranged advancements

assets/minecraft/lang/en_us.json

@@ -2,10 +2,17 @@
     "advancements.husbandry.netherite_hoe.description": "Use a Dendrite Ingot to upgrade a Hoe, and then reevaluate your life choices",
     "advancements.husbandry.netherite_hoe.title": "Serious Dedication",
     "advancements.nether.netherite_armor.description": "Get a full suit of Dendrite armor",
-    "advancements.story.mine_diamond.description": "Lost in light and heat",
+    "advancements.story.mine_diamond.description": "Find a diamond lost in light and heat",
     "advancements.story.mine_diamond.title": "Hearts of the Sunrise",
     "advancements.story.wooden_paxel.description": "Craft a Wooden Paxel",
     "advancements.story.wooden_paxel.title": "A New Beginning",
+	"advancements.story.upgrade_tools.description":"Scrounge enough copper for a pickaxe",
+	"advancements.story.upgrade_tools.title":"Really Is a Trial",
+	"advancements.story.smelt_iron.description":"Source and smelt iron from underground",
+	"advancements.story.smelt_gold.description":"Delve deeper and find gold. Or wait - is this gold?",
+	"advancements.story.smelt_gold.title":"We're Rich!",
+	"advancements.story.enter_the_nether.description":"Cool obsidian to a portal's shape, light it, and enter",
+
     "block.minecraft.deepslate_diamond_ore": "Blackstone Diamond Ore",
     "block.minecraft.netherite_block": "Block of Dendrite",
     "item.minecraft.netherite_axe": "Dendrite Axe",

assets/tetra/lang/en_us.json

@@ -1,14 +1,15 @@
 {
-  "tetra.advancements.story.more_upgrades.description": "Craft a copper hammer from two sticks and two copper ingots\n \n§8§oTetra begins",
+  "tetra.advancements.story.more_upgrades.description": "Craft a copper hammer for your tooling convenience\n \n§8§oTetra begins",
-  "tetra.advancements.upgrades.hammer_3.description": "Craft a double-sided iron hammer, the iron hammer provides tier three hammering capabilities\n\n§7Can only be crafted in a workbench, requires a secondary hammer in your inventory to craft",
+  "tetra.advancements.upgrades.hammer_3.description": "Craft a double-sided iron hammer and gain increased hammering capability\n\n§7May require a secondary hammer",
   "tetra.advancements.upgrades.hammer_3.title": "Hammer II (Iron)",
-  "tetra.advancements.upgrades.hammer_4.description": "Craft a double-sided cobalt hammer, the cobalt hammer provides tier four hammering capabilities\n\n§7An upgraded handle or a binding will provide enough integrity to support a cobalt hammer",
+  "tetra.advancements.upgrades.hammer_4.description": "Upgrade your hammer with cobalt\n\n§7An upgraded handle or a binding will provide enough integrity to support a cobalt hammer",
   "tetra.advancements.upgrades.hammer_4.title": "Hammer III (Cobalt)",
-  "tetra.advancements.upgrades.hammer_5.description": "Craft a double-sided diamond hammer, the diamond hammer provides tier five hammering capabilities",
+  "tetra.advancements.upgrades.hammer_5.description": "Craft a double-sided diamond hammer using an end rod handle",
   "tetra.advancements.upgrades.hammer_5.title": "Hammer IV (Diamond)",
-  "tetra.advancements.upgrades.hammer_6.description": "Craft a double-sided dendrite hammer, the dendrite hammer provides tier six hammering capabilities",
+  "tetra.advancements.upgrades.hammer_6.description": "Craft a double-sided dendrite hammer for ultimate customisation",
-  "tetra.advancements.upgrades.hammer_6.title": "Hammer V (Dendrite)",
+  "tetra.advancements.upgrades.hammer_6.title": "The Tinker Would Be Proud",
-  "tetra.advancements.upgrades.root.description": "Craft a mallet from two sticks and two copper ingots\n \nItem Reward: Holosphere",
+  "tetra.advancements.upgrades.root.description": "Craft a hammer and earn a holosphere",
+  "tetra.advancements.upgrades.tool_upgrade.description":"Start tinkering with a vanilla tool",
   "tetra.material.netherite": "Dendrite",
   "tetra.material.netherite.prefix": "Dendrite",
   "tetra.variant.spike/netherite": "Dendrite spike",

data/minecraft/advancements/nether/obtain_ancient_debris.json

@@ -0,0 +1,19 @@
+{
+	"parent": "minecraft:end/root",
+	"criteria": {
+		"ancient_debris": {
+			"conditions": {"items": [{"items": ["minecraft:ancient_debris"]}]},
+			"trigger": "minecraft:inventory_changed"
+		}
+	},
+	"display": {
+		"announce_to_chat": true,
+		"description": {"translate": "advancements.nether.obtain_ancient_debris.description"},
+		"frame": "task",
+		"hidden": false,
+		"icon": {"item": "minecraft:ancient_debris"},
+		"show_toast": true,
+		"title": {"translate": "advancements.nether.obtain_ancient_debris.title"}
+	},
+	"requirements": [["ancient_debris"]]
+}

data/minecraft/advancements/story/enchant_item.json

@@ -0,0 +1,19 @@
+{
+	"parent": "minecraft:story/enter_the_nether",
+	"criteria": {
+		"enchanted_item": {
+			"conditions": {},
+			"trigger": "minecraft:enchanted_item"
+		}
+	},
+	"display": {
+		"announce_to_chat": true,
+		"description": {"translate": "advancements.story.enchant_item.description"},
+		"frame": "task",
+		"hidden": false,
+		"icon": {"item": "minecraft:enchanted_book"},
+		"show_toast": true,
+		"title": {"translate": "advancements.story.enchant_item.title"}
+	},
+	"requirements": [["enchanted_item"]]
+}

data/minecraft/advancements/story/enter_the_nether.json

@@ -0,0 +1,22 @@
+{
+	"parent": "minecraft:story/smelt_gold",
+	"criteria": {
+		"entered_nether": {
+			"conditions": {"to": "minecraft:the_nether"},
+			"trigger": "minecraft:changed_dimension"
+		}
+	},
+	"display": {
+		"announce_to_chat": true,
+		"description": {"translate": "advancements.story.enter_the_nether.description"},
+		"frame": "task",
+		"hidden": false,
+		"icon": {
+			"item": "minecraft:flint_and_steel",
+			"nbt": "{Damage:0}"
+		},
+		"show_toast": true,
+		"title": {"translate": "advancements.story.enter_the_nether.title"}
+	},
+	"requirements": [["entered_nether"]]
+}

data/minecraft/advancements/story/form_obsidian.json

@@ -0,0 +1 @@
+{}

data/minecraft/advancements/story/iron_tools.json

@@ -0,0 +1 @@
+{}

data/minecraft/advancements/story/mine_diamond.json

@@ -1,22 +1,19 @@
 {
-	"parent": "minecraft:story/iron_tools",
+	"parent": "minecraft:story/enter_the_nether",
 	"criteria": {
 		"diamond": {
-			"conditions": {
+			"conditions": {"items": [{"items": ["minecraft:diamond"]}]},
-				"items": [{"items": ["minecraft:diamond"]}]
-			},
 			"trigger": "minecraft:inventory_changed"
 		}
 	},
 	"display": {
 		"announce_to_chat": true,
-		"description": "Lost in light and heat",
+		"title":{"translate":"advancements.story.mine_diamond.title"},
+		"description": {"translate":"advancements.story.mine_diamond.description"},
 		"frame": "task",
 		"hidden": false,
 		"icon": {"item": "minecraft:diamond"},
-		"show_toast": true,
+		"show_toast": true
-		"title": "Hearts of the Sunrise"
 	},
-	"requirements": [["diamond"]],
+	"requirements": [["diamond"]]
-	"sends_telemetry_event": false
 }

data/minecraft/advancements/story/mine_stone.json

@@ -1,39 +1,22 @@
 {
-  "parent": "minecraft:story/root",
+	"parent": "minecraft:story/root",
-  "criteria": {
+	"criteria": {
-    "wooden_paxel": {
+		"wooden_paxel": {
-      "conditions": {
+			"conditions": {"items": [{"items": ["paxelsfordummies:wooden_paxel"]}]},
-        "items": [
+			"trigger": "minecraft:inventory_changed"
-          {
+		}
-            "items": [
+	},
-              "paxelsfordummies:wooden_paxel"
+	"display": {
-            ]
+		"announce_to_chat": true,
-          }
+		"description": {"translate": "advancements.story.wooden_paxel.description"},
-        ]
+		"frame": "task",
-      },
+		"hidden": false,
-      "trigger": "minecraft:inventory_changed"
+		"icon": {
-    }
+			"item": "paxelsfordummies:wooden_paxel",
-  },
+			"nbt": "{Damage:0}"
-  "display": {
+		},
-    "announce_to_chat": true,
+		"show_toast": true,
-    "description": {
+		"title": {"translate": "advancements.story.wooden_paxel.title"}
-      "translate": "advancements.story.wooden_paxel.description"
+	},
-    },
+	"requirements": [["wooden_paxel"]]
-    "frame": "task",
-    "hidden": false,
-    "icon": {
-      "item": "paxelsfordummies:wooden_paxel",
-      "nbt": "{Damage:0}"
-    },
-    "show_toast": true,
-    "title": {
-      "translate": "advancements.story.wooden_paxel.title"
-    }
-  },
-  "requirements": [
-    [
-      "wooden_paxel"
-    ]
-  ],
-  "sends_telemetry_event": true
 }

data/minecraft/advancements/story/smelt_gold.json

@@ -0,0 +1,19 @@
+{
+	"parent": "minecraft:story/smelt_iron",
+	"criteria": {
+		"gold_ingot": {
+			"conditions": {"items": [{"items": ["minecraft:gold_ingot"]}]},
+			"trigger": "minecraft:inventory_changed"
+		}
+	},
+	"display": {
+		"announce_to_chat": true,
+		"description": {"translate": "advancements.story.smelt_gold.description"},
+		"frame": "task",
+		"hidden": false,
+		"icon": {"item": "minecraft:gold_ingot"},
+		"show_toast": true,
+		"title": {"translate": "advancements.story.smelt_gold.title"}
+	},
+	"requirements": [["gold_ingot"]]
+}