diff --git a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java index 714064a6b3..e707cfb37c 100644 --- a/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java +++ b/runelite-client/src/main/java/net/runelite/client/callback/Hooks.java @@ -54,6 +54,7 @@ import net.runelite.api.events.ActorDeath; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.FocusChanged; import net.runelite.api.events.GameTick; +import net.runelite.api.events.MenuOpened; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.PostItemComposition; import net.runelite.api.events.ProjectileMoved; @@ -440,4 +441,11 @@ public class Hooks event.setItemComposition(itemComposition); eventBus.post(event); } + + public static void menuOpened(Client client, int var1, int var2) + { + MenuOpened event = new MenuOpened(); + event.setMenuEntries(client.getMenuEntries()); + eventBus.post(event); + } } diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index 10abc0e614..754644c6ec 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -65,7 +65,6 @@ import net.runelite.api.events.ExperienceChanged; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GrandExchangeOfferChanged; import net.runelite.api.events.MapRegionChanged; -import net.runelite.api.events.MenuOpened; import net.runelite.api.events.NpcDespawned; import net.runelite.api.events.NpcSpawned; import net.runelite.api.events.PlayerDespawned; @@ -766,20 +765,6 @@ public abstract class RSClientMixin implements RSClient eventBus.post(new ClanChanged(client.getClanMemberManager() != null)); } - @FieldHook("isMenuOpen") - @Inject - public static void menuOpened(int opened) - { - if (!client.isMenuOpen()) - { - return; - } - - MenuOpened event = new MenuOpened(); - event.setMenuEntries(client.getMenuEntries()); - eventBus.post(event); - } - @Inject @Override public boolean hasHintArrow()