Merge pull request #20

* regex for trophy fish + customizable formatting options

* hide duplicate fish

* don't load trophy fish repeatedly per profile + cleanup

* rework config option for readability

* i messed up the regex in two ways that somehow cancelled out, but thi…

* using config instead of SkyHanniMod.feature.fishing everywhere

* Added to changelog files and give credits

1 files changed, 15 insertions, 6 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
index 6da701b78..397613f40 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/NumberUtil.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.utils
 
+import at.hannibal2.skyhanni.utils.NumberUtil.addSuffix
 import java.text.NumberFormat
 import java.util.*
 import java.util.regex.Pattern
@@ -74,17 +75,25 @@ object NumberUtil {
         return (this * scale).roundToInt().toFloat() / scale
     }
 
-    fun Number.addSuffix(): String {
+    fun Number.ordinal(): String {
         val long = this.toLong()
-        if (long in 11..13) return "${this}th"
+        if (long % 100 in 11..13) return "th"
         return when (long % 10) {
-            1L -> "${this}st"
-            2L -> "${this}nd"
-            3L -> "${this}rd"
-            else -> "${this}th"
+            1L -> "st"
+            2L -> "nd"
+            3L -> "rd"
+            else -> "th"
         }
     }
 
+    fun Number.addSuffix(): String {
+        return this.toString() + this.ordinal()
+    }
+
+    fun Number.addSeparators(): String {
+        return NumberFormat.getNumberInstance().format(this)
+    }
+
     fun String.romanToDecimalIfNeeded() = toIntOrNull() ?: romanToDecimal()
 
     /**