how much more do i need?

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

@@ -126,7 +126,7 @@ object SkillAPI {
                     skillMultiplierPattern -> handleSkillPatternMultiplier(matcher, skillType, skillInfo)
                 }
 
-                SkillExpGainEvent(skillType, matcher.group("gained").formatDouble()).postAndCatch()
+                SkillExpGainEvent(skillType, matcher.group("gained").formatDouble()).post()
 
                 showDisplay = true
                 lastUpdate = SimpleTimeMark.now()
@@ -274,7 +274,7 @@ object SkillAPI {
             calculateSkillLevel(totalXp, cap)
 
         if (skillInfo.overflowLevel > 60 && levelOverflow == skillInfo.overflowLevel + 1)
-            SkillOverflowLevelUpEvent(skillType, skillInfo.overflowLevel, levelOverflow).postAndCatch()
+            SkillOverflowLevelUpEvent(skillType, skillInfo.overflowLevel, levelOverflow).post()
 
         skillInfo.apply {
             this.level = level

src/main/java/at/hannibal2/skyhanni/events/NeuEventWrappers.kt → src/main/java/at/hannibal2/skyhanni/api/enoughupdates/NeuEventWrappers.kt

@@ -1,7 +1,9 @@
-package at.hannibal2.skyhanni.events
+package at.hannibal2.skyhanni.api.enoughupdates
 
 import at.hannibal2.skyhanni.data.jsonobjects.other.HypixelApiTrophyFish
 import at.hannibal2.skyhanni.data.jsonobjects.other.HypixelPlayerApiJson
+import at.hannibal2.skyhanni.events.NeuProfileDataLoadedEvent
+import at.hannibal2.skyhanni.events.NeuRepositoryReloadEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.test.command.ErrorManager
 import at.hannibal2.skyhanni.utils.NumberUtil.isInt

src/main/java/at/hannibal2/skyhanni/data/BitsAPI.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.ConfigUpdaterMigrator
 import at.hannibal2.skyhanni.data.FameRanks.getFameRankByNameOrNull
 import at.hannibal2.skyhanni.events.BitsUpdateEvent
@@ -187,7 +188,7 @@ object BitsAPI {
         "^§aCommunity Shop|§eFame Rank$",
     )
 
-    @SubscribeEvent
+    @HandleEvent
     fun onScoreboardChange(event: ScoreboardUpdateEvent) {
         if (!isEnabled()) return
         for (line in event.added) {

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

@@ -15,10 +15,10 @@ object BlockData {
         if (event.packet is S23PacketBlockChange) {
             val blockPos = event.packet.blockPosition ?: return
             val blockState = event.packet.blockState ?: return
-            ServerBlockChangeEvent(blockPos, blockState).postAndCatch()
+            ServerBlockChangeEvent(blockPos, blockState).post()
         } else if (event.packet is S22PacketMultiBlockChange) {
             for (block in event.packet.changedBlocks) {
-                ServerBlockChangeEvent(block.pos, block.blockState).postAndCatch()
+                ServerBlockChangeEvent(block.pos, block.blockState).post()
             }
         }
     }

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

@@ -1,10 +1,10 @@
 package at.hannibal2.skyhanni.data
 
-import at.hannibal2.skyhanni.api.enoughupdates.NEURenderEvent
 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
+import at.hannibal2.skyhanni.events.NEURenderEvent
 import at.hannibal2.skyhanni.events.minecraft.ClientDisconnectEvent
 import at.hannibal2.skyhanni.features.inventory.wardrobe.CustomWardrobeKeybinds
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule

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

@@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.data
 import at.hannibal2.skyhanni.api.HotmAPI
 import at.hannibal2.skyhanni.api.HotmAPI.MayhemPerk
 import at.hannibal2.skyhanni.api.HotmAPI.SkymallPerk
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage
 import at.hannibal2.skyhanni.data.jsonobjects.local.HotmTree
 import at.hannibal2.skyhanni.data.model.TabWidget
@@ -690,7 +691,7 @@ enum class HotmData(
             }
         }
 
-        @SubscribeEvent
+        @HandleEvent
         fun onScoreboardUpdate(event: ScoreboardUpdateEvent) {
             if (!LorenzUtils.inSkyBlock) return
 

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

@@ -355,7 +355,7 @@ object HypixelData {
         hasScoreboardUpdated = false
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onScoreboardUpdate(event: ScoreboardUpdateEvent) {
         hasScoreboardUpdated = true
     }

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

@@ -190,7 +190,7 @@ object MiningAPI {
 
     fun inColdIsland() = inAnyIsland(IslandType.DWARVEN_MINES, IslandType.MINESHAFT)
 
-    @SubscribeEvent
+    @HandleEvent
     fun onScoreboardChange(event: ScoreboardUpdateEvent) {
         if (!inCustomMiningIsland()) return
 
@@ -300,7 +300,7 @@ object MiningAPI {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onBlockChange(event: ServerBlockChangeEvent) {
         if (!inCustomMiningIsland()) return
         val oldState = event.oldState

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

@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.data
 
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.events.InventoryCloseEvent
 import at.hannibal2.skyhanni.events.PurseChangeCause
 import at.hannibal2.skyhanni.events.PurseChangeEvent
@@ -44,15 +45,15 @@ object PurseAPI {
         inventoryCloseTime = SimpleTimeMark.now()
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onScoreboardChange(event: ScoreboardUpdateEvent) {
         coinsPattern.firstMatcher(event.added) {
             val newPurse = group("coins").formatDouble()
             val diff = newPurse - currentPurse
             if (diff == 0.0) return
             currentPurse = newPurse
 
-            PurseChangeEvent(diff, currentPurse, getCause(diff)).postAndCatch()
+            PurseChangeEvent(diff, currentPurse, getCause(diff)).post()
         }
     }
 

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

@@ -111,15 +111,15 @@ object ScoreboardData {
         val semiFormatted = list.map { cleanSB(it) }
         if (semiFormatted != sidebarLines) {
             sidebarLines = semiFormatted
-            RawScoreboardUpdateEvent(semiFormatted).postAndCatch()
+            RawScoreboardUpdateEvent(semiFormatted).post()
         }
 
         sidebarLinesRaw = list
         val new = formatLines(list)
         if (new != sidebarLinesFormatted) {
             val old = sidebarLinesFormatted
             sidebarLinesFormatted = new
-            ScoreboardUpdateEvent(new, old).postAndCatch()
+            ScoreboardUpdateEvent(new, old).post()
         }
     }
 

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

@@ -112,12 +112,12 @@ object SlayerAPI {
         if (slayerQuest != latestSlayerCategory) {
             val old = latestSlayerCategory
             latestSlayerCategory = slayerQuest
-            SlayerChangeEvent(old, latestSlayerCategory).postAndCatch()
+            SlayerChangeEvent(old, latestSlayerCategory).post()
         }
 
         val slayerProgress = ScoreboardData.sidebarLinesFormatted.nextAfter("Slayer Quest", 2).orEmpty()
         if (latestSlayerProgress != slayerProgress) {
-            SlayerProgressChangeEvent(latestSlayerProgress, slayerProgress).postAndCatch()
+            SlayerProgressChangeEvent(latestSlayerProgress, slayerProgress).post()
             latestSlayerProgress = slayerProgress
         }
 

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

@@ -16,7 +16,7 @@ object TitleData {
         if (packet !is S45PacketTitle) return
         val message = packet.message ?: return
         val formattedText = message.formattedText
-        if (TitleReceivedEvent(formattedText).postAndCatch()) {
+        if (TitleReceivedEvent(formattedText).post()) {
             event.cancel()
         }
     }

src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt

@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.data.model
 
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.events.SecondPassedEvent
@@ -398,7 +399,7 @@ enum class TabWidget(
             ChatUtils.debug("Forcefully Updated Widgets")
         }
 
-        @SubscribeEvent(priority = EventPriority.HIGH)
+        @HandleEvent(priority = HandleEvent.HIGH)
         fun onTabListUpdate(event: TabListUpdateEvent) {
             if (!LorenzUtils.inSkyBlock) {
                 if (separatorIndexes.isNotEmpty()) {

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

@@ -1,8 +1,9 @@
 package at.hannibal2.skyhanni.events
 
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 import at.hannibal2.skyhanni.utils.LorenzVec
 import net.minecraft.item.ItemStack
 
-class MinionOpenEvent(val inventoryName: String, val inventoryItems: Map<Int, ItemStack>) : LorenzEvent()
-class MinionCloseEvent : LorenzEvent()
-class MinionStorageOpenEvent(val position: LorenzVec?, val inventoryItems: Map<Int, ItemStack>) : LorenzEvent()
+class MinionOpenEvent(val inventoryName: String, val inventoryItems: Map<Int, ItemStack>) : SkyHanniEvent()
+class MinionCloseEvent : SkyHanniEvent()
+class MinionStorageOpenEvent(val position: LorenzVec?, val inventoryItems: Map<Int, ItemStack>) : SkyHanniEvent()

src/main/java/at/hannibal2/skyhanni/api/enoughupdates/NEURenderEvent.kt → src/main/java/at/hannibal2/skyhanni/events/NEURenderEvent.kt

@@ -1,4 +1,4 @@
-package at.hannibal2.skyhanni.api.enoughupdates
+package at.hannibal2.skyhanni.events
 
 import at.hannibal2.skyhanni.api.event.CancellableSkyHanniEvent
 

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

@@ -1,6 +1,8 @@
 package at.hannibal2.skyhanni.events
 
-class PurseChangeEvent(val coins: Double, val purse: Double, val reason: PurseChangeCause) : LorenzEvent()
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+
+class PurseChangeEvent(val coins: Double, val purse: Double, val reason: PurseChangeCause) : SkyHanniEvent()
 
 enum class PurseChangeCause {
     GAIN_MOB_KILL,

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

@@ -1,3 +1,5 @@
 package at.hannibal2.skyhanni.events
 
-class RawScoreboardUpdateEvent(val rawScoreboard: List<String>) : LorenzEvent()
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+
+class RawScoreboardUpdateEvent(val rawScoreboard: List<String>) : SkyHanniEvent()

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

@@ -1,9 +1,10 @@
 package at.hannibal2.skyhanni.events
 
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 import net.minecraft.item.ItemStack
 
 class RenderGuiItemOverlayEvent(
     val stack: ItemStack?,
     val x: Int,
     val y: Int,
-) : LorenzEvent()
+) : SkyHanniEvent()

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

@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.events
 
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 import net.minecraft.item.ItemStack
 
-class RenderItemTooltipEvent(val stack: ItemStack) : LorenzEvent()
+class RenderItemTooltipEvent(val stack: ItemStack) : SkyHanniEvent()

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

@@ -1,9 +1,11 @@
 package at.hannibal2.skyhanni.events
 
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+
 class ScoreboardUpdateEvent(
     val full: List<String>,
     val old: List<String>,
-) : LorenzEvent() {
+) : SkyHanniEvent() {
 
     val added: List<String> = full - old.toSet()
     val removed: List<String> = old - full.toSet()

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

@@ -1,9 +1,10 @@
 package at.hannibal2.skyhanni.events
 
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 import at.hannibal2.skyhanni.features.fishing.SeaCreature
 
 class SeaCreatureFishEvent(
     val seaCreature: SeaCreature,
     val chatEvent: LorenzChatEvent,
     val doubleHook: Boolean,
-) : LorenzEvent()
+) : SkyHanniEvent()

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

@@ -1,13 +1,14 @@
 package at.hannibal2.skyhanni.events
 
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 import at.hannibal2.skyhanni.utils.BlockUtils.getBlockAt
 import at.hannibal2.skyhanni.utils.BlockUtils.getBlockStateAt
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.toLorenzVec
 import net.minecraft.block.state.IBlockState
 import net.minecraft.util.BlockPos
 
-class ServerBlockChangeEvent(blockPos: BlockPos, blockState: IBlockState) : LorenzEvent() {
+class ServerBlockChangeEvent(blockPos: BlockPos, blockState: IBlockState) : SkyHanniEvent() {
 
     val location by lazy { blockPos.toLorenzVec() }
     val old by lazy { location.getBlockAt().toString().getName() }

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

@@ -1,6 +1,7 @@
 package at.hannibal2.skyhanni.events
 
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 import at.hannibal2.skyhanni.features.skillprogress.SkillType
 
 // does not know how much exp is there, also gets called multiple times
-class SkillExpGainEvent(val skill: SkillType, val gained: Double) : LorenzEvent()
+class SkillExpGainEvent(val skill: SkillType, val gained: Double) : SkyHanniEvent()

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

@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.events
 
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 import at.hannibal2.skyhanni.features.skillprogress.SkillType
 
-class SkillOverflowLevelUpEvent(val skill: SkillType, val oldLevel: Int, val newLevel: Int) : LorenzEvent()
+class SkillOverflowLevelUpEvent(val skill: SkillType, val oldLevel: Int, val newLevel: Int) : SkyHanniEvent()

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

@@ -1,11 +1,10 @@
 package at.hannibal2.skyhanni.events
 
+import at.hannibal2.skyhanni.api.event.CancellableSkyHanniEvent
 import at.hannibal2.skyhanni.features.misc.compacttablist.TabLine
-import net.minecraftforge.fml.common.eventhandler.Cancelable
 
-@Cancelable
 data class SkipTabListLineEvent(
     val line: TabLine,
     val lastSubTitle: TabLine?,
     val lastTitle: TabLine?,
-) : LorenzEvent()
+) : CancellableSkyHanniEvent()

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

@@ -1,3 +1,5 @@
 package at.hannibal2.skyhanni.events
 
-class SlayerChangeEvent(val oldSlayer: String, val newSlayer: String) : LorenzEvent()
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+
+class SlayerChangeEvent(val oldSlayer: String, val newSlayer: String) : SkyHanniEvent()

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

@@ -1,3 +1,5 @@
 package at.hannibal2.skyhanni.events
 
-class SlayerProgressChangeEvent(val oldProgress: String, val newProgress: String) : LorenzEvent()
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+
+class SlayerProgressChangeEvent(val oldProgress: String, val newProgress: String) : SkyHanniEvent()

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

@@ -1,3 +1,5 @@
 package at.hannibal2.skyhanni.events
 
-class TabListLineRenderEvent(var text: String) : LorenzEvent()
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+
+class TabListLineRenderEvent(var text: String) : SkyHanniEvent()

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

@@ -1,3 +1,5 @@
 package at.hannibal2.skyhanni.events
 
-class TabListUpdateEvent(val tabList: List<String>) : LorenzEvent()
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+
+class TabListUpdateEvent(val tabList: List<String>) : SkyHanniEvent()

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

@@ -1,3 +1,5 @@
 package at.hannibal2.skyhanni.events
 
-class TablistFooterUpdateEvent(val footer: String) : LorenzEvent()
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+
+class TablistFooterUpdateEvent(val footer: String) : SkyHanniEvent()

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

@@ -1,6 +1,5 @@
 package at.hannibal2.skyhanni.events
 
-import net.minecraftforge.fml.common.eventhandler.Cancelable
+import at.hannibal2.skyhanni.api.event.CancellableSkyHanniEvent
 
-@Cancelable
-class TitleReceivedEvent(val title: String) : LorenzEvent()
+class TitleReceivedEvent(val title: String) : CancellableSkyHanniEvent()

src/main/java/at/hannibal2/skyhanni/features/combat/ghosttracker/GhostTracker.kt

@@ -176,7 +176,7 @@ object GhostTracker {
         add(tracker.addTotalProfit(profit, data.kills, "kill"))
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onSkillExp(event: SkillExpGainEvent) {
         if (!isEnabled()) return
         if (event.gained > 10_000) return
@@ -208,7 +208,7 @@ object GhostTracker {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onPurseChange(event: PurseChangeEvent) {
         if (!isEnabled()) return
         if (event.reason != PurseChangeCause.GAIN_MOB_KILL) return