From 5b3ee9de1856d9989e20cc4d534cac17089ce0e5 Mon Sep 17 00:00:00 2001
From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com>
Date: Sat, 8 Jun 2024 13:33:35 +1000
Subject: Backend: Start using new event system (#2023)

---
 src/main/java/at/hannibal2/skyhanni/data/GuiData.kt          | 3 ++-
 src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt      | 3 ++-
 src/main/java/at/hannibal2/skyhanni/data/ToolTipData.kt      | 2 +-
 src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/data')

diff --git a/src/main/java/at/hannibal2/skyhanni/data/GuiData.kt b/src/main/java/at/hannibal2/skyhanni/data/GuiData.kt
index e128143e1..c51e4cccc 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/GuiData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/GuiData.kt
@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.data
 
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.events.GuiContainerEvent
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
@@ -60,7 +61,7 @@ object GuiData {
         preDrawEventCanceled = false
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onDisconnect(event: ClientDisconnectEvent) {
         preDrawEventCanceled = false
     }
diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
index a46ff6de4..06ed7f44f 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.data
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigManager.Companion.gson
 import at.hannibal2.skyhanni.data.model.TabWidget
 import at.hannibal2.skyhanni.events.HypixelJoinEvent
@@ -235,7 +236,7 @@ class HypixelData {
         skyBlockAreaWithSymbol = null
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onDisconnect(event: ClientDisconnectEvent) {
         hypixelLive = false
         hypixelAlpha = false
diff --git a/src/main/java/at/hannibal2/skyhanni/data/ToolTipData.kt b/src/main/java/at/hannibal2/skyhanni/data/ToolTipData.kt
index 70cd9cd34..482b590fe 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/ToolTipData.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/ToolTipData.kt
@@ -37,7 +37,7 @@ object ToolTipData {
 
     @JvmStatic
     fun onHover(stack: ItemStack, toolTip: MutableList<String>) {
-        ItemHoverEvent(stack, toolTip).postAndCatch()
+        ItemHoverEvent(stack, toolTip).post()
     }
 
     var lastSlot: Slot? = null
diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
index 452fa09b3..a5e34f0fc 100644
--- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
+++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt
@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.data.mob
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.IslandType
 import at.hannibal2.skyhanni.data.mob.MobData.logger
 import at.hannibal2.skyhanni.data.mob.MobFilter.isDisplayNPC
@@ -333,7 +334,7 @@ object MobDetection {
         allEntitiesViaPacketId.add(id)
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onDisconnect(event: ClientDisconnectEvent) {
         shouldClear.set(true)
     }
-- 
cgit