From 5dc5adc01ff407e0e61b9220c5aae553a7ca8d47 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 19 Dec 2020 13:56:53 -0500 Subject: [PATCH] Remove ITEM_DROP menu action It is identical to ITEM_FIFTH_OPTION and of() was returning only ITEM_DROP, which made ITEM_FIFTH_OPTION useless --- runelite-api/src/main/java/net/runelite/api/MenuAction.java | 4 ---- .../client/plugins/crowdsourcing/zmi/CrowdsourcingZMI.java | 1 - .../client/plugins/grounditems/GroundItemsPlugin.java | 2 +- .../client/plugins/mousehighlight/MouseHighlightOverlay.java | 1 - 4 files changed, 1 insertion(+), 7 deletions(-) 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 8f8033ad8c..e389a3c588 100644 --- a/runelite-api/src/main/java/net/runelite/api/MenuAction.java +++ b/runelite-api/src/main/java/net/runelite/api/MenuAction.java @@ -186,10 +186,6 @@ public enum MenuAction * Fifth menu action for an item. */ ITEM_FIFTH_OPTION(37), - /** - * Menu action to drop an item (identical to ITEM_FIFTH_OPTION). - */ - ITEM_DROP(37), /** * Menu action to use an item. */ diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/zmi/CrowdsourcingZMI.java b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/zmi/CrowdsourcingZMI.java index 2f76cd4741..669be22f22 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/zmi/CrowdsourcingZMI.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/crowdsourcing/zmi/CrowdsourcingZMI.java @@ -90,7 +90,6 @@ public class CrowdsourcingZMI case GROUND_ITEM_THIRD_OPTION: case GROUND_ITEM_FOURTH_OPTION: case GROUND_ITEM_FIFTH_OPTION: - case ITEM_DROP: illegalActionTick = client.getTickCount(); break; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java index 4bedc5c28e..0c8db3a0e1 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/grounditems/GroundItemsPlugin.java @@ -680,7 +680,7 @@ public class GroundItemsPlugin extends Plugin @Subscribe public void onMenuOptionClicked(MenuOptionClicked menuOptionClicked) { - if (menuOptionClicked.getMenuAction() == MenuAction.ITEM_DROP) + if (menuOptionClicked.getMenuAction() == MenuAction.ITEM_FIFTH_OPTION) { int itemId = menuOptionClicked.getId(); // Keep a queue of recently dropped items to better detect 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 07b11ccf50..be6001241d 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 @@ -61,7 +61,6 @@ class MouseHighlightOverlay extends Overlay MenuAction.ITEM_FOURTH_OPTION, MenuAction.ITEM_FIFTH_OPTION, MenuAction.ITEM_USE, - MenuAction.ITEM_DROP, MenuAction.WIDGET_FIRST_OPTION, MenuAction.WIDGET_SECOND_OPTION, MenuAction.WIDGET_THIRD_OPTION,