From 060d45c617c5fd76bf83ac231144ccf0ef21fb86 Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Mon, 25 Apr 2022 10:56:06 +0200 Subject: [PATCH 1/2] project(api): remove menu event --- .../java/net/runelite/api/events/Menu.java | 31 ------------------- .../net/runelite/mixins/RSClientMixin.java | 14 --------- 2 files changed, 45 deletions(-) delete mode 100644 runelite-api/src/main/java/net/runelite/api/events/Menu.java diff --git a/runelite-api/src/main/java/net/runelite/api/events/Menu.java b/runelite-api/src/main/java/net/runelite/api/events/Menu.java deleted file mode 100644 index d7a5af40cb..0000000000 --- a/runelite-api/src/main/java/net/runelite/api/events/Menu.java +++ /dev/null @@ -1,31 +0,0 @@ -package net.runelite.api.events; - -/** - * Gets sent before menu handling code is ran, once per client tick. - * Can be consumed, skipping this method this tick. - */ -public class Menu -{ - public static final Menu MENU = new Menu(); - - private Menu() - { - } - - private boolean run; - - public void reset() - { - run = true; - } - - public void dontRun() - { - run = false; - } - - public boolean shouldRun() - { - return run; - } -} 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 d1a1b4299a..ce531f16e5 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -105,7 +105,6 @@ import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GrandExchangeOfferChanged; import net.runelite.api.events.GrandExchangeSearched; import net.runelite.api.events.ItemSpawned; -import net.runelite.api.events.Menu; import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuOpened; import net.runelite.api.events.MenuOptionClicked; @@ -2224,19 +2223,6 @@ public abstract class RSClientMixin implements RSClient return false; } - @Copy("menu") - @Replace("menu") - void copy$menu() - { - Menu menu = Menu.MENU; - menu.reset(); - getCallbacks().post(menu); - if (menu.shouldRun()) - { - copy$menu(); - } - } - @Inject @Override public EnumComposition getEnum(int id) From 26ca429e594482971e5d534a3a66a4c4d09bd89a Mon Sep 17 00:00:00 2001 From: Owain van Brakel Date: Mon, 25 Apr 2022 10:56:54 +0200 Subject: [PATCH 2/2] project(mixins): remove WIDGET_CONTINUE check --- .../src/main/java/net/runelite/mixins/RSClientMixin.java | 9 --------- 1 file changed, 9 deletions(-) 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 ce531f16e5..9cdbb52b74 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -1790,15 +1790,6 @@ public abstract class RSClientMixin implements RSClient } } - if (opcode == MenuAction.WIDGET_CONTINUE.getId()) - { - Widget widget = client.getWidget(param1); - if (widget == null || param0 > -1 && widget.getChild(param0) == null) - { - return; - } - } - copy$menuAction(event.getParam0(), event.getParam1(), event.getMenuAction() == UNKNOWN ? opcode : event.getMenuAction().getId(), event.getId(), event.getMenuOption(), event.getMenuTarget(),