Random Code Cleanup (#516)

Sonar Lint for the win #516

3 files changed, 5 insertions, 13 deletions

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)
                         }
                     }
                 }