revert 0ab82b5317

revert add cutest predator advancement, Fix accidental deletions.

mods/HUD/mcl_achievements/init.lua

@@ -15,7 +15,9 @@ awards.register_achievement("mcl_buildWorkBench", {
 		type = "craft",
 		item = "mcl_crafting_table:crafting_table",
 		target = 1
-	}
+	},
+	type = "Advancement",
+	group = "Overworld",
 })
 awards.register_achievement("mcl:buildPickaxe", {
 	title = S("Time to Mine!"),
@@ -25,7 +27,9 @@ awards.register_achievement("mcl:buildPickaxe", {
 		type = "craft",
 		item = "mcl_tools:pick_wood",
 		target = 1
-	}
+	},
+	type = "Advancement",
+	group = "Overworld",
 })
 awards.register_achievement("mcl:buildFurnace", {
 	title = S("Hot Topic"),
@@ -35,7 +39,9 @@ awards.register_achievement("mcl:buildFurnace", {
 		type = "craft",
 		item = "mcl_furnaces:furnace",
 		target = 1
-	}
+	},
+	type = "Advancement",
+	group = "Overworld",
 })
 awards.register_achievement("mcl:buildHoe", {
 	title = S("Time to Farm!"),
@@ -45,7 +51,9 @@ awards.register_achievement("mcl:buildHoe", {
 		type = "craft",
 		item = "mcl_farming:hoe_wood",
 		target = 1
-	}
+	},
+	type = "Advancement",
+	group = "Husbandry",
 })
 awards.register_achievement("mcl:makeBread", {
 	title = S("Bake Bread"),
@@ -55,7 +63,9 @@ awards.register_achievement("mcl:makeBread", {
 		type = "craft",
 		item = "mcl_farming:bread",
 		target = 1
-	}
+	},
+	type = "Advancement",
+	group = "Husbandry",
 })
 
 awards.register_achievement("mcl:bakeCake", {
@@ -66,7 +76,9 @@ awards.register_achievement("mcl:bakeCake", {
 		type = "craft",
 		item = "mcl_cake:cake",
 		target = 1
-	}
+	},
+	type = "Advancement",
+	group = "Husbandry",
 })
 awards.register_achievement("mcl:buildBetterPickaxe", {
 	title = S("Getting an Upgrade"),
@@ -77,7 +89,9 @@ awards.register_achievement("mcl:buildBetterPickaxe", {
 		type = "craft",
 		item = "mcl_tools:pick_stone",
 		target = 1
-	}
+	},
+	type = "Advancement",
+	group = "Overworld",
 })
 awards.register_achievement("mcl:buildSword", {
 	title = S("Time to Strike!"),
@@ -87,7 +101,9 @@ awards.register_achievement("mcl:buildSword", {
 		type = "craft",
 		item = "mcl_tools:sword_wood",
 		target = 1
-	}
+	},
+	type = "Advancement",
+	group = "Adventure",
 })
 
 awards.register_achievement("mcl:bookcase", {
@@ -98,7 +114,9 @@ awards.register_achievement("mcl:bookcase", {
 		type = "craft",
 		item = "mcl_books:bookshelf",
 		target = 1
-	}
+	},
+	type = "Advancement",
+	group = "Overworld",
 })
 
 awards.register_achievement("mcl:buildIronPickaxe", {
@@ -109,7 +127,9 @@ awards.register_achievement("mcl:buildIronPickaxe", {
 		type = "craft",
 		item = "mcl_tools:pick_iron",
 		target = 1
-	}
+	},
+	type = "Advancement",
+	group = "Overworld",
 })
 
 -- Item pickup achievements: These are awarded when picking up a certain item.
@@ -118,46 +138,61 @@ awards.register_achievement("mcl:diamonds", {
 	title = S("DIAMONDS!"),
 	description = S("Pick up a diamond from the floor."),
 	icon = "mcl_core_diamond_ore.png",
+	type = "Advancement",
 })
 awards.register_achievement("mcl:blazeRod", {
 	title = S("Into Fire"),
 	description = S("Pick up a blaze rod from the floor."),
 	icon = "mcl_mobitems_blaze_rod.png",
+	type = "Advancement",
+	group = "Nether",
 })
 
 awards.register_achievement("mcl:killCow", {
 	title = S("Cow Tipper"),
 	description = S("Pick up leather from the floor.\nHint: Cows and some other animals have a chance to drop leather, when killed."),
 	icon = "mcl_mobitems_leather.png",
+	type = "Advancement",
+	group = "Adventure",
 })
 awards.register_achievement("mcl:mineWood", {
 	title = S("Getting Wood"),
 	description = S("Pick up a wood item from the ground.\nHint: Punch a tree trunk until it pops out as an item."),
 	icon = "default_tree.png",
+	type = "Advancement",
+	group = "Overworld",
 })
 
 awards.register_achievement("mcl:whosCuttingOnions", {
 	title = S("Who is Cutting Onions?"),
 	description = S("Pick up a crying obsidian from the floor."),
 	icon = "default_obsidian.png^mcl_core_crying_obsidian.png",
+	type = "Advancement",
+	group = "Nether",
 })
 
 awards.register_achievement("mcl:hiddenInTheDepths", {
 	title = S("Hidden in the Depths"),
 	description = S("Pick up an Ancient Debris from the floor."),
 	icon = "mcl_nether_ancient_debris_side.png",
+	type = "Advancement",
+	group = "Nether",
 })
 
 awards.register_achievement("mcl:PickUpDragonEgg", {
 	title = S("The Next Generation"),
 	description = S("Hold the Dragon Egg.\nHint: Pick up the egg from the ground and have it in your inventory."),
 	icon = "mcl_end_dragon_egg.png",
+	type = "Goal",
+	group = "End",
 })
 
 awards.register_achievement("mcl:skysTheLimit", {
 	title = S("Sky's the Limit"),
 	description = S("Find the elytra and prepare to fly above and beyond!"),
 	icon = "mcl_armor_inv_elytra.png",
+	type = "Goal",
+	group = "End",
 }) -- TODO: Make also unlock when moved to inventory, not just picking up from ground
 
 -- Smelting achivements: These are awarded when picking up an item from a furnace
@@ -166,11 +201,15 @@ awards.register_achievement("mcl:acquireIron", {
 	title = S("Aquire Hardware"),
 	description = S("Take an iron ingot from a furnace's output slot.\nHint: To smelt an iron ingot, put a fuel (like coal) and iron ore into a furnace."),
 	icon = "default_steel_ingot.png",
+	type = "Advancement",
+	group = "Overworld",
 })
 awards.register_achievement("mcl:cookFish", {
 	title = S("Delicious Fish"),
 	description = S("Take a cooked fish from a furnace.\nHint: Use a fishing rod to catch a fish and cook it in a furnace."),
 	icon = "mcl_fishing_fish_cooked.png",
+	type = "Advancement",
+	group = "Husbandry",
 })
 
 -- Other achievements triggered outside of mcl_achievements
@@ -180,6 +219,8 @@ awards.register_achievement("mcl:onARail", {
 	title = S("On A Rail"),
 	description = S("Travel by minecart for at least 1000 meters from your starting point in a single ride."),
 	icon = "default_rail.png",
+	type = "Challenge",
+	group = "Adventure",
 })
 
 -- Triggered in mcl_bows
@@ -189,6 +230,8 @@ awards.register_achievement("mcl:snipeSkeleton", {
 	-- TODO: The range should be 50, not 20. Nerfed because of reduced bow range
 	description = S("Hit a skeleton, wither skeleton or stray by bow and arrow from a distance of at least 20 meters."),
 	icon = "mcl_bows_bow.png",
+	type = "Challenge",
+	group = "Adventure",
 })
 
 -- Triggered in mcl_portals
@@ -196,18 +239,24 @@ awards.register_achievement("mcl:buildNetherPortal", {
 	title = S("We Need to Go Deeper"),
 	description = S("Use obsidian and a fire starter to construct a Nether portal."),
 	icon = "mcl_fire_flint_and_steel.png",
+	type = "Advancement",
+	group = "Overworld",
 })
 
 awards.register_achievement("mcl:enterEndPortal", {
 	title = S("The End?"),
 	description = S("Or the beginning?\nHint: Enter an end portal."),
 	icon = "mcl_end_end_stone.png",
+	type = "Advancement",
+	group = "Overworld",
 })
 
 awards.register_achievement("mcl:theNether", {
 	title = S("The Nether"),
 	description = S("Bring summer clothes.\nHint: Enter the Nether."),
 	icon = "mcl_nether_netherrack.png",
+	type = "Advancement",
+	group = "Nether",
 })
 
 -- Triggered in mcl_totems
@@ -215,19 +264,25 @@ awards.register_achievement("mcl:postMortal", {
 	title = S("Postmortal"),
 	description = S("Use a Totem of Undying to cheat death."),
 	icon = "mcl_totems_totem.png",
+	type = "Goal",
+	group = "Adventure",
 })
 
 -- Triggered in mcl_beds
 awards.register_achievement("mcl:sweetDreams", {
 	title = S("Sweet Dreams"),
 	description = S("Sleep in a bed to change your respawn point."),
-	icon = "mcl_beds_bed_red.png",
+	icon = "mcl_beds_bed_red_inv.png",
+	type = "Advancement",
+	group = "Adventure",
 })
 
 awards.register_achievement("mcl:notQuiteNineLives", {
 	title = S('Not Quite "Nine" Lives'),
 	description = S("Charge a Respawn Anchor to the maximum."),
 	icon = "respawn_anchor_side4.png",
+	type = "Advancement",
+	group = "Nether",
 })
 
 -- Triggered in mobs_mc
@@ -235,30 +290,32 @@ awards.register_achievement("mcl:whatAdeal", {
 	title = S("What A Deal!"),
 	description = S("Successfully trade with a Villager."),
 	icon = "mcl_core_emerald.png",
+	type = "Advancement",
+	group = "Adventure",
 })
 
 awards.register_achievement("mcl:tacticalFishing", {
 	title = S("Tactical Fishing"),
 	description = S("Catch a fish... without a fishing rod!"),
 	icon = "pufferfish_bucket.png",
-})
-
-awards.register_achievement("mcl:cutestPredator", {
-	title = S("The Cutest Predator"),
-	description = S("Catch an axolotl with a bucket."),
-	icon = "pufferfish_bucket.png",
+	type = "Advancement",
+	group = "Husbandry",
 })
 
 awards.register_achievement("mcl:witheringHeights", {
 	title = S("Withering Heights"),
 	description = S("Summon the wither from the dead."),
 	icon = "mcl_mobitems_nether_star.png",
+	type = "Advancement",
+	group = "Nether",
 })
 
 awards.register_achievement("mcl:freeTheEnd", {
 	title = S("Free the End"),
 	description = S("Kill the ender dragon. Good Luck!"),
-	icon = "mobs_mc_spawn_icon_dragon.png", -- TODO: Dragon Head Icon
+	icon = "(spawn_egg.png^[multiply:#252525)^(spawn_egg_overlay.png^[multiply:#b313c9)", -- TODO: Dragon Head Icon
+	type = "Advancement",
+	group = "End",
 })
 
 -- Triggered in mcl_fishing
@@ -266,6 +323,8 @@ awards.register_achievement("mcl:fishyBusiness", {
 	title = S("Fishy Business"),
 	description = S("Catch a fish.\nHint: Catch a fish, salmon, clownfish, or pufferfish."),
 	icon = "mcl_fishing_fishing_rod.png",
+	type = "Advancement",
+	group = "Husbandry",
 })
 
 -- Triggered in mcl_compass
@@ -273,6 +332,8 @@ awards.register_achievement("mcl:countryLode", {
 	title = S("Country Lode,\nTake Me Home"),
 	description = S("Use a compass on a Lodestone."),
 	icon = "lodestone_side4.png",
+	type = "Advancement",
+	group = "Nether",
 })
 
 -- Triggered in mcl_smithing_table
@@ -280,6 +341,8 @@ awards.register_achievement("mcl:seriousDedication", {
 	title = S("Serious Dedication"),
 	description = S("Use a Netherite Ingot to upgrade a hoe, and then completely reevaluate your life choices."),
 	icon = "farming_tool_netheritehoe.png",
+	type = "Challenge",
+	group = "Husbandry",
 })
 
 -- Triggered in mcl_brewing
@@ -287,6 +350,8 @@ awards.register_achievement("mcl:localBrewery", {
 	title = S("Local Brewery"),
 	description = S("Brew a Potion.\nHint: Take a potion or glass bottle out of the brewing stand."),
 	icon = "mcl_potions_potion_overlay.png^[colorize:#F82423:"..tostring(127).."^mcl_potions_potion_bottle.png",
+	type = "Advancement",
+	group = "Nether",
 })
 
 -- Triggered in mcl_enchanting
@@ -294,6 +359,8 @@ awards.register_achievement("mcl:enchanter", {
 	title = S("Enchanter"),
 	description = S("Enchant an item using an Enchantment Table."),
 	icon = "mcl_enchanting_book_enchanted.png",
+	type = "Advancement",
+	group = "Overworld",
 })
 
 --Triggered in mcl_beacons
@@ -301,12 +368,16 @@ awards.register_achievement("mcl:beacon", {
 	title = S("Bring Home the Beacon"),
 	description = S("Use a beacon."),
 	icon = "beacon_achievement_icon.png",
+	type = "Advancement",
+	group = "Nether",
 })
 
 awards.register_achievement("mcl:maxed_beacon", {
 	title = S("Beaconator"),
 	description = S("Use a fully powered beacon."),
 	icon = "beacon_achievement_icon.png",
+	type = "Goal",
+	group = "Nether",
 })
 
 -- Triggered in mcl_end
@@ -314,6 +385,8 @@ awards.register_achievement("mcl:theEndAgain", {
 	title = S("The End... Again..."),
 	description = S("Respawn the Ender Dragon."),
 	icon = "mcl_end_crystal_item.png",
+	type = "Goal",
+	group = "End",
 })
 
 -- NON-PC ACHIEVEMENTS (XBox, Pocket Edition, etc.)
@@ -397,14 +470,20 @@ awards.register_achievement("mcl:stoneAge", {
 	title		= S("Stone Age"),
 	description	= S("Mine a stone with new pickaxe."),
 	icon		= "default_cobble.png",
+	type = "Advancement",
+	group = "Overworld",
 })
 awards.register_achievement("mcl:hotStuff", {
 	title		= S("Hot Stuff"),
 	description	= S("Put lava in a bucket."),
 	icon		= "bucket_lava.png",
+	type = "Advancement",
+	group = "Overworld",
 })
 awards.register_achievement("mcl:obsidian", {
 	title		= S("Ice Bucket Challenge"),
 	description	= S("Obtain an obsidian block."),
 	icon		= "default_obsidian.png",
+	type = "Advancement",
+	group = "Overworld",
 })