diff options
| author | HiZe_ <superhize@hotmail.com> | 2023-08-10 18:41:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-10 18:41:40 +0200 |
| commit | 1064ed4a42b51a4270d29d2bb45e9aa7d8e7211f (patch) | |
| tree | 2df9f6833930da38aafa4a98ef2d500def467064 /src/main/java/at/hannibal2/skyhanni/utils | |
| parent | 56009ab8253ca356aa7c460c79c839abe7955075 (diff) | |
| download | skyhanni-1064ed4a42b51a4270d29d2bb45e9aa7d8e7211f.tar.gz skyhanni-1064ed4a42b51a4270d29d2bb45e9aa7d8e7211f.tar.bz2 skyhanni-1064ed4a42b51a4270d29d2bb45e9aa7d8e7211f.zip | |
Merge pull request #379
* removed unused function format3 in NumberUtil
* removed toInt and toBoolean in LorenzUtils
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
3 files changed, 1 insertions, 31 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt index a2bcc4020..71dfb1edb 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt @@ -474,7 +474,4 @@ object LorenzUtils { javaClass.getDeclaredField("modifiers").makeAccessible().set(this, modifiers and (Modifier.FINAL.inv())) return this } - - fun Int.toBoolean() = this != 0 - fun Boolean.toInt() = if (!this) 0 else 1 }
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt index 3ad3e7a4d..d76251ddf 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt @@ -66,32 +66,6 @@ object NumberUtil { } } - @JvmStatic - fun format3(value: Number, digit: Int): String { - @Suppress("NAME_SHADOWING") - val value = value.toLong() - //Long.MIN_VALUE == -Long.MIN_VALUE so we need an adjustment here - if (value == Long.MIN_VALUE) return format3(Long.MIN_VALUE + 1, digit) - if (value < 0) return "-" + format3(-value, digit) - if (value < 1000) return value.toString() //deal with small numbers - - val (divideBy, suffix) = suffixes.floorEntry(value) - - var truncated = value / (divideBy / 10) //the number part of the output times 10 - - val truncatedAt = if (suffix == "M") 1000 else if (suffix == "B") 1000000 else 100 - - val hasDecimal = truncated < truncatedAt && truncated / 10.0 != (truncated / 10).toDouble() - - // Add check for value greater than 1000000000 (1 Billion) - return if (value > 1000000000 && hasDecimal) { - val decimalPart = (value % 1000000000) / 1000000 // Extract 3 digits after the decimal point - "${(truncated / 10).toDouble().toString().take(digit + 2)}$suffix" - } else { - if (hasDecimal) (truncated / 10.0).toString().take(digit + 2) + suffix else (truncated / 10).toString() + suffix - } - } - /** * This code was unmodified and taken under CC BY-SA 3.0 license * @link https://stackoverflow.com/a/22186845 diff --git a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt index dabf428d4..7407d5c6b 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/renderables/Renderable.kt @@ -212,5 +212,4 @@ interface Renderable { } } } -} - +}
\ No newline at end of file |