diff --git a/runelite-api/src/main/java/net/runelite/api/MenuAction.java b/runelite-api/src/main/java/net/runelite/api/MenuAction.java index 688b18f141..450989d9c3 100644 --- a/runelite-api/src/main/java/net/runelite/api/MenuAction.java +++ b/runelite-api/src/main/java/net/runelite/api/MenuAction.java @@ -226,9 +226,9 @@ public enum MenuAction PLAYER_EIGTH_OPTION(51), /** - * Default menu action for a widget. + * Menu action for normal priority child component actions. */ - WIDGET_DEFAULT(57), + CC_OP(57), /** * Casting a spell / op target on a widget @@ -256,10 +256,9 @@ public enum MenuAction */ CANCEL(1006), /** - * Menu action triggered by either examining item in bank, examining - * item in inventory while having bank open, or examining equipped item. + * Menu action for low priority child component actions. */ - EXAMINE_ITEM_BANK_EQ(1007), + CC_OP_LOW_PRIORITY(1007), /** * Menu action injected by runelite for its menu items. diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java index 4126e3805f..2800f4657d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java @@ -608,7 +608,7 @@ public class TabInterface if ((event.getWidgetId() == WidgetInfo.BANK_ITEM_CONTAINER.getId() || event.getWidgetId() == WidgetInfo.BANK_INVENTORY_ITEMS_CONTAINER.getId()) - && event.getMenuAction() == MenuAction.EXAMINE_ITEM_BANK_EQ + && event.getMenuAction() == MenuAction.CC_OP_LOW_PRIORITY && (event.getMenuOption().equalsIgnoreCase("withdraw-x") || event.getMenuOption().equalsIgnoreCase("deposit-x"))) { diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.java index c67157d8db..cbdba9f4b4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/camera/CameraPlugin.java @@ -120,7 +120,7 @@ public class CameraPlugin extends Plugin implements KeyListener, MouseListener @Subscribe public void onMenuEntryAdded(MenuEntryAdded menuEntryAdded) { - if (menuEntryAdded.getType() == MenuAction.WIDGET_DEFAULT.getId() && menuEntryAdded.getOption().equals(LOOK_NORTH) && config.compassLook()) + if (menuEntryAdded.getType() == MenuAction.CC_OP.getId() && menuEntryAdded.getOption().equals(LOOK_NORTH) && config.compassLook()) { MenuEntry[] menuEntries = client.getMenuEntries(); int len = menuEntries.length; @@ -144,7 +144,7 @@ public class CameraPlugin extends Plugin implements KeyListener, MouseListener m.setOption(option); m.setTarget(lookNorth.getTarget()); m.setIdentifier(identifier); - m.setType(MenuAction.WIDGET_DEFAULT.getId()); + m.setType(MenuAction.CC_OP.getId()); m.setParam0(lookNorth.getActionParam0()); m.setParam1(lookNorth.getActionParam1()); return m; @@ -275,7 +275,7 @@ public class CameraPlugin extends Plugin implements KeyListener, MouseListener case EXAMINE_NPC: case EXAMINE_ITEM_GROUND: case EXAMINE_ITEM: - case EXAMINE_ITEM_BANK_EQ: + case CC_OP_LOW_PRIORITY: if (config.ignoreExamine()) { break; diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java index 081c464400..d414d6fba0 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/examine/ExaminePlugin.java @@ -130,7 +130,7 @@ public class ExaminePlugin extends Plugin type = ExamineType.ITEM; id = event.getId(); break; - case EXAMINE_ITEM_BANK_EQ: + case CC_OP_LOW_PRIORITY: { type = ExamineType.ITEM_BANK_EQ; int[] qi = findItemFromWidget(event.getWidgetId(), event.getActionParam()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java index d9fa163675..40a97330e1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemprices/ItemPricesOverlay.java @@ -100,7 +100,7 @@ class ItemPricesOverlay extends Overlay { break; } - case WIDGET_DEFAULT: + case CC_OP: case ITEM_USE: case ITEM_FIRST_OPTION: case ITEM_SECOND_OPTION: diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java index e7e12580cd..22f9691bd3 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/mousehighlight/MouseHighlightOverlay.java @@ -75,7 +75,7 @@ class MouseHighlightOverlay extends Overlay String option = menuEntry.getOption(); int type = menuEntry.getType(); - if (type == MenuAction.RUNELITE_OVERLAY.getId() || type == MenuAction.EXAMINE_ITEM_BANK_EQ.getId()) + if (type == MenuAction.RUNELITE_OVERLAY.getId() || type == MenuAction.CC_OP_LOW_PRIORITY.getId()) { // These are always right click only return null;