ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

menu swapper: use menu callback for swap config

Browse Source 
Co-authored-by: sam <dasistkeinnamen@gmail.com>
This commit is contained in:
Adam
2021-12-18 10:47:18 -05:00
parent ffaa1cce1d
commit 406ce7bd6b
1 changed files with 7 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
runelite-client/src/main/java/net/runelite/client/plugins/menuentryswapper/MenuEntrySwapperPlugin.java
View File

@@ -53,7 +53,6 @@ import net.runelite.api.NPC;
import net.runelite.api.events.ClientTick; import net.runelite.api.events.ClientTick;
import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuEntryAdded;
import net.runelite.api.events.MenuOpened; import net.runelite.api.events.MenuOpened;
import net.runelite.api.events.MenuOptionClicked;
import net.runelite.api.events.PostItemComposition; import net.runelite.api.events.PostItemComposition;
import net.runelite.api.widgets.WidgetID; import net.runelite.api.widgets.WidgetID;
import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetInfo;
@@ -576,6 +575,13 @@ public class MenuEntrySwapperPlugin extends Plugin
if (ITEM_MENU_TYPES.contains(menuAction) && entry.getIdentifier() == itemId) if (ITEM_MENU_TYPES.contains(menuAction) && entry.getIdentifier() == itemId)
{ {
entry.setType(MenuAction.RUNELITE); entry.setType(MenuAction.RUNELITE);
entry.onClick(e ->
{
int index = menuAction == MenuAction.ITEM_USE
? -1
: menuAction.getId() - MenuAction.ITEM_FIRST_OPTION.getId();
setSwapConfig(configuringShiftClick, itemId, index);
});
if (activeAction == menuAction) if (activeAction == menuAction)
{ {
@@ -663,49 +669,6 @@ public class MenuEntrySwapperPlugin extends Plugin
} }
} }
@Subscribe
public void onMenuOptionClicked(MenuOptionClicked event)
{
if (event.getMenuAction() != MenuAction.RUNELITE || event.getParam1() != WidgetInfo.INVENTORY.getId())
{
return;
}
int itemId = event.getId();
if (itemId == -1)
{
return;
}
String option = event.getMenuOption();
String target = event.getMenuTarget();
ItemComposition itemComposition = itemManager.getItemComposition(itemId);
if (!itemComposition.getName().equals(Text.removeTags(target)))
{
return;
}
if (option.equals("Use")) //because "Use" is not in inventoryActions
{
setSwapConfig(configuringShiftClick, itemId, -1);
}
else
{
String[] inventoryActions = itemComposition.getInventoryActions();
for (int index = 0; index < inventoryActions.length; index++)
{
if (option.equals(inventoryActions[index]))
{
setSwapConfig(configuringShiftClick, itemId, index);
break;
}
}
}
}
private void swapMenuEntry(MenuEntry[] menuEntries, int index, MenuEntry menuEntry) private void swapMenuEntry(MenuEntry[] menuEntries, int index, MenuEntry menuEntry)
{ {
final int eventId = menuEntry.getIdentifier(); final int eventId = menuEntry.getIdentifier();