creating and using Number.format()

4 files changed, 19 insertions, 18 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt
index 864f4926d..9eb6483a3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/BestiaryData.kt
@@ -17,8 +17,8 @@ import at.hannibal2.skyhanni.utils.ItemUtils.getLore
 import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils.addButton
-import at.hannibal2.skyhanni.utils.NumberUtil
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.format
 import at.hannibal2.skyhanni.utils.NumberUtil.formatLong
 import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimalIfNecessary
 import at.hannibal2.skyhanni.utils.NumberUtil.roundToPrecision
@@ -477,7 +477,7 @@ object BestiaryData {
     }
 
     private fun Long.formatNumber(): String = when (config.numberFormat) {
-        BestiaryConfig.NumberFormatEntry.SHORT -> NumberUtil.format(this)
+        BestiaryConfig.NumberFormatEntry.SHORT -> this.format()
         BestiaryConfig.NumberFormatEntry.LONG -> this.addSeparators()
         else -> "0"
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
index 8632f9d03..8f759415a 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/damageindicator/DamageIndicatorManager.kt
@@ -38,6 +38,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils.round
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.NumberUtil
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.format
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
@@ -231,8 +232,8 @@ object DamageIndicatorManager {
                 val currentDamage = data.damageCounter.currentDamage
                 val currentHealing = data.damageCounter.currentHealing
                 if (currentDamage != 0L || currentHealing != 0L) {
-                    val formatDamage = "§c" + NumberUtil.format(currentDamage)
-                    val formatHealing = "§a+" + NumberUtil.format(currentHealing)
+                    val formatDamage = "§c" + currentDamage.format()
+                    val formatHealing = "§a+" + currentHealing.format()
                     val finalResult = if (currentHealing == 0L) {
                         formatDamage
                     } else if (currentDamage == 0L) {
@@ -250,8 +251,8 @@ object DamageIndicatorManager {
                     diff += 9f
                 }
                 for (damage in data.damageCounter.oldDamages) {
-                    val formatDamage = "§c" + NumberUtil.format(damage.damage) + "/s"
-                    val formatHealing = "§a+" + NumberUtil.format(damage.healing) + "/s"
+                    val formatDamage = "§c" + damage.damage.format() + "/s"
+                    val formatHealing = "§a+" + damage.healing.format() + "/s"
                     val finalResult = if (damage.healing == 0L) {
                         formatDamage
                     } else if (damage.damage == 0L) {
@@ -378,7 +379,7 @@ object DamageIndicatorManager {
                 entityData.healthText = customHealthText
             } else {
                 val color = NumberUtil.percentageColor(health, maxHealth)
-                entityData.healthText = color.getChatColor() + NumberUtil.format(health)
+                entityData.healthText = color.getChatColor() + health.format()
             }
             entityData.timeLastTick = System.currentTimeMillis()
             return entity.uniqueID to entityData
@@ -532,7 +533,7 @@ object DamageIndicatorManager {
 
         return NumberUtil.percentageColor(
             calcHealth.toLong(), calcMaxHealth.toLong(),
-        ).getChatColor() + NumberUtil.format(calcHealth)
+        ).getChatColor() + calcHealth.format()
     }
 
     private fun checkMagmaCube(
@@ -551,7 +552,7 @@ object DamageIndicatorManager {
             else -> {
                 val color = NumberUtil.percentageColor(health.toLong(), 10_000_000)
                 entityData.namePrefix = "§a6/6"
-                return color.getChatColor() + NumberUtil.format(health)
+                return color.getChatColor() + health.format()
             }
         } + " §f"
 
@@ -595,7 +596,7 @@ object DamageIndicatorManager {
         if (calcHealth == -1) return null
 
         val color = NumberUtil.percentageColor(calcHealth.toLong(), maxHealth.toLong())
-        return color.getChatColor() + NumberUtil.format(calcHealth)
+        return color.getChatColor() + calcHealth.format()
     }
 
     private fun checkEnderSlayer(
@@ -653,7 +654,7 @@ object DamageIndicatorManager {
         }
         var result = NumberUtil.percentageColor(
             calcHealth.toLong(), calcMaxHealth.toLong(),
-        ).getChatColor() + NumberUtil.format(calcHealth)
+        ).getChatColor() + calcHealth.format()
 
         if (!SkyHanniMod.feature.slayer.endermen.phaseDisplay) {
             result = ""
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
index 2cac59010..b9d60f507 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/endernodetracker/EnderNodeTracker.kt
@@ -216,13 +216,13 @@ object EnderNodeTracker {
 
         addAsSingletonList("§5§lEnder Node Tracker")
         addAsSingletonList("§d${data.totalNodesMined.addSeparators()} Ender Nodes mined")
-        addAsSingletonList("§6${format(lootProfit.values.sum())} Coins made")
+        addAsSingletonList("§6${lootProfit.values.sum().format()} Coins made")
         addAsSingletonList(" ")
         addAsSingletonList("§b${data.totalEndermiteNests.addSeparators()} §cEndermite Nest")
 
         for (item in EnderNode.entries.subList(0, 11)) {
             val count = (data.lootCount[item] ?: 0).addSeparators()
-            val profit = format(lootProfit[item] ?: 0.0)
+            val profit = (lootProfit[item] ?: 0.0).format()
             addAsSingletonList("§b$count ${item.displayName} §7(§6$profit§7)")
         }
         addAsSingletonList(" ")
@@ -230,16 +230,16 @@ object EnderNodeTracker {
         val totalEnderArmor = calculateEnderArmor(data)
         addAsSingletonList(
             "§b${totalEnderArmor.addSeparators()} §5Ender Armor " +
-                "§7(§6${format(totalEnderArmor * 10_000)}§7)"
+                "§7(§6${(totalEnderArmor * 10_000).format()}§7)"
         )
         for (item in EnderNode.entries.subList(11, 16)) {
             val count = (data.lootCount[item] ?: 0).addSeparators()
-            val profit = format(lootProfit[item] ?: 0.0)
+            val profit = (lootProfit[item] ?: 0.0).format()
             addAsSingletonList("§b$count ${item.displayName} §7(§6$profit§7)")
         }
         // enderman pet rarities
         val (c, u, r, e, l) = EnderNode.entries.subList(16, 21).map { (data.lootCount[it] ?: 0).addSeparators() }
-        val profit = format(EnderNode.entries.subList(16, 21).sumOf { lootProfit[it] ?: 0.0 })
+        val profit = EnderNode.entries.subList(16, 21).sumOf { lootProfit[it] ?: 0.0 }.format()
         addAsSingletonList("§f$c§7-§a$u§7-§9$r§7-§5$e§7-§6$l §fEnderman Pet §7(§6$profit§7)")
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostUtil.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostUtil.kt
index 61e03cf97..d5e632d49 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostUtil.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostUtil.kt
@@ -4,8 +4,8 @@ import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.config.ConfigManager
 import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.utils.ChatUtils
-import at.hannibal2.skyhanni.utils.NumberUtil
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
+import at.hannibal2.skyhanni.utils.NumberUtil.format
 import at.hannibal2.skyhanni.utils.NumberUtil.roundToPrecision
 import io.github.moulberry.notenoughupdates.util.Utils
 import java.io.FileReader
@@ -132,7 +132,7 @@ object GhostUtil {
                 if (GhostCounter.config.showMax) GhostCounter.bestiaryCurrentKill.addSeparators() else currentKill.addSeparators()
             )
                 .replace("%percentNumber%", percent(GhostCounter.bestiaryCurrentKill.toDouble()))
-                .replace("%killNeeded%", NumberUtil.format(killNeeded))
+                .replace("%killNeeded%", killNeeded.format())
                 .replace("%currentLevel%", currentLevel)
                 .replace("%nextLevel%", nextLevel)
                 .replace("&", "§")