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

menu swapper: don't apply item menu swaps when shift is held

Browse Source 
This fixes a regression where applying menu swaps post-shift would make
shift effectively do nothing. Instead use the client swap when shift is
held.
This commit is contained in:
Adam
2020-06-25 20:55:23 -04:00
parent 1e1273d172
commit 31c66294f0
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

@@ -633,30 +633,40 @@ public class MenuEntrySwapperPlugin extends Plugin
private void swapMenuEntry(int index, MenuEntry menuEntry) private void swapMenuEntry(int index, MenuEntry menuEntry)
{ {
final int eventId = menuEntry.getIdentifier(); final int eventId = menuEntry.getIdentifier();
final MenuAction menuAction = MenuAction.of(menuEntry.getType());
final String option = Text.removeTags(menuEntry.getOption()).toLowerCase(); final String option = Text.removeTags(menuEntry.getOption()).toLowerCase();
final String target = Text.removeTags(menuEntry.getTarget()).toLowerCase(); final String target = Text.removeTags(menuEntry.getTarget()).toLowerCase();
final NPC hintArrowNpc = client.getHintArrowNpc(); final NPC hintArrowNpc = client.getHintArrowNpc();
if (hintArrowNpc != null if (hintArrowNpc != null
&& hintArrowNpc.getIndex() == eventId && hintArrowNpc.getIndex() == eventId
&& NPC_MENU_TYPES.contains(MenuAction.of(menuEntry.getType()))) && NPC_MENU_TYPES.contains(menuAction))
{ {
return; return;
} }
// Special case use shift click due to items not actually containing a "Use" option, making if (shiftModifier && (menuAction == MenuAction.ITEM_FIRST_OPTION
// the client unable to perform the swap itself. || menuAction == MenuAction.ITEM_SECOND_OPTION
if (shiftModifier && config.shiftClickCustomization() && !option.equals("use")) || menuAction == MenuAction.ITEM_THIRD_OPTION
|| menuAction == MenuAction.ITEM_FOURTH_OPTION
|| menuAction == MenuAction.ITEM_FIFTH_OPTION
|| menuAction == MenuAction.ITEM_USE))
{ {
Integer customOption = getSwapConfig(eventId); // Special case use shift click due to items not actually containing a "Use" option, making
// the client unable to perform the swap itself.
if (customOption != null && customOption == -1) if (config.shiftClickCustomization() && !option.equals("use"))
{ {
if (swap("use", target, index, true)) Integer customOption = getSwapConfig(eventId);
if (customOption != null && customOption == -1)
{ {
return; swap("use", target, index, true);
} }
} }
// don't perform swaps on items when shift is held; instead prefer the client menu swap, which
// we may have overwrote
return;
} }
Collection<Swap> swaps = this.swaps.get(option); Collection<Swap> swaps = this.swaps.get(option);