From 5b3ee9de1856d9989e20cc4d534cac17089ce0e5 Mon Sep 17 00:00:00 2001 From: CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> Date: Sat, 8 Jun 2024 13:33:35 +1000 Subject: Backend: Start using new event system (#2023) --- .../hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt | 3 ++- .../at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features/misc') diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt index 44449b2db..1565b7871 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/discordrpc/DiscordRPCManager.kt @@ -5,6 +5,7 @@ package at.hannibal2.skyhanni.features.misc.discordrpc import at.hannibal2.skyhanni.SkyHanniMod.Companion.coroutineScope import at.hannibal2.skyhanni.SkyHanniMod.Companion.feature import at.hannibal2.skyhanni.SkyHanniMod.Companion.logger +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.config.features.misc.DiscordRPCConfig.LineEntry import at.hannibal2.skyhanni.config.features.misc.DiscordRPCConfig.PriorityEntry @@ -186,7 +187,7 @@ object DiscordRPCManager : IPCListener { } } - @SubscribeEvent + @HandleEvent fun onDisconnect(event: ClientDisconnectEvent) { stop() } diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt index d0e198765..a2ed65ee7 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.features.misc.items import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.data.jsonobjects.repo.ItemsJson import at.hannibal2.skyhanni.data.jsonobjects.repo.neu.NeuReforgeStoneJson @@ -64,9 +65,8 @@ object EstimatedItemValue { bookBundleAmount = data.bookBundleAmount } - @SubscribeEvent + @HandleEvent(onlyOnSkyblock = true) fun onTooltip(event: ItemHoverEvent) { - if (!LorenzUtils.inSkyBlock) return if (!config.enabled) return if (Minecraft.getMinecraft().currentScreen !is GuiProfileViewer) return -- cgit