2 files changed, 31 insertions, 9 deletions
diff --git a/src/main/kotlin/moe/nea/firmament/util/FirmFormatters.kt b/src/main/kotlin/moe/nea/firmament/util/FirmFormatters.kt
index c07f53d..087bb2f 100644
--- a/src/main/kotlin/moe/nea/firmament/util/FirmFormatters.kt
+++ b/src/main/kotlin/moe/nea/firmament/util/FirmFormatters.kt
@@ -11,21 +11,22 @@ import kotlin.math.absoluteValue
 import kotlin.time.Duration
 
 object FirmFormatters {
-    fun formatCurrency(long: Long, segments: Int = 3): String {
+    fun formatCommas(int: Int, segments: Int = 3): String = formatCommas(int.toLong(), segments)
+    fun formatCommas(long: Long, segments: Int = 3): String {
         val α = long / 1000
         if (α != 0L) {
-            return formatCurrency(α, segments) + "," + (long - α * 1000).toString().padStart(3, '0')
+            return formatCommas(α, segments) + "," + (long - α * 1000).toString().padStart(3, '0')
         }
         return long.toString()
     }
 
-    fun formatCurrency(float: Float, fractionalDigits: Int): String = formatCurrency(float.toDouble(), fractionalDigits)
-    fun formatCurrency(double: Double, fractionalDigits: Int): String {
+    fun formatCommas(float: Float, fractionalDigits: Int): String = formatCommas(float.toDouble(), fractionalDigits)
+    fun formatCommas(double: Double, fractionalDigits: Int): String {
         val long = double.toLong()
         val δ = (double - long).absoluteValue
         val μ = pow(10, fractionalDigits)
         val digits = (μ * δ).toInt().toString().padStart(fractionalDigits, '0').trimEnd('0')
-        return formatCurrency(long) + (if (digits.isEmpty()) "" else ".$digits")
+        return formatCommas(long) + (if (digits.isEmpty()) "" else ".$digits")
     }
 
     fun formatDistance(distance: Double): String {
@@ -34,8 +35,29 @@ object FirmFormatters {
         return "%dm".format(distance.toInt())
     }
 
-    fun formatTimespan(duration: Duration): String {
-        return duration.toString()
+    fun formatTimespan(duration: Duration, millis: Boolean = false): String {
+        if (duration.isInfinite()) {
+            return if (duration.isPositive()) "∞"
+            else "-∞"
+        }
+        val sb = StringBuilder()
+        if (duration.isNegative()) sb.append("-")
+        duration.toComponents { days, hours, minutes, seconds, nanoseconds ->
+            if (days > 0) {
+                sb.append(days).append("d")
+            }
+            if (hours > 0) {
+                sb.append(hours).append("h")
+            }
+            if (minutes > 0) {
+                sb.append(minutes).append("m")
+            }
+            sb.append(seconds).append("s")
+            if (millis) {
+                sb.append(nanoseconds / 1_000_000).append("ms")
+            }
+        }
+        return sb.toString()
     }
 
 }
diff --git a/src/main/kotlin/moe/nea/firmament/util/MoulConfigUtils.kt b/src/main/kotlin/moe/nea/firmament/util/MoulConfigUtils.kt
index 3c77dc4..2884dc5 100644
--- a/src/main/kotlin/moe/nea/firmament/util/MoulConfigUtils.kt
+++ b/src/main/kotlin/moe/nea/firmament/util/MoulConfigUtils.kt
@@ -77,9 +77,9 @@ object MoulConfigUtils {
             override fun createInstance(context: XMLContext<*>, element: Element): FirmButtonComponent {
                 return FirmButtonComponent(
                     context.getChildFragment(element),
-                    context.getMethodFromAttribute(element, QName("onClick")),
                     context.getPropertyFromAttribute(element, QName("enabled"), Boolean::class.java)
-                        ?: GetSetter.constant(true)
+                        ?: GetSetter.constant(true),
+                    context.getMethodFromAttribute(element, QName("onClick")),
                 )
             }