Merge pull request #3171 from open-osrs/idk
This commit is contained in:
@@ -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;
|
||||
}
|
||||
}
|
||||
@@ -103,7 +103,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;
|
||||
@@ -1789,15 +1788,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(),
|
||||
@@ -2197,19 +2187,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)
|
||||
|
||||
Reference in New Issue
Block a user