From 0dc5c9ab748a2b8444d46591c4a0a6c6a0f6c8bc Mon Sep 17 00:00:00 2001 From: Empa Date: Wed, 16 Oct 2024 10:38:01 +0200 Subject: [PATCH] change SkyHanniEvents without a parameter to be objects instead of classes --- src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt | 2 +- src/main/java/at/hannibal2/skyhanni/api/FmlEventApi.kt | 2 +- .../hannibal2/skyhanni/events/bingo/BingoCardUpdateEvent.kt | 2 +- .../hannibal2/skyhanni/events/garden/pests/PestUpdateEvent.kt | 2 +- .../skyhanni/events/minecraft/ClientDisconnectEvent.kt | 2 +- .../hannibal2/skyhanni/events/utils/PreInitFinishedEvent.kt | 2 +- .../hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt | 4 ++-- .../at/hannibal2/skyhanni/features/garden/pests/PestAPI.kt | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt index 12ad96191083..2c14076a93ba 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt @@ -61,7 +61,7 @@ class SkyHanniMod { CommandRegistrationEvent.post() - PreInitFinishedEvent().post() + PreInitFinishedEvent.post() } @Mod.EventHandler diff --git a/src/main/java/at/hannibal2/skyhanni/api/FmlEventApi.kt b/src/main/java/at/hannibal2/skyhanni/api/FmlEventApi.kt index c2b1571f4792..0adb824a5a6a 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/FmlEventApi.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/FmlEventApi.kt @@ -12,7 +12,7 @@ object FmlEventApi { @SubscribeEvent fun onDisconnect(event: FMLNetworkEvent.ClientDisconnectionFromServerEvent) { - ClientDisconnectEvent().post() + ClientDisconnectEvent.post() } @SubscribeEvent 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 de9a83214a85..eed37ff0a6a0 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 c4c299b1338f..54df3b20b0ae 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 6c7a5e8a1b4c..1a6b31c4c9bf 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 1d52761ed2dd..e2ab833a7643 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() diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt index 1afa6859dc3f..98b266053e04 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt @@ -96,7 +96,7 @@ object BingoCardReader { } BingoAPI.lastBingoCardOpenTime = SimpleTimeMark.now() - BingoCardUpdateEvent().post() + BingoCardUpdateEvent.post() } private fun bingoGoalDifference(bingoGoal: BingoGoal, new: Double) { @@ -163,7 +163,7 @@ object BingoCardReader { val goal = BingoAPI.personalGoals.firstOrNull { it.displayName == name } ?: return goal.done = true BingoGoalReachedEvent(goal).post() - BingoCardUpdateEvent().post() + BingoCardUpdateEvent.post() } private fun BingoData.getDescriptionLine() = "ยง7" + note.joinToString(" ") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestAPI.kt index d49de324c851..e239caeab5b3 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/pests/PestAPI.kt @@ -155,7 +155,7 @@ object PestAPI { private fun updatePests() { if (!firstScoreboardCheck) return fixPests() - PestUpdateEvent().post() + PestUpdateEvent.post() } @HandleEvent(onlyOnIsland = IslandType.GARDEN)