Backend: Start using new event system (#2023)

12 files changed, 27 insertions, 25 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/events/PreInitFinishedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/PreInitFinishedEvent.kt
deleted file mode 100644
index 8294b8bd7..000000000
--- a/src/main/java/at/hannibal2/skyhanni/events/PreInitFinishedEvent.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package at.hannibal2.skyhanni.events
-
-class PreInitFinishedEvent : LorenzEvent()
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 f7406498b..de9a83214 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/bingo/BingoCardUpdateEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/bingo/BingoCardUpdateEvent.kt
@@ -1,5 +1,5 @@
 package at.hannibal2.skyhanni.events.bingo
 
-import at.hannibal2.skyhanni.events.LorenzEvent
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 
-class BingoCardUpdateEvent : LorenzEvent()
+class BingoCardUpdateEvent : SkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/bingo/BingoGoalReachedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/bingo/BingoGoalReachedEvent.kt
index b091c24f3..06d392251 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/bingo/BingoGoalReachedEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/bingo/BingoGoalReachedEvent.kt
@@ -1,6 +1,6 @@
 package at.hannibal2.skyhanni.events.bingo
 
-import at.hannibal2.skyhanni.events.LorenzEvent
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 import at.hannibal2.skyhanni.features.bingo.card.goals.BingoGoal
 
-class BingoGoalReachedEvent(val goal: BingoGoal) : LorenzEvent()
+class BingoGoalReachedEvent(val goal: BingoGoal) : SkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/diana/InquisitorFoundEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/diana/InquisitorFoundEvent.kt
index 9978c6f3c..9061eaa72 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/diana/InquisitorFoundEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/diana/InquisitorFoundEvent.kt
@@ -1,6 +1,6 @@
 package at.hannibal2.skyhanni.events.diana
 
-import at.hannibal2.skyhanni.events.LorenzEvent
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 import net.minecraft.client.entity.EntityOtherPlayerMP
 
-class InquisitorFoundEvent(val inquisitorEntity: EntityOtherPlayerMP) : LorenzEvent()
+class InquisitorFoundEvent(val inquisitorEntity: EntityOtherPlayerMP) : SkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/farming/FarmingLaneSwitchEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/farming/FarmingLaneSwitchEvent.kt
deleted file mode 100644
index 3f78fd9c0..000000000
--- a/src/main/java/at/hannibal2/skyhanni/events/farming/FarmingLaneSwitchEvent.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package at.hannibal2.skyhanni.events.farming
-
-import at.hannibal2.skyhanni.events.LorenzEvent
-import at.hannibal2.skyhanni.features.garden.farming.lane.FarmingLane
-
-class FarmingLaneSwitchEvent(val lane: FarmingLane?) : LorenzEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/fishing/TrophyFishCaughtEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/fishing/TrophyFishCaughtEvent.kt
index 358b057bc..46215c90e 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/fishing/TrophyFishCaughtEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/fishing/TrophyFishCaughtEvent.kt
@@ -1,7 +1,7 @@
 package at.hannibal2.skyhanni.events.fishing
 
-import at.hannibal2.skyhanni.events.LorenzEvent
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 import at.hannibal2.skyhanni.features.fishing.trophy.TrophyRarity
 
 // trophyFishName is NO Neu Internal Name
-class TrophyFishCaughtEvent(val trophyFishName: String, val rarity: TrophyRarity) : LorenzEvent()
+class TrophyFishCaughtEvent(val trophyFishName: String, val rarity: TrophyRarity) : SkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/farming/FarmingLaneSwitchEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/farming/FarmingLaneSwitchEvent.kt
new file mode 100644
index 000000000..c2e514135
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/garden/farming/FarmingLaneSwitchEvent.kt
@@ -0,0 +1,6 @@
+package at.hannibal2.skyhanni.events.garden.farming
+
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+import at.hannibal2.skyhanni.features.garden.farming.lane.FarmingLane
+
+class FarmingLaneSwitchEvent(val lane: FarmingLane?) : SkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/pests/PestSpawnEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/pests/PestSpawnEvent.kt
index 219516b9b..5c441a2de 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/garden/pests/PestSpawnEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/garden/pests/PestSpawnEvent.kt
@@ -1,5 +1,5 @@
 package at.hannibal2.skyhanni.events.garden.pests
 
-import at.hannibal2.skyhanni.events.LorenzEvent
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 
-class PestSpawnEvent(val amountPests: Int, val plotNames: List<String>, val unknownAmount: Boolean) : LorenzEvent()
+class PestSpawnEvent(val amountPests: Int, val plotNames: List<String>, val unknownAmount: Boolean) : 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 6f444fa86..c4c299b13 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
@@ -1,5 +1,5 @@
 package at.hannibal2.skyhanni.events.garden.pests
 
-import at.hannibal2.skyhanni.events.LorenzEvent
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 
-class PestUpdateEvent : LorenzEvent()
+class PestUpdateEvent : SkyHanniEvent()
diff --git a/src/main/java/at/hannibal2/skyhanni/events/item/ItemHoverEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/item/ItemHoverEvent.kt
index 343883841..1081f8647 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/item/ItemHoverEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/item/ItemHoverEvent.kt
@@ -1,9 +1,9 @@
 package at.hannibal2.skyhanni.events.item
 
-import at.hannibal2.skyhanni.events.LorenzEvent
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 import net.minecraft.item.ItemStack
 
-class ItemHoverEvent(val itemStack: ItemStack, private val toolTip0: MutableList<String>) : LorenzEvent() {
+class ItemHoverEvent(val itemStack: ItemStack, private val toolTip0: MutableList<String>) : SkyHanniEvent() {
     var toolTip
         set(value) {
             toolTip0.clear()
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 b041fc595..6c7a5e8a1 100644
--- a/src/main/java/at/hannibal2/skyhanni/events/minecraft/ClientDisconnectEvent.kt
+++ b/src/main/java/at/hannibal2/skyhanni/events/minecraft/ClientDisconnectEvent.kt
@@ -1,5 +1,5 @@
 package at.hannibal2.skyhanni.events.minecraft
 
-import at.hannibal2.skyhanni.events.LorenzEvent
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
 
-class ClientDisconnectEvent : LorenzEvent()
+class 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
new file mode 100644
index 000000000..1d52761ed
--- /dev/null
+++ b/src/main/java/at/hannibal2/skyhanni/events/utils/PreInitFinishedEvent.kt
@@ -0,0 +1,5 @@
+package at.hannibal2.skyhanni.events.utils
+
+import at.hannibal2.skyhanni.api.event.SkyHanniEvent
+
+class PreInitFinishedEvent : SkyHanniEvent()