change some LorenzEvents without parameters to SkyHanniEvents and mak…

…e them objects

src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt

@@ -60,7 +60,7 @@ object CollectionAPI {
                 val internalName = incorrectCollectionNames[name] ?: NEUInternalName.fromItemName(name)
                 collectionValue[internalName] = counter
             }
-            CollectionUpdateEvent().postAndCatch()
+            CollectionUpdateEvent.post()
         }
 
         if (inventoryName.endsWith(" Collections")) {
@@ -83,7 +83,7 @@ object CollectionAPI {
                     collectionValue[internalName] = counter
                 }
             }
-            CollectionUpdateEvent().postAndCatch()
+            CollectionUpdateEvent.post()
         }
     }
 

src/main/java/at/hannibal2/skyhanni/data/EntityMovementData.kt

@@ -104,7 +104,7 @@ object EntityMovementData {
         if (!LorenzUtils.inSkyBlock) return
         if (!warpingPattern.matches(event.message)) return
         DelayedRun.runNextTick {
-            LorenzWarpEvent().postAndCatch()
+            LorenzWarpEvent.post()
         }
     }
 

src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt

@@ -51,7 +51,7 @@ object GardenCropMilestones {
                 crop.setCounter(amount)
             }
         }
-        CropMilestoneUpdateEvent().postAndCatch()
+        CropMilestoneUpdateEvent.post()
         GardenCropMilestonesCommunityFix.openInventory(event.inventoryItems)
     }
 

src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt

@@ -334,7 +334,7 @@ object SackAPI {
         ProfileStorageData.sackProfiles?.sackContents = sackData
         SkyHanniMod.configManager.saveConfig(ConfigFileType.SACKS, "saving-data")
 
-        SackDataUpdateEvent().postAndCatch()
+        SackDataUpdateEvent.post()
     }
 
     data class SackGemstone(

src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt

@@ -82,7 +82,7 @@ object SlayerAPI {
         }
 
         if (event.message == "  §r§a§lSLAYER QUEST COMPLETE!") {
-            SlayerQuestCompleteEvent().postAndCatch()
+            SlayerQuestCompleteEvent.post()
         }
     }
 

src/main/java/at/hannibal2/skyhanni/events/CollectionUpdateEvent.kt

@@ -1,3 +1,5 @@
 package at.hannibal2.skyhanni.events
 
-class CollectionUpdateEvent : LorenzEvent()
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+
+object CollectionUpdateEvent : SkyHanniEvent()

src/main/java/at/hannibal2/skyhanni/events/CropMilestoneUpdateEvent.kt

@@ -1,3 +1,5 @@
 package at.hannibal2.skyhanni.events
 
-class CropMilestoneUpdateEvent : LorenzEvent()
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+
+object CropMilestoneUpdateEvent : SkyHanniEvent()

src/main/java/at/hannibal2/skyhanni/events/DungeonBossRoomEnterEvent.kt

@@ -1,3 +1,5 @@
 package at.hannibal2.skyhanni.events
 
-class DungeonBossRoomEnterEvent : LorenzEvent()
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+
+object DungeonBossRoomEnterEvent : SkyHanniEvent()

src/main/java/at/hannibal2/skyhanni/events/LorenzWarpEvent.kt

@@ -1,3 +1,5 @@
 package at.hannibal2.skyhanni.events
 
-class LorenzWarpEvent : LorenzEvent()
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+
+object LorenzWarpEvent : SkyHanniEvent()

src/main/java/at/hannibal2/skyhanni/events/NEURenderEvent.kt

@@ -1,6 +1,5 @@
 package at.hannibal2.skyhanni.events
 
-import net.minecraftforge.fml.common.eventhandler.Cancelable
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 
-@Cancelable
-class NEURenderEvent : LorenzEvent()
+class NEURenderEvent : SkyHanniEvent(), SkyHanniEvent.Cancellable

src/main/java/at/hannibal2/skyhanni/events/SackDataUpdateEvent.kt

@@ -1,3 +1,5 @@
 package at.hannibal2.skyhanni.events
 
-class SackDataUpdateEvent : LorenzEvent()
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+
+object SackDataUpdateEvent : SkyHanniEvent()

src/main/java/at/hannibal2/skyhanni/events/SlayerQuestCompleteEvent.kt

@@ -1,3 +1,5 @@
 package at.hannibal2.skyhanni.events
 
-class SlayerQuestCompleteEvent : LorenzEvent()
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+
+object SlayerQuestCompleteEvent : SkyHanniEvent()

src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonAPI.kt

@@ -123,7 +123,7 @@ object DungeonAPI {
         val message = rawMessage.removeColor()
         val bossName = message.substringAfter("[BOSS] ").substringBefore(":").trim()
         if ((bossName != "The Watcher") && dungeonFloor != null && checkBossName(bossName) && !inBossRoom) {
-            DungeonBossRoomEnterEvent().postAndCatch()
+            DungeonBossRoomEnterEvent.post()
             inBossRoom = true
         }
     }

src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt

@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.dungeon
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
 import at.hannibal2.skyhanni.events.DungeonBossRoomEnterEvent
@@ -133,7 +134,7 @@ object DungeonCopilot {
         searchForKey = true
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onDungeonBossRoomEnter(event: DungeonBossRoomEnterEvent) {
         changeNextStep("Defeat the boss! Good luck :)")
     }

src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt

@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.features.garden.farming
 
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.GardenCropMilestones.getCounter
 import at.hannibal2.skyhanni.events.CropClickEvent
 import at.hannibal2.skyhanni.events.CropMilestoneUpdateEvent
@@ -76,7 +77,7 @@ object CropSpeedMeter {
         return list
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onCropMilestoneUpdate(event: CropMilestoneUpdateEvent) {
         if (!isEnabled()) return
         val counters = mutableMapOf<CropType, Long>()

src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt

@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.features.garden.farming
 
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.config.features.garden.cropmilestones.CropMilestonesConfig.MilestoneTextEntry
 import at.hannibal2.skyhanni.config.features.garden.cropmilestones.CropMilestonesConfig.TimeFormatEntry
@@ -99,7 +100,7 @@ object GardenCropMilestoneDisplay {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onCropMilestoneUpdate(event: CropMilestoneUpdateEvent) {
         needsInventory = false
         GardenBestCropTime.updateTimeTillNextCrop()

src/main/java/at/hannibal2/skyhanni/features/garden/inventory/GardenCropMilestoneInventory.kt

@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.features.garden.inventory
 
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.GardenCropMilestones
 import at.hannibal2.skyhanni.data.GardenCropMilestones.getCounter
@@ -24,7 +25,7 @@ object GardenCropMilestoneInventory {
     private var average = -1.0
     private val config get() = GardenAPI.config
 
-    @SubscribeEvent
+    @HandleEvent
     fun onCropMilestoneUpdate(event: CropMilestoneUpdateEvent) {
         if (!config.number.averageCropMilestone) return
 

src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorFeatures.kt

@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.features.garden.visitor
 
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.config.features.garden.visitor.VisitorConfig.HighlightMode
 import at.hannibal2.skyhanni.data.IslandType
@@ -336,7 +337,7 @@ object GardenVisitorFeatures {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onSackUpdate(event: SackDataUpdateEvent) {
         update()
     }

src/main/java/at/hannibal2/skyhanni/features/mining/TunnelsMaps.kt

@@ -502,7 +502,7 @@ object TunnelsMaps {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onLorenzWarp(event: LorenzWarpEvent) {
         if (!isEnabled()) return
         if (goal != null) {

src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerProfitTracker.kt

@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.features.slayer
 
 import at.hannibal2.skyhanni.SkyHanniMod
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage
 import at.hannibal2.skyhanni.data.ItemAddManager
@@ -143,7 +144,7 @@ object SlayerProfitTracker {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onQuestComplete(event: SlayerQuestCompleteEvent) {
         getTracker()?.modify {
             it.slayerCompletedCount++

src/main/java/at/hannibal2/skyhanni/mixins/transformers/MixinNEUOverlay.java

@@ -12,7 +12,7 @@ public class MixinNEUOverlay {
 
     @Inject(method = "render", at = @At("HEAD"), cancellable = true, remap = false)
     private void render(boolean hoverInv, CallbackInfo ci) {
-        if (new NEURenderEvent().postAndCatch()) {
+        if (new NEURenderEvent().post()) {
             ci.cancel();
         }
     }