diff options
| author | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-12-09 02:04:00 +0100 |
|---|---|---|
| committer | hannibal2 <24389977+hannibal00212@users.noreply.github.com> | 2023-12-09 02:04:00 +0100 |
| commit | 5d8a5b582ef436fadbd74ff1a3148dfa96e8a400 (patch) | |
| tree | 2c0e605fd8044c68c6495cb333694cda895cd603 | |
| parent | e791dff4d2dff8203f5198fb4d0e90bbf457380a (diff) | |
| download | skyhanni-5d8a5b582ef436fadbd74ff1a3148dfa96e8a400.tar.gz skyhanni-5d8a5b582ef436fadbd74ff1a3148dfa96e8a400.tar.bz2 skyhanni-5d8a5b582ef436fadbd74ff1a3148dfa96e8a400.zip | |
code cleanup
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt | 3 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt index c400da59b..39ff40765 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/lobby/waypoints/christmas/PresentWaypoints.kt @@ -28,6 +28,7 @@ class PresentWaypoints { private val presentSet get() = presentLocations[HypixelData.lobbyType] private val presentEntranceSet get() = presentEntranceLocations[HypixelData.lobbyType] + // TODO use repo pattern private val presentAlreadyFoundPattern = "§cYou have already found this present!".toPattern() private val presentFoundPattern = "§aYou found a.*present! §r§e\\(§r§b\\d+§r§e/§r§b\\d+§r§e\\)".toPattern() private val allFoundPattern = "§aCongratulations! You found all the presents in every lobby!".toPattern() @@ -110,5 +111,5 @@ class PresentWaypoints { } private fun isEnabled(): Boolean = - LorenzUtils.onHypixel && HypixelData.inLobby && (config.allWaypoints || config.allEntranceWaypoints) + LorenzUtils.inHypixelLobby && (config.allWaypoints || config.allEntranceWaypoints) } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt index d9ec96dac..2724d40e5 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/LorenzUtils.kt @@ -51,6 +51,8 @@ object LorenzUtils { val inSkyBlock get() = onHypixel && HypixelData.skyBlock + val inHypixelLobby get() = onHypixel && HypixelData.inLobby + val inDungeons get() = inSkyBlock && DungeonAPI.inDungeon() /** |