From 0ab26ff3a07ce7c268fa6b1c77ef7627475b32b0 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Fri, 19 Oct 2018 14:08:58 +0200 Subject: [PATCH] Make HiScore lookup always deprioritized It is super annoying to accidentally have left-click option on stuff that never has one. Signed-off-by: Tomas Slusny --- .../client/plugins/hiscore/HiscorePlugin.java | 26 +++++-------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java index 2d3c268580..c1bfb361ca 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java @@ -66,8 +66,7 @@ public class HiscorePlugin extends Plugin { private static final String LOOKUP = "Lookup"; private static final String KICK_OPTION = "Kick"; - private static final ImmutableList BEFORE_OPTIONS = ImmutableList.of("Add friend", "Remove friend", KICK_OPTION); - private static final ImmutableList AFTER_OPTIONS = ImmutableList.of("Message"); + private static final ImmutableList AFTER_OPTIONS = ImmutableList.of("Message", "Add ignore", "Remove friend", KICK_OPTION); private static final Pattern BOUNTY_PATTERN = Pattern.compile("You've been assigned a target: (.*)"); @Inject @@ -182,15 +181,7 @@ public class HiscorePlugin extends Plugin { boolean after; - if (AFTER_OPTIONS.contains(option)) - { - after = true; - } - else if (BEFORE_OPTIONS.contains(option)) - { - after = false; - } - else + if (!AFTER_OPTIONS.contains(option)) { return; } @@ -203,7 +194,7 @@ public class HiscorePlugin extends Plugin lookup.setParam1(event.getActionParam1()); lookup.setIdentifier(event.getIdentifier()); - insertMenuEntry(lookup, client.getMenuEntries(), after); + insertMenuEntry(lookup, client.getMenuEntries()); } } @@ -232,16 +223,11 @@ public class HiscorePlugin extends Plugin } } - private void insertMenuEntry(MenuEntry newEntry, MenuEntry[] entries, boolean after) + private void insertMenuEntry(MenuEntry newEntry, MenuEntry[] entries) { MenuEntry[] newMenu = ObjectArrays.concat(entries, newEntry); - - if (after) - { - int menuEntryCount = newMenu.length; - ArrayUtils.swap(newMenu, menuEntryCount - 1, menuEntryCount - 2); - } - + int menuEntryCount = newMenu.length; + ArrayUtils.swap(newMenu, menuEntryCount - 1, menuEntryCount - 2); client.setMenuEntries(newMenu); }