feat(web): support 1.18

Add 1.18 advancements.
Count deepslate ores while getting ore data.

Author: xslingcn

web/src/assets/advancement-data.json

@@ -105,6 +105,12 @@
     "title": "advancements.adventure.bullseye.title",
     "description": "advancements.adventure.bullseye.description"
   },
+  "minecraft:adventure/fall_from_world_height": {
+    "type": "task",
+    "icon": "minecraft:water_bucket",
+    "title": "advancements.adventure.fall_from_world_height.title",
+    "description": "advancements.adventure.fall_from_world_height.description"
+  },
   "minecraft:adventure/hero_of_the_village": {
     "type": "challenge",
     "icon": "minecraft:white_banner",
@@ -279,6 +285,12 @@
     "title": "advancements.adventure.trade.title",
     "description": "advancements.adventure.trade.description"
   },
+  "minecraft:adventure/trade_at_world_height": {
+    "type": "task",
+    "icon": "minecraft:emerald",
+    "title": "advancements.adventure.trade_at_world_height.title",
+    "description": "advancements.adventure.trade_at_world_height.description"
+  },
   "minecraft:adventure/two_birds_one_arrow": {
     "type": "challenge",
     "icon": "minecraft:crossbow",
@@ -579,6 +591,12 @@
     "title": "advancements.husbandry.plant_seed.title",
     "description": "advancements.husbandry.plant_seed.description"
   },
+  "minecraft:husbandry/play_jukebox_in_meadows": {
+    "type": "task",
+    "icon": "minecraft:note_block",
+    "title": "advancements.husbandry.play_jukebox_in_meadows.title",
+    "description": "advancements.husbandry.play_jukebox_in_meadows.description"
+  },
   "minecraft:husbandry/ride_a_boat_with_a_goat": {
     "type": "task",
     "icon": "minecraft:oak_boat",
@@ -755,6 +773,12 @@
     "title": "advancements.nether.ride_strider.title",
     "description": "advancements.nether.ride_strider.description"
   },
+  "minecraft:nether/ride_strider_in_overworld_lava": {
+    "type": "task",
+    "icon": "minecraft:warped_fungus_on_a_stick",
+    "title": "advancements.nether.ride_strider_in_overworld_lava.title",
+    "description": "advancements.nether.ride_strider_in_overworld_lava.description"
+  },
   "minecraft:nether/root": {
     "type": "task",
     "icon": "minecraft:red_nether_bricks",

web/src/assets/advancements/adventure/caves_and_cliffs.png renamed to web/src/assets/advancements/adventure/fall_from_world_height.png

@@ -7,7 +7,7 @@ export const trade = require('./trade.png');
 export const honey_block_slide = require('./honey_block_slide.png');
 export const ol_betsy = require('./ol_betsy.png');
 export const lightning_rod_with_villager_no_fire = require('./lightning_rod_with_villager_no_fire.png');
-export const caves_and_cliffs = require('./caves_and_cliffs.png');
+export const fall_from_world_height = require("./fall_from_world_height.png");
 export const walk_on_powder_snow_with_leather_boots = require('./walk_on_powder_snow_with_leather_boots.png');
 export const sleep_in_bed = require('./sleep_in_bed.png');
 export const hero_of_the_village = require('./hero_of_the_village.png');

web/src/assets/advancements/adventure/index.js

@@ -40,6 +40,8 @@
     "advancements.adventure.adventuring_time.description": "Discover every biome",
     "advancements.adventure.arbalistic.title": "Arbalistic",
     "advancements.adventure.arbalistic.description": "Kill five unique mobs with one crossbow shot",
+    "advancements.adventure.fall_from_world_height.title": "Caves & Cliffs",
+    "advancements.adventure.fall_from_world_height.description": "Free fall from the top of the world (build limit) to the bottom of the world and survive",
     "advancements.adventure.hero_of_the_village.title": "Hero of the Village",
     "advancements.adventure.hero_of_the_village.description": "Successfully defend a village from a raid",
     "advancements.adventure.kill_all_mobs.title": "Monsters Hunted",
@@ -62,6 +64,8 @@
     "advancements.adventure.totem_of_undying.description": "Use a Totem of Undying to cheat death",
     "advancements.adventure.trade.title": "What a Deal!",
     "advancements.adventure.trade.description": "Successfully trade with a Villager",
+    "advancements.adventure.trade_at_world_height.title": "Star Trader",
+    "advancements.adventure.trade_at_world_height.description": "Trade with a villager at the build height limit",
     "advancements.adventure.throw_trident.title": "A Throwaway Joke",
     "advancements.adventure.throw_trident.description": "Throw a trident at something.\nNote: Throwing away your only weapon is not a good idea.",
     "advancements.adventure.two_birds_one_arrow.title": "Two Birds, One Arrow",
@@ -98,6 +102,8 @@
     "advancements.husbandry.tame_an_animal.description": "Tame an animal",
     "advancements.husbandry.plant_seed.title": "A Seedy Place",
     "advancements.husbandry.plant_seed.description": "Plant a seed and watch it grow",
+    "advancements.husbandry.play_jukebox_in_meadows.title": "Sound of Music",
+    "advancements.husbandry.play_jukebox_in_meadows.description": "Make the Meadows come alive with the sound of music from a jukebox",
     "advancements.husbandry.break_diamond_hoe.title": "Serious Dedication",
     "advancements.husbandry.break_diamond_hoe.description": "Completely use up a diamond hoe, and then reevaluate your life choices",
     "advancements.husbandry.balanced_diet.title": "A Balanced Diet",
@@ -174,6 +180,8 @@
     "advancements.nether.charge_respawn_anchor.description": "Charge a Respawn Anchor to the maximum",
     "advancements.nether.ride_strider.title": "This Boat Has Legs",
     "advancements.nether.ride_strider.description": "Ride a Strider with a Warped Fungus on a Stick",
+    "advancements.nether.ride_strider_in_overworld_lava.title": "Feels like home",
+    "advancements.nether.ride_strider_in_overworld_lava.description": "Take a Strider for a loooong ride on a lava lake in the Overworld",
     "advancements.nether.explore_nether.title": "Hot Tourist Destinations",
     "advancements.nether.explore_nether.description": "Explore all Nether biomes",
     "advancements.nether.find_bastion.title": "Those Were the Days",
@@ -507,6 +515,8 @@
     "advancements.adventure.adventuring_time.title": "探索的时光",
     "advancements.adventure.arbalistic.description": "用弩一发击杀五只不同的生物",
     "advancements.adventure.arbalistic.title": "劲弩手",
+    "advancements.adventure.fall_from_world_height.description": "从世界顶部（建筑高度限制处）自由落体，坠至世界底部并存活下来",
+    "advancements.adventure.fall_from_world_height.title": "上天入地",
     "advancements.adventure.hero_of_the_village.description": "成功在袭击中保卫村庄",
     "advancements.adventure.hero_of_the_village.title": "村庄英雄",
     "advancements.adventure.kill_a_mob.description": "杀死任意敌对性怪物",
@@ -531,6 +541,8 @@
     "advancements.adventure.totem_of_undying.title": "超越生死",
     "advancements.adventure.trade.description": "成功与一名村民进行交易",
     "advancements.adventure.trade.title": "成交！",
+    "advancements.adventure.trade_at_world_height.description": "在建筑高度限制处与村民交易",
+    "advancements.adventure.trade_at_world_height.title": "星际商人",
     "advancements.adventure.two_birds_one_arrow.description": "用一支穿透箭射杀两只幻翼",
     "advancements.adventure.two_birds_one_arrow.title": "一箭双雕",
     "advancements.adventure.very_very_frightening.description": "雷击一名村民",
@@ -585,6 +597,8 @@
     "advancements.husbandry.fishy_business.title": "腥味十足的生意",
     "advancements.husbandry.plant_seed.description": "种下种子，见证它的成长",
     "advancements.husbandry.plant_seed.title": "开荒垦地",
+    "advancements.husbandry.play_jukebox_in_meadows.description": "用唱片机的音乐声为草甸增添生机",
+    "advancements.husbandry.play_jukebox_in_meadows.title": "音乐之声",
     "advancements.husbandry.root.description": "世界无处没有朋友与美食",
     "advancements.husbandry.root.title": "农牧业",
     "advancements.husbandry.tactical_fishing.description": "不用钓鱼竿抓住一条鱼！",
@@ -653,6 +667,8 @@
     "advancements.nether.obtain_crying_obsidian.title": "谁在切洋葱？",
     "advancements.nether.ride_strider.description": "手持诡异菌钓竿骑乘炽足兽",
     "advancements.nether.ride_strider.title": "画船添足",
+    "advancements.nether.ride_strider_in_overworld_lava.description": "带炽足兽在主世界的熔岩湖上来一场长——途旅行",
+    "advancements.nether.ride_strider_in_overworld_lava.title": "温暖如家",
     "advancements.nether.use_lodestone.description": "对着磁石使用指南针",
     "advancements.nether.use_lodestone.title": "天涯共此石",
     "advancements.story.cure_zombie_villager.description": "弱化并治疗一名僵尸村民",

web/src/assets/lang.json

@@ -143,8 +143,8 @@
     computed: {
       oreData () {
         const data = ORES.map(ore => {
-          const mined = this.player.stats[`minecraft:mined/minecraft:${ore}_ore`] ?? 0
-          const used = this.player.stats[`minecraft:used/minecraft:${ore}_ore`] ?? 0
+          const mined = (this.player.stats[`minecraft:mined/minecraft:${ore}_ore`] ?? 0) + (this.player.stats[`minecraft:mined/minecraft:deepslate_${ore}_ore`] ?? 0)
+          const used = (this.player.stats[`minecraft:used/minecraft:${ore}_ore`] ?? 0) + (this.player.stats[`minecraft:used/minecraft:deepslate_${ore}_ore`] ?? 0)
           const net = Math.max(mined - used, 0)
           return {
             ore,