From 6c1c000ba4a27e30a4c141b9988b5204d1ccad2f Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal002@users.noreply.github.com>
Date: Sun, 7 Jul 2024 11:44:37 +0200
Subject: Hoppity and Chocolate being less annoying (#2196)

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
---
 .../hannibal2/skyhanni/features/event/hoppity/HoppityEggsManager.kt   | 3 ++-
 .../java/at/hannibal2/skyhanni/features/event/hoppity/HoppityNpc.kt   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/features/event')

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)",
-- 
cgit