Cleanup (#1485)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

52 files changed, 239 insertions, 100 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
index 20491ce3e..4c1ca6ca1 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
+++ b/src/main/java/at/hannibal2/skyhanni/config/core/config/gui/GuiPositionEditor.kt
@@ -148,7 +148,6 @@ class GuiPositionEditor(private val positions: List<Position>, private val borde
     override fun mouseClicked(originalX: Int, priginalY: Int, mouseButton: Int) {
         super.mouseClicked(originalX, priginalY, mouseButton)
 
-
         val mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth
         val mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1
         for (i in positions.indices.reversed()) {
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/PlotMenuHighlightingConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/PlotMenuHighlightingConfig.java
index 441509afd..6019f9f37 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/PlotMenuHighlightingConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/PlotMenuHighlightingConfig.java
@@ -33,7 +33,7 @@ public class PlotMenuHighlightingConfig {
         SPRAYS("§6Sprays", LorenzColor.GOLD),
         LOCKED("§7Locked", LorenzColor.DARK_GRAY),
         CURRENT("§aCurrent plot", LorenzColor.GREEN),
-        PASTING("§ePasting", LorenzColor.YELLOW)
+        PASTING("§ePasting", LorenzColor.YELLOW),
         ;
 
         public final String name;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/RewardWarningConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/RewardWarningConfig.java
index 2ea448148..f3cafae08 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/RewardWarningConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/garden/visitor/RewardWarningConfig.java
@@ -60,7 +60,7 @@ public class RewardWarningConfig {
     @ConfigOption(
         name = "Coins Per Copper",
         desc = "The price to use for the below options.\n" +
-               "Requires one of the below options to be on."
+            "Requires one of the below options to be on."
     )
     @ConfigEditorSlider(minValue = 1, maxValue = 50_000, minStep = 250)
     public int coinsPerCopperPrice = 6_000;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningNotificationsConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningNotificationsConfig.java
index 59a74b879..0c1461183 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningNotificationsConfig.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/mining/MiningNotificationsConfig.java
@@ -22,16 +22,16 @@ public class MiningNotificationsConfig {
 
     @Expose
     @ConfigOption(
-            name = "Notification List",
-            desc = "Drag text to change which events send a title."
+        name = "Notification List",
+        desc = "Drag text to change which events send a title."
     )
     @ConfigEditorDraggableList
     public List<MiningNotificationList> notifications = new ArrayList<>(Arrays.asList(
-            MiningNotificationList.MINESHAFT_SPAWN,
-            MiningNotificationList.SCRAP,
-            MiningNotificationList.COLD,
-            MiningNotificationList.GOLDEN_GOBLIN,
-            MiningNotificationList.DIAMOND_GOBLIN
+        MiningNotificationList.MINESHAFT_SPAWN,
+        MiningNotificationList.SCRAP,
+        MiningNotificationList.COLD,
+        MiningNotificationList.GOLDEN_GOBLIN,
+        MiningNotificationList.DIAMOND_GOBLIN
     ));
 
     @Expose
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ClickType.kt b/src/main/java/at/hannibal2/skyhanni/data/ClickType.kt
index b008978f0..97b3fc87a 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ClickType.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ClickType.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.data
 
 enum class ClickType {
-    LEFT_CLICK, RIGHT_CLICK
+    LEFT_CLICK,
+    RIGHT_CLICK,
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt
index 224ce9979..2815db0ab 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt
@@ -33,6 +33,7 @@ object FriendAPI {
         "addbest",
         ".*\n(?<name>.*)§a is now a best friend!§r§9§m\n.*"
     )
+
     /**
      * REGEX-TEST:
      * §eClick here to view §bAaronL_Jackson§e's profile
diff --git a/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt
index ff8f4b5e4..9bbccc161 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt
@@ -24,7 +24,7 @@ object PurseAPI {
 
     private var inventoryCloseTime = 0L
     var currentPurse = 0.0
-      private set
+        private set
 
     @SubscribeEvent
     fun onInventoryClose(event: InventoryCloseEvent) {
diff --git a/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt
index 702e29cb5..662d2e921 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt
@@ -263,8 +263,8 @@ object QuiverAPI {
 
     private fun checkChestplate() {
         val wasWearing = wearingSkeletonMasterChestplate
-        wearingSkeletonMasterChestplate = InventoryUtils.getChestplate()?.getInternalName()?.equals(
-            SKELETON_MASTER_CHESTPLATE) ?: false
+        wearingSkeletonMasterChestplate =
+            InventoryUtils.getChestplate()?.getInternalName() == SKELETON_MASTER_CHESTPLATE
         if (wasWearing != wearingSkeletonMasterChestplate) {
             QuiverUpdateEvent(currentArrow, currentAmount, shouldHideAmount()).postAndCatch()
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt
index d35d46759..4a9323ae2 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/Mob.kt
@@ -83,7 +83,16 @@ class Mob(
     val extraEntities: List<EntityLivingBase> = extraEntitiesList
 
     enum class Type {
-        DISPLAY_NPC, SUMMON, BASIC, DUNGEON, BOSS, SLAYER, PLAYER, PROJECTILE, SPECIAL;
+        DISPLAY_NPC,
+        SUMMON,
+        BASIC,
+        DUNGEON,
+        BOSS,
+        SLAYER,
+        PLAYER,
+        PROJECTILE,
+        SPECIAL,
+        ;
 
         fun isSkyblockMob() = when (this) {
             BASIC, DUNGEON, BOSS, SLAYER -> true
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt
index 9ed5a4497..b8bf67f81 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt
@@ -43,7 +43,10 @@ class MobData {
     }
 
     internal enum class Result {
-        Found, NotYetFound, Illegal, SomethingWentWrong
+        Found,
+        NotYetFound,
+        Illegal,
+        SomethingWentWrong,
     }
 
     internal class MobResult(val result: Result, val mob: Mob?) {
@@ -71,7 +74,7 @@ class MobData {
     internal class RetryEntityInstancing(
         var entity: EntityLivingBase,
         var times: Int,
-        val roughType: MobType
+        val roughType: MobType,
     ) {
         override fun hashCode() = entity.entityId
         override fun equals(other: Any?) = (other as? RetryEntityInstancing).hashCode() == this.hashCode()
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
index b31b2a47b..5629eefcf 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
@@ -168,7 +168,9 @@ class MobDetection {
 
     /** For mobs that have default health of the entity */
     private enum class EntityPacketType {
-        SPIRIT_BAT, VILLAGER, CREEPER_VAIL
+        SPIRIT_BAT,
+        VILLAGER,
+        CREEPER_VAIL,
     }
 
     /** Handles some mobs that have default health of the entity, specially using the [EntityHealthUpdateEvent] */
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt
index 134274620..33ab90e60 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt
@@ -91,7 +91,16 @@ object MobFilter {
     const val MINION_MOB_PREFIX = "Minion Mob "
 
     enum class DungeonAttribute {
-        Flaming, Stormy, Speedy, Fortified, Healthy, Healing, Boomer, Golden, Stealth;
+        Flaming,
+        Stormy,
+        Speedy,
+        Fortified,
+        Healthy,
+        Healing,
+        Boomer,
+        Golden,
+        Stealth,
+        ;
 
         companion object {
 
diff --git a/src/main/java/at/hannibal2/skyhanni/events/GuiContainerEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/GuiContainerEvent.kt
index 442603257..b11f75733 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/GuiContainerEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/GuiContainerEvent.kt
@@ -59,7 +59,6 @@ abstract class GuiContainerEvent(open val gui: GuiContainer, open val container:
         val clickType: Int,
     ) : GuiContainerEvent(gui, container) {
 
-
         fun makePickblock() {
             if (this.clickedButton == 2 && this.clickType == 3) return
             slot?.slotNumber?.let { slotNumber ->
diff --git a/src/main/java/at/hannibal2/skyhanni/events/PacketEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/PacketEvent.kt
index 1c9905ce6..961699a40 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/PacketEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/PacketEvent.kt
@@ -41,6 +41,7 @@ abstract class PacketEvent : LorenzEvent() {
     }
 
     enum class Direction {
-        INBOUND, OUTBOUND
+        INBOUND,
+        OUTBOUND,
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/events/mining/FossilExcavationEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/mining/FossilExcavationEvent.kt
index b672def95..98b18a83f 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/mining/FossilExcavationEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/mining/FossilExcavationEvent.kt
@@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events.mining
 
 import at.hannibal2.skyhanni.events.LorenzEvent
 
-class FossilExcavationEvent(val loot: List<Pair<String, Int>>): LorenzEvent()
+class FossilExcavationEvent(val loot: List<Pair<String, Int>>) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EasterEggWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EasterEggWaypoints.kt
index 0017e9098..1a8fde100 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EasterEggWaypoints.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EasterEggWaypoints.kt
@@ -87,7 +87,7 @@ class EasterEggWaypoints {
     }
 
     // TODO use regex with the help of knowing the original lore. Will most likely need to wait until next egg event
-    
+
     /*
         Title:
         §e§lHYPIXEL
@@ -113,5 +113,6 @@ class EasterEggWaypoints {
         val c = ScoreboardData.sidebarLinesFormatted.any { it.contains("Easter Eggs") }
         return a && b && c
     }
+
     private fun isEnabled() = HypixelData.hypixelLive && !LorenzUtils.inSkyBlock
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EggEntrances.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EggEntrances.kt
index a369e405a..31663b403 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EggEntrances.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EggEntrances.kt
@@ -8,10 +8,20 @@ enum class EggEntrances(
     vararg val easterEgg: EasterEgg,
 ) {
 
-    EASTER_EGG_ENTER_12_13_1_28_1("#12, #13, #28 (tunnel)", LorenzVec(126, 52, 175), EasterEgg.EASTER_EGG_12, EasterEgg.EASTER_EGG_13, EasterEgg.EASTER_EGG_28),
+    EASTER_EGG_ENTER_12_13_1_28_1(
+        "#12, #13, #28 (tunnel)",
+        LorenzVec(126, 52, 175),
+        EasterEgg.EASTER_EGG_12,
+        EasterEgg.EASTER_EGG_13,
+        EasterEgg.EASTER_EGG_28
+    ),
     EASTER_EGG_ENTER_13_2("#13 (keep going, stay on your left [<--])", LorenzVec(144, 30, 19), EasterEgg.EASTER_EGG_13),
     EASTER_EGG_ENTER_13_3("#13 (enter here)", LorenzVec(107, 42, -47), EasterEgg.EASTER_EGG_13),
-    EASTER_EGG_ENTER_13_4("#13 (straight ahead, don't take the stairs)", LorenzVec(105, 49, -34), EasterEgg.EASTER_EGG_13),
+    EASTER_EGG_ENTER_13_4(
+        "#13 (straight ahead, don't take the stairs)",
+        LorenzVec(105, 49, -34),
+        EasterEgg.EASTER_EGG_13
+    ),
     EASTER_EGG_ENTER_14_1("#14 (enter here)", LorenzVec(159, 68, -25), EasterEgg.EASTER_EGG_14),
     EASTER_EGG_ENTER_14_2("#14 (right turn [-->] here)", LorenzVec(153, 68, -8), EasterEgg.EASTER_EGG_14),
     EASTER_EGG_ENTER_14_3("#14 (left turn [<--] here)", LorenzVec(143, 68, -8), EasterEgg.EASTER_EGG_14),
@@ -19,16 +29,34 @@ enum class EggEntrances(
     EASTER_EGG_ENTER_18_2("#18 (through this painting)", LorenzVec(142, 56, -82), EasterEgg.EASTER_EGG_18),
     EASTER_EGG_ENTER_21("#21 (through the waterfall)", LorenzVec(-137, 64, -82), EasterEgg.EASTER_EGG_21),
     EASTER_EGG_ENTER_28_2("#13, #28 (right turn [-->] here)", LorenzVec(94, 35, 145), EasterEgg.EASTER_EGG_28),
-    EASTER_EGG_ENTER_28_3("#13, #28 (straight ahead, stay on your right [-->])", LorenzVec(92, 21, 107), EasterEgg.EASTER_EGG_28),
-    EASTER_EGG_ENTER_29_2("#29 (straight ahead, stay on your right [-->])", LorenzVec(16, 32, 2), EasterEgg.EASTER_EGG_29),
+    EASTER_EGG_ENTER_28_3(
+        "#13, #28 (straight ahead, stay on your right [-->])",
+        LorenzVec(92, 21, 107),
+        EasterEgg.EASTER_EGG_28
+    ),
+    EASTER_EGG_ENTER_29_2(
+        "#29 (straight ahead, stay on your right [-->])",
+        LorenzVec(16, 32, 2),
+        EasterEgg.EASTER_EGG_29
+    ),
     EASTER_EGG_ENTER_29_3("#29 (enter here)", LorenzVec(54, 22, 60), EasterEgg.EASTER_EGG_29),
     EASTER_EGG_ENTER_29_4("#29 (up stairs, make left turn [<--])", LorenzVec(25, 25, 51), EasterEgg.EASTER_EGG_29),
-    EASTER_EGG_ENTER_29_5("#29 (up stairs, make left turn [<--] again)", LorenzVec(17, 32, 66), EasterEgg.EASTER_EGG_29),
+    EASTER_EGG_ENTER_29_5(
+        "#29 (up stairs, make left turn [<--] again)",
+        LorenzVec(17, 32, 66),
+        EasterEgg.EASTER_EGG_29
+    ),
     EASTER_EGG_ENTER_29_6("#29 (left turn [<--] here)", LorenzVec(35, 37, 66), EasterEgg.EASTER_EGG_29),
     EASTER_EGG_ENTER_29_7("#29 (past this door)", LorenzVec(39, 37, 48), EasterEgg.EASTER_EGG_29),
     EASTER_EGG_ENTER_30_1("#30 (1st digit, SNEAK + RCLICK)", LorenzVec(143, 65, -30), EasterEgg.EASTER_EGG_30),
     EASTER_EGG_ENTER_30_2("#30 (3rd digit, open chest)", LorenzVec(205, 34, -157), EasterEgg.EASTER_EGG_30),
-    EASTER_EGG_ENTER_27_29_1_30_3("#27, #29, #30 (inside this well)", LorenzVec(10, 63, 0), EasterEgg.EASTER_EGG_27, EasterEgg.EASTER_EGG_29, EasterEgg.EASTER_EGG_30),
+    EASTER_EGG_ENTER_27_29_1_30_3(
+        "#27, #29, #30 (inside this well)",
+        LorenzVec(10, 63, 0),
+        EasterEgg.EASTER_EGG_27,
+        EasterEgg.EASTER_EGG_29,
+        EasterEgg.EASTER_EGG_30
+    ),
     EASTER_EGG_ENTER_30_4("#30 (left turn [<--] here)", LorenzVec(-28, 42, 14), EasterEgg.EASTER_EGG_30),
     EASTER_EGG_ENTER_30_5("#30 Vault (brute force 2nd digit)", LorenzVec(-35, 25, 63), EasterEgg.EASTER_EGG_30),
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt
index b0ff26ef0..3551898cd 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/TotemOfCorruption.kt
@@ -134,7 +134,6 @@ class TotemOfCorruption {
                 }
             }
 
-
     private fun createDisplay() = buildList {
         val totem = getTotemToShow() ?: return@buildList
         add("§5§lTotem of Corruption")
diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/OdgerWaypoint.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/trophy/OdgerWaypoint.kt
index ee9c4b44b..8337e367d 100644
--- a/