diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-11-18 22:46:20 +0100 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-11-18 22:46:20 +0100 |
| commit | cfa64d7f4360093523029b52dabea8e30ce966b6 (patch) | |
| tree | 8ea87056d0a14f075e9af6bbc862b25fcc43bc67 /src/main/java/at/hannibal2/skyhanni/utils | |
| parent | 869d7a10cb1bf3d471655e96217325a767f7d943 (diff) | |
| download | skyhanni-cfa64d7f4360093523029b52dabea8e30ce966b6.tar.gz skyhanni-cfa64d7f4360093523029b52dabea8e30ce966b6.tar.bz2 skyhanni-cfa64d7f4360093523029b52dabea8e30ce966b6.zip | |
fixed visitor problems and code cleanup
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt | 6 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/SimpleTimeMark.kt | 7 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt index 2e71ab2fa..967f183f6 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt @@ -133,9 +133,9 @@ object LorenzUtils { var multiplier = 1.0 repeat(decimals) { multiplier *= 10 } val result = kotlin.math.round(this * multiplier) / multiplier - val a = result.toString() - val b = toString() - return if (a.length > b.length) this else result.toFloat() + val a = result.toString().length + val b = toString().length + return if (a > b) this else result.toFloat() } // TODO replace all calls with regex diff --git a/src/main/java/at/hannibal2/skyhanni/utils/SimpleTimeMark.kt b/src/main/java/at/hannibal2/skyhanni/utils/SimpleTimeMark.kt index eebcc5f06..3e30f300c 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/SimpleTimeMark.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/SimpleTimeMark.kt @@ -7,8 +7,6 @@ import kotlin.time.Duration.Companion.milliseconds @JvmInline value class SimpleTimeMark(private val millis: Long) { -// operator fun plus(other: SimpleTimeMark) = -// (millis + other.millis).milliseconds operator fun minus(other: SimpleTimeMark) = (millis - other.millis).milliseconds @@ -18,10 +16,7 @@ value class SimpleTimeMark(private val millis: Long) { operator fun minus(other: Duration) = plus(-other) -// operator fun minus(other: Duration) = -// SimpleTimeMark(millis - other.inWholeMilliseconds) - - fun passedSince() = if (millis == 0L) Duration.INFINITE else now() - this + fun passedSince() = now() - this fun timeUntil() = -passedSince() |