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

menu swapper: don't show default action if one isn't configured

Browse Source 
Currently it is ambiguous if the configured action is the default action or there is no configured action because either way it prepends a * to the default op.

Co-authored-by: sam <dasistkeinnamen@gmail.com>
This commit is contained in:
Adam
2021-12-18 11:00:53 -05:00
parent 406ce7bd6b
commit 8fa819d035
1 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,6 @@ package net.runelite.client.plugins.menuentryswapper;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import static com.google.common.base.Predicates.alwaysTrue; import static com.google.common.base.Predicates.alwaysTrue;
import static com.google.common.base.Predicates.equalTo; import static com.google.common.base.Predicates.equalTo;
import com.google.common.base.Strings;
import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.LinkedHashMultimap;
@@ -529,7 +528,7 @@ public class MenuEntrySwapperPlugin extends Plugin
return; return;
} }
MenuAction activeAction = MenuAction.ITEM_USE; MenuAction activeAction = null;
final ItemComposition itemComposition = itemManager.getItemComposition(itemId); final ItemComposition itemComposition = itemManager.getItemComposition(itemId);
if (configuringShiftClick) if (configuringShiftClick)
@@ -542,20 +541,18 @@ public class MenuEntrySwapperPlugin extends Plugin
{ {
activeAction = MenuAction.of(MenuAction.ITEM_FIRST_OPTION.getId() + shiftClickActionIndex); activeAction = MenuAction.of(MenuAction.ITEM_FIRST_OPTION.getId() + shiftClickActionIndex);
} }
else
{
// Otherwise it is possible that we have Use swap configured
Integer config = getSwapConfig(true, itemId);
if (config != null && config == -1)
{
activeAction = MenuAction.ITEM_USE;
}
}
} }
else else
{ {
// The default left click on items is the highest priority action 0-2, and otherwise is use.
final String[] actions = itemComposition.getInventoryActions();
for (int i = 0; i <= 2; ++i)
{
if (!Strings.isNullOrEmpty(actions[i]))
{
activeAction = MenuAction.of(MenuAction.ITEM_FIRST_OPTION.getId() + i);
break;
}
}
// Apply left click action from configuration // Apply left click action from configuration
Integer config = getSwapConfig(false, itemId); Integer config = getSwapConfig(false, itemId);
if (config != null) if (config != null)