Backend: Migrate to skyhanni events #1

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

@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.api
 
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.ItemAddManager
 import at.hannibal2.skyhanni.events.CollectionUpdateEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
@@ -99,7 +100,7 @@ object CollectionAPI {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onItemAdd(event: ItemAddEvent) {
         if (event.source == ItemAddManager.Source.COMMAND) return
         val internalName = event.internalName

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

@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.api
 
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.data.ProfileStorageData
 import at.hannibal2.skyhanni.data.jsonobjects.repo.neu.NeuSkillLevelJson
 import at.hannibal2.skyhanni.events.ActionBarUpdateEvent
@@ -104,7 +105,7 @@ object SkillAPI {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onActionBarUpdate(event: ActionBarUpdateEvent) {
         val actionBar = event.actionBar.removeColor()
         val components = SPACE_SPLITTER.splitToList(actionBar)

src/main/java/at/hannibal2/skyhanni/api/event/SkyHanniEvent.kt

@@ -5,6 +5,7 @@ package at.hannibal2.skyhanni.api.event
  */
 abstract class SkyHanniEvent protected constructor() {
 
+    // TODO: This should only be accessible in the cancellable interface
     var isCancelled: Boolean = false
         private set
 

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

@@ -30,7 +30,7 @@ object ActionBarData {
         val message = original.formattedText.stripHypixelMessage()
         actionBar = message
         val actionBarEvent = ActionBarUpdateEvent(actionBar, event.message)
-        actionBarEvent.postAndCatch()
+        actionBarEvent.post()
         if (event.message.formattedText != actionBarEvent.chatComponent.formattedText) {
             event.message = actionBarEvent.chatComponent
         }

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

@@ -1,12 +1,12 @@
 package at.hannibal2.skyhanni.data
 
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.events.ActionBarUpdateEvent
 import at.hannibal2.skyhanni.events.ActionBarValueUpdateEvent
 import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule
 import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher
 import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import org.intellij.lang.annotations.Language
 
 enum class ActionBarStatsData(@Language("RegExp") rawPattern: String) {
@@ -45,7 +45,7 @@ enum class ActionBarStatsData(@Language("RegExp") rawPattern: String) {
             entries.forEach { it.pattern }
         }
 
-        @SubscribeEvent
+        @HandleEvent
         fun onActionBarUpdate(event: ActionBarUpdateEvent) {
             if (!LorenzUtils.inSkyBlock) return
 
@@ -57,7 +57,7 @@ enum class ActionBarStatsData(@Language("RegExp") rawPattern: String) {
                         ActionBarValueUpdateEvent(data)
                     } else null
                 }
-            }.forEach { it.postAndCatch() }
+            }.forEach { it.post() }
         }
     }
 }

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

@@ -383,10 +383,10 @@ object BitsAPI {
     fun hasCookieBuff() = cookieBuffTime?.isInFuture() ?: false
 
     private fun sendBitsGainEvent(difference: Int) =
-        BitsUpdateEvent.BitsGain(bits, bitsAvailable, difference).postAndCatch()
+        BitsUpdateEvent.BitsGain(bits, bitsAvailable, difference).post()
 
-    private fun sendBitsSpentEvent() = BitsUpdateEvent.BitsSpent(bits, bitsAvailable).postAndCatch()
-    private fun sendBitsAvailableGainedEvent() = BitsUpdateEvent.BitsAvailableGained(bits, bitsAvailable).postAndCatch()
+    private fun sendBitsSpentEvent() = BitsUpdateEvent.BitsSpent(bits, bitsAvailable).post()
+    private fun sendBitsAvailableGainedEvent() = BitsUpdateEvent.BitsAvailableGained(bits, bitsAvailable).post()
 
     fun isEnabled() = LorenzUtils.inSkyBlock && !LorenzUtils.isOnAlphaServer && profileStorage != null
 

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

@@ -39,6 +39,6 @@ object BossbarData {
         if (previousServerBossbar.isNotEmpty()) previousServerBossbar = ""
 
         bossbar = bossbarLine
-        BossbarUpdateEvent(bossbarLine).postAndCatch()
+        BossbarUpdateEvent(bossbarLine).post()
     }
 }

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

@@ -52,7 +52,7 @@ object EntityData {
             val oldMaxHealth = maxHealthMap.getOrDefault(id, -1)
             if (oldMaxHealth != maxHealth) {
                 maxHealthMap[id] = maxHealth
-                EntityMaxHealthUpdateEvent(entity, maxHealth.derpy()).postAndCatch()
+                EntityMaxHealthUpdateEvent(entity, maxHealth.derpy()).post()
             }
         }
     }
@@ -83,7 +83,7 @@ object EntityData {
             val health = (it.`object` as Float).toInt()
             if (entity is EntityWither && health == 300 && entityId < 0) return
             if (entity is EntityLivingBase) {
-                EntityHealthUpdateEvent(entity, health.derpy()).postAndCatch()
+                EntityHealthUpdateEvent(entity, health.derpy()).post()
             }
         }
     }
@@ -107,7 +107,7 @@ object EntityData {
     @JvmStatic
     fun getHealthDisplay(text: String) = healthDisplayCache.getOrPut(text) {
         val event = EntityHealthDisplayEvent(text)
-        event.postAndCatch()
+        event.post()
         event.text
     }
 

src/main/java/at/hannibal2/skyhanni/data/FriendAPI.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.ConfigFileType
 import at.hannibal2.skyhanni.data.jsonobjects.local.FriendsJson
 import at.hannibal2.skyhanni.data.jsonobjects.local.FriendsJson.PlayerFriends.Friend
@@ -74,7 +75,7 @@ object FriendAPI {
         FriendsJson.PlayerFriends().also { it.friends = mutableMapOf() }
     }.friends
 
-    @SubscribeEvent
+    @HandleEvent
     fun onHypixelJoin(event: HypixelJoinEvent) {
         if (SkyHanniMod.friendsData.players == null) {
             SkyHanniMod.friendsData.players = mutableMapOf()

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

@@ -73,7 +73,7 @@ object GuiEditManager {
     @SubscribeEvent
     fun onTick(event: LorenzTickEvent) {
         lastMovedGui?.let {
-            GuiPositionMovedEvent(it).postAndCatch()
+            GuiPositionMovedEvent(it).post()
             lastMovedGui = null
         }
     }

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

@@ -419,7 +419,7 @@ object HypixelData {
         if (!LorenzUtils.onHypixel) {
             checkHypixel()
             if (LorenzUtils.onHypixel) {
-                HypixelJoinEvent().postAndCatch()
+                HypixelJoinEvent.post()
                 SkyHanniMod.repo.displayRepoStatus(true)
             }
         }

src/main/java/at/hannibal2/skyhanni/data/ItemAddManager.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.InventoryOpenEvent
 import at.hannibal2.skyhanni.events.ItemAddEvent
@@ -54,7 +55,7 @@ object ItemAddManager {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onSackChange(event: SackChangeEvent) {
         if (!LorenzUtils.inSkyBlock) return
 
@@ -70,7 +71,7 @@ object ItemAddManager {
         superCraftedItems.clear()
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onItemAdd(event: ItemAddInInventoryEvent) {
         if (!LorenzUtils.inSkyBlock) return
 
@@ -85,7 +86,7 @@ object ItemAddManager {
     }
 
     private fun Source.addItem(internalName: NEUInternalName, amount: Int) {
-        ItemAddEvent(internalName, amount, this).postAndCatch()
+        ItemAddEvent(internalName, amount, this).post()
     }
 
     private var lastDiceRoll = SimpleTimeMark.farPast()

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

@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.data
 
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.events.DrawScreenAfterEvent
 import at.hannibal2.skyhanni.events.GuiRenderItemEvent
 import at.hannibal2.skyhanni.events.RenderInventoryItemTipEvent
@@ -14,13 +15,11 @@ import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.inventory.GuiChest
 import net.minecraft.client.renderer.GlStateManager
 import net.minecraft.inventory.ContainerChest
-import net.minecraftforge.fml.common.eventhandler.EventPriority
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 
 @SkyHanniModule
 object ItemTipHelper {
 
-    @SubscribeEvent
+    @HandleEvent
     fun onRenderItemOverlayPost(event: GuiRenderItemEvent.RenderOverlayEvent.GuiRenderItemPost) {
         val stack = event.stack ?: return
         if (!LorenzUtils.inSkyBlock || stack.stackSize != 1) return
@@ -39,7 +38,7 @@ object ItemTipHelper {
         }
     }
 
-    @SubscribeEvent(priority = EventPriority.HIGHEST)
+    @HandleEvent(priority = HandleEvent.HIGHEST)
     fun onRenderInventoryItemOverlayPost(event: DrawScreenAfterEvent) {
         if (!LorenzUtils.inSkyBlock) return
         if (!SkyHanniDebugsAndTests.globalRender) return

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

@@ -90,7 +90,7 @@ object MinecraftData {
             }
             InventoryUtils.itemInHandId = newItem
             InventoryUtils.latestItemInHand = hand
-            ItemInHandChangeEvent(newItem, oldItem).postAndCatch()
+            ItemInHandChangeEvent(newItem, oldItem).post()
         }
     }
 

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

@@ -248,7 +248,7 @@ object MiningAPI {
 
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onPlayerDeath(event: PlayerDeathEvent) {
         if (event.name == LorenzUtils.getPlayerName()) {
             updateCold(0)
@@ -477,7 +477,7 @@ object MiningAPI {
         // Hypixel sends cold data once in scoreboard even after resetting it
         if (cold == 0 && lastColdUpdate.passedSince() < 1.seconds) return
         lastColdUpdate = SimpleTimeMark.now()
-        ColdUpdateEvent(newCold).postAndCatch()
+        ColdUpdateEvent(newCold).post()
         cold = newCold
     }
 

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

@@ -191,6 +191,6 @@ object OwnInventoryData {
 
         if (internalName.startsWith("MAP-")) return
 
-        ItemAddInInventoryEvent(internalName, add).postAndCatch()
+        ItemAddInInventoryEvent(internalName, add).post()
     }
 }

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

@@ -25,7 +25,7 @@ object PlayerDeathManager {
         deathMessagePattern.matchMatcher(message) {
             val name = group("name")
             val reason = group("reason").removeColor()
-            PlayerDeathEvent(name, reason, event).postAndCatch()
+            PlayerDeathEvent(name, reason, event).post()
         }
     }
 }

src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.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.SackData
 import at.hannibal2.skyhanni.config.storage.PlayerSpecificStorage
 import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage
@@ -125,7 +126,7 @@ object ProfileStorageData {
         ConfigLoadEvent().postAndCatch()
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onHypixelJoin(event: HypixelJoinEvent) {
         val playerUuid = LorenzUtils.getRawPlayerUuid()
         playerSpecific = SkyHanniMod.feature.storage.players.getOrPut(playerUuid) { PlayerSpecificStorage() }

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

@@ -282,7 +282,7 @@ object QuiverAPI {
     }
 
     private fun postUpdateEvent(arrowType: ArrowType? = currentArrow) {
-        QuiverUpdateEvent(arrowType, currentAmount).postAndCatch()
+        QuiverUpdateEvent(arrowType, currentAmount).post()
     }
 
     @SubscribeEvent

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

@@ -273,7 +273,7 @@ object SackAPI {
         }
         val sackEvent = SackChangeEvent(sackChanges, otherItemsAdded, otherItemsRemoved)
         updateSacks(sackEvent)
-        sackEvent.postAndCatch()
+        sackEvent.post()
         if (chatConfig.hideSacksChange) {
             event.blockedReason = "sacks_change"
         }

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

@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.data
 
+import at.hannibal2.skyhanni.api.event.HandleEvent
 import at.hannibal2.skyhanni.events.ActionBarUpdateEvent
 import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent
 import at.hannibal2.skyhanni.events.ProfileJoinEvent
@@ -31,7 +32,7 @@ object SkillExperience {
         skillExp.clear()
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onActionBarUpdate(event: ActionBarUpdateEvent) {
         if (!LorenzUtils.inSkyBlock) return
 

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

@@ -62,7 +62,7 @@ object TrackerManager {
         }
 
         commandEditTrackerSuccess = false
-        ItemAddEvent(internalName, amount, ItemAddManager.Source.COMMAND).postAndCatch()
+        ItemAddEvent(internalName, amount, ItemAddManager.Source.COMMAND).post()
         if (!commandEditTrackerSuccess) {
             ChatUtils.userError("Could not edit the Item Tracker! Does this item belong to this tracker? Is the tracker active right now?")
         }

src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt

@@ -252,7 +252,7 @@ object MobDetection {
         }
     }
 
-    @SubscribeEvent
+    @HandleEvent
     fun onEntityHealthUpdateEvent(event: EntityHealthUpdateEvent) {
         when {
             event.entity is EntityBat && event.health == 6 -> {

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

@@ -1,9 +1,10 @@
 package at.hannibal2.skyhanni.events
 
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 import net.minecraft.util.ChatComponentText
 import net.minecraft.util.IChatComponent
 
-class ActionBarUpdateEvent(var actionBar: String, var chatComponent: IChatComponent) : LorenzEvent() {
+class ActionBarUpdateEvent(var actionBar: String, var chatComponent: IChatComponent) : SkyHanniEvent() {
     fun changeActionBar(newText: String) {
         chatComponent = ChatComponentText(newText)
     }

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

@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.events
 
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 import at.hannibal2.skyhanni.data.ActionBarStatsData
 
-class ActionBarValueUpdateEvent(val updated: ActionBarStatsData) : LorenzEvent()
+class ActionBarValueUpdateEvent(val updated: ActionBarStatsData) : SkyHanniEvent()

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

@@ -1,6 +1,6 @@
 package at.hannibal2.skyhanni.events
 
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 import at.hannibal2.skyhanni.utils.NEUInternalName
 
-class BazaarOpenedProductEvent(val openedProduct: NEUInternalName?, val inventoryOpenEvent: InventoryFullyOpenedEvent) :
-    LorenzEvent()
+class BazaarOpenedProductEvent(val openedProduct: NEUInternalName?, val inventoryOpenEvent: InventoryFullyOpenedEvent) : SkyHanniEvent()

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

@@ -1,6 +1,8 @@
 package at.hannibal2.skyhanni.events
 
-open class BitsUpdateEvent(val bits: Int, val bitsAvailable: Int, val difference: Int = 0) : LorenzEvent() {
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+
+open class BitsUpdateEvent(val bits: Int, val bitsAvailable: Int, val difference: Int = 0) : SkyHanniEvent() {
     class BitsGain(bits: Int, bitsAvailable: Int, difference: Int) : BitsUpdateEvent(bits, bitsAvailable, difference)
     class BitsSpent(bits: Int, bitsAvailable: Int) : BitsUpdateEvent(bits, bitsAvailable)
     class BitsAvailableGained(bits: Int, bitsAvailable: Int) : BitsUpdateEvent(bits, bitsAvailable)

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

@@ -1,5 +1,6 @@
 package at.hannibal2.skyhanni.events
 
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 import at.hannibal2.skyhanni.features.combat.damageindicator.EntityData
 
-class BossHealthChangeEvent(val entityData: EntityData, val lastHealth: Long, val health: Long, val maxHealth: Long) : LorenzEvent()
+class BossHealthChangeEvent(val entityData: EntityData, val lastHealth: Long, val health: Long, val maxHealth: Long) : SkyHanniEvent()

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

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