diff options
| author | hannibal2 <24389977+hannibal002@users.noreply.github.com> | 2024-07-07 11:44:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-07 11:44:37 +0200 |
| commit | 6c1c000ba4a27e30a4c141b9988b5204d1ccad2f (patch) | |
| tree | 9e207aa790da723781df2612148656ea00017c3d /src/main/java/at/hannibal2/skyhanni/features/event | |
| parent | 6b3e2d7b0cf478deb2d8f5876a402c01508a5d43 (diff) | |
| download | skyhanni-6c1c000ba4a27e30a4c141b9988b5204d1ccad2f.tar.gz skyhanni-6c1c000ba4a27e30a4c141b9988b5204d1ccad2f.tar.bz2 skyhanni-6c1c000ba4a27e30a4c141b9988b5204d1ccad2f.zip | |
Hoppity and Chocolate being less annoying (#2196)
Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/event')
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt | 3 | ||||
| -rw-r--r-- | src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt index 37679bdbf..5e51a7693 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt @@ -25,6 +25,7 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeColor import at.hannibal2.skyhanni.utils.TimeUtils.format import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.util.regex.Matcher +import kotlin.time.Duration.Companion.minutes import kotlin.time.Duration.Companion.seconds @SkyHanniModule @@ -218,7 +219,7 @@ object HoppityEggsManager { private fun warn() { if (!config.warnUnclaimedEggs) return if (ReminderUtils.isBusy() && !config.warnWhileBusy) return - if (lastWarnTime.passedSince() < 30.seconds) return + if (lastWarnTime.passedSince() < 1.minutes) return lastWarnTime = now() val amount = HoppityEggType.entries.size diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt index 2ec98ccf6..877e161ef 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt @@ -18,7 +18,7 @@ import at.hannibal2.skyhanni.utils.RenderUtils.highlight import at.hannibal2.skyhanni.utils.SimpleTimeMark import at.hannibal2.skyhanni.utils.SkyBlockTime import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -import kotlin.time.Duration.Companion.seconds +import kotlin.time.Duration.Companion.minutes @SkyHanniModule object HoppityNpc { @@ -51,7 +51,7 @@ object HoppityNpc { if (ReminderUtils.isBusy()) return if (hoppityYearOpened == SkyBlockTime.now().year) return if (!ChocolateFactoryAPI.isHoppityEvent()) return - if (lastReminderSent.passedSince() <= 30.seconds) return + if (lastReminderSent.passedSince() <= 2.minutes) return ChatUtils.clickableChat( "New rabbits are available at §aHoppity's Shop§e! §c(Click to disable this reminder)", |