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>
---
 .../features/rift/area/dreadfarm/RiftAgaricusCap.kt    | 18 +++++++++---------
 .../rift/area/dreadfarm/RiftWiltedBerberisHelper.kt    | 10 ++++++----
 2 files changed, 15 insertions(+), 13 deletions(-)

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

diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftAgaricusCap.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftAgaricusCap.kt
index 70b595d1a..c01d20157 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftAgaricusCap.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftAgaricusCap.kt
@@ -11,13 +11,14 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
-import at.hannibal2.skyhanni.utils.TimeUtils
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
+import at.hannibal2.skyhanni.utils.TimeUtils.format
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class RiftAgaricusCap {
 
     private val config get() = RiftAPI.config.area.dreadfarm
-    private var startTime = 0L
+    private var startTime = SimpleTimeMark.farPast()
     private var location: LorenzVec? = null
 
     @SubscribeEvent
@@ -36,11 +37,11 @@ class RiftAgaricusCap {
         when (currentLocation.getBlockStateAt().toString()) {
             "minecraft:brown_mushroom" -> {
                 return if (location != currentLocation) {
-                    startTime = System.currentTimeMillis()
+                    startTime = SimpleTimeMark.now()
                     currentLocation
                 } else {
-                    if (startTime == -1L) {
-                        startTime = System.currentTimeMillis()
+                    if (startTime.isFarFuture()) {
+                        startTime = SimpleTimeMark.now()
                     }
                     location
                 }
@@ -48,7 +49,7 @@ class RiftAgaricusCap {
 
             "minecraft:red_mushroom" -> {
                 if (location == currentLocation) {
-                    startTime = -1L
+                    startTime = SimpleTimeMark.farFuture()
                     return location
                 }
             }
@@ -62,13 +63,12 @@ class RiftAgaricusCap {
 
         val location = location?.add(y = 0.6) ?: return
 
-        if (startTime == -1L) {
+        if (startTime.isFarFuture()) {
             event.drawDynamicText(location, "§cClick!", 1.5)
             return
         }
 
-        val countDown = System.currentTimeMillis() - startTime
-        val format = TimeUtils.formatDuration(countDown - 1000, showMilliSeconds = true)
+        val format = startTime.passedSince().format(showMilliSeconds = true)
         event.drawDynamicText(location, "§b$format", 1.5)
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt
index 319b04142..9515330d1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/dreadfarm/RiftWiltedBerberisHelper.kt
@@ -15,11 +15,13 @@ import at.hannibal2.skyhanni.utils.RenderUtils.draw3DLine
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
 import at.hannibal2.skyhanni.utils.RenderUtils.drawFilledBoundingBox_nea
 import at.hannibal2.skyhanni.utils.RenderUtils.expandBlock
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import net.minecraft.client.Minecraft
 import net.minecraft.init.Blocks
 import net.minecraft.util.EnumParticleTypes
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import java.awt.Color
+import kotlin.time.Duration.Companion.milliseconds
 
 class RiftWiltedBerberisHelper {
 
@@ -28,12 +30,12 @@ class RiftWiltedBerberisHelper {
     private var hasFarmingToolInHand = false
     private var list = listOf<WiltedBerberis>()
 
-    class WiltedBerberis(var currentParticles: LorenzVec) {
+    data class WiltedBerberis(var currentParticles: LorenzVec) {
 
         var previous: LorenzVec? = null
         var moving = true
         var y = 0.0
-        var lastTime = System.currentTimeMillis()
+        var lastTime = SimpleTimeMark.now()
     }
 
     @SubscribeEvent
@@ -41,7 +43,7 @@ class RiftWiltedBerberisHelper {
         if (!isEnabled()) return
         if (!event.isMod(5)) return
 
-        list = list.editCopy { removeIf { System.currentTimeMillis() > it.lastTime + 500 } }
+        list = list.editCopy { removeIf { it.lastTime.passedSince() > 500.milliseconds } }
 
         hasFarmingToolInHand = InventoryUtils.getItemInHand()?.getInternalName() == RiftAPI.farmingTool
 
@@ -98,7 +100,7 @@ class RiftWiltedBerberisHelper {
 
             moving = isMoving
             currentParticles = location
-            lastTime = System.currentTimeMillis()
+            lastTime = SimpleTimeMark.now()
         }
     }
 
-- 
cgit