From 915ab96b2444fa2e93d99a9747861b619d77f8f8 Mon Sep 17 00:00:00 2001 From: Linnea Gräf Date: Sun, 17 Nov 2024 16:58:30 +0100 Subject: refactor: Fix overlapping filenames for StringUtil --- src/main/kotlin/features/mining/PristineProfitTracker.kt | 2 +- src/main/kotlin/util/StringUtil.kt | 4 ++++ src/main/kotlin/util/stringutil.kt | 6 ------ 3 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 src/main/kotlin/util/stringutil.kt diff --git a/src/main/kotlin/features/mining/PristineProfitTracker.kt b/src/main/kotlin/features/mining/PristineProfitTracker.kt index 9d24445..0f50918 100644 --- a/src/main/kotlin/features/mining/PristineProfitTracker.kt +++ b/src/main/kotlin/features/mining/PristineProfitTracker.kt @@ -16,7 +16,7 @@ import moe.nea.firmament.util.FirmFormatters.formatCommas import moe.nea.firmament.util.SkyblockId import moe.nea.firmament.util.data.ProfileSpecificDataHolder import moe.nea.firmament.util.formattedString -import moe.nea.firmament.util.parseIntWithComma +import moe.nea.firmament.util.StringUtil.parseIntWithComma import moe.nea.firmament.util.useMatch object PristineProfitTracker : FirmamentFeature { diff --git a/src/main/kotlin/util/StringUtil.kt b/src/main/kotlin/util/StringUtil.kt index d9253cb..f080d5a 100644 --- a/src/main/kotlin/util/StringUtil.kt +++ b/src/main/kotlin/util/StringUtil.kt @@ -5,5 +5,9 @@ object StringUtil { return splitToSequence(" ") // TODO: better boundaries } + fun parseIntWithComma(string: String): Int { + return string.replace(",", "").toInt() + } + fun Iterable.unwords() = joinToString(" ") } diff --git a/src/main/kotlin/util/stringutil.kt b/src/main/kotlin/util/stringutil.kt deleted file mode 100644 index 56f8dbe..0000000 --- a/src/main/kotlin/util/stringutil.kt +++ /dev/null @@ -1,6 +0,0 @@ - -package moe.nea.firmament.util - -fun parseIntWithComma(string: String): Int { - return string.replace(",", "").toInt() -} -- cgit