Make pickaxe ability display use AbilityUtils

[no changelog]

1 files changed, 45 insertions, 37 deletions

diff --git a/src/main/kotlin/util/TimeMark.kt b/src/main/kotlin/util/TimeMark.kt
index 1264212..4a076ac 100644
--- a/src/main/kotlin/util/TimeMark.kt
+++ b/src/main/kotlin/util/TimeMark.kt
@@ -1,44 +1,52 @@
-
-
 package moe.nea.firmament.util
 
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 
 class TimeMark private constructor(private val timeMark: Long) : Comparable<TimeMark> {
-    fun passedTime() = if (timeMark == 0L) Duration.INFINITE else (System.currentTimeMillis() - timeMark).milliseconds
-
-    operator fun minus(other: TimeMark): Duration {
-        if (other.timeMark == timeMark)
-            return 0.milliseconds
-        if (other.timeMark == 0L)
-            return Duration.INFINITE
-        if (timeMark == 0L)
-            return -Duration.INFINITE
-        return (timeMark - other.timeMark).milliseconds
-    }
-
-    companion object {
-        fun now() = TimeMark(System.currentTimeMillis())
-        fun farPast() = TimeMark(0L)
-        fun ago(timeDelta: Duration): TimeMark {
-            if (timeDelta.isFinite()) {
-                return TimeMark(System.currentTimeMillis() - timeDelta.inWholeMilliseconds)
-            }
-            require(timeDelta.isPositive())
-            return farPast()
-        }
-    }
-
-    override fun hashCode(): Int {
-        return timeMark.hashCode()
-    }
-
-    override fun equals(other: Any?): Boolean {
-        return other is TimeMark && other.timeMark == timeMark
-    }
-
-    override fun compareTo(other: TimeMark): Int {
-        return this.timeMark.compareTo(other.timeMark)
-    }
+	fun passedTime() =
+		if (timeMark == 0L) Duration.INFINITE
+		else (System.currentTimeMillis() - timeMark).milliseconds
+
+	fun passedAt(fakeNow: TimeMark) =
+		if (timeMark == 0L) Duration.INFINITE
+		else (fakeNow.timeMark - timeMark).milliseconds
+
+	operator fun minus(other: TimeMark): Duration {
+		if (other.timeMark == timeMark)
+			return 0.milliseconds
+		if (other.timeMark == 0L)
+			return Duration.INFINITE
+		if (timeMark == 0L)
+			return -Duration.INFINITE
+		return (timeMark - other.timeMark).milliseconds
+	}
+
+	companion object {
+		fun now() = TimeMark(System.currentTimeMillis())
+		fun farPast() = TimeMark(0L)
+		fun ago(timeDelta: Duration): TimeMark {
+			if (timeDelta.isFinite()) {
+				return TimeMark(System.currentTimeMillis() - timeDelta.inWholeMilliseconds)
+			}
+			require(timeDelta.isPositive())
+			return farPast()
+		}
+	}
+
+	override fun hashCode(): Int {
+		return timeMark.hashCode()
+	}
+
+	override fun equals(other: Any?): Boolean {
+		return other is TimeMark && other.timeMark == timeMark
+	}
+
+	override fun toString(): String {
+		return "https://time.is/$timeMark"
+	}
+
+	override fun compareTo(other: TimeMark): Int {
+		return this.timeMark.compareTo(other.timeMark)
+	}
 }