From 5b6dda18bd3b439504ac12f319a2c8cee82e0d26 Mon Sep 17 00:00:00 2001
From: Red <73609416+MrRedstone54@users.noreply.github.com>
Date: Mon, 16 Mar 2026 16:04:19 -0400
Subject: [PATCH] First Pass on Updating the Poptracker.

---
 .gitignore                                 |   1 +
 images/items/brush.png                     | Bin 0 -> 363 bytes
 items/items.json                           |  36 +++
 layouts/items.json                         |  14 +-
 manifest.json                              |  12 +-
 maps/Achievements/generate_all_map_base.py | 254 +++++++++++----------
 scripts/autotracking/item_mapping.lua      |  99 ++++----
 scripts/autotracking/location_mapping.lua  | 251 +++++++++++---------
 scripts/autotracking/slot_data.lua         |   2 +-
 scripts/logic.lua                          |  66 ++++++
 10 files changed, 450 insertions(+), 285 deletions(-)
 create mode 100644 images/items/brush.png

diff --git a/.gitignore b/.gitignore
index f08083e..1474e13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /Notes/
 .idea
+.api
 *.xcf
 *.log
 .luarc.json
\ No newline at end of file
diff --git a/images/items/brush.png b/images/items/brush.png
new file mode 100644
index 0000000000000000000000000000000000000000..6e4ab8373a51987ea548ff1d83021b0aadc0653b
GIT binary patch
literal 363
zcmeAS@N?(olHy`uVBq!ia0vp^3qY8I8A$FCoGuTf%mREuT!D0ZUi7=evu-b&xPNMW
zalGGBPqn4Z`G00M{XV?S(@eB2RV~*<@nDo$q_bpcgkpA}yn+Om=8xQWK%I;wL4Lsu
z4$p3+0XdI7T^vIy7~h^_?K|SY<9aZ$?a9CCu@A)~&l#247B<If|GlQ-`P$3@1P-WP
zQ_H=q_w`R=0~qkGX8N{$F(VjU&z$WQ7JXQXjRORBc<#Q!yt@3iiIe~c6wEGrxpmD&
zh%Vdg*>;D1orjp{9O!DhjO+5Ie|BJn8xrSUvXs4KSS$1Sdm~u+^b+6gCH~v5Br|}l
zInEHa#=UA;bktQwCLrKrcoP|1wajv@7!wN!yorQZ;eBNuE7%<xo|o9G8O=@iE&MId
R$PV-_gQu&X%Q~loCIA@KgIfRq

literal 0
HcmV?d00001

diff --git a/items/items.json b/items/items.json
index b77a9ab..83f1dc0 100644
--- a/items/items.json
+++ b/items/items.json
@@ -251,6 +251,12 @@
     "img": "images/items/enchanted_book.png",
     "img_mods": "overlay|images/items/infinity.png",
     "codes": "infinity"
+  },
+   {
+    "name": "Brush",
+    "type": "toggle",
+    "img": "images/items/brush.png",
+    "codes": "brush"
   },
   {
     "name": "Structure Compass (Village)",
@@ -281,6 +287,36 @@
     "type": "toggle",
     "img": "images/items/compass.png",
     "codes": "compass_city"
+  },
+    {
+    "name": "Structure Compass (Ocean Monument)",
+    "type": "toggle",
+    "img": "images/items/compass.png",
+    "codes": "compass_ocean"
+  },
+    {
+    "name": "Structure Compass (Woodland Mansion)",
+    "type": "toggle",
+    "img": "images/items/compass.png",
+    "codes": "compass_woodland"
+  },
+    {
+    "name": "Structure Compass (Trail Ruins)",
+    "type": "toggle",
+    "img": "images/items/compass.png",
+    "codes": "compass_trail_ruins"
+  },
+    {
+    "name": "Structure Compass (Trial Chamber)",
+    "type": "toggle",
+    "img": "images/items/compass.png",
+    "codes": "compass_trial_chamber"
+  },
+      {
+    "name": "Structure Compass (Ancient City)",
+    "type": "toggle",
+    "img": "images/items/compass.png",
+    "codes": "compass_ancient_city"
   },
   {
     "name": "Saddle",
diff --git a/layouts/items.json b/layouts/items.json
index d845baf..903d227 100644
--- a/layouts/items.json
+++ b/layouts/items.json
@@ -23,14 +23,24 @@
         "outpost",
         "fortress",
         "bastion",
-        "city"
+        "city",
+        "ancient_city",
+        "ocean_monument",
+        "trail_ruins",
+        "trial_chamber",
+        "woodland_mansion"
       ],
       [
         "compass_village",
         "compass_outpost",
         "compass_fortress",
         "compass_bastion",
-        "compass_city"
+        "compass_city",
+        "compass_ancient_city",
+        "compass_ocean",
+        "compass_trail_ruins",
+        "compass_trial_chamber",
+        "compass_woodland"
       ]
     ]
   },
diff --git a/manifest.json b/manifest.json
index a7b70ef..3b314df 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,11 +1,9 @@
 {
-  "name": "Minecraft Randomizer",
+  "name": "Minecraft Randomizer Tracker",
   "game_name": "Minecraft",
-  "platform": "PC",
+  "package_uid": "ap_minecraft",
   "package_version": "0.2.4",
-  "min_poptracker_version": "0.24.1",
-  "target_poptracker_version": "0.28.0",
-  "package_uid": "minecraft_randomizer_emotracker-neomatamune",
+  "platform": "PC",
   "author": "Neomatamune, Cyb3R, AkumaGath17#0725",
   "variants": {
     "tracker": {
@@ -15,5 +13,7 @@
       ]
     }
   },
-  "versions_url": "https://raw.githubusercontent.com/Cyb3RGER/minecraft_rando_tracker/master/versions.json"
+  "versions_url": "https://raw.githubusercontent.com/Cyb3RGER/minecraft_rando_tracker/master/versions.json",
+  "min_poptracker_version": "0.34.0",
+  "target_poptracker_version": "0.34.0"
 }
\ No newline at end of file
diff --git a/maps/Achievements/generate_all_map_base.py b/maps/Achievements/generate_all_map_base.py
index 8323385..b71dfd8 100644
--- a/maps/Achievements/generate_all_map_base.py
+++ b/maps/Achievements/generate_all_map_base.py
@@ -44,121 +44,145 @@ def get_size(self):
 
 
 advancement_list = [
-    Advancement("Who is Cutting Onions?", Shape.NORMAL, [40], 17),  # 0
-    Advancement("Oh Shiny", Shape.NORMAL, None, 17),  # 1
-    Advancement("Suit Up", Shape.NORMAL, [9], 39),  # 2
-    Advancement("Very Very Frightening", Shape.NORMAL, None, 72),  # 3
-    Advancement("Hot Stuff", Shape.NORMAL, [31], 39),  # 4
-    Advancement("Free the End", Shape.NORMAL, [38, 12, 46], 52),  # 5
-    Advancement("A Furious Cocktail", Shape.SPIKED, [11], 19),  # 6
-    Advancement("Best Friends Forever", Shape.NORMAL, [79], 65),  # 7
-    Advancement("Bring Home the Beacon", Shape.NORMAL, [61], 62),  # 8
-    Advancement("Not Today, Thank You", Shape.NORMAL, None, 2),  # 9
-    Advancement("Isn't It Iron Pick", Shape.NORMAL, [70], 39),  # 10
-    Advancement("Local Brewery", Shape.NORMAL, [33], 6),  # 11
-    Advancement("The Next Generation", Shape.ROUNDED, None, 5),  # 12
-    Advancement("Fishy Business", Shape.NORMAL, [28], 65),  # 13
-    Advancement("Hot Tourist Destinations", Shape.SPIKED, None, 15),  # 14
-    Advancement("This Boat Has Legs", Shape.NORMAL, [14], 17),  # 15
-    Advancement("Sniper Duel", Shape.SPIKED, None, 35),  # 16
-    Advancement("Nether", Shape.NORMAL, [2, 15, 64, 0, 71, 60, 58, 44], -1),  # 17
-    Advancement("Great View From Up Here", Shape.SPIKED, None, 30),  # 18
-    Advancement("How Did We Get Here?", Shape.SPIKED, None, 6),  # 19
-    Advancement("Bullseye", Shape.SPIKED, None, 35),  # 20
-    Advancement("Spooky Scary Skeleton", Shape.NORMAL, [62], 71),  # 21
-    Advancement("Two by Two", Shape.SPIKED, None, 78),  # 22
-    Advancement("Stone Age", Shape.NORMAL, None, 73),  # 23
-    Advancement("Two Birds, One Arrow", Shape.SPIKED),  # 24
-    Advancement("We Need to Go Deeper", Shape.NORMAL),  # 25
-    Advancement("Who's the Pillager Now?", Shape.NORMAL),  # 26
-    Advancement("Getting an Upgrade", Shape.NORMAL),  # 27
-    Advancement("Tactical Fishing", Shape.NORMAL),  # 28
-    Advancement("Zombie Doctor", Shape.ROUNDED),  # 29
-    Advancement("The City at the End of the Game", Shape.NORMAL),  # 30
-    Advancement("Ice Bucket Challenge", Shape.NORMAL),  # 31
-    Advancement("Remote Getaway", Shape.NORMAL),  # 32
-    Advancement("Into Fire", Shape.NORMAL),  # 33
-    Advancement("War Pigs", Shape.NORMAL),  # 34
-    Advancement("Take Aim", Shape.NORMAL),  # 35
-    Advancement("Total Beelocation", Shape.NORMAL),  # 36
-    Advancement("Arbalistic", Shape.SPIKED),  # 37
-    Advancement("The End... Again...", Shape.ROUNDED),  # 38
-    Advancement("Acquire Hardware", Shape.NORMAL),  # 39
-    Advancement("Not Quite \"Nine\" Lives", Shape.NORMAL),  # 40
-    Advancement("Cover Me With Diamonds", Shape.NORMAL),  # 41
-    Advancement("Sky's the Limit", Shape.NORMAL),  # 42
-    Advancement("Hired Help", Shape.ROUNDED),  # 43
-    Advancement("Return to Sender", Shape.SPIKED),  # 44
-    Advancement("Sweet Dreams", Shape.NORMAL),  # 45
-    Advancement("You Need a Mint", Shape.ROUNDED),  # 46
-    Advancement("Adventure", Shape.NORMAL),  # 47
-    Advancement("Monsters Hunted", Shape.SPIKED),  # 48
-    Advancement("Enchanter", Shape.NORMAL),  # 49
-    Advancement("Voluntary Exile", Shape.NORMAL),  # 50
-    Advancement("Eye Spy", Shape.NORMAL),  # 51
-    Advancement("The End", Shape.NORMAL),  # 52
-    Advancement("Serious Dedication", Shape.SPIKED),  # 53
-    Advancement("Postmortal", Shape.ROUNDED),  # 54
-    Advancement("Monster Hunter", Shape.NORMAL),  # 55
-    Advancement("Adventuring Time", Shape.SPIKED),  # 56
-    Advancement("A Seedy Place", Shape.NORMAL),  # 57
-    Advancement("Those Were the Days", Shape.NORMAL),  # 58
-    Advancement("Hero of the Village", Shape.SPIKED),  # 59
-    Advancement("Hidden in the Depths", Shape.NORMAL),  # 60
-    Advancement("Beaconator", Shape.ROUNDED),  # 61
-    Advancement("Withering Heights", Shape.NORMAL),  # 62
-    Advancement("A Balanced Diet", Shape.SPIKED),  # 63
-    Advancement("Subspace Bubble", Shape.SPIKED),  # 64
-    Advancement("Husbandry", Shape.NORMAL),  # 65
-    Advancement("Country Lode, Take Me Home", Shape.NORMAL),  # 66
-    Advancement("Bee Our Guest", Shape.NORMAL),  # 67
-    Advancement("What a Deal!", Shape.NORMAL),  # 68
-    Advancement("Uneasy Alliance", Shape.SPIKED),  # 69
-    Advancement("Diamonds!", Shape.NORMAL),  # 70
-    Advancement("A Terrible Fortress", Shape.NORMAL),  # 71
-    Advancement("A Throwaway Joke", Shape.NORMAL),  # 72
-    Advancement("Minecraft", Shape.NORMAL),  # 73
-    Advancement("Sticky Situation", Shape.NORMAL),  # 74
-    Advancement("Ol' Betsy", Shape.NORMAL),  # 75
-    Advancement("Cover Me in Debris", Shape.SPIKED),  # 76
-    Advancement("The End?", Shape.NORMAL),  # 77
-    Advancement("The Parrots and the Bats", Shape.NORMAL),  # 78
-    Advancement("A Complete Catalogue", Shape.SPIKED),  # 79
-    Advancement("Getting Wood", Shape.NORMAL),  # 80
-    Advancement("Time to Mine!", Shape.NORMAL),  # 81
-    Advancement("Hot Topic", Shape.NORMAL),  # 82
-    Advancement("Bake Bread", Shape.NORMAL),  # 83
-    Advancement("The Lie", Shape.SPIKED),  # 84
-    Advancement("On a Rail", Shape.ROUNDED),  # 85
-    Advancement("Time to Strike!", Shape.NORMAL),  # 86
-    Advancement("Cow Tipper", Shape.NORMAL),  # 87
-    Advancement("When Pigs Fly", Shape.SPIKED),  # 88
-    Advancement("Overkill", Shape.ROUNDED),  # 89
-    Advancement("Librarian", Shape.NORMAL),  # 90
-    Advancement("Overpowered", Shape.NORMAL),  # 91
-    Advancement("Wax On", Shape.NORMAL),  # 92
-    Advancement("Wax Off", Shape.NORMAL),  # 93
-    Advancement("The Cutest Predator", Shape.NORMAL),  # 94
-    Advancement("The Healing Power of Friendship", Shape.NORMAL),  # 95
-    Advancement("Is It a Bird?", Shape.NORMAL),  # 96
-    Advancement("Is It a Balloon?", Shape.NORMAL),  # 97
-    Advancement("Is It a Plane?", Shape.NORMAL),  # 98
-    Advancement("Surge Protector", Shape.NORMAL),  # 99
-    Advancement("Light as a Rabbit", Shape.NORMAL),  # 100
-    Advancement("Glow and Behold!", Shape.NORMAL),  # 101
-    Advancement("Whatever Floats Your Goat!", Shape.NORMAL),  # 102
-    Advancement("Archipelago", Shape.NORMAL),  # 103
-    Advancement("Star Trader", Shape.NORMAL),  # 104
-    Advancement("Caves & Cliffs", Shape.NORMAL),  # 105
-    Advancement("Feels like home", Shape.NORMAL),  # 106
-    Advancement("Sound of Music", Shape.NORMAL),  # 107
-    Advancement("You've Got a Friend in Me", Shape.NORMAL),  # 108
-    Advancement("Birthday Song", Shape.NORMAL),  # 109
-    Advancement("Bukkit Bukkit", Shape.NORMAL),  # 110
-    Advancement("When the Squad Hops into Town", Shape.NORMAL),  # 111
-    Advancement("With Our Powers Combined!", Shape.NORMAL),  # 112
-    Advancement("It Spreads", Shape.NORMAL),  # 113
-    Advancement("Sneak 100", Shape.NORMAL),  # 114
+    Advancement("Who is Cutting Onions?", Shape.NORMAL, [40], 17),  # 1
+    Advancement("Oh Shiny", Shape.NORMAL, None, 17),  # 2
+    Advancement("Suit Up", Shape.NORMAL, [9], 39),  # 3
+    Advancement("Very Very Frightening", Shape.NORMAL, None, 72),  # 4
+    Advancement("Hot Stuff", Shape.NORMAL, [31], 39),  # 5
+    Advancement("Free the End", Shape.NORMAL, [38, 12, 46], 52),  # 6
+    Advancement("A Furious Cocktail", Shape.SPIKED, [11], 19),  # 7
+    Advancement("Best Friends Forever", Shape.NORMAL, [79], 65),  # 8
+    Advancement("Bring Home the Beacon", Shape.NORMAL, [61], 62),  # 9
+    Advancement("Not Today, Thank You", Shape.NORMAL, None, 2),  # 10
+    Advancement("Isn't It Iron Pick", Shape.NORMAL, [70], 39),  # 11
+    Advancement("Local Brewery", Shape.NORMAL, [33], 6),  # 12
+    Advancement("The Next Generation", Shape.ROUNDED, None, 5),  # 13
+    Advancement("Fishy Business", Shape.NORMAL, [28], 65),  # 14
+    Advancement("Hot Tourist Destinations", Shape.SPIKED, None, 15),  # 15
+    Advancement("This Boat Has Legs", Shape.NORMAL, [14], 17),  # 16
+    Advancement("Sniper Duel", Shape.SPIKED, None, 35),  # 17
+    Advancement("Nether", Shape.NORMAL, [2, 15, 64, 0, 71, 60, 58, 44], -1),  # 18
+    Advancement("Great View From Up Here", Shape.SPIKED, None, 30),  # 19
+    Advancement("How Did We Get Here?", Shape.SPIKED, None, 6),  # 20
+    Advancement("Bullseye", Shape.SPIKED, None, 35),  # 21
+    Advancement("Spooky Scary Skeleton", Shape.NORMAL, [62], 71),  # 22
+    Advancement("Two by Two", Shape.SPIKED, None, 78),  # 23
+    Advancement("Stone Age", Shape.NORMAL, None, 73),  # 24
+    Advancement("Two Birds, One Arrow", Shape.SPIKED),  # 25
+    Advancement("We Need to Go Deeper", Shape.NORMAL),  # 26
+    Advancement("Who's the Pillager Now?", Shape.NORMAL),  # 27
+    Advancement("Getting an Upgrade", Shape.NORMAL),  # 28
+    Advancement("Tactical Fishing", Shape.NORMAL),  # 29
+    Advancement("Zombie Doctor", Shape.ROUNDED),  # 30
+    Advancement("The City at the End of the Game", Shape.NORMAL),  # 31
+    Advancement("Ice Bucket Challenge", Shape.NORMAL),  # 32
+    Advancement("Remote Getaway", Shape.NORMAL),  # 33
+    Advancement("Into Fire", Shape.NORMAL),  # 34
+    Advancement("War Pigs", Shape.NORMAL),  # 35
+    Advancement("Take Aim", Shape.NORMAL),  # 36
+    Advancement("Total Beelocation", Shape.NORMAL),  # 37
+    Advancement("Arbalistic", Shape.SPIKED),  # 38
+    Advancement("The End... Again...", Shape.ROUNDED),  # 39
+    Advancement("Acquire Hardware", Shape.NORMAL),  # 40
+    Advancement("Not Quite \"Nine\" Lives", Shape.NORMAL),  # 41
+    Advancement("Cover Me With Diamonds", Shape.NORMAL),  # 42
+    Advancement("Sky's the Limit", Shape.NORMAL),  # 43
+    Advancement("Hired Help", Shape.ROUNDED),  # 44
+    Advancement("Return to Sender", Shape.SPIKED),  # 45
+    Advancement("Sweet Dreams", Shape.NORMAL),  # 46
+    Advancement("You Need a Mint", Shape.ROUNDED),  # 47
+    Advancement("Adventure", Shape.NORMAL),  # 48
+    Advancement("Monsters Hunted", Shape.SPIKED),  # 49
+    Advancement("Enchanter", Shape.NORMAL),  # 50
+    Advancement("Voluntary Exile", Shape.NORMAL),  # 51
+    Advancement("Eye Spy", Shape.NORMAL),  # 52
+    Advancement("The End", Shape.NORMAL),  # 53
+    Advancement("Serious Dedication", Shape.SPIKED),  # 54
+    Advancement("Postmortal", Shape.ROUNDED),  # 55
+    Advancement("Monster Hunter", Shape.NORMAL),  # 56
+    Advancement("Adventuring Time", Shape.SPIKED),  # 57
+    Advancement("A Seedy Place", Shape.NORMAL),  # 58
+    Advancement("Those Were the Days", Shape.NORMAL),  # 59
+    Advancement("Hero of the Village", Shape.SPIKED),  # 60
+    Advancement("Hidden in the Depths", Shape.NORMAL),  # 61
+    Advancement("Beaconator", Shape.ROUNDED),  # 62
+    Advancement("Withering Heights", Shape.NORMAL),  # 63
+    Advancement("A Balanced Diet", Shape.SPIKED),  # 64
+    Advancement("Subspace Bubble", Shape.SPIKED),  # 65
+    Advancement("Husbandry", Shape.NORMAL),  # 66
+    Advancement("Country Lode, Take Me Home", Shape.NORMAL),  # 67
+    Advancement("Bee Our Guest", Shape.NORMAL),  # 68
+    Advancement("What a Deal!", Shape.NORMAL),  # 69
+    Advancement("Uneasy Alliance", Shape.SPIKED),  # 70
+    Advancement("Diamonds!", Shape.NORMAL),  # 71
+    Advancement("A Terrible Fortress", Shape.NORMAL),  # 72
+    Advancement("A Throwaway Joke", Shape.NORMAL),  # 73
+    Advancement("Minecraft", Shape.NORMAL),  # 74
+    Advancement("Sticky Situation", Shape.NORMAL),  # 75
+    Advancement("Ol' Betsy", Shape.NORMAL),  # 76
+    Advancement("Cover Me in Debris", Shape.SPIKED),  # 77
+    Advancement("The End?", Shape.NORMAL),  # 78
+    Advancement("The Parrots and the Bats", Shape.NORMAL),  # 79
+    Advancement("A Complete Catalogue", Shape.SPIKED),  # 80
+    Advancement("Getting Wood", Shape.NORMAL),  # 81
+    Advancement("Time to Mine!", Shape.NORMAL),  # 82
+    Advancement("Hot Topic", Shape.NORMAL),  # 83
+    Advancement("Bake Bread", Shape.NORMAL),  # 84
+    Advancement("The Lie", Shape.SPIKED),  # 85
+    Advancement("On a Rail", Shape.ROUNDED),  # 86
+    Advancement("Time to Strike!", Shape.NORMAL),  # 87
+    Advancement("Cow Tipper", Shape.NORMAL),  # 88
+    Advancement("When Pigs Fly", Shape.SPIKED),  # 89
+    Advancement("Overkill", Shape.ROUNDED),  # 90
+    Advancement("Librarian", Shape.NORMAL),  # 91
+    Advancement("Overpowered", Shape.NORMAL),  # 92
+    Advancement("Wax On", Shape.NORMAL),  # 93
+    Advancement("Wax Off", Shape.NORMAL),  # 94
+    Advancement("The Cutest Predator", Shape.NORMAL),  # 95
+    Advancement("The Healing Power of Friendship", Shape.NORMAL),  # 96
+    Advancement("Is It a Bird?", Shape.NORMAL),  # 97
+    Advancement("Is It a Balloon?", Shape.NORMAL),  # 98
+    Advancement("Is It a Plane?", Shape.NORMAL),  # 99
+    Advancement("Surge Protector", Shape.NORMAL),  # 100
+    Advancement("Light as a Rabbit", Shape.NORMAL),  # 101
+    Advancement("Glow and Behold!", Shape.NORMAL),  # 102
+    Advancement("Whatever Floats Your Goat!", Shape.NORMAL),  # 103
+    Advancement("Caves & Cliffs", Shape.NORMAL),  # 104
+    Advancement("Feels like Home", Shape.NORMAL),  # 105
+    Advancement("Sound of Music", Shape.NORMAL),  # 106
+    Advancement("Star Trader", Shape.NORMAL),  # 107
+    Advancement("Birthday Song", Shape.NORMAL),  # 108
+    Advancement("Bukkit Bukkit", Shape.NORMAL),  # 109
+    Advancement("It Spreads", Shape.NORMAL),  # 110
+    Advancement("Sneak 100", Shape.NORMAL),  # 111
+    Advancement("When the Squad Hops into Town", Shape.NORMAL),  # 112
+    Advancement("With Our Powers Combined!", Shape.NORMAL),  # 113
+    Advancement("You've Got a Friend in Me", Shape.NORMAL),  # 114
+    Advancement("Smells Interesting", Shape.NORMAL), #115
+    Advancement("Little Sniffs", Shape.NORMAL), #116
+    Advancement("Planting the Past", Shape.NORMAL), #117
+    Advancement("Crafting a New Look", Shape.NORMAL), #118
+    Advancement("Smithing with Style", Shape.SPIKED), #119
+    Advancement("Respecting the Remnants", Shape.NORMAL), #120
+    Advancement("Careful Restoration", Shape.NORMAL), #121
+    Advancement("The Power of Books", Shape.NORMAL), #122
+    Advancement("Isn't it Scute", Shape.NORMAL), #123
+    Advancement("Shear Brilliance", Shape.NORMAL), #124
+    Advancement("Good as New", Shape.NORMAL), #125
+    Advancement("The Whole Pack", Shape.SPIKED), #126
+    Advancement("Minecraft: Trial(s) Edition", Shape.NORMAL), #127
+    Advancement("Under Lock and Key", Shape.NORMAL),#128
+    Advancement("Blowback", Shape.SPIKED), #129
+    Advancement("Who Needs Rockets?", Shape.NORMAL), #130
+    Advancement("Crafters Crafting Crafters", Shape.NORMAL), #131
+    Advancement("Lighten Up", Shape.NORMAL), #132
+    Advancement("Over-Overkill", Shape.SPIKED), #133
+    Advancement("Revaulting", Shape.ROUNDED), #134
+    Advancement("Stay Hydrated!", Shape.NORMAL), #135
+    Advancement("Heart Transplanter", Shape.NORMAL), #136
+    Advancement("Mob Kabob", Shape.ROUNDED), #137
+    Advancement("Archipelago", Shape.NORMAL), #Archipelago?
+
 ]
 
 
diff --git a/scripts/autotracking/item_mapping.lua b/scripts/autotracking/item_mapping.lua
index ff41ecd..8a934b2 100644
--- a/scripts/autotracking/item_mapping.lua
+++ b/scripts/autotracking/item_mapping.lua
@@ -1,49 +1,54 @@
 ITEM_MAPPING = {
-    [45000] = { "archery", "toggle" },
-    [45001] = { "crafting", "progressive" },
-    --[45002] = {}
-    [45003] = { "brewing", "toggle" },
-    [45004] = { "enchanting", "toggle" },
-    [45005] = { "bucket", "toggle" },
-    [45006] = { "flint", "toggle" },
-    [45007] = { "bed", "toggle" },
-    [45008] = { "bottles", "toggle" },
-    [45009] = { "shield", "toggle" },
-    [45010] = { "rod", "toggle" },
-    [45011] = { "campfire", "toggle" },
-    [45012] = { "weapons", "progressive" },
-    [45013] = { "tools", "progressive" },
-    [45014] = { "armor", "progressive" },
-    [45015] = { "scraps", "consumable" },
-    [45016] = {},                                    --8 Emeralds
-    [45017] = {},                                    --4 Emeralds
-    [45018] = { "channeling", "toggle" },            --Channeling Book
-    [45019] = { "silk_touch", "toggle" },            --Silk Touch Book
-    [45020] = { "sharpness", "toggle" },             --Sharpness III Book
-    [45021] = { "piercing", "toggle" },              --Piercing IV Book
-    [45022] = { "looting", "toggle" },               --Looting III Book
-    [45023] = { "infinity", "toggle" },              --Infinity Book
-    [45024] = {},                                    --4 Diamond Ore
-    [45025] = {},                                    --16 Iron Ore
-    [45026] = {},                                    --500 XP
-    [45027] = {},                                    --100 XP
-    [45028] = {},                                    --50 XP
-    [45029] = { "pearls", "consumable" },            -- 3 ender pearls
-    [45030] = {},                                    --4 Lapis Lazuli
-    [45031] = {},                                    --16 Porkchops
-    [45032] = {},                                    --8 Gold Ore
-    [45033] = {},                                    --Rotten Flesh
-    [45034] = {},                                    --Single Arrow
-    [45035] = {},                                    --32 Arrows
-    [45036] = { "saddle", "toggle" },                --Saddle
-    [45037] = { "compass_village", "toggle" },       --Structure Compass (Village)
-    [45038] = { "compass_outpost", "toggle" },       --Structure Compass (Pillager Outpost)
-    [45039] = { "compass_fortress", "toggle" },      --Structure Compass (Nether Fortress)
-    [45040] = { "compass_bastion", "toggle" },       --Structure Compass (Bastion Remnant)
-    [45041] = { "compass_city", "toggle" },          --Structure Compass (End City)
-    [45042] = { "shulker_box", "toggle" },           --Shulker Box
-    [45043] = { "dragon_egg_shards", "consumable" }, --Dragon Egg Shard
-    [45044] = { "spyglass", "toggle" },              --Spyglass
-    [45045] = { "lead", "toggle" },                  --Lead
-    [45100] = {},                                    --Bee Trap (Minecraft)
+    [1] = { "archery", "toggle" },
+    [2] = { "crafting", "progressive" },
+    [3] = { "brewing", "toggle" },
+    [4] = { "enchanting", "toggle" },
+    [5] = { "bucket", "toggle" },
+    [6] = { "flint", "toggle" },
+    [7] = { "bed", "toggle" },
+    [8] = { "bottles", "toggle" },
+    [9] = { "shield", "toggle" },
+    [10] = { "rod", "toggle" },
+    [11] = { "campfire", "toggle" },
+    [12] = { "weapons", "progressive" },
+    [13] = { "tools", "progressive" },
+    [14] = { "armor", "progressive" },
+    [15] = { "scraps", "consumable" },
+    [16] = {},                                    --8 Emeralds
+    [17] = {},                                    --4 Emeralds
+    [18] = { "channeling", "toggle" },            --Channeling Book
+    [19] = { "silk_touch", "toggle" },            --Silk Touch Book
+    [20] = { "sharpness", "toggle" },             --Sharpness III Book
+    [21] = { "piercing", "toggle" },              --Piercing IV Book
+    [22] = { "looting", "toggle" },               --Looting III Book
+    [23] = { "infinity", "toggle" },              --Infinity Book
+    [24] = {},                                    --4 Diamond Ore
+    [25] = {},                                    --16 Iron Ore
+    [26] = {},                                    --500 XP
+    [27] = {},                                    --100 XP
+    [28] = {},                                    --50 XP
+    [29] = { "pearls", "consumable" },            -- 3 ender pearls
+    [30] = {},                                    --4 Lapis Lazuli
+    [31] = {},                                    --16 Porkchops
+    [32] = {},                                    --8 Gold Ore
+    [33] = {},                                    --Rotten Flesh
+    [34] = {},                                    --Single Arrow
+    [35] = {},                                    --32 Arrows
+    [36] = { "saddle", "toggle" },                --Saddle
+    [37] = { "compass_village", "toggle" },       --Structure Compass (Village)
+    [38] = { "compass_outpost", "toggle" },       --Structure Compass (Pillager Outpost)
+    [39] = { "compass_fortress", "toggle" },      --Structure Compass (Nether Fortress)
+    [40] = { "compass_bastion", "toggle" },       --Structure Compass (Bastion Remnant)
+    [41] = { "compass_city", "toggle" },          --Structure Compass (End City)
+    [42] = { "shulker_box", "toggle" },           --Shulker Box
+    [43] = { "dragon_egg_shards", "consumable" }, --Dragon Egg Shard
+    [44] = { "spyglass", "toggle" },              --Spyglass
+    [45] = { "lead", "toggle" },                  --Lead
+    [46] = {},                                    --Bee Trap (Minecraft)
+    [47] = { "brush", "toggle" },                 --Brush
+    [48] = { "compass_ocean", "toggle" },         --Structure Compass (Ocean Monument)
+    [49] = { "compass_woodland", "toggle" },      --Structure Compass (Woodland Mansion)           --Brush
+    [50] = { "compass_ancient_city", "toggle" },  --Structure Compass (Ancient City)
+    [51] = { "compass_trail_ruins", "toggle" },   --Structure Compass (Trail Ruins)
+    [52] = { "compass_trial_chamber", "toggle" }, --Structure Compass (Trial Chamber)
 }
diff --git a/scripts/autotracking/location_mapping.lua b/scripts/autotracking/location_mapping.lua
index f2bccba..934acf9 100644
--- a/scripts/autotracking/location_mapping.lua
+++ b/scripts/autotracking/location_mapping.lua
@@ -1,116 +1,139 @@
 LOCATION_MAPPING = {
-    [42000] = { "@Nether/Who is Cutting Onions?/Have a block of crying obsidian in your inventory." },
-    [42001] = { "@Nether/Oh Shiny/Give a piglin gold while it's angry." },
-    [42002] = { "@Overworld/Suit Up/Have any type of iron armor in your inventory." },
-    [42003] = { "@Adventure/Very Very Frightening/Hit a villager with a channeling trident on a thunderstorm." },
-    [42004] = { "@Overworld/Hot Stuff/Have a lava bucket in your inventory." },
-    [42005] = { "@The End/Free The End/Kill the Ender Dragon." },
-    [42006] = { "@Nether/A Furious Cocktail/Have every potion effect applied at the same time." },
-    [42007] = { "@Husbandry/Best Friends Forever/Tame a mob." },
-    [42008] = { "@Nether/Bring Home The Beacon/Power a beacon." },
-    [42009] = { "@Overworld/Not Today, Thank You/Block any projectile with a shield." },
-    [42010] = { "@Overworld/Isn't it Iron Pick/Have an iron pickaxe in your inventory." },
-    [42011] = { "@Nether/Local Brewery/Take an item from a brewing stand bottle slot." },
-    [42012] = { "@The End/The Next Generation/Have the dragon egg in your inventory." },
-    [42013] = { "@Husbandry/Fishy Business/Use a fishing rod to catch a fish." },
-    [42014] = { "@Nether/Hot Tourist Destinations/Visit all 5 Nether biomes." },
-    [42015] = { "@Nether/This Boat Has Legs/Feed a strider warped fungus on a stick while riding on it." },
-    [42016] = { "@Adventure/Sniper Duel/Kill a skeleton from at least 50m away." },
-    [42017] = { "@Nether/Nether/Enter the nether dimension.\n(Logically unlocked with: We Need To Go Deeper)" },
-    [42018] = { "@The End/Great View From Up Here/Move 50 blocks upwards while under the effects of levitation." },
-    [42019] = { "@Nether/How Did We Get Here?/Have every status effect applied at the same time." },
-    [42020] = { "@Adventure/Bullseye/Hit the bullseye of a target block from at least 30m away." },
-    [42021] = { "@Nether/Spooky Scary Skeleton/Have a wither skeleton skull in your inventory." },
-    [42022] = { "@Husbandry/Two by Two/Breed all 24 animals." },
-    [42023] = { "@Overworld/Stone Age/Have cobblestone, blackstone, or cobbled deepslate in your inventory." },
-    [42024] = { "@Adventure/Two Birds, One Arrow/Use a piercing crossbow to kill two phantoms with one shot." },
-    [42025] = { "nether" },
-    [42026] = { "@Adventure/Who's the Pillager Now?/Use a crossbow to kill a pillager." },
-    [42027] = { "@Overworld/Getting an Upgrade/Have a stone pickaxe in your inventory." },
-    [42028] = { "@Husbandry/Tactical Fishing/Use a bucket on a fish." },
-    [42029] = { "@Overworld/Zombie Doctor/Cure a zombie villager using weakness and a golden apple." },
-    [42030] = { "city" },
-    [42031] = { "@Overworld/Ice Bucket Challenge/Have a block of obsidian in your inventory." },
-    [42032] = { "@The End/Remote Getaway/Use an end gateway." },
-    [42033] = { "@Nether/Into Fire/Have a blaze rod in your inventory." },
-    [42034] = { "@Nether/War Pigs/Open a naturally generated chest in a bastion." },
-    [42035] = { "@Adventure/Take Aim/Shoot something with a bow or a crossbow." },
-    [42036] = { "@Husbandry/Total Beelocation/Move a bee nest, with 3 bees inside, using silk touch." },
-    [42037] = { "@Adventure/Arbalistic/Kill 5 different mobs with one crossbow shot." },
-    [42038] = { "@The End/The End... Again.../Summon the ender dragon using end crystals." },
-    [42039] = { "@Overworld/Acquire Hardware/Have an iron ingot in your inventory." },
-    [42040] = { "@Nether/Not Quite \"Nine\" Lives/Fully charge a respawn anchor using 4 blocks of Glowstone on it." },
-    [42041] = { "@Overworld/Cover Me With Diamonds/Have any type of diamond armor in your inventory." },
-    [42042] = { "@The End/Sky's The Limit/Have a pair of elytra in your inventory." },
-    [42043] = { "@Adventure/Hired Help/Summon an iron golem." },
-    [42044] = { "@Nether/Return to Sender/Kill a ghast with it's own fireball." },
-    [42045] = { "@Adventure/Sweet Dreams/Sleep." },
-    [42046] = { "@The End/You Need a Mint/Have a bottle of dragon's breath in your inventory." },
-    [42047] = { "@Adventure/Adventure/Kill or be killed." },
-    [42048] = { "@Adventure/Monsters Hunted/Kill at least one of every hostile monster.\n(Warden not included)" },
-    [42049] = { "@Overworld/Enchanter/Enchant an item at an enchanting table." },
-    [42050] = { "@Adventure/Voluntary Exile/Get the Bad omen effect." },
-    [42051] = { "@Overworld/Eye Spy/Enter a stronghold." },
-    [42052] = { "@The End/The End/Enter the End dimension.\n(Logically unlocked with: The End?)" },
-    [42053] = { "@Husbandry/Serious Dedication/Have a netherite hoe in your inventory." },
-    [42054] = { "@Adventure/Postmortal/Use a totem of undying." },
-    [42055] = { "@Adventure/Monster Hunter/Kill a hostile monster." },
-    [42056] = { "@Adventure/Adventuring Time/Visit all 53 biomes." },
-    [42057] = { "@Husbandry/A Seedy Place/Plant a seed and watch it grow." },
-    [42058] = { "bastion" },
-    [42059] = { "@Adventure/Hero of the Village/Successfully defend a village from a raid." },
-    [42060] = { "@Nether/Hidden in the Depths/Have ancient debris in your inventory." },
-    [42061] = { "@Nether/Beaconator/Fully power a beacon." },
-    [42062] = { "@Nether/Withering Heights/Summon the wither." },
-    [42063] = { "@Husbandry/A Balanced Diet/Eat all 40 foods." },
-    [42064] = { "@Nether/Subspace Bubble/Use the nether to travel 7km in the overworld, or 875 blocks in the nether." },
-    [42065] = { "@Husbandry/Husbandry/Eat something." },
-    [42066] = { "@Nether/Country Lode, Take Me Home/Use a compass on a lodestone." },
-    [42067] = { "@Husbandry/Bee Our Guest/Use a campfire to collect honey without making the bees angry." },
-    [42068] = { "@Adventure/What a Deal!/Trade with a villager or wandering trader." },
-    [42069] = { "@Nether/Uneasy Alliance/Kill a ghast while in the overworld." },
-    [42070] = { "@Overworld/Diamonds!/Have a diamond in your inventory." },
-    [42071] = { "fortress" },
-    [42072] = { "@Adventure/A Throwaway Joke/Hit something with a thrown trident." },
-    [42073] = { "@Overworld/Minecraft/Have a crafting table in your inventory." },
-    [42074] = { "@Adventure/Sticky Situation/Collide on a vertical side of a honey block when in air." },
-    [42075] = { "@Adventure/Ol' Betsy/Fire a crossbow." },
-    [42076] = { "@Nether/Cover Me in Debris/Have a full set of netherite armor in your inventory." },
-    [42077] = { "end" },
-    [42078] = { "@Husbandry/The Parrots and the Bats/Breed two animals." },
-    [42079] = { "@Husbandry/A Complete Catalogue/Tame all 11 cats." },
-    [42080] = { "@Archipelago/Getting Wood/Have wooden logs in your inventory" },
-    [42081] = { "@Archipelago/Time to Mine!/Craft a wooden pickaxe." },
-    [42082] = { "@Archipelago/Hot Topic/Craft a furnace." },
-    [42083] = { "@Archipelago/Bake Bread/Craft bread." },
-    [42084] = { "@Archipelago/The Lie/Craft a cake." },
-    [42085] = { "@Archipelago/On A Rail/Travel 1km by minecart." },
-    [42086] = { "@Archipelago/Time to Strike!/Craft a wooden sword." },
-    [42087] = { "@Archipelago/Cow Tipper/Have leather in your inventory." },
-    [42088] = { "@Archipelago/When Pigs Fly/Fall off a cliff on a pig." },
-    [42089] = { "@Archipelago/Overkill/Deal 9 hearts of damage in a single hit." },
-    [42090] = { "@Archipelago/Librarian/Craft a bookshelf." },
-    [42091] = { "@Archipelago/Overpowered/Eat a notch apple.\n(8 Gold Blocks + Apple craft)" },
-    [42092] = { "@Husbandry/Wax On/Apply honeycomb to a copper block." },
-    [42093] = { "@Husbandry/Wax Off/Scrape wax off of a copper block." },
-    [42094] = { "@Husbandry/The Cutest Predator/Catch an axolotl in a bucket." },
-    [42095] = { "@Husbandry/The Healing Power of Friendship/Have an axolotl heal you by helping it in a fight." },
-    [42096] = { "@Adventure/Is It a Bird?/Look at a parrot through a spyglass." },
-    [42097] = { "@Adventure/Is It a Balloon?/Look at a ghast through a spyglass." },
-    [42098] = { "@Adventure/Is It a Plane?/Look at the ender dragon through a spyglass." },
-    [42099] = { "@Adventure/Surge Protector/Protect a villager from a lightning bolt without starting a fire." },
-    [42100] = { "@Adventure/Light as a Rabbit/Walk on powder snow while wearing leather boots." },
-    [42101] = { "@Husbandry/Glow and Behold!/Use glow ink on a sign." },
-    [42102] = { "@Husbandry/Whatever Floats Your Goat!/Get in a boat with a goat." },
-    [42103] = { "@Adventure/Caves & Cliffs/Fall from build height to bedrock without taking damage." },
-    [42104] = { "@Nether/Feels like home/Travel 50 blocks on lava using a strider in the overworld." },
-    [42105] = { "@Adventure/Sound of Music/Use a jukebox while in a meadow." },
-    [42106] = { "@Adventure/Star Trader/Trade with a villager while at build height." },
-    [42107] = { "@Husbandry/Birthday Song/Have an Allay drop a Cake at a Note Block." },
-    [42108] = { "@Husbandry/Bukkit Bukkit/Catch a tadpole in a bucket." },
-    [42109] = { "@Adventure/It Spreads/Kill a mob near a sculk catalyst." },
-    [42110] = { "@Adventure/Sneak 100/Sneak while close to a sculk sensor or warden." },
-    [42111] = { "@Husbandry/When the Squad Hops into Town/Have each frog variant on a lead." },
-    [42112] = { "@Husbandry/With Our Powers Combined!/Have all Froglights in your inventory." },
-    [42113] = { "@Husbandry/You've Got a Friend in Me/Have an Allay deliver items to you." },
+    [1] = { "@Nether/Who is Cutting Onions?/Have a block of crying obsidian in your inventory." },
+    [2] = { "@Nether/Oh Shiny/Give a piglin gold while it's angry." },
+    [3] = { "@Overworld/Suit Up/Have any type of iron armor in your inventory." },
+    [4] = { "@Adventure/Very Very Frightening/Hit a villager with a channeling trident on a thunderstorm." },
+    [5] = { "@Overworld/Hot Stuff/Have a lava bucket in your inventory." },
+    [6] = { "@The End/Free The End/Kill the Ender Dragon." },
+    [7] = { "@Nether/A Furious Cocktail/Have every potion effect applied at the same time." },
+    [8] = { "@Husbandry/Best Friends Forever/Tame a mob." },
+    [9] = { "@Nether/Bring Home The Beacon/Power a beacon." },
+    [10] = { "@Overworld/Not Today, Thank You/Block any projectile with a shield." },
+    [11] = { "@Overworld/Isn't it Iron Pick/Have an iron pickaxe in your inventory." },
+    [12] = { "@Nether/Local Brewery/Take an item from a brewing stand bottle slot." },
+    [13] = { "@The End/The Next Generation/Have the dragon egg in your inventory." },
+    [14] = { "@Husbandry/Fishy Business/Use a fishing rod to catch a fish." },
+    [15] = { "@Nether/Hot Tourist Destinations/Visit all 5 Nether biomes." },
+    [16] = { "@Nether/This Boat Has Legs/Feed a strider warped fungus on a stick while riding on it." },
+    [17] = { "@Adventure/Sniper Duel/Kill a skeleton from at least 50m away." },
+    [18] = { "@Nether/Nether/Enter the nether dimension.\n(Logically unlocked with: We Need To Go Deeper)" },
+    [19] = { "@The End/Great View From Up Here/Move 50 blocks upwards while under the effects of levitation." },
+    [20] = { "@Nether/How Did We Get Here?/Have every status effect applied at the same time." },
+    [21] = { "@Adventure/Bullseye/Hit the bullseye of a target block from at least 30m away." },
+    [22] = { "@Nether/Spooky Scary Skeleton/Have a wither skeleton skull in your inventory." },
+    [23] = { "@Husbandry/Two by Two/Breed all 24 animals." },
+    [24] = { "@Overworld/Stone Age/Have cobblestone, blackstone, or cobbled deepslate in your inventory." },
+    [25] = { "@Adventure/Two Birds, One Arrow/Use a piercing crossbow to kill two phantoms with one shot." },
+    [26] = { "nether" },
+    [27] = { "@Adventure/Who's the Pillager Now?/Use a crossbow to kill a pillager." },
+    [28] = { "@Overworld/Getting an Upgrade/Have a stone pickaxe in your inventory." },
+    [29] = { "@Husbandry/Tactical Fishing/Use a bucket on a fish." },
+    [30] = { "@Overworld/Zombie Doctor/Cure a zombie villager using weakness and a golden apple." },
+    [31] = { "city" },
+    [32] = { "@Overworld/Ice Bucket Challenge/Have a block of obsidian in your inventory." },
+    [33] = { "@The End/Remote Getaway/Use an end gateway." },
+    [34] = { "@Nether/Into Fire/Have a blaze rod in your inventory." },
+    [35] = { "@Nether/War Pigs/Open a naturally generated chest in a bastion." },
+    [36] = { "@Adventure/Take Aim/Shoot something with a bow or a crossbow." },
+    [37] = { "@Husbandry/Total Beelocation/Move a bee nest, with 3 bees inside, using silk touch." },
+    [38] = { "@Adventure/Arbalistic/Kill 5 different mobs with one crossbow shot." },
+    [39] = { "@The End/The End... Again.../Summon the ender dragon using end crystals." },
+    [40] = { "@Overworld/Acquire Hardware/Have an iron ingot in your inventory." },
+    [41] = { "@Nether/Not Quite \"Nine\" Lives/Fully charge a respawn anchor using 4 blocks of Glowstone on it." },
+    [42] = { "@Overworld/Cover Me With Diamonds/Have any type of diamond armor in your inventory." },
+    [43] = { "@The End/Sky's The Limit/Have a pair of elytra in your inventory." },
+    [44] = { "@Adventure/Hired Help/Summon an iron golem." },
+    [45] = { "@Nether/Return to Sender/Kill a ghast with it's own fireball." },
+    [46] = { "@Adventure/Sweet Dreams/Sleep." },
+    [47] = { "@The End/You Need a Mint/Have a bottle of dragon's breath in your inventory." },
+    [48] = { "@Adventure/Adventure/Kill or be killed." },
+    [49] = { "@Adventure/Monsters Hunted/Kill at least one of every hostile monster.\n(Warden not included)" },
+    [50] = { "@Overworld/Enchanter/Enchant an item at an enchanting table." },
+    [51] = { "@Adventure/Voluntary Exile/Get the Bad omen effect." },
+    [52] = { "@Overworld/Eye Spy/Enter a stronghold." },
+    [53] = { "@The End/The End/Enter the End dimension.\n(Logically unlocked with: The End?)" },
+    [54] = { "@Husbandry/Serious Dedication/Have a netherite hoe in your inventory." },
+    [55] = { "@Adventure/Postmortal/Use a totem of undying." },
+    [56] = { "@Adventure/Monster Hunter/Kill a hostile monster." },
+    [57] = { "@Adventure/Adventuring Time/Visit all 53 biomes." },
+    [58] = { "@Husbandry/A Seedy Place/Plant a seed and watch it grow." },
+    [59] = { "bastion" },
+    [60] = { "@Adventure/Hero of the Village/Successfully defend a village from a raid." },
+    [61] = { "@Nether/Hidden in the Depths/Have ancient debris in your inventory." },
+    [62] = { "@Nether/Beaconator/Fully power a beacon." },
+    [63] = { "@Nether/Withering Heights/Summon the wither." },
+    [64] = { "@Husbandry/A Balanced Diet/Eat all 40 foods." },
+    [65] = { "@Nether/Subspace Bubble/Use the nether to travel 7km in the overworld, or 875 blocks in the nether." },
+    [66] = { "@Husbandry/Husbandry/Eat something." },
+    [67] = { "@Adventure/Country Lode, Take Me Home/Use a compass on a lodestone." },
+    [68] = { "@Husbandry/Bee Our Guest/Use a campfire to collect honey without making the bees angry." },
+    [69] = { "@Adventure/What a Deal!/Trade with a villager or wandering trader." },
+    [70] = { "@Nether/Uneasy Alliance/Kill a ghast while in the overworld." },
+    [71] = { "@Overworld/Diamonds!/Have a diamond in your inventory." },
+    [72] = { "fortress" },
+    [73] = { "@Adventure/A Throwaway Joke/Hit something with a thrown trident." },
+    [74] = { "@Overworld/Minecraft/Have a crafting table in your inventory." },
+    [75] = { "@Adventure/Sticky Situation/Collide on a vertical side of a honey block when in air." },
+    [76] = { "@Adventure/Ol' Betsy/Fire a crossbow." },
+    [77] = { "@Nether/Cover Me in Debris/Have a full set of netherite armor in your inventory." },
+    [78] = { "end" },
+    [79] = { "@Husbandry/The Parrots and the Bats/Breed two animals." },
+    [80] = { "@Husbandry/A Complete Catalogue/Tame all 11 cats." },
+    [81] = { "@Archipelago/Getting Wood/Have wooden logs in your inventory" },
+    [82] = { "@Archipelago/Time to Mine!/Craft a wooden pickaxe." },
+    [83] = { "@Archipelago/Hot Topic/Craft a furnace." },
+    [84] = { "@Archipelago/Bake Bread/Craft bread." },
+    [85] = { "@Archipelago/The Lie/Craft a cake." },
+    [86] = { "@Archipelago/On A Rail/Travel 1km by minecart." },
+    [87] = { "@Archipelago/Time to Strike!/Craft a wooden sword." },
+    [88] = { "@Archipelago/Cow Tipper/Have leather in your inventory." },
+    [89] = { "@Archipelago/When Pigs Fly/Fall off a cliff on a pig." },
+    [90] = { "@Archipelago/Overkill/Deal 9 hearts of damage in a single hit." },
+    [91] = { "@Archipelago/Librarian/Craft a bookshelf." },
+    [92] = { "@Archipelago/Overpowered/Eat a notch apple.\n(8 Gold Blocks + Apple craft)" },
+    [93] = { "@Husbandry/Wax On/Apply honeycomb to a copper block." },
+    [94] = { "@Husbandry/Wax Off/Scrape wax off of a copper block." },
+    [95] = { "@Husbandry/The Cutest Predator/Catch an axolotl in a bucket." },
+    [96] = { "@Husbandry/The Healing Power of Friendship/Have an axolotl heal you by helping it in a fight." },
+    [97] = { "@Adventure/Is It a Bird?/Look at a parrot through a spyglass." },
+    [98] = { "@Adventure/Is It a Balloon?/Look at a ghast through a spyglass." },
+    [99] = { "@Adventure/Is It a Plane?/Look at the ender dragon through a spyglass." },
+    [100] = { "@Adventure/Surge Protector/Protect a villager from a lightning bolt without starting a fire." },
+    [101] = { "@Adventure/Light as a Rabbit/Walk on powder snow while wearing leather boots." },
+    [102] = { "@Husbandry/Glow and Behold!/Use glow ink on a sign." },
+    [103] = { "@Husbandry/Whatever Floats Your Goat!/Get in a boat with a goat." },
+    [104] = { "@Adventure/Caves & Cliffs/Fall from build height to bedrock without taking damage." },
+    [105] = { "@Nether/Feels like home/Travel 50 blocks on lava using a strider in the overworld." },
+    [106] = { "@Adventure/Sound of Music/Use a jukebox while in a meadow." },
+    [107] = { "@Adventure/Star Trader/Trade with a villager while at build height." },
+    [108] = { "@Husbandry/Birthday Song/Have an Allay drop a Cake at a Note Block." },
+    [109] = { "@Husbandry/Bukkit Bukkit/Catch a tadpole in a bucket." },
+    [110] = { "@Adventure/It Spreads/Kill a mob near a sculk catalyst." },
+    [111] = { "@Adventure/Sneak 100/Sneak while close to a sculk sensor or warden." },
+    [112] = { "@Husbandry/When the Squad Hops into Town/Have each frog variant on a lead." },
+    [113] = { "@Husbandry/With Our Powers Combined!/Have all Froglights in your inventory." },
+    [114] = { "@Husbandry/You've Got a Friend in Me/Have an Allay deliver items to you." },
+    [115] = { "@Husbandry/Smells Interesting/Obtain a Sniffer Egg via Brushing Suspicous Sand in Warm Ocean Ruins." },
+    [116] = { "@Husbandry/Little Sniffs/Feed a Snifflet Torchflower Seeds." },
+    [117] = { "@Husbandry/Planting the Past/Plant either Torchflower Seeds or a Pitcher Pod." },
+    [118] = { "@Adventure/Crafting a New Look/Craft a trimmed armor at Smithing Table." },
+    [119] = { "@Adventure/Smithing with Style/Apply each of these Smithing Templets at least once:\n Spire\n Snout\n Rib\n Ward\n Silence\n Vex\n Tide\n Wayfinder." },
+    [120] = { "@Adventure/Resepcting the Remants/Brush either Suspicious Sand or Suspicious gravel and obtain a Pottery Sherd." },
+    [121] = { "@Adventure/Careful Restoration/Make a Decorated Pot out of 4 Pottery Sherds." },
+    [122] = { "@Adventure/The Power of Books/Place a Comparator on any side of a Chiseled Bookshelf." },
+    [123] = { "@Adventure/Isn't It Scute?/Use a Brush on an Armadillo." },
+    [124] = { "@Husbandry/Sheer Brilliance/Remove Wolf Armor from a Wolf using Shears." },
+    [125] = { "@Husbandry/Good as New/Repair damaged Wolf Armor to full durability using Armadillo Scutes while the armor is equiped on the wolf." },
+    [126] = { "@Husbandry/The Whole Pack/Tame each of these 9 wolf varients:\n Ashen\n Black\n Chestnut\n Pale\n Rusty\n Snowy\n Spotted\n Striped\n Woods." },
+    [127] = { "@Adventure/Minecraft: Trial(s) Edition/Step foot in a Trial Chamber." },
+    [128] = { "@Adventure/Under Lock and Key/Use a Trial Key on an Ominous Vault." },
+    [129] = { "@Adventure/Blowback/Kill a Breeze with a deflected Breeze-shot Wind Charge." },
+    [130] = { "@Adventure/Who Needs Rockets?/Use a Wind Charge to launch yourself upwards 8 blocks." },
+    [131] = { "@Adventure/Crafters Crafing Crafters/Be near a Crafter when it crafts a Crafter." },
+    [132] = { "@Adventure/Lighten Up/Scrape any oxidized Copper Bulb with an axe." },
+    [133] = { "@Adventure/Over-Overkill/Deal 50 hearts of damage in a single hit using the Mace.\n (Hint: Gravity)" },
+    [134] = { "@Adventure/Revaulting/Use an Ominous Trial Key on an Ominous Vault." },
+    [135] = { "@Husbandry/Stay Hydrated!/Place a Dried Ghast block into water." },
+    [136] = { "@Adventure/Heart Transplanter/Place a Creaking Heart with the correct alignment between two Pale Oak Log blocks." },
+    [137] = { "@Adventure/Mob Kabob/Hit 5 mobs (or Armor Stands) in the same Charge attack using the Spear." },
 }
diff --git a/scripts/autotracking/slot_data.lua b/scripts/autotracking/slot_data.lua
index f0279ea..43824ca 100644
--- a/scripts/autotracking/slot_data.lua
+++ b/scripts/autotracking/slot_data.lua
@@ -1,4 +1,4 @@
-function get_slot_options(slot_data)
+function Get_Slot_Options(slot_data)
     --    if slot_data["egg_shards_required"] ~= nil then
     --		Tracker:FindObjectForCode('egg_shards_required').AcquiredCount = slot_data["egg_shards_required"]
     --	end
diff --git a/scripts/logic.lua b/scripts/logic.lua
index 85a24cb..fb9244b 100644
--- a/scripts/logic.lua
+++ b/scripts/logic.lua
@@ -286,6 +286,61 @@ function compass_city()
     return 0
 end
 
+function compass_ancient_city()
+    local value = Tracker:ProviderCountForCode("compass_ancient_city")
+    if ENABLE_DEBUG_LOG then
+        print(string.format("compass_ancient_city: value: %s", value))
+    end
+    if (value > 0) then
+        return 1
+    end
+    return 0
+end
+
+function compass_ocean()
+    local value = Tracker:ProviderCountForCode("compass_ocean")
+    if ENABLE_DEBUG_LOG then
+        print(string.format("compass_ocean: value: %s", value))
+    end
+    if (value > 0) then
+        return 1
+    end
+    return 0
+end
+
+function compass_woodland()
+    local value = Tracker:ProviderCountForCode("compass_woodland")
+    if ENABLE_DEBUG_LOG then
+        print(string.format("compass_woodland: value: %s", value))
+    end
+    if (value > 0) then
+        return 1
+    end
+    return 0
+end
+
+function compass_trail_ruins()
+    local value = Tracker:ProviderCountForCode("compass_trail_ruins")
+    if ENABLE_DEBUG_LOG then
+        print(string.format("compass_trail_ruins: value: %s", value))
+    end
+    if (value > 0) then
+        return 1
+    end
+    return 0
+end
+
+function compass_trial_chamber()
+    local value = Tracker:ProviderCountForCode("compass_trial_chamber")
+    if ENABLE_DEBUG_LOG then
+        print(string.format("compass_trial_chamber: value: %s", value))
+    end
+    if (value > 0) then
+        return 1
+    end
+    return 0
+end
+
 function archery()
     local value = Tracker:ProviderCountForCode("archery")
     if ENABLE_DEBUG_LOG then
@@ -572,6 +627,17 @@ function saddle()
     return 0
 end
 
+function brush()
+    local value = Tracker:ProviderCountForCode("brush")
+    if ENABLE_DEBUG_LOG then
+        print(string.format("brush: value: %s", value))
+    end
+    if (value > 0) then
+        return 1
+    end
+    return 0
+end
+
 function piercing()
     local value = Tracker:ProviderCountForCode("piercing")
     if ENABLE_DEBUG_LOG then