diff options
| author | CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> | 2024-06-08 13:33:35 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-08 13:33:35 +1000 |
| commit | 5b3ee9de1856d9989e20cc4d534cac17089ce0e5 (patch) | |
| tree | 6186c64e1f7d59c2dd04b7ffb05925609811895a /src/main/java/at/hannibal2/skyhanni/features/event | |
| parent | aaca5f08d47732b3db5329a3a9404281b21d2f55 (diff) | |
| download | skyhanni-5b3ee9de1856d9989e20cc4d534cac17089ce0e5.tar.gz skyhanni-5b3ee9de1856d9989e20cc4d534cac17089ce0e5.tar.bz2 skyhanni-5b3ee9de1856d9989e20cc4d534cac17089ce0e5.zip | |
Backend: Start using new event system (#2023)
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/features/event')
3 files changed, 5 insertions, 4 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaAPI.kt index a8c440efe..468c3ecbe 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/DianaAPI.kt @@ -35,7 +35,7 @@ object DianaAPI { @HandleEvent(onlyOnSkyblock = true) fun onJoinWorld(event: EntityEnterWorldEvent<EntityOtherPlayerMP>) { if (event.entity.name == "Minos Inquisitor") { - InquisitorFoundEvent(event.entity).postAndCatch() + InquisitorFoundEvent(event.entity).post() } } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/HighlightInquisitors.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/HighlightInquisitors.kt index e37041717..0d1cd7bd0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/HighlightInquisitors.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/HighlightInquisitors.kt @@ -1,18 +1,18 @@ package at.hannibal2.skyhanni.features.event.diana import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.diana.InquisitorFoundEvent import at.hannibal2.skyhanni.mixins.hooks.RenderLivingEntityHelper import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.ColorUtils.toChromaColorInt -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object HighlightInquisitors { private val config get() = SkyHanniMod.feature.event.diana - @SubscribeEvent + @HandleEvent fun onInquisitorFound(event: InquisitorFoundEvent) { if (!config.highlightInquisitors) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt index 238b951c2..268eacf0e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/diana/InquisitorWaypointShare.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.features.event.diana import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.EntityHealthUpdateEvent import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.LorenzKeyPressEvent @@ -109,7 +110,7 @@ object InquisitorWaypointShare { val inquisitorTime = mutableListOf<SimpleTimeMark>() - @SubscribeEvent + @HandleEvent fun onInquisitorFound(event: InquisitorFoundEvent) { val inquisitor = event.inquisitorEntity inquisitorsNearby = inquisitorsNearby.editCopy { add(inquisitor) } |