diff options
| author | hannibal2 <24389977+hannibal002@users.noreply.github.com> | 2024-04-13 22:05:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-13 22:05:36 +0200 |
| commit | 6c02dfed05d21d80a90624c432f372cba7f35767 (patch) | |
| tree | d2d657ae17d303a9ab3864e51906928d74745da5 /src/main/java/at/hannibal2/skyhanni/utils | |
| parent | 714a722e748cb082af808c3168e7e7ab0c594adb (diff) | |
| download | skyhanni-6c02dfed05d21d80a90624c432f372cba7f35767.tar.gz skyhanni-6c02dfed05d21d80a90624c432f372cba7f35767.tar.bz2 skyhanni-6c02dfed05d21d80a90624c432f372cba7f35767.zip | |
New Feature: Excavation Profit Tracker (#1432)
Co-authored-by: Empa <42304516+ItsEmpa@users.noreply.github.com>
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/utils')
3 files changed, 5 insertions, 7 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt index 94558d949..5104c52b3 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/ItemUtils.kt @@ -12,6 +12,7 @@ import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.isRecombobulated import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher import at.hannibal2.skyhanni.utils.StringUtils.matches import at.hannibal2.skyhanni.utils.StringUtils.removeColor +import at.hannibal2.skyhanni.utils.StringUtils.removeResets import com.google.gson.GsonBuilder import com.google.gson.JsonObject import net.minecraft.client.Minecraft @@ -293,9 +294,9 @@ object ItemUtils { fun readItemAmount(originalInput: String): Pair<String, Int>? { // This workaround fixes 'Tubto Cacti I Book' - val input = if (originalInput.endsWith(" Book")) { + val input = (if (originalInput.endsWith(" Book")) { originalInput.replace(" Book", "") - } else originalInput + } else originalInput).removeResets() if (itemAmountCache.containsKey(input)) { return itemAmountCache[input]!! @@ -313,9 +314,6 @@ object ItemUtils { string = string.substring(2) val matcher = UtilsPatterns.readAmountAfterPattern.matcher(string) if (!matcher.matches()) { - println("") - println("input: '$input'") - println("string: '$string'") return null } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt b/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt index 97a4ab51c..e6a244f09 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/UtilsPatterns.kt @@ -53,7 +53,7 @@ object UtilsPatterns { ) val readAmountAfterPattern by patternGroup.pattern( "item.amount.behind", - "(?<name>(?:['\\w-]+ ?)+)(?:§8x(?<amount>[\\d,]+))?" + "(?<name>(?:§.)*(?:[^§] ?)+)(?:§8x(?<amount>[\\d,]+))?" ) val timeAmountPattern by patternGroup.pattern( diff --git a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt index a64471e75..46bb84f04 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/tracker/SkyHanniItemTracker.kt @@ -183,7 +183,7 @@ class SkyHanniItemTracker<Data : ItemTrackerData>( } fun addTotalProfit(profit: Double, totalAmount: Long, action: String): Renderable { - val profitFormat = profit.addSeparators() + val profitFormat = profit.toInt().addSeparators() val profitPrefix = if (profit < 0) "§c" else "§6" val tips = if (totalAmount > 0) { |