Merge branch 'beta' into cumcum

# Conflicts:
#	src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt
#	src/main/java/at/hannibal2/skyhanni/config/features/AshfangConfig.java

1 files changed, 7 insertions, 5 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/data/TitleUtils.kt b/src/main/java/at/hannibal2/skyhanni/data/TitleUtils.kt
index d66a321b2..2004a1ed1 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/TitleUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/TitleUtils.kt
@@ -2,34 +2,36 @@ package at.hannibal2.skyhanni.data
 
 import at.hannibal2.skyhanni.events.GuiRenderEvent
 import at.hannibal2.skyhanni.events.PreProfileSwitchEvent
+import at.hannibal2.skyhanni.utils.SimpleTimeMark
 import io.github.moulberry.moulconfig.internal.TextRenderUtils
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.ScaledResolution
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
+import kotlin.time.Duration
 
 class TitleUtils {
 
     companion object {
         private var display = ""
-        private var endTime = 0L
+        private var endTime = SimpleTimeMark.farPast()
         private var heightModifier = 1.8
 
-        fun sendTitle(text: String, duration: Int, height: Double = 1.8) {
+        fun sendTitle(text: String, duration: Duration, height: Double = 1.8) {
             display = "§f$text"
-            endTime = System.currentTimeMillis() + duration
+            endTime = SimpleTimeMark.now() + duration
             heightModifier = height
         }
     }
 
     @SubscribeEvent
     fun onPreProfileSwitch(event: PreProfileSwitchEvent) {
-        sendTitle("", 1)
+        endTime = SimpleTimeMark.farPast()
     }
 
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) {
-        if (System.currentTimeMillis() > endTime) return
+        if (endTime.isInPast()) return
 
         val scaledResolution = ScaledResolution(Minecraft.getMinecraft())
         val width = scaledResolution.scaledWidth