From 8f3314c9397a62085941ece6d9fe2114f5338889 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sat, 22 Jun 2024 09:33:15 +0200 Subject: enum is singular --- .../lobby/waypoints/easter/EasterEggWaypoints.kt | 2 +- .../event/lobby/waypoints/easter/EggEntrance.kt | 63 ++++++++++++++++++++++ .../event/lobby/waypoints/easter/EggEntrances.kt | 63 ---------------------- .../lobby/waypoints/halloween/BasketEntrance.kt | 18 +++++++ .../lobby/waypoints/halloween/BasketEntrances.kt | 18 ------- .../lobby/waypoints/halloween/BasketWaypoints.kt | 2 +- 6 files changed, 83 insertions(+), 83 deletions(-) create mode 100644 src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EggEntrance.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EggEntrances.kt create mode 100644 src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/halloween/BasketEntrance.kt delete mode 100644 src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/halloween/BasketEntrances.kt (limited to 'src/main/java/at/hannibal2/skyhanni/features/event') 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 1b3bf9cb4..2df035702 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 @@ -70,7 +70,7 @@ object EasterEggWaypoints { } if (config.allEntranceWaypoints) { - for (eggEntrance in EggEntrances.entries) { + for (eggEntrance in EggEntrance.entries) { if (!eggEntrance.easterEgg.any { it.shouldShow() }) continue event.drawWaypointFilled(eggEntrance.waypoint, LorenzColor.YELLOW.toColor()) event.drawDynamicText(eggEntrance.waypoint, "§e" + eggEntrance.eggEntranceName, 1.5) diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EggEntrance.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EggEntrance.kt new file mode 100644 index 000000000..1ac684570 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EggEntrance.kt @@ -0,0 +1,63 @@ +package at.hannibal2.skyhanni.features.event.lobby.waypoints.easter + +import at.hannibal2.skyhanni.utils.LorenzVec + +enum class EggEntrance( + val eggEntranceName: String, + val waypoint: LorenzVec, + 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_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_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), + EASTER_EGG_ENTER_18_1("#18 (down this well)", LorenzVec(158, 67, -82), EasterEgg.EASTER_EGG_18), + 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_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_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_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/event/lobby/waypoints/easter/EggEntrances.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EggEntrances.kt deleted file mode 100644 index 31663b403..000000000 --- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/easter/EggEntrances.kt +++ /dev/null @@ -1,63 +0,0 @@ -package at.hannibal2.skyhanni.features.event.lobby.waypoints.easter - -import at.hannibal2.skyhanni.utils.LorenzVec - -enum class EggEntrances( - val eggEntranceName: String, - val waypoint: LorenzVec, - 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_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_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), - EASTER_EGG_ENTER_18_1("#18 (down this well)", LorenzVec(158, 67, -82), EasterEgg.EASTER_EGG_18), - 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_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_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_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/event/lobby/waypoints/halloween/BasketEntrance.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/halloween/BasketEntrance.kt new file mode 100644 index 000000000..b54b17eb8 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/halloween/BasketEntrance.kt @@ -0,0 +1,18 @@ +package at.hannibal2.skyhanni.features.event.lobby.waypoints.halloween + +import at.hannibal2.skyhanni.utils.LorenzVec + +enum class BasketEntrance( + val basketEntranceName: String, + val waypoint: LorenzVec, + vararg val basket: Basket, +) { + + BASKET_ENTER_23("#23, #24 (behind the lava)", LorenzVec(-138, 74, -4), Basket.BASKET_23, Basket.BASKET_24), + BASKET_ENTER_24("#24 (within this tunnel)", LorenzVec(-80, 72, -4), Basket.BASKET_24), + BASKET_ENTER_25_1("#25 (1st digit, SNEAK + RCLICK)", LorenzVec(143, 65, -30), Basket.BASKET_25), + BASKET_ENTER_25_2("#25 (3rd digit, open chest)", LorenzVec(205, 34, -157), Basket.BASKET_25), + BASKET_ENTER_25_3("#25 (inside this well)", LorenzVec(10, 63, 0), Basket.BASKET_25), + BASKET_ENTER_25_4("#25 (left turn [<--] here)", LorenzVec(-28, 41, 14), Basket.BASKET_25), + BASKET_ENTER_25_5("#25 Vault (brute force 2nd digit)", LorenzVec(-35, 25, 63), Basket.BASKET_25), +} diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/halloween/BasketEntrances.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/halloween/BasketEntrances.kt deleted file mode 100644 index 3907986d9..000000000 --- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/halloween/BasketEntrances.kt +++ /dev/null @@ -1,18 +0,0 @@ -package at.hannibal2.skyhanni.features.event.lobby.waypoints.halloween - -import at.hannibal2.skyhanni.utils.LorenzVec - -enum class BasketEntrances( - val basketEntranceName: String, - val waypoint: LorenzVec, - vararg val basket: Basket, -) { - - BASKET_ENTER_23("#23, #24 (behind the lava)", LorenzVec(-138, 74, -4), Basket.BASKET_23, Basket.BASKET_24), - BASKET_ENTER_24("#24 (within this tunnel)", LorenzVec(-80, 72, -4), Basket.BASKET_24), - BASKET_ENTER_25_1("#25 (1st digit, SNEAK + RCLICK)", LorenzVec(143, 65, -30), Basket.BASKET_25), - BASKET_ENTER_25_2("#25 (3rd digit, open chest)", LorenzVec(205, 34, -157), Basket.BASKET_25), - BASKET_ENTER_25_3("#25 (inside this well)", LorenzVec(10, 63, 0), Basket.BASKET_25), - BASKET_ENTER_25_4("#25 (left turn [<--] here)", LorenzVec(-28, 41, 14), Basket.BASKET_25), - BASKET_ENTER_25_5("#25 Vault (brute force 2nd digit)", LorenzVec(-35, 25, 63), Basket.BASKET_25), -} diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/halloween/BasketWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/halloween/BasketWaypoints.kt index c2f30a967..a76805577 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/halloween/BasketWaypoints.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/halloween/BasketWaypoints.kt @@ -71,7 +71,7 @@ object BasketWaypoints { } if (config.allEntranceWaypoints) { - for (basketEntrance in BasketEntrances.entries) { + for (basketEntrance in BasketEntrance.entries) { if (!basketEntrance.basket.any { it.shouldShow() }) continue event.drawWaypointFilled(basketEntrance.waypoint, LorenzColor.YELLOW.toColor()) event.drawDynamicText(basketEntrance.waypoint, "§e" + basketEntrance.basketEntranceName, 1.5) -- cgit