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

menu entry swapper: optimize menu searching for strict matching

Browse Source 
Currently with many menu entries (~256) the searching is very slow and
measurably causes FPS drops
This commit is contained in:
Adam
2019-09-03 17:00:15 -04:00
parent 17634bb2a1
commit ef7ad04ef9
1 changed files with 34 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,8 +25,10 @@
*/ */
package net.runelite.client.plugins.menuentryswapper; package net.runelite.client.plugins.menuentryswapper;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.util.List;
import java.util.Set; import java.util.Set;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.Getter; import lombok.Getter;
@@ -130,6 +132,8 @@ public class MenuEntrySwapperPlugin extends Plugin
@Setter @Setter
private boolean shiftModifier = false; private boolean shiftModifier = false;
private final ArrayListMultimap<String, Integer> optionIndexes = ArrayListMultimap.create();
@Provides @Provides
MenuEntrySwapperConfig provideConfig(ConfigManager configManager) MenuEntrySwapperConfig provideConfig(ConfigManager configManager)
{ {
@@ -354,13 +358,22 @@ public class MenuEntrySwapperPlugin extends Plugin
@Subscribe @Subscribe
public void onMenuEntryAdded(MenuEntryAdded event) public void onMenuEntryAdded(MenuEntryAdded event)
{ {
final String option = Text.removeTags(event.getOption()).toLowerCase();
if (event.getType() == MenuAction.CANCEL.getId())
{
optionIndexes.clear();
}
int size = optionIndexes.size();
optionIndexes.put(option, size);
if (client.getGameState() != GameState.LOGGED_IN) if (client.getGameState() != GameState.LOGGED_IN)
{ {
return; return;
} }
final int eventId = event.getIdentifier(); final int eventId = event.getIdentifier();
final String option = Text.removeTags(event.getOption()).toLowerCase();
final String target = Text.removeTags(event.getTarget()).toLowerCase(); final String target = Text.removeTags(event.getTarget()).toLowerCase();
final NPC hintArrowNpc = client.getHintArrowNpc(); final NPC hintArrowNpc = client.getHintArrowNpc();
@@ -624,21 +637,33 @@ public class MenuEntrySwapperPlugin extends Plugin
private int searchIndex(MenuEntry[] entries, String option, String target, boolean strict) private int searchIndex(MenuEntry[] entries, String option, String target, boolean strict)
{ {
for (int i = entries.length - 1; i >= 0; i--) if (strict)
{ {
MenuEntry entry = entries[i]; List<Integer> indexes = optionIndexes.get(option);
String entryOption = Text.removeTags(entry.getOption()).toLowerCase();
String entryTarget = Text.removeTags(entry.getTarget()).toLowerCase();
if (strict) // We want the last index which matches the target, as that is what is top-most
// on the menu
for (int i = indexes.size() - 1; i >= 0; --i)
{ {
if (entryOption.equals(option) && entryTarget.equals(target)) int idx = indexes.get(i);
MenuEntry entry = entries[idx];
String entryTarget = Text.removeTags(entry.getTarget()).toLowerCase();
if (entryTarget.equals(target))
{ {
return i; return idx;
} }
} }
else }
else
{
// Without strict matching we have to iterate all entries...
for (int i = entries.length - 1; i >= 0; i--)
{ {
MenuEntry entry = entries[i];
String entryOption = Text.removeTags(entry.getOption()).toLowerCase();
String entryTarget = Text.removeTags(entry.getTarget()).toLowerCase();
if (entryOption.contains(option.toLowerCase()) && entryTarget.equals(target)) if (entryOption.contains(option.toLowerCase()) && entryTarget.equals(target))
{ {
return i; return i;