Internal Change: Reformat Code to match .editorconfig (#628)

Code cleanup done everywhere #628

56 files changed, 414 insertions, 212 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt
index b59eae0b2..ee1fc5874 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt
@@ -24,6 +24,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 class BingoCardDisplay {
 
     private var display = emptyList<String>()
+
     // TODO USE SH-REPO
     private val goalCompletePattern = "§6§lBINGO GOAL COMPLETE! §r§e(?<name>.*)".toPattern()
 
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 8e74b434f..2960b2d22 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoNextStepHelper.kt
@@ -28,6 +28,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 class BingoNextStepHelper {
     private val config get() = SkyHanniMod.feature.event.bingo.bingoCard
     private var dirty = true
+
     // TODO USE SH-REPO
     private val crystalObtainedPattern = " *§r§e(?<crystalName>Topaz|Sapphire|Jade|Amethyst|Amber) Crystal".toPattern()
     private val itemIslandRequired = mutableMapOf<String, IslandVisitStep>()
@@ -85,7 +86,7 @@ class BingoNextStepHelper {
             }
 
             if (!step.done && !parentDone && requirementsToDo == 0 && !currentSteps.contains(step)) {
-                    currentSteps = currentSteps.editCopy { add(step) }
+                currentSteps = currentSteps.editCopy { add(step) }
             }
         }
 
@@ -248,22 +249,22 @@ class BingoNextStepHelper {
 
         if (description == "Craft an Emerald Ring.") {
             return CraftStep("Emerald Ring") requires (
-                    ItemsStep(
-                        "32x Enchanted Emerald",
-                        "Emerald",
-                        160 * 32,
-                        mapOf("Emerald" to 1, "Enchanted Emerald" to 160)
-                    ) requires IslandType.DWARVEN_MINES.getStep())
+                ItemsStep(
+                    "32x Enchanted Emerald",
+                    "Emerald",
+                    160 * 32,
+                    mapOf("Emerald" to 1, "Enchanted Emerald" to 160)
+                ) requires IslandType.DWARVEN_MINES.getStep())
         }
 
         if (description == "Obtain a Mathematical Hoe Blueprint.") {
             return CraftStep("Mathematical Hoe Blueprint") requires (
-                    ItemsStep(
-                        "32x Jacob's Ticket",
-                        "Jacob's Ticket",
-                        32,
-                        mapOf("Jacob's Ticket" to 1)
-                    ).addItemRequirements() requires IslandType.GARDEN.getStep())
+                ItemsStep(
+                    "32x Jacob's Ticket",
+                    "Jacob's Ticket",
+                    32,
+                    mapOf("Jacob's Ticket" to 1)
+                ).addItemRequirements() requires IslandType.GARDEN.getStep())
         }
 
         crystalPattern.matchMatcher(description) {
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 0dc99f595..8657f76ee 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt
@@ -23,6 +23,7 @@ import kotlin.time.Duration.Companion.seconds
 
 class MinionCraftHelper {
     private val config get() = SkyHanniMod.feature.event.bingo
+
     // TODO USE SH-REPO
     private var minionNamePattern = "(?<name>.*) Minion (?<number>.*)".toPattern()
     private var display = emptyList<String>()
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 87692135e..b9088bac6 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/PlayerDeathMessages.kt
@@ -37,7 +37,10 @@ class PlayerDeathMessages {
         val message = event.message
         deathMessagePattern.matchMatcher(message) {
             val name = group("name")
-            if (SkyHanniMod.feature.markedPlayers.highlightInChat && !LorenzUtils.inDungeons && !LorenzUtils.inKuudraFight && MarkedPlayerManager.isMarkedPlayer(name)) {
+            if (SkyHanniMod.feature.markedPlayers.highlightInChat && !LorenzUtils.inDungeons && !LorenzUtils.inKuudraFight && MarkedPlayerManager.isMarkedPlayer(
+                    name
+                )
+            ) {
                 val reason = group("reason").removeColor()
                 LorenzUtils.chat(" §c☠ §e$name §7$reason", false)
                 event.blockedReason = "marked_player_death"
@@ -45,7 +48,11 @@ class PlayerDeathMessages {
             }
 
 
-            if (isHideFarDeathsEnabled() && System.currentTimeMillis() > lastTimePlayerSeen.getOrDefault(name, 0) + 30_000) {
+            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/WatchdogHider.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/WatchdogHider.kt
index 739eaa123..c5eefc603 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/WatchdogHider.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/WatchdogHider.kt
@@ -23,11 +23,13 @@ class WatchdogHider {
                 startLineComponent = event.chatComponent
                 blockedLines = 0
             }
+
             watchdogAnnouncementLine -> {
                 ChatManager.retractMessage(startLineComponent, "watchdog")
                 startLineComponent = null
                 inWatchdog = true
             }
+
             watchdogEndLine -> {
                 event.blockedReason = "watchdog"
                 inWatchdog = false
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaFontRenderer.kt b/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaFontRenderer.kt
index 981b7b33a..469fc2f3c 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaFontRenderer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaFontRenderer.kt
@@ -36,7 +36,7 @@ class ChromaFontRenderer(private val baseColor: Int) {
         }
     }
 
-    fun newChromaEnv() : ChromaFontRenderer {
+    fun newChromaEnv(): ChromaFontRenderer {
         if (ShaderHelper.areShadersSupported()) {
             ChromaShaderManager.begin()
             GlStateManager.shadeModel(GL11.GL_SMOOTH)
@@ -44,7 +44,7 @@ class ChromaFontRenderer(private val baseColor: Int) {
         return this
     }
 
-    fun bindActualColor() : ChromaFontRenderer {
+    fun bindActualColor(): ChromaFontRenderer {
         GlStateManager.color(
             ColorUtils.getRed(baseColor).toFloat() / 255f,
             ColorUtils.getGreen(baseColor).toFloat() / 255f,
@@ -54,7 +54,7 @@ class ChromaFontRenderer(private val baseColor: Int) {
         return this
     }
 
-    fun endChromaEnv() : ChromaFontRenderer {
+    fun endChromaEnv(): ChromaFontRenderer {
         if (ShaderHelper.areShadersSupported()) {
             ChromaShaderManager.end()
             GlStateManager.shadeModel(GL11.GL_FLAT)
@@ -63,4 +63,4 @@ class ChromaFontRenderer(private val baseColor: Int) {
     }
 
     fun getChromaState() = chromaOn
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShader.kt b/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShader.kt
index 00215b032..e7bedbdcd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chroma/ChromaShader.kt
@@ -22,7 +22,8 @@ object ChromaShader : Shader("chroma", "chroma") {
             SkyHanniMod.feature.chroma.chromaSize * (Minecraft.getMinecraft().displayWidth / 100f)
         }
         registerUniform(Uniform.UniformType.FLOAT, "timeOffset") {
-            var ticks = (MinecraftData.totalTicks / 2) + (Minecraft.getMinecraft() as AccessorMinecraft).timer.renderPartialTicks
+            var ticks =
+                (MinecraftData.totalTicks / 2) + (Minecraft.getMinecraft() as AccessorMinecraft).timer.renderPartialTicks
 
             ticks = when (SkyHanniMod.feature.chroma.chromaDirection) {
                 0, 2 -> ticks
@@ -44,4 +45,4 @@ object ChromaShader : Shader("chroma", "chroma") {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostData.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostData.kt
index 69094b991..abcf2dbba 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/ghostcounter/GhostData.kt
@@ -6,16 +6,16 @@ import kotlin.math.roundToInt
 object GhostData {
 
     private var session = mutableMapOf(
-            Option.KILLS to 0.0,
-            Option.SORROWCOUNT to 0.0,
-            Option.VOLTACOUNT to 0.0,
-            Option.PLASMACOUNT to 0.0,
-            Option.GHOSTLYBOOTS to 0.0,
-            Option.BAGOFCASH to 0.0,
-            Option.TOTALDROPS to 0.0,
-            Option.SCAVENGERCOINS to 0.0,
-            Option.MAXKILLCOMBO to 0.0,
-            Option.SKILLXPGAINED to 0.0
+        Option.KILLS to 0.0,
+        Option.SORROWCOUNT to 0.0,
+        Option.VOLTACOUNT to 0.0,
+        Option.PLASMACOUNT to 0.0,
+        Option.GHOSTLYBOOTS to 0.0,
+        Option.BAGOFCASH to 0.0,
+        Option.TOTALDROPS to 0.0,
+        Option.SCAVENGERCOINS to 0.0,
+        Option.MAXKILLCOMBO to 0.0,
+        Option.SKILLXPGAINED to 0.0
     )
 
     val bestiaryData = mutableMapOf<Int, Int>().apply {
@@ -34,11 +34,11 @@ object GhostData {
                 11 -> 750
                 12 -> 1_500
                 13 -> 2_000
-                14,15,16,17 -> 2_500
+                14, 15, 16, 17 -> 2_500
                 18 -> 3_000
-                19,20 -> 3_500
+                19, 20 -> 3_500
                 21 -> 25_000
-                22,23,24,25 -> 50_000
+                22, 23, 24, 25 -> 50_000
                 else -> 0
             }
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt
index 07a4edf18..6e5fc27bd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCleanEnd.kt
@@ -90,7 +90,8 @@ class DungeonCleanEnd {
             && DungeonAPI.isOneOf("F3", "M3")
             && entity is EntityGuardian
             && entity.entityId != lastBossId
-            && Minecraft.getMinecraft().thePlayer.isSneaking) {
+            && Minecraft.getMinecraft().thePlayer.isSneaking
+        ) {
             return
         }
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt
index 88ab543f0..36788e4b3 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt
@@ -88,7 +88,10 @@ class DungeonDeathCounter {
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
         if (!isEnabled()) return
 
-        SkyHanniMod.feature.dungeon.deathCounterPos.renderString(DungeonMilestonesDisplay.color + display, posLabel = "Dungeon Death Counter")
+        SkyHanniMod.feature.dungeon.deathCounterPos.renderString(
+            DungeonMilestonesDisplay.color + display,
+            posLabel = "Dungeon Death Counter"
+        )
     }
 
     private fun isEnabled(): Boolean {
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
index eceb28ad1..b824bc6a5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonFinderFeatures.kt
@@ -26,7 +26,8 @@ class DungeonFinderFeatures {
     private val pricePattern = "([0-9]{2,3}K|[0-9]{1,3}M|[0-9]+\\.[0-9]M|[0-9] ?mil)".toRegex(RegexOption.IGNORE_CASE)

     private val carryPattern = "(carry|cary|carries|caries|comp|to cata [0-9]{2})".toRegex(RegexOption.IGNORE_CASE)

     private val memberPattern = "^ §.*?§.: §.([A-Z]+)§. \\(§.([0-9]+)§.\\)".toRegex(RegexOption.IGNORE_CASE)

-    private val ineligiblePattern = "^§c(Requires .*$|You don't meet the requirement!|Complete previous floor first!$)".toRegex()

+    private val ineligiblePattern =

+        "^§c(Requires .*$|You don't meet the requirement!|Complete previous floor first!$)".toRegex()

     private val classLevelPattern = " §.(?<playerName>.*)§f: §e(?<className>.*)§b \\(§e(?<level>.*)§b\\)".toPattern()

     private val notePattern = "^(§7§7Note: |§f[^§])".toRegex()

 

@@ -81,7 +82,7 @@ class DungeonFinderFeatures {
         if (!LorenzUtils.inSkyBlock || LorenzUtils.skyBlockArea != "Dungeon Hub") return

         if (event.inventoryName != "Catacombs Gate") return

 

-        val lore =  event.inventoryItems[45]?.getLore() ?: return

+        val lore = event.inventoryItems[45]?.getLore() ?: return

 

         if (lore[0] == "§7View and select a dungeon class.") {

             selectedClass = lore[2].split(" ").last().removeColor()

@@ -111,7 +112,7 @@ class DungeonFinderFeatures {
             }

 

             if (config.markPaidCarries) {

-                val note = slot.stack.getLore().filter { notePattern.containsMatchIn(it) }.joinToString(" ") ?: ""

+                val note = slot.stack.getLore().filter { notePattern.containsMatchIn(it) }.joinToString(" ")

 

                 if (pricePattern.containsMatchIn(note) && carryPattern.containsMatchIn(note)) {

                     slot highlight LorenzColor.RED

diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt
index c1f8826b4..5a01eae76 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonHideItems.kt
@@ -50,11 +50,7 @@ class DungeonHideItems {
 
     private fun isSkeletonSkull(entity: EntityArmorStand): Boolean {
         val itemStack = entity.inventory[4]
-        if (itemStack != null && itemStack.cleanName() == "Skeleton Skull") {
-            return true
-        }
-
-        return false
+        return itemStack != null && itemStack.cleanName() == "Skeleton Skull"
     }
 
     @SubscribeEvent
@@ -241,4 +237,4 @@ class DungeonHideItems {
         event.move(3, "dungeon.hideHealerOrbs", "dungeon.objectHider.hideHealerOrbs")
         event.move(3, "dungeon.hideHealerFairy", "dungeon.objectHider.hideHealerFairy")
     }
-}
\ No newline at end of file
+}
diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt
index 69b06c0ce..fbf6a3850 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt
@@ -83,10 +83,13 @@ class DungeonMilestonesDisplay {
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
         if (!isEnabled()) return
 
-        SkyHanniMod.feature.dungeon.showMileStonesDisplayPos.renderString(color + display, posLabel = "Dungeon Milestone")
+        SkyHanniMod.feature.dungeon.showMileStonesDisplayPos.renderString(
+            color + display,
+