Backend: Event Objects (#2744)

Co-authored-by: Empa <itsempa@users.noreply.github.com>
Co-authored-by: Cal <cwolfson58@gmail.com>

12 files changed, 26 insertions, 15 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/events/CollectionUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/CollectionUpdateEvent.kt
index f4c46d0b7..2dd016e95 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/CollectionUpdateEvent.kt
+++ b/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()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/CropMilestoneUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/CropMilestoneUpdateEvent.kt
index 8da8b20f7..feebc16af 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/CropMilestoneUpdateEvent.kt
+++ b/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()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/DungeonBossRoomEnterEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DungeonBossRoomEnterEvent.kt
index 9f372d5c3..ec1f35412 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/DungeonBossRoomEnterEvent.kt
+++ b/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()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzWarpEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzWarpEvent.kt
deleted file mode 100644
index 170dcabe9..000000000
--- a/src/main/java/at/hannibal2/skyhanni/events/LorenzWarpEvent.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package at.hannibal2.skyhanni.events
-
-class LorenzWarpEvent : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/NEURenderEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/NEURenderEvent.kt
index c2bcc9b49..af8587178 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/NEURenderEvent.kt
+++ b/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.CancellableSkyHanniEvent
 
-@Cancelable
-class NEURenderEvent : LorenzEvent()
+class NEURenderEvent : CancellableSkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/SackDataUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SackDataUpdateEvent.kt
index f9e3831d1..f156d31fc 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/SackDataUpdateEvent.kt
+++ b/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()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/SkyHanniWarpEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SkyHanniWarpEvent.kt
new file mode 100644
index 000000000..18560da4c
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/SkyHanniWarpEvent.kt
@@ -0,0 +1,5 @@
+package at.hannibal2.skyhanni.events
+
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+
+object SkyHanniWarpEvent : SkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/SlayerQuestCompleteEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SlayerQuestCompleteEvent.kt
index b7e0edfed..6b0185fe1 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/SlayerQuestCompleteEvent.kt
+++ b/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()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/bingo/BingoCardUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/bingo/BingoCardUpdateEvent.kt
index de9a83214..eed37ff0a 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/bingo/BingoCardUpdateEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/bingo/BingoCardUpdateEvent.kt
@@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events.bingo
 
 import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 
-class BingoCardUpdateEvent : SkyHanniEvent()
+object BingoCardUpdateEvent : SkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/pests/PestUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/pests/PestUpdateEvent.kt
index c4c299b13..54df3b20b 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/garden/pests/PestUpdateEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/garden/pests/PestUpdateEvent.kt
@@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events.garden.pests
 
 import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 
-class PestUpdateEvent : SkyHanniEvent()
+object PestUpdateEvent : SkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/minecraft/ClientDisconnectEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/minecraft/ClientDisconnectEvent.kt
index 6c7a5e8a1..1a6b31c4c 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/minecraft/ClientDisconnectEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/minecraft/ClientDisconnectEvent.kt
@@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events.minecraft
 
 import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 
-class ClientDisconnectEvent : SkyHanniEvent()
+object ClientDisconnectEvent : SkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/utils/PreInitFinishedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/utils/PreInitFinishedEvent.kt
index 1d52761ed..e2ab833a7 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/utils/PreInitFinishedEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/utils/PreInitFinishedEvent.kt
@@ -2,4 +2,4 @@ package at.hannibal2.skyhanni.events.utils
 
 import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 
-class PreInitFinishedEvent : SkyHanniEvent()
+object PreInitFinishedEvent : SkyHanniEvent()