From cdcc7b35e38ddb5e00d8a4d900c4cad77bd6e1f5 Mon Sep 17 00:00:00 2001 From: appable Date: Sat, 16 Dec 2023 03:13:06 -0800 Subject: Feature: Active spray display and expiry notification (#800) Added Spray Display and Spray Expiration Notice. #800 --- .../skyhanni/features/misc/NonGodPotEffectDisplay.kt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features/misc') diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt index d08dd888a..d9a478d4e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt @@ -18,11 +18,11 @@ import at.hannibal2.skyhanni.utils.RenderUtils.renderStrings import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher import at.hannibal2.skyhanni.utils.TimeUnit import at.hannibal2.skyhanni.utils.TimeUtils +import at.hannibal2.skyhanni.utils.TimeUtils.timerColor import at.hannibal2.skyhanni.utils.Timer import net.minecraft.network.play.server.S47PacketPlayerListHeaderFooter import net.minecraftforge.fml.common.eventhandler.EventPriority import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -import kotlin.time.Duration import kotlin.time.Duration.Companion.hours import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.minutes @@ -123,7 +123,7 @@ class NonGodPotEffectDisplay { val remaining = time.remaining.coerceAtLeast(0.seconds) val format = TimeUtils.formatDuration(remaining.inWholeMilliseconds, TimeUnit.HOUR) - val color = colorForTime(remaining) + val color = remaining.timerColor() val displayName = effect.tabListName newDisplay.add("$displayName $color$format") @@ -137,13 +137,6 @@ class NonGodPotEffectDisplay { return newDisplay } - private fun colorForTime(duration: Duration) = when (duration) { - in 0.seconds..60.seconds -> "§c" - in 60.seconds..3.minutes -> "§6" - in 3.minutes..10.minutes -> "§e" - else -> "§f" - } - @SubscribeEvent fun onTick(event: LorenzTickEvent) { if (!isEnabled()) return -- cgit