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

Revert "npcindicators: Add option to highlight NPC name in right click menu (#8673)"

Browse Source 
This reverts commit 8ff1aacfd8.
This commit is contained in:
Adam
2019-05-02 09:39:05 -04:00
committed by GitHub
parent 412d97716e
commit ec9ec1d3af
2 changed files with 13 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsConfig.java
View File

@@ -89,17 +89,6 @@ public interface NpcIndicatorsConfig extends Config
@ConfigItem( @ConfigItem(
position = 5, position = 5,
keyName = "highlightMenuNames",
name = "Highlight menu names",
description = "Highlight NPC names in right click menu"
)
default boolean highlightMenuNames()
{
return false;
}
@ConfigItem(
position = 6,
keyName = "showRespawnTimer", keyName = "showRespawnTimer",
name = "Show respawn timer", name = "Show respawn timer",
description = "Show respawn timer of tagged NPCs") description = "Show respawn timer of tagged NPCs")

44
runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java
View File

@@ -66,7 +66,6 @@ import net.runelite.client.input.KeyManager;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.ui.overlay.OverlayManager; import net.runelite.client.ui.overlay.OverlayManager;
import net.runelite.client.util.ColorUtil;
import net.runelite.client.util.Text; import net.runelite.client.util.Text;
import net.runelite.client.util.WildcardMatcher; import net.runelite.client.util.WildcardMatcher;
@@ -249,37 +248,20 @@ public class NpcIndicatorsPlugin extends Plugin
@Subscribe @Subscribe
public void onMenuEntryAdded(MenuEntryAdded event) public void onMenuEntryAdded(MenuEntryAdded event)
{ {
if (!hotKeyPressed || event.getType() != MenuAction.EXAMINE_NPC.getId())
{
return;
}
MenuEntry[] menuEntries = client.getMenuEntries(); MenuEntry[] menuEntries = client.getMenuEntries();
String target = event.getTarget(); menuEntries = Arrays.copyOf(menuEntries, menuEntries.length + 1);
final int identifier = event.getIdentifier(); MenuEntry menuEntry = menuEntries[menuEntries.length - 1] = new MenuEntry();
int type = event.getType(); menuEntry.setOption(TAG);
menuEntry.setTarget(event.getTarget());
if (type >= 2000) menuEntry.setParam0(event.getActionParam0());
{ menuEntry.setParam1(event.getActionParam1());
type -= 2000; menuEntry.setIdentifier(event.getIdentifier());
} menuEntry.setType(MenuAction.RUNELITE.getId());
if (config.highlightMenuNames() &&
NPC_MENU_ACTIONS.contains(MenuAction.of(type)) &&
highlightedNpcs.stream().anyMatch(npc -> npc.getIndex() == identifier))
{
final MenuEntry menuEntry = menuEntries[menuEntries.length - 1];
target = ColorUtil.prependColorTag(Text.removeTags(target), config.getHighlightColor());
menuEntry.setTarget(target);
}
if (hotKeyPressed && type == MenuAction.EXAMINE_NPC.getId())
{
menuEntries = Arrays.copyOf(menuEntries, menuEntries.length + 1);
final MenuEntry tagEntry = menuEntries[menuEntries.length - 1] = new MenuEntry();
tagEntry.setOption(TAG);
tagEntry.setTarget(target);
tagEntry.setParam0(event.getActionParam0());
tagEntry.setParam1(event.getActionParam1());
tagEntry.setIdentifier(event.getIdentifier());
tagEntry.setType(MenuAction.RUNELITE.getId());
}
client.setMenuEntries(menuEntries); client.setMenuEntries(menuEntries);
} }