From f67af16eacb6cdf3598183d473f072d123ef8a25 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Sun, 26 May 2024 23:02:48 +1000
Subject: Backend: Convert stuff to SimpleTimeMark (#1777)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../skyhanni/features/mining/powdertracker/PowderTracker.kt    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/features/mining')

diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
index 6df86dda0..9e0857285 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/mining/powdertracker/PowderTracker.kt
@@ -19,6 +19,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
 import at.hannibal2.skyhanni.utils.tracker.SkyHanniTracker
 import at.hannibal2.skyhanni.utils.tracker.TrackerData
@@ -26,6 +27,7 @@ import com.google.gson.JsonArray
 import com.google.gson.JsonNull
 import com.google.gson.annotations.Expose
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration.Companion.minutes
 
 object PowderTracker {
 
@@ -53,7 +55,7 @@ object PowderTracker {
         "§e§lPASSIVE EVENT §b§l2X POWDER §e§lRUNNING FOR §a§l(?<time>.*)§r"
     )
 
-    private var lastChestPicked = 0L
+    private var lastChestPicked = SimpleTimeMark.farPast()
     private var isGrinding = false
     private val gemstoneInfo = ResourceInfo(0L, 0L, 0, 0.0, mutableListOf())
     private val mithrilInfo = ResourceInfo(0L, 0L, 0, 0.0, mutableListOf())
@@ -122,7 +124,7 @@ object PowderTracker {
                     it.totalChestPicked += 1
                 }
                 isGrinding = true
-                lastChestPicked = System.currentTimeMillis()
+                lastChestPicked = SimpleTimeMark.now()
             }
         }
 
@@ -131,7 +133,7 @@ object PowderTracker {
                 it.totalChestPicked += 1
             }
             isGrinding = true
-            lastChestPicked = System.currentTimeMillis()
+            lastChestPicked = SimpleTimeMark.now()
         }
 
         powderStartedPattern.matchMatcher(msg) { doublePowder = true }
@@ -163,7 +165,7 @@ object PowderTracker {
                 tracker.update()
             }
         }
-        if (System.currentTimeMillis() - lastChestPicked > 60_000) {
+        if (lastChestPicked.passedSince() > 1.minutes) {
             isGrinding = false
         }
     }
-- 
cgit