Fix + Improvement: No Bits Warning (#1425)

2 files changed, 12 insertions, 6 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
index 6de6ea4f0..8c1c1afc1 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/gui/customscoreboard/ScoreboardElements.kt
@@ -372,10 +372,10 @@ private fun getBankShowWhen() = !inAnyIsland(IslandType.THE_RIFT)
 
 private fun getBitsDisplayPair(): List<ScoreboardElementType> {
     val bits = BitsAPI.bits.coerceAtLeast(0).formatNum()
-    val bitsToClaim = if (BitsAPI.bitsToClaim == -1) {
+    val bitsToClaim = if (BitsAPI.bitsAvailable == -1) {
         "§cOpen Sbmenu§b"
     } else {
-        BitsAPI.bitsToClaim.coerceAtLeast(0).formatNum()
+        BitsAPI.bitsAvailable.coerceAtLeast(0).formatNum()
     }
 
     return listOf(
diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/NoBitsWarning.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/NoBitsWarning.kt
index 0b2e6069e..2529c026b 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/misc/NoBitsWarning.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/misc/NoBitsWarning.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.misc
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.BitsUpdateEvent
 import at.hannibal2.skyhanni.utils.ChatUtils
 import at.hannibal2.skyhanni.utils.LorenzUtils
@@ -14,17 +15,22 @@ class NoBitsWarning {
     private val config get() = SkyHanniMod.feature.misc.noBitsWarning
 
     @SubscribeEvent
-    fun onBitsUpdate(event: BitsUpdateEvent) {
+    fun onBitsGain(event: BitsUpdateEvent.BitsGain) {
         if (!isEnabled()) return
-        if (event.bitsToClaim != 0) return
+        if (event.bitsAvailable != 0) return
 
         ChatUtils.clickableChat(
             "§bNo Bits Available! §eClick to run /bz booster cookie.",
             "bz booster cookie"
         )
         LorenzUtils.sendTitle("§bNo Bits Available", 5.seconds)
-        SoundUtils.repeatSound(100,10, createSound("note.pling", 0.6f))
+        if (config.notificationSound) SoundUtils.repeatSound(100, 10, createSound("note.pling", 0.6f))
     }
 
-    private fun isEnabled() = LorenzUtils.inSkyBlock && config
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(35, "misc.noBitsWarning", "misc.noBitsWarning.enabled")
+    }
+
+    private fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled
 }