Skip to content

Commit

Permalink
Merge pull request runelite#2882 from deathbeam/unify-highlight-tag
Browse files Browse the repository at this point in the history 
Unify Highlight and Tag colors for NPC indicators, cleanup code
  • Loading branch information
@Adam-
Adam- authored May 24, 2018
2 parents 08df33c + 404cddd commit 274a0dc
Show file tree
Hide file tree
Showing 4 changed files with 87 additions and 94 deletions.
12 changes: 1 addition & 11 deletions ...ite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcClickboxOverlay.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,17 +60,7 @@ public Dimension render(Graphics2D graphics)
{
for (NPC npc : plugin.getHighlightedNpcs())
{
renderNpcOverlay(graphics, npc, npc.getName(), config.getNpcColor());
}

NPC[] npcs = client.getCachedNPCs();
for (int npcId : plugin.getNpcTags())
{
NPC npc = npcs[npcId];
if (npc != null && npc.getName() != null)
{
renderNpcOverlay(graphics, npc, npc.getName(), config.getTagColor());
}
renderNpcOverlay(graphics, npc, npc.getName(), config.getHighlightColor());
}

return null;
Expand Down
15 changes: 2 additions & 13 deletions ...te-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ default String getNpcToHighlight()
name = "Highlight Color",
description = "Color of the NPC highlight"
)
default Color getNpcColor()
default Color getHighlightColor()
{
return Color.CYAN;
}
Expand All @@ -82,17 +82,6 @@ default boolean isTagEnabled()

@ConfigItem(
position = 4,
keyName = "tagColor",
name = "Tag Color",
description = "Color of the NPC tag highlight"
)
default Color getTagColor()
{
return Color.CYAN;
}

@ConfigItem(
position = 5,
keyName = "drawNames",
name = "Draw names above NPC",
description = "Configures whether or not NPC names should be drawn above the NPC"
Expand All @@ -103,7 +92,7 @@ default boolean drawNames()
}

@ConfigItem(
position = 6,
position = 5,
keyName = "drawMinimapNames",
name = "Draw names on minimap",
description = "Configures whether or not NPC names should be drawn on the minimap"
Expand Down
142 changes: 83 additions & 59 deletions ...te-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
*/
package net.runelite.client.plugins.npchighlight;

import com.google.common.base.Splitter;
import com.google.common.eventbus.Subscribe;
import com.google.inject.Provides;
import java.util.ArrayList;
Expand All @@ -34,6 +35,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;
import javax.inject.Inject;
import lombok.AccessLevel;
import lombok.Getter;
Expand Down Expand Up @@ -61,7 +63,7 @@ public class NpcIndicatorsPlugin extends Plugin
private static final String TAG = "Tag";

// Regex for splitting the hidden items in the config.
private static final String DELIMITER_REGEX = "\\s*,\\s*";
private static final Splitter COMMA_SPLITTER = Splitter.on(Pattern.compile("\\s*,\\s*")).trimResults();

@Inject
private Client client;
Expand All @@ -85,13 +87,7 @@ public class NpcIndicatorsPlugin extends Plugin
private KeyManager keyManager;

/**
* NPCs tagged with the Tag option
*/
@Getter(AccessLevel.PACKAGE)
private final Set<Integer> npcTags = new HashSet<>();

/**
* NPCs tagged due to highlight in the config
* NPCs to highlight
*/
@Getter(AccessLevel.PACKAGE)
private final Set<NPC> highlightedNpcs = new HashSet<>();
Expand All @@ -101,14 +97,12 @@ public class NpcIndicatorsPlugin extends Plugin
*/
private List<String> highlights = new ArrayList<>();

private boolean hotKeyPressed = false;
/**
* NPC ids marked with the Tag option
*/
private final Set<Integer> npcTags = new HashSet<>();

private void toggleTag(int npcId)
{
boolean removed = npcTags.remove(npcId);
if (!removed)
npcTags.add(npcId);
}
private boolean hotKeyPressed = false;

@Provides
NpcIndicatorsConfig provideConfig(ConfigManager configManager)
Expand All @@ -121,7 +115,7 @@ protected void startUp() throws Exception
{
keyManager.registerKeyListener(inputListener);
highlights = getHighlights();
rebuildNpcs();
rebuildAllNpcs();
}

@Override
Expand Down Expand Up @@ -150,44 +144,7 @@ public void onConfigChanged(ConfigChanged configChanged)
}

highlights = getHighlights();
rebuildNpcs();
}

private List<String> getHighlights()
{
String configNpcs = config.getNpcToHighlight().toLowerCase();
if (configNpcs.isEmpty())
return Collections.emptyList();

List<String> highlightedNpcs = Arrays.asList(configNpcs.split(DELIMITER_REGEX));
return highlightedNpcs;
}

/**
* Rebuild highlighted npcs
*/
private void rebuildNpcs()
{
highlightedNpcs.clear();

for (NPC npc : client.getNpcs())
{
String npcName = npc.getName();

if (npcName == null)
{
continue;
}

for (String highlight : highlights)
{
if (WildcardMatcher.matches(highlight, npcName))
{
highlightedNpcs.add(npc);
break;
}
}
}
rebuildAllNpcs();
}

@Subscribe
Expand All @@ -204,16 +161,41 @@ public void onFocusChanged(FocusChanged focusChanged)
public void onMenuObjectClicked(MenuOptionClicked click)
{
if (click.getMenuOption().equals(TAG))
toggleTag(click.getId());
{
final int id = click.getId();
final boolean removed = npcTags.remove(id);
final NPC[] cachedNPCs = client.getCachedNPCs();
final NPC npc = cachedNPCs[id];

if (npc != null && npc.getName() != null)
{
if (removed)
{
highlightedNpcs.remove(npc);
}
else
{
npcTags.add(id);
highlightedNpcs.add(npc);
}
}
}
}

@Subscribe
public void onNpcSpawned(NpcSpawned npcSpawned)
{
NPC npc = npcSpawned.getNpc();
String npcName = npc.getName();
final NPC npc = npcSpawned.getNpc();
final String npcName = npc.getName();

if (npcName != null)
{
if (npcTags.contains(npc.getIndex()))
{
highlightedNpcs.add(npc);
return;
}

for (String highlight : highlights)
{
if (WildcardMatcher.matches(highlight, npcName))
Expand All @@ -228,8 +210,7 @@ public void onNpcSpawned(NpcSpawned npcSpawned)
@Subscribe
public void onNpcDespawned(NpcDespawned npcDespawned)
{
NPC npc = npcDespawned.getNpc();
highlightedNpcs.remove(npc);
highlightedNpcs.remove(npcDespawned.getNpc());
}

@Override
Expand All @@ -256,4 +237,47 @@ void updateNpcMenuOptions(boolean pressed)

hotKeyPressed = pressed;
}

private List<String> getHighlights()
{
final String configNpcs = config.getNpcToHighlight().toLowerCase();

if (configNpcs.isEmpty())
{
return Collections.emptyList();
}

return COMMA_SPLITTER.splitToList(configNpcs);
}

private void rebuildAllNpcs()
{
highlightedNpcs.clear();

for (NPC npc : client.getNpcs())
{
String npcName = npc.getName();

if (npcName == null)
{
continue;
}

if (npcTags.contains(npc.getIndex()))
{
highlightedNpcs.add(npc);
continue;
}

for (String highlight : highlights)
{
if (WildcardMatcher.matches(highlight, npcName))
{
highlightedNpcs.add(npc);
break;
}
}
}
}

}
12 changes: 1 addition & 11 deletions ...lite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcMinimapOverlay.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,7 @@ public Dimension render(Graphics2D graphics)
{
for (NPC npc : plugin.getHighlightedNpcs())
{
renderNpcOverlay(graphics, npc, npc.getName(), config.getNpcColor());
}

NPC[] npcs = client.getCachedNPCs();
for (int npcId : plugin.getNpcTags())
{
NPC npc = npcs[npcId];
if (npc != null && npc.getName() != null)
{
renderNpcOverlay(graphics, npc, npc.getName(), config.getTagColor());
}
renderNpcOverlay(graphics, npc, npc.getName(), config.getHighlightColor());
}

return null;
Expand Down

0 comments on commit 274a0dc

Please sign in to comment.