Random Code Cleanup (#516)

Sonar Lint for the win #516

76 files changed, 703 insertions, 1252 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt
index e03126fde..eddd232bd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt
@@ -25,7 +25,6 @@ class AnvilCombineHelper {
         if (chestName != "Anvil") return
 
         val matchLore = mutableListOf<String>()
-//        var compareItem: ItemStack? = null
 
         for (slot in chest.inventorySlots) {
             if (slot == null) continue
@@ -34,13 +33,9 @@ class AnvilCombineHelper {
             if (slot.stack == null) continue
 
             if (slot.slotNumber == 29) {
-//                slot highlight LorenzColor.GREEN
                 val lore = slot.stack.getLore()
-//                compareItem = slot.stack
                 matchLore.addAll(lore)
                 break
-//            } else if (slot.slotIndex == 29) {
-//                slot highlight LorenzColor.YELLOW
             }
         }
 
@@ -56,19 +51,6 @@ class AnvilCombineHelper {
             if (matchLore == slot.stack.getLore()) {
                 slot highlight LorenzColor.GREEN
             }
-
-//            if (compareItem == slot.stack) {
-//                slot highlight LorenzColor.GREEN
-//            } else if (compareItem.metadata == slot.stack.metadata) {
-//                slot highlight LorenzColor.YELLOW
-//            }
-
-//            if (slot.slotNumber == 3) {
-////                slot highlight LorenzColor.GREEN
-////            } else if (slot.slotIndex == 4) {
-////                slot highlight LorenzColor.YELLOW
-////            }
-//            }
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt
index 7f4b5cf46..e7ebc2d9e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt
@@ -84,10 +84,8 @@ class BingoNextStepHelper {
                 }
             }
 
-            if (!step.done && !parentDone && requirementsToDo == 0) {
-                if (!currentSteps.contains(step)) {
+            if (!step.done && !parentDone && requirementsToDo == 0 && !currentSteps.contains(step)) {
                     currentSteps = currentSteps.editCopy { add(step) }
-                }
             }
         }
 
@@ -345,7 +343,6 @@ class BingoNextStepHelper {
             "Combat",
             12
         ).also { it requires IslandType.DEEP_CAVERNS.getStep() }
-
 //        enchantedCharcoal(7)
 //        compactor(7)
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt
index 7beff8920..3e40f0b85 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt
@@ -48,10 +48,8 @@ class CompactBingoChat {
             return false
         }
 
-        if (inSkillLevelUp) {
-            if (!message.contains("Access to") && !message.endsWith(" Enchantment")) {
-                return true
-            }
+        if (inSkillLevelUp && !message.contains("Access to") && !message.endsWith(" Enchantment")) {
+            return true
         }
 
         return false
diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
index 92602860f..7f080ae39 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
@@ -59,7 +59,6 @@ class MinionCraftHelper {
         }
 
         if (!event.isMod(3)) return
-//        if (!event.isMod(60)) return
 
         val mainInventory = Minecraft.getMinecraft()?.thePlayer?.inventory?.mainInventory ?: return
 
@@ -161,10 +160,8 @@ class MinionCraftHelper {
 
                     for (ingredient in recipe.ingredients) {
                         val id = ingredient.internalItemId
-                        if (!id.contains("_GENERATOR_")) {
-                            if (!allIngredients.contains(id)) {
-                                allIngredients.add(id)
-                            }
+                        if (!id.contains("_GENERATOR_") && !allIngredients.contains(id)) {
+                            allIngredients.add(id)
                         }
                     }
                 }
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
-//    }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/cosmetics/CosmeticFollowingLine.kt b/src/main/java/at/hannibal2/skyhanni/features/cosmetics/CosmeticFoll