From a7eb45b3e3378fe5b423e90aabaf105acb4f50c2 Mon Sep 17 00:00:00 2001 From: zeruth Date: Thu, 28 May 2020 02:47:16 -0400 Subject: [PATCH] client: merge upstream --- runelite-api/src/main/java/net/runelite/api/Client.java | 2 +- .../src/main/java/net/runelite/api/MenuOpcode.java | 5 +++++ .../main/java/net/runelite/client/menus/MenuManager.java | 8 ++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java index d8528039a0..8ddfd364b5 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -2030,7 +2030,7 @@ public interface Client extends GameShell * If the image is larger than half the width of fixed mode, * it won't get mirrored to the other side of the screen */ - void setLoginScreen(SpritePixels pixels); + void setLoginScreen(Sprite pixels); /** * Sets whether the flames on the login screen should be rendered diff --git a/runelite-api/src/main/java/net/runelite/api/MenuOpcode.java b/runelite-api/src/main/java/net/runelite/api/MenuOpcode.java index 890715af1e..e13c0b30b1 100644 --- a/runelite-api/src/main/java/net/runelite/api/MenuOpcode.java +++ b/runelite-api/src/main/java/net/runelite/api/MenuOpcode.java @@ -279,6 +279,11 @@ public enum MenuOpcode * Menu action for configuring runelite overlays. */ RUNELITE_OVERLAY_CONFIG(1502), + /** + * Menu action injected by runelite for menu items which target + * a player and have its identifier set to a player index. + */ + RUNELITE_PLAYER(1503), FOLLOW(2046), TRADE(2047), diff --git a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java index 6631d1bcb7..ff4e3b50f9 100644 --- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java +++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java @@ -448,8 +448,8 @@ public class MenuManager } } - if (event.getMenuAction() != MenuAction.RUNELITE - && event.getMenuAction() != MenuAction.RUNELITE_PLAYER) + if (event.getMenuOpcode() != MenuOpcode.RUNELITE + && event.getMenuOpcode() != MenuOpcode.RUNELITE_PLAYER) { return; // not a managed widget option or custom player option } @@ -460,7 +460,7 @@ public class MenuManager for (WidgetMenuOption curMenuOption : options) { if (curMenuOption.getMenuTarget().equals(event.getTarget()) - && curMenuOption.getMenuOption().equals(event.getOption())) + && curMenuOption.getMenuOption().equals(event.getMenuOpcode())) { WidgetMenuOptionClicked customMenu = new WidgetMenuOptionClicked(); customMenu.setMenuOption(event.getOption()); @@ -484,7 +484,7 @@ public class MenuManager { client.getPlayerOptions()[playerOptionIndex] = menuText; client.getPlayerOptionsPriorities()[playerOptionIndex] = true; - client.getPlayerMenuTypes()[playerOptionIndex] = MenuAction.RUNELITE_PLAYER.getId(); + client.getPlayerMenuTypes()[playerOptionIndex] = MenuOpcode.RUNELITE_PLAYER.getId(); playerMenuIndexMap.put(playerOptionIndex, menuText); }