From 7a7f1b9acb5990b24b8aeea5a435c136bb1bb7db Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Thu, 16 Mar 2023 19:47:46 +0100
Subject: Fixed non god pod time parsing errors

---
 .../features/misc/NonGodPotEffectDisplay.kt        | 30 ++--------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

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

diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
index 46a6aff78..7ae821011 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt
@@ -132,7 +132,7 @@ class NonGodPotEffectDisplay {
                 if (name in nonGodPotEffects.values) {
                     for (line in stack.getLore()) {
                         if (line.contains("Remaining")) {
-                            val duration = readDuration(line.split("§f")[1])
+                            val duration = TimeUtils.getMillis(line.split("§f")[1])
                             activeEffects[name] = System.currentTimeMillis() + duration
                             format()
                         }
@@ -152,7 +152,7 @@ class NonGodPotEffectDisplay {
             var effectsCount = 0
             for (line in lines) {
                 if (line.startsWith("§2Mushed Glowy Tonic I")) {
-                    val duration = readDuration(line.split("§f")[1])
+                    val duration = TimeUtils.getMillis(line.split("§f")[1])
                     activeEffects["§2Mushed Glowy Tonic I"] = System.currentTimeMillis() + duration
                     format()
                 }
@@ -166,32 +166,6 @@ class NonGodPotEffectDisplay {
         }
     }
 
-    private fun readDuration(text: String): Int {
-        val split = text.split(":")
-        return when (split.size) {
-            3 -> {
-                val hours = split[0].toInt() * 1000 * 60 * 60
-                val minutes = split[1].toInt() * 1000 * 60
-                val seconds = split[2].toInt() * 1000
-                seconds + minutes + hours
-            }
-
-            2 -> {
-                val minutes = split[0].toInt() * 1000 * 60
-                val seconds = split[1].toInt() * 1000
-                seconds + minutes
-            }
-
-            1 -> {
-                split[0].toInt() * 1000
-            }
-
-            else -> {
-                throw RuntimeException("Invalid format: '$text'")
-            }
-        }
-    }
-
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) {
         if (!isEnabled()) return
-- 
cgit