From 0913b9a3d864b2d37cb24cfdf7b4aafc6ef5023e Mon Sep 17 00:00:00 2001
From: Allen Zheng <zhenga8533@gmail.com>
Date: Wed, 17 Apr 2024 21:54:28 -0400
Subject: [PATCH] v2.9.2 final

---
 changelog.json                   |  2 ++
 features/mining/FossilHelper.js  |  4 ++--
 features/mining/ShaftAnnounce.js | 14 +++++---------
 utils/variables.js               |  1 +
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/changelog.json b/changelog.json
index d42ba05a..c6ad6a6b 100644
--- a/changelog.json
+++ b/changelog.json
@@ -2,6 +2,7 @@
     "- Added Hoppity event experimental features",
     "- Added widget display (`/va wgl`)",
     "- Added `/missingSkins`",
+    "- Added corpse waypoints",
     "- Compacted some chat messages to be 1 message",
     "- Changed fossil finder to the worst Leetcode algorithm",
     "- Changed chat waypoints to detect item",
@@ -9,5 +10,6 @@
     "- Fixed new Gemstone in value calc",
     "- Fixed `/resetSkills`",
     "- Fixed searchbar calculator showing NaN",
+    "- Fixed powder tracker timer",
     "- Removed bestiary display (`/va wgl add bestiary`)"
 ]
\ No newline at end of file
diff --git a/features/mining/FossilHelper.js b/features/mining/FossilHelper.js
index 1cef4852..b9208104 100644
--- a/features/mining/FossilHelper.js
+++ b/features/mining/FossilHelper.js
@@ -219,7 +219,7 @@ const highlightTile = register("guiRender", () => {
 }).unregister();
 
 const trackClicks = register("guiMouseClick", () => {
-    Client.scheduleTask(3, () => {
+    Client.scheduleTask(1, () => {
         const container = Player.getContainer().getItems();
         const fossil = container.find(item => item?.getName() === "§6Fossil");
         
@@ -264,7 +264,7 @@ const untrackFossils = register("guiClosed", () => {
 }).unregister();
 
 registerWhen(register("guiOpened", () => {
-    Client.scheduleTask(3, () => {
+    Client.scheduleTask(1, () => {
         const container = Player.getContainer();
         if (container.getName() !== "Fossil Excavator" || container.getItems()[49].getName() === "§cClose") return;
         highlightTile.register();
diff --git a/features/mining/ShaftAnnounce.js b/features/mining/ShaftAnnounce.js
index a4fe9b75..6a7e897c 100644
--- a/features/mining/ShaftAnnounce.js
+++ b/features/mining/ShaftAnnounce.js
@@ -19,7 +19,7 @@ const TRANSFER_COMMANDS = ["?transfer", "!ptme", "!pt", ".transfer", "Mineshaft,
  */
 function attemptTransfer(index) {
     delay(() => {
-        if (getIsLeader() || index > 4) return;
+        if (getIsLeader() || index >= TRANSFER_COMMANDS.length) return;
         ChatLib.command(`pc ${TRANSFER_COMMANDS[index]}`);
         attemptTransfer(index + 1);
     }, 420);
@@ -92,12 +92,6 @@ registerWhen(register("chat", (_, x, y, z) => {
     corpses.push([x, y, z.split(' ')[0]]);
 }).setCriteria("${player}: x: ${x}, y: ${y}, z: ${z}"), () => settings.corpseAnnounce && getWorld() === "Mineshaft");
 
-register("worldUnload", () => {
-    corpses = [];
-    looted = [];
-});
-
-
 /**
  * Corpse detection 
  */
@@ -127,9 +121,9 @@ registerWhen(register("step", () => {
     stands.forEach(stand => {
         const helmet = stand.getEntity()?.func_71124_b(4);  // getEquipmentInSlot(0: Tool in Hand; 1-4: Armor)
         if (helmet !== null) {
-            const type = helmet.func_82833_r().removeFormatting().split(' ')[0];  // getDisplayName
+            const type = helmet.func_82833_r().removeFormatting().split(' ')[0];  // getDisplayName for ItemStack
             if (!(type in corpseWaypoints)) return;
-            
+
             const corpsePos = [ARMOR_MATCH[type], stand.getX(), stand.getY() + 2, stand.getZ()];
             if (getClosest(corpsePos, looted)[1] < 10) return;
             corpseWaypoints[type].push([ARMOR_MATCH[type], stand.getX(), stand.getY() + 2, stand.getZ()]);
@@ -138,6 +132,8 @@ registerWhen(register("step", () => {
 }).setDelay(1), () => settings.corpseWaypoints && getWorld() === "Mineshaft");
 
 register("worldUnload", () => {
+    corpses = [];
+    looted = [];
     corpseWaypoints = {
         "Lapis": [],
         "Mineral": [],
diff --git a/utils/variables.js b/utils/variables.js
index a3cefc8d..f0cca211 100644
--- a/utils/variables.js
+++ b/utils/variables.js
@@ -156,6 +156,7 @@ export function registerWhen(trigger, dependency) {
 
 // Updates trigger registrations based on world or GUI changes
 export function setRegisters(off = false) {
+    Client.showTitle("Loading...", "", 0, 1 ,0);
     registers.forEach(trigger => {
         if (off || (!trigger[1]() && trigger[2])) {
             trigger[0].unregister();