refactor: remove old DungeonEvent

Skytils · Dec 25, 2024 · 7511f1d · 7511f1d
1 parent 063ea3f
commit 7511f1d
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 37 deletions.
diff --git a/mod/src/main/kotlin/gg/skytils/skytilsmod/events/impl/skyblock/DungeonEvent.kt b/mod/src/main/kotlin/gg/skytils/skytilsmod/events/impl/skyblock/DungeonEvent.kt
diff --git a/mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/DungeonFeatures.kt b/mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/DungeonFeatures.kt
@@ -39,12 +39,12 @@ import gg.skytils.event.register
 import gg.skytils.skytilsmod.Skytils
 import gg.skytils.skytilsmod.Skytils.mc
 import gg.skytils.skytilsmod.Skytils.prefix
+import gg.skytils.skytilsmod._event.DungeonPuzzleResetEvent
 import gg.skytils.skytilsmod._event.MainThreadPacketReceiveEvent
 import gg.skytils.skytilsmod._event.PacketReceiveEvent
 import gg.skytils.skytilsmod._event.PacketSendEvent
 import gg.skytils.skytilsmod.core.GuiManager
 import gg.skytils.skytilsmod.core.structure.GuiElement
-import gg.skytils.skytilsmod.events.impl.skyblock.DungeonEvent
 import gg.skytils.skytilsmod.features.impl.dungeons.catlas.handlers.DungeonInfo
 import gg.skytils.skytilsmod.features.impl.handlers.MayorInfo
 import gg.skytils.skytilsmod.listeners.DungeonListener
@@ -342,7 +342,7 @@ object DungeonFeatures : EventSubscriber {
         }
     }
 
-    fun onPuzzleReset(event: DungeonEvent.PuzzleEvent.Reset) {
+    fun onPuzzleReset(event: DungeonPuzzleResetEvent) {
         if (!Utils.inDungeons) return
         if (event.puzzle == "Higher Or Lower") {
             blazes = 0

diff --git a/mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/ScoreCalculation.kt b/mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/ScoreCalculation.kt
@@ -25,7 +25,6 @@ import gg.skytils.skytilsmod.core.GuiManager
 import gg.skytils.skytilsmod.core.structure.GuiElement
 import gg.skytils.skytilsmod.core.tickTimer
 import gg.skytils.skytilsmod.events.impl.MainReceivePacketEvent
-import gg.skytils.skytilsmod.events.impl.skyblock.DungeonEvent
 import gg.skytils.skytilsmod.features.impl.dungeons.DungeonFeatures.dungeonFloorNumber
 import gg.skytils.skytilsmod.features.impl.handlers.MayorInfo
 import gg.skytils.skytilsmod.listeners.DungeonListener

diff --git a/mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/BoulderSolver.kt b/mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/dungeons/solvers/BoulderSolver.kt
@@ -29,7 +29,6 @@ import gg.skytils.skytilsmod.Skytils.mc
 import gg.skytils.skytilsmod.Skytils.successPrefix
 import gg.skytils.skytilsmod._event.DungeonPuzzleDiscoveredEvent
 import gg.skytils.skytilsmod.core.tickTimer
-import gg.skytils.skytilsmod.events.impl.skyblock.DungeonEvent
 import gg.skytils.skytilsmod.listeners.DungeonListener
 import gg.skytils.skytilsmod.utils.RenderUtil
 import gg.skytils.skytilsmod.utils.SuperSecretSettings

diff --git a/mod/src/main/kotlin/gg/skytils/skytilsmod/listeners/DungeonListener.kt b/mod/src/main/kotlin/gg/skytils/skytilsmod/listeners/DungeonListener.kt
@@ -40,7 +40,6 @@ import gg.skytils.skytilsmod._event.MainThreadPacketReceiveEvent
 import gg.skytils.skytilsmod.commands.impl.RepartyCommand
 import gg.skytils.skytilsmod.core.API
 import gg.skytils.skytilsmod.core.tickTimer
-import gg.skytils.skytilsmod.events.impl.skyblock.DungeonEvent
 import gg.skytils.skytilsmod.features.impl.dungeons.DungeonFeatures
 import gg.skytils.skytilsmod.features.impl.dungeons.DungeonTimer
 import gg.skytils.skytilsmod.features.impl.dungeons.ScoreCalculation
@@ -282,15 +281,12 @@ object DungeonListener : EventSubscriber {
                 val resetPuzzles = localMissingPuzzles.filter { it in completedPuzzles }
 
                 resetPuzzles.forEach {
-                    DungeonEvent.PuzzleEvent.Reset(it).postAndCatch()
                     postSync(DungeonPuzzleResetEvent(it))
                 }
                 newPuzzles.forEach {
-                    DungeonEvent.PuzzleEvent.Discovered(it).postAndCatch()
                     postSync(DungeonPuzzleDiscoveredEvent(it))
                 }
                 localCompletedPuzzles.forEach {
-                    DungeonEvent.PuzzleEvent.Completed(it).postAndCatch()
                     postSync(DungeonPuzzleCompletedEvent(it))
                 }
                 missingPuzzles.clear()