Random Code Cleanup (#516)

Sonar Lint for the win #516

3 files changed, 12 insertions, 38 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
index ac83feb51..3296ab782 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
@@ -36,20 +36,16 @@ class PlayerDeathMessages {
         val message = event.message
         deathMessagePattern.matchMatcher(message) {
             val name = group("name")
-            if (SkyHanniMod.feature.markedPlayers.highlightInChat && !LorenzUtils.inDungeons && !LorenzUtils.inKuudraFight) {
-                if (MarkedPlayerManager.isMarkedPlayer(name)) {
-                    val reason = group("reason").removeColor()
-                    LorenzUtils.chat(" §c☠ §e$name §7$reason")
-                    event.blockedReason = "marked_player_death"
-                    return
-                }
+            if (SkyHanniMod.feature.markedPlayers.highlightInChat && !LorenzUtils.inDungeons && !LorenzUtils.inKuudraFight && MarkedPlayerManager.isMarkedPlayer(name)) {
+                val reason = group("reason").removeColor()
+                LorenzUtils.chat(" §c☠ §e$name §7$reason")
+                event.blockedReason = "marked_player_death"
+                return
             }
 
 
-            if (isHideFarDeathsEnabled()) {
-                if (System.currentTimeMillis() > lastTimePlayerSeen.getOrDefault(name, 0) + 30_000) {
-                    event.blockedReason = "far_away_player_death"
-                }
+            if (isHideFarDeathsEnabled() && System.currentTimeMillis() > lastTimePlayerSeen.getOrDefault(name, 0) + 30_000) {
+                event.blockedReason = "far_away_player_death"
             }
         }
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt
index ffa7d53ec..6d238b8b3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt
@@ -32,7 +32,7 @@ class Translator {
         val message = event.message
         if (message.getPlayerName() == "-") return
 
-        val editedComponent = event.chatComponent.transformIf({ siblings.size > 0 }) { siblings.last() }
+        val editedComponent = event.chatComponent.transformIf({ siblings.isNotEmpty() }) { siblings.last() }
 
         val clickStyle = createClickStyle(message.removeColor(), editedComponent.chatStyle)
         editedComponent.setChatStyle(clickStyle)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt
index c9311d11e..e63c925df 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/playerchat/PlayerChatModifier.kt
@@ -48,10 +48,8 @@ class PlayerChatModifier {
     private fun addComponent(foundCommands: MutableList<IChatComponent>, message: IChatComponent) {
         val clickEvent = message.chatStyle.chatClickEvent
         if (clickEvent != null) {
-            if (foundCommands.size == 1) {
-                if (foundCommands[0].chatStyle.chatClickEvent.value == clickEvent.value) {
-                    return
-                }
+            if (foundCommands.size == 1 && foundCommands[0].chatStyle.chatClickEvent.value == clickEvent.value) {
+                return
             }
             foundCommands.add(message)
         }
@@ -74,12 +72,8 @@ class PlayerChatModifier {
             }
         }
 
-        if (SkyHanniMod.feature.chat.chatFilter) {
-            if (string.contains("§r§f: ")) {
-                if (PlayerChatFilter.shouldChatFilter(string)) {
-                    string = string.replace("§r§f: ", "§r§7: ")
-                }
-            }
+        if (SkyHanniMod.feature.chat.chatFilter && string.contains("§r§f: ") && PlayerChatFilter.shouldChatFilter(string)) {
+            string = string.replace("§r§f: ", "§r§7: ")
         }
 
         if (SkyHanniMod.feature.markedPlayers.highlightInChat) {
@@ -90,20 +84,4 @@ class PlayerChatModifier {
 
         return string
     }
-
-//    private fun shouldChatFilter(input: String): Boolean {
-//        val text = input.lowercase()
-//
-//        //Low baller
-//        if (text.contains("lowballing")) return true
-//        if (text.contains("lowballer")) return true
-//
-//        //Trade
-//        if (text.contains("buy")) return true
-//        if (text.contains("sell")) return true
-//        if (text.contains("on my ah")) return true
-//
-//
-//        return false
-//    }
 }