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

menu entry swapper: refactor configure shift click menu code to use menu types and ids

Browse Source 
This fixes an issue where if the action at the configured shift click action
index was null, which can happen due to item variations, the option.equals()
check would npe, and prevent configuring shift click on the item.
This commit is contained in:
Adam
2020-12-19 14:09:39 -05:00
parent c05d29424f
commit b1ebf7814b
1 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,6 +105,16 @@ public class MenuEntrySwapperPlugin extends Plugin
private static final WidgetMenuOption RESIZABLE_BOTTOM_LINE_INVENTORY_TAB_SAVE = new WidgetMenuOption(SAVE, private static final WidgetMenuOption RESIZABLE_BOTTOM_LINE_INVENTORY_TAB_SAVE = new WidgetMenuOption(SAVE,
MENU_TARGET, WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE_INVENTORY_TAB); MENU_TARGET, WidgetInfo.RESIZABLE_VIEWPORT_BOTTOM_LINE_INVENTORY_TAB);
private static final Set<MenuAction> ITEM_MENU_TYPES = ImmutableSet.of(
MenuAction.ITEM_FIRST_OPTION,
MenuAction.ITEM_SECOND_OPTION,
MenuAction.ITEM_THIRD_OPTION,
MenuAction.ITEM_FOURTH_OPTION,
MenuAction.ITEM_FIFTH_OPTION,
MenuAction.EXAMINE_ITEM,
MenuAction.ITEM_USE
);
private static final Set<MenuAction> NPC_MENU_TYPES = ImmutableSet.of( private static final Set<MenuAction> NPC_MENU_TYPES = ImmutableSet.of(
MenuAction.NPC_FIRST_OPTION, MenuAction.NPC_FIRST_OPTION,
MenuAction.NPC_SECOND_OPTION, MenuAction.NPC_SECOND_OPTION,
@@ -477,27 +487,27 @@ public class MenuEntrySwapperPlugin extends Plugin
} }
ItemComposition itemComposition = itemManager.getItemComposition(itemId); ItemComposition itemComposition = itemManager.getItemComposition(itemId);
String itemName = itemComposition.getName(); MenuAction shiftClickAction = MenuAction.ITEM_USE;
String option = "Use"; final int shiftClickActionIndex = itemComposition.getShiftClickActionIndex();
int shiftClickActionIndex = itemComposition.getShiftClickActionIndex();
String[] inventoryActions = itemComposition.getInventoryActions();
if (shiftClickActionIndex >= 0 && shiftClickActionIndex < inventoryActions.length) if (shiftClickActionIndex >= 0)
{ {
option = inventoryActions[shiftClickActionIndex]; shiftClickAction = MenuAction.of(MenuAction.ITEM_FIRST_OPTION.getId() + shiftClickActionIndex);
} }
MenuEntry[] entries = event.getMenuEntries(); MenuEntry[] entries = event.getMenuEntries();
for (MenuEntry entry : entries) for (MenuEntry entry : entries)
{ {
if (itemName.equals(Text.removeTags(entry.getTarget()))) final MenuAction menuAction = MenuAction.of(entry.getType());
if (ITEM_MENU_TYPES.contains(menuAction) && entry.getIdentifier() == itemId)
{ {
entry.setType(MenuAction.RUNELITE.getId()); entry.setType(MenuAction.RUNELITE.getId());
if (option.equals(entry.getOption())) if (shiftClickAction == menuAction)
{ {
entry.setOption("* " + option); entry.setOption("* " + entry.getOption());
} }
} }
} }