From 9ed29514ac55f613323ee623765b02ddd5d59fdd Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Mon, 1 Jan 2024 15:02:15 +0100 Subject: Code cleanup --- .../skyhanni/features/event/UniqueGiftingOpportunitiesFeatures.kt | 3 +-- .../hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features') diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/UniqueGiftingOpportunitiesFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/event/UniqueGiftingOpportunitiesFeatures.kt index a873854b5..a3bc56396 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/UniqueGiftingOpportunitiesFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/UniqueGiftingOpportunitiesFeatures.kt @@ -1,7 +1,6 @@ package at.hannibal2.skyhanni.features.event import at.hannibal2.skyhanni.SkyHanniMod -import at.hannibal2.skyhanni.data.HypixelData import at.hannibal2.skyhanni.data.ProfileStorageData import at.hannibal2.skyhanni.data.WinterAPI import at.hannibal2.skyhanni.events.EntityCustomNameUpdateEvent @@ -79,7 +78,7 @@ object UniqueGiftingOpportunitiesFeatures { } private fun isBingo(entity: EntityLivingBase) = - !HypixelData.bingo && entity.displayName.formattedText.endsWith("Ⓑ§r") + !LorenzUtils.isBingoProfile && entity.displayName.formattedText.endsWith("Ⓑ§r") private fun isIronman(entity: EntityLivingBase) = !LorenzUtils.noTradeMode && entity.displayName.formattedText.endsWith("♲§r") diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt index cc2a09b9d..2f7be15ec 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordStatus.kt @@ -206,9 +206,10 @@ enum class DiscordStatus(private val displayMessageSupplier: Supplier?) var profile = "SkyBlock Level: [$sbLevel] on " profile += when { - HypixelData.ironman -> "♲" - HypixelData.bingo -> "Ⓑ" - HypixelData.stranded -> "☀" + + LorenzUtils.isIronmanProfile -> "♲" + LorenzUtils.isBingoProfile -> "Ⓑ" + LorenzUtils.isStrandedProfile -> "☀" else -> "" } -- cgit