From bcd8d64c107e01860eb5b273e7ee78579d09497d Mon Sep 17 00:00:00 2001 From: "Erymanthus[#5074] | (u/)RayDeeUx" <51521765+RayDeeUx@users.noreply.github.com> Date: Sun, 26 May 2024 20:10:24 -0400 Subject: [PATCH] more --- .../skyhanni/features/misc/WhereWillIBe.kt | 52 ++++++++++++++----- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/WhereWillIBe.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/WhereWillIBe.kt index 66a82a1cef0b..5957048c9156 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/WhereWillIBe.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/WhereWillIBe.kt @@ -60,18 +60,26 @@ object WhereWillIBe { } } - private fun chooseIslandsList(islandsAsList: MutableList) = + private fun chooseIslandsList( + islandsAsList: MutableList + ) = if (Random.nextBoolean()) - islandsAsList.filter { it !in privateOrGuest } + islandsAsList.filter { + it !in privateOrGuest + } else islandsAsList - private fun randomMillis(lastUsedMillis: Long): Long = + private fun randomMillis( + lastUsedMillis: Long + ): Long = Random.nextLong( lastUsedMillis, lastUsedMillis + Random.nextLong( 10000, - 2.0.pow(26).toLong() + 2.0.pow( + 26 + ).toLong() ) ) @@ -80,20 +88,34 @@ object WhereWillIBe { chosenIslandsList: List ): IslandType { var islandToReturn = IslandType.NONE - while (islandToReturn == lastIsland || islandToReturn in nonIslands) + while ( + islandToReturn == lastIsland || + islandToReturn in nonIslands + ) islandToReturn = chosenIslandsList.shuffled().first() return islandToReturn } - private fun randomIsland(chosenIsland: IslandType): String = - "SkyBlock (${chosenIsland.displayName})" + private fun randomIsland( + chosenIsland: IslandType + ): String = + "SkyBlock (${ + chosenIsland.displayName + })" - private fun randomServerID(chosenIsland: IslandType): String = + private fun randomServerID( + chosenIsland: IslandType + ): String = "${miniOrMega(chosenIsland)}${randServerNumber()}${oneOrTwoLetters()}" - private fun miniOrMega(chosenIsland: IslandType): String = - if (chosenIsland == IslandType.HUB) - listOf("mini", "mega").random() + private fun miniOrMega( + chosenIsland: IslandType + ): String = + if ( + chosenIsland == IslandType.HUB && + Random.nextBoolean() + ) + "mega" else "mini" @@ -103,13 +125,17 @@ object WhereWillIBe { 401 ) - private fun oneOrTwoLetters(charRange: CharRange = ('A'..'Z')): String = + private fun oneOrTwoLetters( + charRange: CharRange = ('A'..'Z') + ): String = if (Random.nextBoolean()) "${charRange.random()}" else "${charRange.random()}${charRange.random()}" - private fun formattedDate(date: Date): String = + private fun formattedDate( + date: Date + ): String = SimpleDateFormat( "HH:mm:ss dd-MM-yy" ).format(