migrate diana and bingo config into events

7 files changed, 26 insertions, 20 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/anniversary/ActivePlayerTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/event/anniversary/Year300RaffleEvent.kt
index a83def532..948d04269 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/anniversary/ActivePlayerTimer.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/anniversary/Year300RaffleEvent.kt
@@ -20,7 +20,8 @@ import java.time.Instant
 import kotlin.time.Duration.Companion.minutes
 import kotlin.time.Duration.Companion.seconds
 
-object ActivePlayerTimer {
+object Year300RaffleEvent {
+    private val config get() = SkyHanniMod.feature.event.century
     val displayItem by lazy { NEUItems.getItemStackOrNull("EPOCH_CAKE_ORANGE") ?: ItemStack(Items.clock) }
 
     private var lastTimerReceived = TimeMark.never()
@@ -35,16 +36,14 @@ object ActivePlayerTimer {
         }
     }
 
-    fun isEnabled(): Boolean {
-        return SkyHanniMod.feature.misc.century.enableActiveTimer &&
-                Instant.now().isBefore(SkyBlockTime(301).toInstant()) &&
-                LorenzUtils.inSkyBlock
-    }
+    fun isEnabled() = config.enableActiveTimer &&
+            Instant.now().isBefore(SkyBlockTime(301).toInstant()) &&
+            LorenzUtils.inSkyBlock
 
 
     @SubscribeEvent
     fun onRender(event: GuiRenderEvent.GameOverlayRenderEvent) {
-        SkyHanniMod.feature.misc.century.activeTimerPosition.renderSingleLineWithItems(
+        config.activeTimerPosition.renderSingleLineWithItems(
             overlay ?: return,
             posLabel = "300þ Anniversary Active Timer"
         )
@@ -62,7 +61,7 @@ object ActivePlayerTimer {
         } else {
             20.minutes - p
         }
-        if (p.isFinite() && timeLeft < 1.seconds && lastTimeAlerted.passedTime() > 5.minutes && SkyHanniMod.feature.misc.century.enableActiveAlert) {
+        if (p.isFinite() && timeLeft < 1.seconds && lastTimeAlerted.passedTime() > 5.minutes && config.enableActiveAlert) {
             SoundUtils.centuryActiveTimerAlert.playSound()
             lastTimeAlerted = TimeMark.now()
         }
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
index fe9efd09a..f96c6d260 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/BurrowWarpHelper.kt
@@ -12,7 +12,6 @@ import net.minecraftforge.fml.common.gameevent.InputEvent.KeyInputEvent
 import org.lwjgl.input.Keyboard
 
 class BurrowWarpHelper {
-    private val config get() = SkyHanniMod.feature.diana
 
     private var lastWarpTime = 0L
     private var lastWarp: WarpPoint? = null
@@ -58,6 +57,7 @@ class BurrowWarpHelper {
     }
 
     companion object {
+        private val config get() = SkyHanniMod.feature.event.diana
         var currentWarp: WarpPoint? = null
 
         fun shouldUseWarps(target: LorenzVec) {
@@ -93,10 +93,10 @@ class BurrowWarpHelper {
     ) {
         HUB("Hub", LorenzVec(-3, 70, -70), 2),
         CASTLE("Castle", LorenzVec(-250, 130, 45), 10),
-        CRYPT("Crypt", LorenzVec(-190, 74, -88), 15, { SkyHanniMod.feature.diana.ignoredWarps.crypt }),
+        CRYPT("Crypt", LorenzVec(-190, 74, -88), 15, { config.ignoredWarps.crypt }),
         DA("Dark Auction", LorenzVec(91, 74, 173), 2),
         MUSEUM("Museum", LorenzVec(-75, 76, 81), 2),
-        WIZARD("Wizard", LorenzVec(42.5, 122.0, 69.0), 5, { SkyHanniMod.feature.diana.ignoredWarps.wizard }),
+        WIZARD("Wizard", LorenzVec(42.5, 122.0, 69.0), 5, { config.ignoredWarps.wizard }),
         ;
 
         fun distance(other: LorenzVec): Double = other.distance(location) + extraBlocks
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
index d3c6038f2..1a6750d85 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowHelper.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.event.diana
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.EntityMovementData
 import at.hannibal2.skyhanni.events.*
 import at.hannibal2.skyhanni.utils.*
@@ -18,7 +19,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import kotlin.time.Duration.Companion.seconds
 
 object GriffinBurrowHelper {
-    private val config get() = SkyHanniMod.feature.diana
+    private val config get() = SkyHanniMod.feature.event.diana
 
     private var guessLocation: LorenzVec? = null
     private var targetLocation: LorenzVec? = null
@@ -137,7 +138,7 @@ object GriffinBurrowHelper {
         sendTip(event)
 
         val playerLocation = LocationUtils.playerLocation()
-        if (SkyHanniMod.feature.diana.inquisitorSharing.enabled) {
+        if (config.inquisitorSharing.enabled) {
             for (inquis in InquisitorWaypointShare.waypoints.values) {
                 val playerName = inquis.fromPlayer
                 val location = inquis.location
@@ -163,7 +164,7 @@ object GriffinBurrowHelper {
         }
 
         if (InquisitorWaypointShare.waypoints.isNotEmpty()) {
-            if (SkyHanniMod.feature.diana.inquisitorSharing.focusInquisitor) {
+            if (config.inquisitorSharing.focusInquisitor) {
                 return
             }
         }
@@ -192,6 +193,11 @@ object GriffinBurrowHelper {
         }
     }
 
+    @SubscribeEvent
+    fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) {
+        event.move(2, "diana", "event.diana")
+    }
+
     private fun sendTip(event: RenderWorldLastEvent) {
         teleportedLocation?.let {
             teleportedLocation = null
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
index 31571b30b..b16df2c70 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinBurrowParticleFinder.kt
@@ -15,6 +15,7 @@ import net.minecraftforge.fml.common.eventhandler.EventPriority
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 class GriffinBurrowParticleFinder {
+    private val config get() = SkyHanniMod.feature.event.diana
 
     private val recentlyDugParticleBurrows = mutableListOf<LorenzVec>()
     private val burrows = mutableMapOf<LorenzVec, Burrow>()
@@ -78,7 +79,7 @@ class GriffinBurrowParticleFinder {
     @SubscribeEvent(priority = EventPriority.LOW, receiveCanceled = true)
     fun onChatPacket(event: PacketEvent.ReceiveEvent) {
         if (!LorenzUtils.inSkyBlock) return
-        if (!SkyHanniMod.feature.diana.burrowsSoopyGuess) return
+        if (!config.burrowsSoopyGuess) return
         if (LorenzUtils.skyBlockIsland != IslandType.HUB) return
         val packet = event.packet
 
@@ -149,7 +150,7 @@ class GriffinBurrowParticleFinder {
 
     @SubscribeEvent
     fun onChatMessage(event: LorenzChatEvent) {
-        if (!SkyHanniMod.feature.diana.burrowsSoopyGuess) return
+        if (!config.burrowsSoopyGuess) return
         if (LorenzUtils.skyBlockIsland != IslandType.HUB) return
         val message = event.message
         if (message.startsWith("§eYou dug out a Griffin Burrow!") ||
@@ -171,7 +172,7 @@ class GriffinBurrowParticleFinder {
     @SubscribeEvent
     fun onBlockClick(event: BlockClickEvent) {
         if (!LorenzUtils.inSkyBlock) return
-        if (!SkyHanniMod.feature.diana.burrowsSoopyGuess) return
+        if (!config.burrowsSoopyGuess) return
         if (LorenzUtils.skyBlockIsland != IslandType.HUB) return
 
         val pos = event.position
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinPetWarning.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinPetWarning.kt
index 5a578590f..679c493ca 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinPetWarning.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/GriffinPetWarning.kt
@@ -17,7 +17,7 @@ class GriffinPetWarning {
     fun onTick(event: LorenzTickEvent) {
         if (!event.isMod(20)) return
         if (!IslandType.HUB.isInIsland()) return
-        if (!SkyHanniMod.feature.diana.petWarning) return
+        if (!SkyHanniMod.feature.event.diana.petWarning) return
         if (!DianaAPI.isRitualActive()) return
         if (!DianaAPI.hasSpadeInHand()) return
 
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
index 7a8ea5d2b..14f4305ab 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt
@@ -20,7 +20,7 @@ import org.lwjgl.input.Keyboard
 import kotlin.time.Duration.Companion.seconds
 
 object InquisitorWaypointShare {
-    private val config get() = SkyHanniMod.feature.diana.inquisitorSharing
+    private val config get() = SkyHanniMod.feature.event.diana.inquisitorSharing
     private val partyPattern =
         "§9Party §8> (?<playerName>.*)§f: §rx: (?<x>-?[0-9]{1,4}), y: (?<y>-?[0-9]{1,4}), z: (?<z>-?[0-9]{1,4})\\b".toPattern()
     private val diedPattern = "§9Party §8> (?<playerName>.*)§f: §rInquisitor dead!".toPattern()
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
index 079d6cecf..0ca67ad8e 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/SoopyGuessBurrow.kt
@@ -276,6 +276,6 @@ class SoopyGuessBurrow {
     }
 
     private fun isEnabled(): Boolean {
-        return LorenzUtils.inSkyBlock && LorenzUtils.skyBlockIsland == IslandType.HUB && SkyHanniMod.feature.diana.burrowsSoopyGuess
+        return LorenzUtils.inSkyBlock && LorenzUtils.skyBlockIsland == IslandType.HUB && SkyHanniMod.feature.event.diana.burrowsSoopyGuess
     }
 }
\ No newline at end of file