cleanPlayerName respects playerRankHider option now.

1 files changed, 12 insertions, 1 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
index 8c75475c9..cb7a0fa23 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/StringUtils.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.utils
 
+import at.hannibal2.skyhanni.SkyHanniMod
 import at.hannibal2.skyhanni.mixins.transformers.AccessorChatComponentText
 import at.hannibal2.skyhanni.utils.GuiRenderUtils.darkenColor
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
@@ -80,7 +81,7 @@ object StringUtils {
     inline fun <T> Pattern.matchMatcher(text: String, consumer: Matcher.() -> T) =
         matcher(text).let { if (it.matches()) consumer(it) else null }
 
-    fun String.cleanPlayerName(): String {
+    private fun String.internalCleanPlayerName(): String {
         val split = trim().split(" ")
         return if (split.size > 1) {
             split[1].removeColor()
@@ -89,6 +90,16 @@ object StringUtils {
         }
     }
 
+    fun String.cleanPlayerName(displayName: Boolean = false): String {
+        return if (displayName) {
+            if (SkyHanniMod.feature.chat.playerMessage.playerRankHider) {
+                "§b" + internalCleanPlayerName()
+            } else this
+        } else {
+            internalCleanPlayerName()
+        }
+    }
+
     inline fun <T> List<Pattern>.matchMatchers(text: String, consumer: Matcher.() -> T): T? {
         for (pattern in iterator()) {
             pattern.matchMatcher<T>(text) {