Cleanup (#1485)

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

2 files changed, 36 insertions, 7 deletions

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