code cleanup

3 files changed, 11 insertions, 9 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
index c98c32aa5..c7dc90840 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt
@@ -87,8 +87,8 @@ enum class SkyblockStat(
     UNKNOWN("§c?", "", "")
     ;
 
-    var lastKnownValue: Double
-        get() = ProfileStorageData.profileSpecific?.stats?.get(this) ?: 0.0
+    var lastKnownValue: Double?
+        get() = ProfileStorageData.profileSpecific?.stats?.get(this)
         set(value) {
             ProfileStorageData.profileSpecific?.stats?.set(this, value)
         }
@@ -101,7 +101,7 @@ enum class SkyblockStat(
 
     val keyName = name.lowercase().replace('_', '.')
 
-    val displayValue get() = icon + lastKnownValue.roundToInt()
+    val displayValue get() = lastKnownValue?.let { icon + it.roundToInt() }
 
     val tablistPattern by RepoPattern.pattern("stats.tablist.$keyName", tabListPatternS)
     val menuPattern by RepoPattern.pattern("stats.menu.$keyName", menuPatternS)
diff --git a/src/main/java/at/hannibal2/skyhanni/features/combat/FerocityDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/combat/FerocityDisplay.kt
index 8ea8449f4..f960f17e4 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/combat/FerocityDisplay.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/combat/FerocityDisplay.kt
@@ -16,8 +16,9 @@ object FerocityDisplay {
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent) {
         if (!isEnabled()) return
-        if (SkyblockStat.FEROCITY.lastKnownValue == 0.0) return
-        config.position.renderString(SkyblockStat.FEROCITY.displayValue, posLabel = "Ferocity Display")
+        SkyblockStat.FEROCITY.displayValue?.let {
+            config.position.renderString(it, posLabel = "Ferocity Display")
+        }
     }
 
     fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/spook/TheGreatSpook.kt b/src/main/java/at/hannibal2/skyhanni/features/event/spook/TheGreatSpook.kt
index 6618b73f3..8d7a68ba5 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/spook/TheGreatSpook.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/spook/TheGreatSpook.kt
@@ -45,8 +45,10 @@ object TheGreatSpook {
     @SubscribeEvent
     fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) {
         if (isTimerEnabled()) config.positionTimer.renderString(displayTimer, posLabel = "Primal Fear Timer")
-        if (isFearStatEnabled() && SkyblockStat.FEAR.lastKnownValue != 0.0) {
-            config.positionFear.renderString(SkyblockStat.FEAR.displayValue, posLabel = "Fear Stat Display")
+        if (isFearStatEnabled()) {
+            SkyblockStat.FEAR.displayValue?.let {
+                config.positionFear.renderString(it, posLabel = "Fear Stat Display")
+            }
         }
         if (isTimeLeftEnabled()) config.positionTimeLeft.renderString(displayTimeLeft, posLabel = "Time Left Display")
     }
@@ -57,6 +59,5 @@ object TheGreatSpook {
     private fun isFearStatEnabled(): Boolean = LorenzUtils.inSkyBlock && config.fearStatDisplay
     private fun isTimeLeftEnabled(): Boolean = LorenzUtils.inSkyBlock && config.greatSpookTimeLeft
 
-    private fun isAllDisabled(): Boolean = !isTimeLeftEnabled() && !isTimerEnabled() && !isFearStatEnabled() &&
-        !isNotificationEnabled()
+    private fun isAllDisabled(): Boolean = !isTimeLeftEnabled() && !isTimerEnabled() && !isFearStatEnabled() && !isNotificationEnabled()
 }