fix: nautilus not working on skyhanni 3.8.0

Author: ItsEmpa

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-skyhanni = "3.5.0"
+skyhanni = "3.8.0"
 libautoupdate = "1.3.1"
 headlessLwjgl = "1.7.2"
 jbAnnotations = "24.1.0"

src/main/kotlin/com/github/itsempa/nautilus/data/KillData.kt

@@ -3,7 +3,7 @@ package com.github.itsempa.nautilus.data
 import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.events.OwnInventoryItemUpdateEvent
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import at.hannibal2.skyhanni.utils.SizeLimitedCache
+import at.hannibal2.skyhanni.utils.collection.SizeLimitedCache
 import com.github.itsempa.nautilus.events.KillEvent
 import com.github.itsempa.nautilus.utils.NautilusItemUtils.getBookOfStats
 import com.github.itsempa.nautilus.utils.NautilusItemUtils.uuid
@@ -29,7 +29,7 @@ object KillData {
         val stack = event.itemStack
         val uuid = stack.uuid ?: return
         val kills = stack.getBookOfStats() ?: return
-        val data = itemCache.getOrNull(uuid)
+        val data = itemCache[uuid]
         if (data == null) {
             itemCache[uuid] = KillData(kills)
             return

src/main/kotlin/com/github/itsempa/nautilus/data/RareDropManager.kt

@@ -6,7 +6,7 @@ import at.hannibal2.skyhanni.utils.NeuInternalName
 import at.hannibal2.skyhanni.utils.NumberUtil.formatInt
 import at.hannibal2.skyhanni.utils.RegexUtils.groupOrNull
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
-import at.hannibal2.skyhanni.utils.SizeLimitedSet
+import at.hannibal2.skyhanni.utils.collection.SizeLimitedSet
 import com.github.itsempa.nautilus.events.NautilusDebugEvent
 import com.github.itsempa.nautilus.events.RareDropEvent
 import com.github.itsempa.nautilus.utils.tryOrDefault

src/main/kotlin/com/github/itsempa/nautilus/data/SeaCreatureDetectionApi.kt

@@ -15,7 +15,7 @@ import at.hannibal2.skyhanni.utils.LocationUtils.distanceTo
 import at.hannibal2.skyhanni.utils.LorenzRarity
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import at.hannibal2.skyhanni.utils.TimeLimitedCache
+import at.hannibal2.skyhanni.utils.collection.TimeLimitedCache
 import at.hannibal2.skyhanni.utils.getLorenzVec
 import com.github.itsempa.nautilus.events.BrigadierRegisterEvent
 import com.github.itsempa.nautilus.events.NautilusDebugEvent

src/main/kotlin/com/github/itsempa/nautilus/data/VanquisherApi.kt

@@ -12,7 +12,7 @@ import at.hannibal2.skyhanni.utils.LocationUtils.distanceTo
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.RegexUtils.matches
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import at.hannibal2.skyhanni.utils.TimeLimitedCache
+import at.hannibal2.skyhanni.utils.collection.TimeLimitedCache
 import at.hannibal2.skyhanni.utils.compat.getStandHelmet
 import at.hannibal2.skyhanni.utils.getLorenzVec
 import com.github.itsempa.nautilus.events.NautilusDebugEvent

src/main/kotlin/com/github/itsempa/nautilus/features/chat/HotspotSharing.kt

@@ -12,14 +12,14 @@ import at.hannibal2.skyhanni.utils.LorenzColor
 import at.hannibal2.skyhanni.utils.LorenzVec
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
-import at.hannibal2.skyhanni.utils.RenderUtils.drawString
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import at.hannibal2.skyhanni.utils.TimeLimitedCache
 import at.hannibal2.skyhanni.utils.chat.TextHelper
 import at.hannibal2.skyhanni.utils.chat.TextHelper.asComponent
 import at.hannibal2.skyhanni.utils.chat.TextHelper.onClick
 import at.hannibal2.skyhanni.utils.chat.TextHelper.onHover
 import at.hannibal2.skyhanni.utils.chat.TextHelper.send
+import at.hannibal2.skyhanni.utils.collection.TimeLimitedCache
+import at.hannibal2.skyhanni.utils.render.WorldRenderUtils.drawString
 import com.github.itsempa.nautilus.Nautilus
 import com.github.itsempa.nautilus.data.HotspotApi
 import com.github.itsempa.nautilus.events.HotspotEvent

src/main/kotlin/com/github/itsempa/nautilus/features/chat/SeaCreatureWarning.kt

@@ -15,7 +15,7 @@ import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
 import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators
 import at.hannibal2.skyhanni.utils.RegexUtils.hasGroup
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
-import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
+import at.hannibal2.skyhanni.utils.render.WorldRenderUtils.drawDynamicText
 import com.github.itsempa.nautilus.Nautilus
 import com.github.itsempa.nautilus.utils.NautilusChat
 import com.github.itsempa.nautilus.utils.NautilusUtils.asChatMessage

src/main/kotlin/com/github/itsempa/nautilus/features/gui/LegionBobbinDisplay.kt

@@ -10,7 +10,7 @@ import at.hannibal2.skyhanni.utils.LocationUtils.distanceTo
 import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.SkyBlockItemModifierUtils.getHypixelEnchantments
-import at.hannibal2.skyhanni.utils.TimeLimitedCache
+import at.hannibal2.skyhanni.utils.collection.TimeLimitedCache
 import at.hannibal2.skyhanni.utils.compat.MinecraftCompat.isLocalPlayer
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import at.hannibal2.skyhanni.utils.renderables.container.HorizontalContainerRenderable

src/main/kotlin/com/github/itsempa/nautilus/features/gui/RareDropsTracker.kt

@@ -13,9 +13,9 @@ import at.hannibal2.skyhanni.utils.NumberUtil.ordinal
 import at.hannibal2.skyhanni.utils.NumberUtil.roundTo
 import at.hannibal2.skyhanni.utils.RenderUtils.renderRenderables
 import at.hannibal2.skyhanni.utils.SimpleTimeMark
-import at.hannibal2.skyhanni.utils.SizeLimitedSet
 import at.hannibal2.skyhanni.utils.StringUtils
 import at.hannibal2.skyhanni.utils.collection.CollectionUtils.addAll
+import at.hannibal2.skyhanni.utils.collection.SizeLimitedSet
 import at.hannibal2.skyhanni.utils.renderables.Renderable
 import com.github.itsempa.nautilus.Nautilus
 import com.github.itsempa.nautilus.data.FeeshApi

src/main/kotlin/com/github/itsempa/nautilus/features/render/InvincibilityTimer.kt

@@ -3,8 +3,8 @@ package com.github.itsempa.nautilus.features.render
 import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.events.minecraft.SkyHanniRenderWorldEvent
 import at.hannibal2.skyhanni.utils.LorenzRarity
-import at.hannibal2.skyhanni.utils.RenderUtils.drawDynamicText
 import at.hannibal2.skyhanni.utils.TimeUtils.format
+import at.hannibal2.skyhanni.utils.render.WorldRenderUtils.drawDynamicText
 import com.github.itsempa.nautilus.Nautilus
 import com.github.itsempa.nautilus.data.SeaCreatureData
 import com.github.itsempa.nautilus.data.VanquisherApi