From 7aaf75ee3ab87e1739a55ca46cf75d90d91889bc Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Mon, 29 Apr 2024 16:51:31 +0200 Subject: code cleanup --- .../event/chocolatefactory/ChocolateFactoryBarnManager.kt | 7 +++++-- .../features/event/chocolatefactory/ChocolateFactoryShortcut.kt | 8 +++++++- .../features/event/chocolatefactory/ChocolateFactoryStats.kt | 1 - .../features/event/chocolatefactory/HoppityCollectionStats.kt | 4 ++-- .../skyhanni/features/event/chocolatefactory/HoppityEggType.kt | 2 +- 5 files changed, 15 insertions(+), 7 deletions(-) (limited to 'src/main') diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryBarnManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryBarnManager.kt index 0d953fcc4..8f387a6b0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryBarnManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryBarnManager.kt @@ -71,8 +71,11 @@ object ChocolateFactoryBarnManager { } ChatUtils.clickableChat( - message = if (profileStorage.currentRabbits == profileStorage.maxRabbits) { "§cYour barn is full! §7(${barnStatus()}). §cUpgrade it so they don't get crushed" } - else { "§cYour barn is almost full! §7(${barnStatus()}). §cUpgrade it so they don't get crushed"}, + message = if (profileStorage.currentRabbits == profileStorage.maxRabbits) { + "§cYour barn is full! §7(${barnStatus()}). §cUpgrade it so they don't get crushed" + } else { + "§cYour barn is almost full! §7(${barnStatus()}). §cUpgrade it so they don't get crushed" + }, onClick = { HypixelCommands.chocolateFactory() } diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryShortcut.kt b/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryShortcut.kt index edb6af40e..6b9fc671e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryShortcut.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryShortcut.kt @@ -37,7 +37,13 @@ class ChocolateFactoryShortcut { @SubscribeEvent fun onInventoryOpen(event: InventoryFullyOpenedEvent) { if (!LorenzUtils.inSkyBlock) return - if (LorenzUtils.inAnyIsland(IslandType.THE_RIFT, IslandType.KUUDRA_ARENA, IslandType.CATACOMBS, IslandType.MINESHAFT)) return + if (LorenzUtils.inAnyIsland( + IslandType.THE_RIFT, + IslandType.KUUDRA_ARENA, + IslandType.CATACOMBS, + IslandType.MINESHAFT, + ) + ) return showItem = config.hoppityMenuShortcut && event.inventoryName == "SkyBlock Menu" } diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryStats.kt b/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryStats.kt index fd36ae76b..d9300ace4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryStats.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/ChocolateFactoryStats.kt @@ -78,7 +78,6 @@ object ChocolateFactoryStats { add("§eRaw Per Second: §6${profileStorage.rawChocPerSecond.addSeparators()}") }) - // TODO keep counting, we dont want pauses // val firstElement = displayText.firstOrNull { it.isNotEmpty() } ?: return // diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/HoppityCollectionStats.kt b/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/HoppityCollectionStats.kt index 92461db88..05361500e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/HoppityCollectionStats.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/HoppityCollectionStats.kt @@ -185,7 +185,7 @@ class HoppityCollectionStats { private data class RabbitCollectionInfo( val rarity: RabbitCollectionRarity, val found: Boolean, - val duplicates: Int + val duplicates: Int, ) // todo in future make the amount and multiplier work with mythic rabbits (can't until I have some) @@ -193,7 +193,7 @@ class HoppityCollectionStats { val displayName: String, val chocolatePerSecond: Int, val chocolateMultiplier: Double, - val item: NEUInternalName + val item: NEUInternalName, ) { COMMON("§fCommon", 1, 0.002, "STAINED_GLASS".asInternalName()), UNCOMMON("§aUncommon", 2, 0.003, "STAINED_GLASS-5".asInternalName()), diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/HoppityEggType.kt b/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/HoppityEggType.kt index c0c88d5f6..80a03c050 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/HoppityEggType.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/chocolatefactory/HoppityEggType.kt @@ -7,7 +7,7 @@ enum class HoppityEggType( val resetsAt: Int, private val mealColour: String, var lastResetDay: Int = -1, - private var claimed: Boolean = false + private var claimed: Boolean = false, ) { BREAKFAST("Breakfast", 7, "§a"), LUNCH("Lunch", 14, "§9"), -- cgit