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, 16 insertions, 0 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TimeMark.kt b/src/main/java/at/hannibal2/skyhanni/utils/TimeMark.kt
new file mode 100644
index 000000000..83285550d
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/utils/TimeMark.kt
@@ -0,0 +1,16 @@
+package at.hannibal2.skyhanni.utils
+
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+
+
+data class TimeMark(val long: Long) {
+
+    fun hasNeverHappened() = long == 0L
+    fun passedTime() = if (long == 0L) Duration.Companion.INFINITE else (System.currentTimeMillis() - long).milliseconds
+
+    companion object {
+        fun never() = TimeMark(0)
+        fun now() = TimeMark(System.currentTimeMillis())
+    }
+}
\ No newline at end of file