From 3180576350dd1f5113bd44e7bc9281b255085abe Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 17 Oct 2021 13:01:43 -0400 Subject: [PATCH] hiscore: simplify lookup menu option add logic --- .../client/plugins/hiscore/HiscorePlugin.java | 26 +++++++------------ 1 file changed, 10 insertions(+), 16 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 37f298c4ab..7feb7311a8 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 @@ -24,7 +24,6 @@ */ package net.runelite.client.plugins.hiscore; -import com.google.common.collect.ImmutableList; import com.google.common.collect.ObjectArrays; import com.google.inject.Provides; import java.awt.image.BufferedImage; @@ -70,8 +69,6 @@ import org.apache.commons.lang3.ArrayUtils; public class HiscorePlugin extends Plugin { private static final String LOOKUP = "Lookup"; - private static final String KICK_OPTION = "Kick"; - private static final ImmutableList AFTER_OPTIONS = ImmutableList.of("Message", "Add ignore", "Remove friend", "Delete", KICK_OPTION); private static final Pattern BOUNTY_PATTERN = Pattern.compile("You've been assigned a target: (.*)"); @Inject @@ -153,26 +150,23 @@ public class HiscorePlugin extends Plugin @Subscribe public void onMenuEntryAdded(MenuEntryAdded event) { - if (!config.menuOption()) + if ((event.getType() != MenuAction.CC_OP.getId() && event.getType() != MenuAction.CC_OP_LOW_PRIORITY.getId()) || !config.menuOption()) { return; } + final String option = event.getOption(); final int componentId = event.getActionParam1(); - int groupId = WidgetInfo.TO_GROUP(componentId); - String option = event.getOption(); + final int groupId = WidgetInfo.TO_GROUP(componentId); - if (groupId == WidgetInfo.FRIENDS_LIST.getGroupId() || groupId == WidgetInfo.FRIENDS_CHAT.getGroupId() || - groupId == WidgetInfo.CHATBOX.getGroupId() && !KICK_OPTION.equals(option) || //prevent from adding for Kick option (interferes with the raiding party one) - groupId == WidgetInfo.RAIDING_PARTY.getGroupId() || groupId == WidgetInfo.PRIVATE_CHAT_MESSAGE.getGroupId() || - groupId == WidgetInfo.IGNORE_LIST.getGroupId() || componentId == WidgetInfo.CLAN_MEMBER_LIST.getId() || - componentId == WidgetInfo.CLAN_GUEST_MEMBER_LIST.getId()) + if (groupId == WidgetInfo.FRIENDS_LIST.getGroupId() && option.equals("Delete") + || groupId == WidgetInfo.FRIENDS_CHAT.getGroupId() && (option.equals("Add ignore") || option.equals("Remove friend")) + || groupId == WidgetInfo.CHATBOX.getGroupId() && (option.equals("Add ignore") || option.equals("Message")) + || groupId == WidgetInfo.IGNORE_LIST.getGroupId() && option.equals("Delete") + || (componentId == WidgetInfo.CLAN_MEMBER_LIST.getId() || componentId == WidgetInfo.CLAN_GUEST_MEMBER_LIST.getId()) && (option.equals("Add ignore") || option.equals("Remove friend")) + || groupId == WidgetInfo.PRIVATE_CHAT_MESSAGE.getGroupId() && (option.equals("Add ignore") || option.equals("Message")) + ) { - if (!AFTER_OPTIONS.contains(option) || (option.equals("Delete") && groupId != WidgetInfo.IGNORE_LIST.getGroupId())) - { - return; - } - final MenuEntry lookup = new MenuEntry(); lookup.setOption(LOOKUP); lookup.setTarget(event.getTarget());