Random Code Cleanup (#516)

Sonar Lint for the win #516

4 files changed, 23 insertions, 39 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt
index be61e4c1c..c18274b05 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt
@@ -112,10 +112,8 @@ class CrimsonIsleReputationHelper(skyHanniMod: SkyHanniMod) {
         if (!LorenzUtils.inSkyBlock) return
         if (LorenzUtils.skyBlockIsland != IslandType.CRIMSON_ISLE) return
 
-        if (config.useHotkey) {
-            if (!OSUtils.isKeyHeld(config.hotkey)) {
-                return
-            }
+        if (config.useHotkey && !OSUtils.isKeyHeld(config.hotkey)) {
+            return
         }
 
         config.position.renderStringsAndItems(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt
index 2962f7561..f4809c10b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/DailyQuestHelper.kt
@@ -293,10 +293,8 @@ class DailyQuestHelper(val reputationHelper: CrimsonIsleReputationHelper) {
 
     fun finishMiniBoss(miniBoss: CrimsonMiniBoss) {
         val miniBossQuest = getQuest<MiniBossQuest>() ?: return
-        if (miniBossQuest.miniBoss == miniBoss) {
-            if (miniBossQuest.state == QuestState.ACCEPTED) {
-                updateProcessQuest(miniBossQuest, miniBossQuest.haveAmount + 1)
-            }
+        if (miniBossQuest.miniBoss == miniBoss && miniBossQuest.state == QuestState.ACCEPTED) {
+            updateProcessQuest(miniBossQuest, miniBossQuest.haveAmount + 1)
         }
     }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt
index 6077d0336..9de600370 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/dailyquest/QuestLoader.kt
@@ -58,12 +58,10 @@ class QuestLoader(private val dailyQuestHelper: DailyQuestHelper) {
     private fun checkQuest(name: String, green: Boolean, needAmount: Int) {
         val oldQuest = getQuestByName(name)
         if (oldQuest != null) {
-            if (green) {
-                if (oldQuest.state != QuestState.READY_TO_COLLECT && oldQuest.state != QuestState.COLLECTED) {
-                    oldQuest.state = QuestState.READY_TO_COLLECT
-                    dailyQuestHelper.update()
-                    LorenzUtils.debug("Reputation Helper: Tab-List updated ${oldQuest.internalName} (This should not happen)")
-                }
+            if (green && oldQuest.state != QuestState.READY_TO_COLLECT && oldQuest.state != QuestState.COLLECTED) {
+                oldQuest.state = QuestState.READY_TO_COLLECT
+                dailyQuestHelper.update()
+                LorenzUtils.debug("Reputation Helper: Tab-List updated ${oldQuest.internalName} (This should not happen)")
             }
             return
         }
@@ -131,19 +129,15 @@ class QuestLoader(private val dailyQuestHelper: DailyQuestHelper) {
             val stack = event.inventoryItems[22] ?: continue
 
             val completed = stack.getLore().any { it.contains("Completed!") }
-            if (completed) {
-                if (quest.state != QuestState.COLLECTED) {
-                    quest.state = QuestState.COLLECTED
-                    dailyQuestHelper.update()
-                }
+            if (completed && quest.state != QuestState.COLLECTED) {
+                quest.state = QuestState.COLLECTED
+                dailyQuestHelper.update()
             }
 
             val accepted = !stack.getLore().any { it.contains("Click to start!") }
-            if (accepted) {
-                if (quest.state == QuestState.NOT_ACCEPTED) {
-                    quest.state = QuestState.ACCEPTED
-                    dailyQuestHelper.update()
-                }
+            if (accepted && quest.state == QuestState.NOT_ACCEPTED) {
+                quest.state = QuestState.ACCEPTED
+                dailyQuestHelper.update()
             }
         }
     }
@@ -155,15 +149,13 @@ class QuestLoader(private val dailyQuestHelper: DailyQuestHelper) {
             val state = QuestState.valueOf(split[1])
             val needAmount = split[2].toInt()
             val quest = addQuest(name, state, needAmount)
-            if (quest is ProgressQuest) {
-                if (split.size == 4) {
-                    try {
-                        val haveAmount = split[3].toInt()
-                        quest.haveAmount = haveAmount
-                    } catch (e: IndexOutOfBoundsException) {
-                        println("text: '$text'")
-                        e.printStackTrace()
-                    }
+            if (quest is ProgressQuest && split.size == 4) {
+                try {
+                    val haveAmount = split[3].toInt()
+                    quest.haveAmount = haveAmount
+                } catch (e: IndexOutOfBoundsException) {
+                    println("text: '$text'")
+                    e.printStackTrace()
                 }
             }
             addQuest(quest)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt
index 3263dc744..ad10e1879 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/miniboss/DailyMiniBossHelper.kt
@@ -56,12 +56,8 @@ class DailyMiniBossHelper(private val reputationHelper: CrimsonIsleReputationHel
 
     private fun needMiniBossQuest(miniBoss: CrimsonMiniBoss): Boolean {
         val bossQuest = reputationHelper.questHelper.getQuest<MiniBossQuest>()
-        if (bossQuest != null) {
-            if (bossQuest.miniBoss == miniBoss) {
-                if (bossQuest.state == QuestState.ACCEPTED) {
-                    return true
-                }
-            }
+        if (bossQuest != null && bossQuest.miniBoss == miniBoss && bossQuest.state == QuestState.ACCEPTED) {
+            return true
         }
 
         return false