Merge pull request #1604 from pklite/pls-work

Player Indicators: fixes

runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java

@@ -1283,9 +1283,8 @@ public class ConfigPanel extends PluginPanel
 
 			Class<?extends Enum> enumType = cid.getItem().enumClass();
 			EnumSet enumSet = configManager.getConfiguration(cd.getGroup().value(),
-				cid.getItem().keyName(), EnumSet.class) != null ? configManager.getConfiguration(cd.getGroup().value(),
-				cid.getItem().keyName(), EnumSet.class) : EnumSet.noneOf(enumType);
-			if (enumSet == null || enumSet.contains(null))
+				cid.getItem().keyName(), EnumSet.class);
+			if (enumSet == null)
 			{
 				enumSet = EnumSet.noneOf(enumType);
 			}

runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsConfig.java

@@ -35,6 +35,8 @@ import net.runelite.client.config.Stub;
 @ConfigGroup("playerindicators")
 public interface PlayerIndicatorsConfig extends Config
 {
+	EnumSet<PlayerIndicationLocation> defaultPlayerIndicatorMode = EnumSet.complementOf(EnumSet.of(PlayerIndicationLocation.HULL));
+
 	@ConfigItem(
 		position = 0,
 		keyName = "drawOwnName",
@@ -69,7 +71,7 @@ public interface PlayerIndicatorsConfig extends Config
 	)
 	default EnumSet<PlayerIndicationLocation> selfIndicatorModes()
 	{
-		return EnumSet.allOf(PlayerIndicationLocation.class);
+		return defaultPlayerIndicatorMode;
 	}
 
 	@ConfigItem(
@@ -107,7 +109,7 @@ public interface PlayerIndicatorsConfig extends Config
 	)
 	default EnumSet<PlayerIndicationLocation> friendIndicatorMode()
 	{
-		return EnumSet.allOf(PlayerIndicationLocation.class);
+		return defaultPlayerIndicatorMode;
 	}
 
 	@ConfigItem(
@@ -145,7 +147,7 @@ public interface PlayerIndicatorsConfig extends Config
 	)
 	default EnumSet<PlayerIndicationLocation> clanIndicatorModes()
 	{
-		return EnumSet.allOf(PlayerIndicationLocation.class);
+		return defaultPlayerIndicatorMode;
 	}
 
 	@ConfigItem(
@@ -195,7 +197,7 @@ public interface PlayerIndicatorsConfig extends Config
 	)
 	default EnumSet<PlayerIndicationLocation> teamIndicatorModes()
 	{
-		return EnumSet.allOf(PlayerIndicationLocation.class);
+		return defaultPlayerIndicatorMode;
 	}
 
 	@ConfigItem(
@@ -233,7 +235,7 @@ public interface PlayerIndicatorsConfig extends Config
 	)
 	default EnumSet<PlayerIndicationLocation> targetsIndicatorModes()
 	{
-		return EnumSet.allOf(PlayerIndicationLocation.class);
+		return defaultPlayerIndicatorMode;
 	}
 
 	@ConfigItem(
@@ -367,7 +369,7 @@ public interface PlayerIndicatorsConfig extends Config
 	)
 	default EnumSet<PlayerIndicationLocation> otherIndicatorModes()
 	{
-		return EnumSet.allOf(PlayerIndicationLocation.class);
+		return defaultPlayerIndicatorMode;
 	}
 
 
@@ -484,7 +486,7 @@ public interface PlayerIndicatorsConfig extends Config
 	)
 	default EnumSet<PlayerIndicationLocation> callerHighlightOptions()
 	{
-		return EnumSet.allOf(PlayerIndicationLocation.class);
+		return defaultPlayerIndicatorMode;
 	}
 
 	@ConfigItem(
@@ -536,7 +538,7 @@ public interface PlayerIndicatorsConfig extends Config
 	)
 	default EnumSet<PlayerIndicationLocation> callerTargetHighlightOptions()
 	{
-		return EnumSet.allOf(PlayerIndicationLocation.class);
+		return defaultPlayerIndicatorMode;
 	}
 
 

runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsOverlay.java

@@ -28,10 +28,10 @@ package net.runelite.client.plugins.playerindicators;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
-import java.awt.Polygon;
 import java.awt.image.BufferedImage;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import lombok.extern.slf4j.Slf4j;
@@ -42,6 +42,7 @@ import net.runelite.api.Point;
 import net.runelite.api.Varbits;
 import net.runelite.api.WorldType;
 import net.runelite.api.kit.KitType;
+import net.runelite.client.game.ClanManager;
 import net.runelite.client.ui.overlay.Overlay;
 import net.runelite.client.ui.overlay.OverlayPosition;
 import net.runelite.client.ui.overlay.OverlayPriority;
@@ -65,6 +66,8 @@ public class PlayerIndicatorsOverlay extends Overlay
 	private PlayerIndicatorsService playerIndicatorsService;
 	@Inject
 	private Client client;
+	@Inject
+	private ClanManager clanManager;
 
 	@Inject
 	public PlayerIndicatorsOverlay(PlayerIndicatorsPlugin plugin, PlayerIndicatorsService playerIndicatorsService)
@@ -114,98 +117,105 @@ public class PlayerIndicatorsOverlay extends Overlay
 			}
 
 			final String builtString = nameSb.toString();
+			final int x = graphics.getFontMetrics().stringWidth(builtString);
+			final int y = graphics.getFontMetrics().getHeight();
 
-			if (skulls && actor.getSkullIcon() != null)
+			if (plugin.isHighlightClan() && actor.isClanMember() && plugin.isShowClanRanks() && relation == PlayerRelation.CLAN)
 			{
-				final int x = graphics.getFontMetrics().stringWidth(builtString);
-				final int y = graphics.getFontMetrics().getHeight();
-				OverlayUtil.renderActorTextAndImage(graphics, actor, builtString, color,
-					ImageUtil.resizeImage(skullIcon, y, y), 0, x);
+				if (clanManager.getRank(actor.getName()) != null)
+				{
+					OverlayUtil.renderActorTextAndImage(graphics, actor, builtString, color,
+						ImageUtil.resizeImage(Objects.requireNonNull(clanManager
+							.getClanImage(clanManager.getRank(actor.getName()))), y, y), 0, ACTOR_HORIZONTAL_TEXT_MARGIN);
+					return;
+				}
 			}
+
+			if (skulls && actor.getSkullIcon() != null && relation.equals(PlayerRelation.TARGET))
+			{
+
+				OverlayUtil.renderActorTextAndImage(graphics, actor, builtString, color,
+					ImageUtil.resizeImage(skullIcon, y, y), ACTOR_OVERHEAD_TEXT_MARGIN, ACTOR_HORIZONTAL_TEXT_MARGIN);
+			}
+
 			else
 			{
 				OverlayUtil.renderActorTextOverlay(graphics, actor, builtString, color);
 			}
 		}
-		if (Arrays.asList(plugin.getLocationHashMap()
-			.getOrDefault(relation, NULL_OBJ))
-			.contains(PlayerIndicationLocation.HULL))
+		if (actor.getConvexHull() != null && indicationLocations.contains(PlayerIndicationLocation.HULL))
 		{
-			if (actor.getConvexHull() == null)
-			{
-				return;
-			}
 			OverlayUtil.renderPolygon(graphics, actor.getConvexHull(), color);
 		}
 
-		if (Arrays.asList(plugin.getLocationHashMap()
-			.getOrDefault(relation, NULL_OBJ))
-			.contains(PlayerIndicationLocation.TILE))
+		if (indicationLocations.contains(PlayerIndicationLocation.TILE))
 		{
-			final Polygon poly = actor.getCanvasTilePoly();
-			if (poly != null)
+			if (actor.getCanvasTilePoly() != null)
 			{
-				OverlayUtil.renderPolygon(graphics, poly, color);
+				OverlayUtil.renderPolygon(graphics, actor.getCanvasTilePoly(), color);
 			}
 		}
 
-		if (plugin.isShowAgilityLevel() && checkWildy() && plugin.getResultCache().containsKey(actor.getName()))
+		if (relation.equals(PlayerRelation.TARGET))
 		{
-			if (textLocation == null)
+			if (plugin.isShowAgilityLevel() && checkWildy() && plugin.getResultCache().containsKey(actor.getName()))
 			{
-				return;
-			}
-
-			final int level = plugin.getResultCache().get(actor.getName()).getAgility().getLevel();
-
-			if (plugin.getAgilityFormat() == PlayerIndicatorsPlugin.AgilityFormats.ICONS)
-			{
-
-				final int width = plugin.isShowCombatLevel() ? graphics.getFontMetrics().stringWidth(name)
-					+ ACTOR_HORIZONTAL_TEXT_MARGIN : graphics.getFontMetrics().stringWidth(name);
-
-				final int height = graphics.getFontMetrics().getHeight();
-				if (level >= plugin.getAgilityFirstThreshold())
+				if (textLocation == null)
 				{
-					OverlayUtil.renderImageLocation(graphics,
-						new Point(textLocation.getX() + 5 + width,
-							textLocation.getY() - height),
-						ImageUtil.resizeImage(agilityIcon, height, height));
-				}
-				if (level >= plugin.getAgilitySecondThreshold())
-				{
-					OverlayUtil.renderImageLocation(graphics,
-						new Point(textLocation.getX() + agilityIcon.getWidth() + width,
-							textLocation.getY() - height),
-						ImageUtil.resizeImage(agilityIcon, height, height));
-				}
-				if (level < plugin.getAgilityFirstThreshold())
-				{
-					OverlayUtil.renderImageLocation(graphics,
-						new Point(textLocation.getX() + 5 + width,
-							textLocation.getY() - height),
-						ImageUtil.resizeImage(noAgilityIcon, height, height));
-				}
-			}
-			else
-			{
-				Color agiColor = Color.WHITE;
-
-				if (level >= plugin.getAgilityFirstThreshold())
-				{
-					agiColor = Color.CYAN;
-				}
-				else if (level >= plugin.getAgilitySecondThreshold())
-				{
-					agiColor = Color.GREEN;
-				}
-				else if (level < plugin.getAgilityFirstThreshold())
-				{
-					agiColor = Color.RED;
+					return;
 				}
 
-				final String n = level + " " + "Agility";
-				OverlayUtil.renderActorTextOverlay(graphics, actor, n, agiColor, 60);
+				final int level = plugin.getResultCache().get(actor.getName()).getAgility().getLevel();
+
+				if (plugin.getAgilityFormat() == PlayerIndicatorsPlugin.AgilityFormats.ICONS)
+				{
+
+					final int width = plugin.isShowCombatLevel() ? graphics.getFontMetrics().stringWidth(name)
+						+ ACTOR_HORIZONTAL_TEXT_MARGIN : graphics.getFontMetrics().stringWidth(name);
+
+					final int height = graphics.getFontMetrics().getHeight();
+					if (level >= plugin.getAgilityFirstThreshold())
+					{
+						OverlayUtil.renderImageLocation(graphics,
+							new Point(textLocation.getX() + 5 + width,
+								textLocation.getY() - height),
+							ImageUtil.resizeImage(agilityIcon, height, height));
+					}
+					else if (level >= plugin.getAgilitySecondThreshold())
+					{
+						OverlayUtil.renderImageLocation(graphics,
+							new Point(textLocation.getX() + agilityIcon.getWidth() + width,
+								textLocation.getY() - height),
+							ImageUtil.resizeImage(agilityIcon, height, height));
+					}
+					else if (level < plugin.getAgilityFirstThreshold())
+					{
+						OverlayUtil.renderImageLocation(graphics,
+							new Point(textLocation.getX() + 5 + width,
+								textLocation.getY() - height),
+							ImageUtil.resizeImage(noAgilityIcon, height, height));
+					}
+				}
+				else
+				{
+					Color agiColor = Color.WHITE;
+
+					if (level >= plugin.getAgilityFirstThreshold())
+					{
+						agiColor = Color.CYAN;
+					}
+					else if (level >= plugin.getAgilitySecondThreshold())
+					{
+						agiColor = Color.GREEN;
+					}
+					else if (level < plugin.getAgilityFirstThreshold())
+					{
+						agiColor = Color.RED;
+					}
+
+					final String n = level + " " + "Agility";
+					OverlayUtil.renderActorTextOverlay(graphics, actor, n, agiColor, 60);
+				}
 			}
 		}
 	}

runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsPlugin.java

@@ -78,7 +78,14 @@ import net.runelite.http.api.hiscore.HiscoreResult;
 public class PlayerIndicatorsPlugin extends Plugin
 {
 	private static final HiscoreClient HISCORE_CLIENT = new HiscoreClient();
-
+	private final List<String> callers = new ArrayList<>();
+	private final Map<Player, PlayerRelation> colorizedMenus = new ConcurrentHashMap<>();
+	private final Map<PlayerRelation, Color> relationColorHashMap = new ConcurrentHashMap<>();
+	private final Map<PlayerRelation, Object[]> locationHashMap = new ConcurrentHashMap<>();
+	private final Map<String, Actor> callerPiles = new ConcurrentHashMap<>();
+	@Getter(AccessLevel.PACKAGE)
+	private final Map<String, HiscoreResult> resultCache = new HashMap<>();
+	private final ExecutorService executorService = Executors.newFixedThreadPool(100);
 	@Inject
 	@Getter(AccessLevel.NONE)
 	private OverlayManager overlayManager;
@@ -100,16 +107,7 @@ public class PlayerIndicatorsPlugin extends Plugin
 	@Inject
 	@Getter(AccessLevel.NONE)
 	private EventBus eventBus;
-
 	private ClanMemberRank callerRank;
-	private final List<String> callers = new ArrayList<>();
-	private final Map<Player, PlayerRelation> colorizedMenus = new ConcurrentHashMap<>();
-	private final Map<PlayerRelation, Color> relationColorHashMap = new ConcurrentHashMap<>();
-	private final Map<PlayerRelation, Object[]> locationHashMap = new ConcurrentHashMap<>();
-	private final Map<String, Actor> callerPiles = new ConcurrentHashMap<>();
-	@Getter(AccessLevel.PACKAGE)
-	private final Map<String, HiscoreResult> resultCache = new HashMap<>();
-	private final ExecutorService executorService = Executors.newFixedThreadPool(100);
 	private PlayerIndicatorsPlugin.AgilityFormats agilityFormat;
 	private PlayerIndicatorsPlugin.MinimapSkullLocations skullLocation;
 	private String configCallers;
@@ -368,6 +366,10 @@ public class PlayerIndicatorsPlugin extends Plugin
 
 					lastEntry.setTarget(ColorUtil.prependColorTag(target, color));
 				}
+				if (image != -1)
+				{
+					lastEntry.setTarget("<img=" + image + ">" + lastEntry.getTarget());
+				}
 
 				if (image2 != -1 && this.playerSkull)
 				{
@@ -379,6 +381,7 @@ public class PlayerIndicatorsPlugin extends Plugin
 		}
 	}
 
+
 	private void getCallerList()
 	{
 		if (!this.highlightCallers)
@@ -445,7 +448,7 @@ public class PlayerIndicatorsPlugin extends Plugin
 	 * @param actor The player to check
 	 * @return true if they are a target, false otherwise
 	 */
-	private boolean isPile(Actor actor)
+	public boolean isPile(Actor actor)
 	{
 		if (!(actor instanceof Player))
 		{

runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java

@@ -24,14 +24,12 @@
  */
 package net.runelite.client.plugins.playerindicators;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.function.BiConsumer;
 import java.util.function.Predicate;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-import net.runelite.api.Actor;
 import net.runelite.api.Client;
 import net.runelite.api.Player;
 import net.runelite.client.util.PvPUtil;
@@ -50,7 +48,6 @@ public class PlayerIndicatorsService
 	private final Predicate<Player> other;
 	private final Predicate<Player> caller;
 	private final Predicate<Player> callerTarget;
-	private final List<Actor> piles = new ArrayList<>();
 
 	@Inject
 	private PlayerIndicatorsService(final Client client, final PlayerIndicatorsPlugin plugin)
@@ -58,29 +55,34 @@ public class PlayerIndicatorsService
 		this.client = client;
 		this.plugin = plugin;
 
-		self = (player) -> Objects.equals(client.getLocalPlayer(), player);
-		friend = (player) -> (!player.equals(client.getLocalPlayer()) && client.isFriended(player.getName(), false));
-		clan = (player) -> (player.isClanMember() && !client.isFriended(player.getName(), false));
-		team = (player) -> (Objects.requireNonNull(client.getLocalPlayer()).getTeam() != 0 &&
-			client.getLocalPlayer().getTeam() == player.getTeam());
-		target = (player ->
-		{
-			if (nonFriendly(player))
-			{
-				return false;
-			}
-			return plugin.isHighlightTargets() && PvPUtil.isAttackable(client, player);
-		});
-		caller = plugin::isCaller;
-		callerTarget = piles::contains;
-		other = (player ->
-		{
-			if (nonFriendly(player))
-			{
-				return false;
-			}
-			return true;
-		});
+		self = (player) -> (client.getLocalPlayer().equals(player)
+			&& plugin.getLocationHashMap().containsKey(PlayerRelation.SELF));
+
+		friend = (player) -> (!player.equals(client.getLocalPlayer())
+			&& client.isFriended(player.getName(), false)
+			&& plugin.getLocationHashMap().containsKey(PlayerRelation.FRIEND));
+
+		clan = (player) -> (player.isClanMember()  && !client.getLocalPlayer().equals(player) && !client.isFriended(player.getName(), false)
+			&& plugin.getLocationHashMap().containsKey(PlayerRelation.CLAN));
+
+		team = (player) -> (Objects.requireNonNull(client.getLocalPlayer()).getTeam() != 0 && !player.isClanMember()
+			&& !client.isFriended(player.getName(), false)
+			&& client.getLocalPlayer().getTeam() == player.getTeam()
+			&& plugin.getLocationHashMap().containsKey(PlayerRelation.TEAM));
+
+		target = (player) -> (!team.test(player) && !clan.test(player)
+			&& !client.isFriended(player.getName(), false) && PvPUtil.isAttackable(client, player)
+			&& !client.getLocalPlayer().equals(player)  && plugin.getLocationHashMap().containsKey(PlayerRelation.TARGET));
+
+		caller = (player) -> (plugin.isCaller(player) && plugin.getLocationHashMap().containsKey(PlayerRelation.CALLER));
+
+		callerTarget = (player) -> (plugin.isPile(player) && plugin.getLocationHashMap().containsKey(PlayerRelation.CALLER_TARGET));
+
+		other = (player) ->
+			(!PvPUtil.isAttackable(client, player) && !client.getLocalPlayer().equals(player)
+				&& !team.test(player) && !player.isClanMember() && !client.isFriended(player.getName(), false)
+				&& plugin.getLocationHashMap().containsKey(PlayerRelation.OTHER));
+
 	}
 
 	public void forEachPlayer(final BiConsumer<Player, PlayerRelation> consumer)
@@ -90,51 +92,50 @@ public class PlayerIndicatorsService
 			return;
 		}
 
-		piles.clear();
-
 		final List<Player> players = client.getPlayers();
-
-		if (plugin.isHighlightOwnPlayer())
+		for (Player p : players)
 		{
-			players.stream().filter(self).forEach(p -> consumer.accept(p, PlayerRelation.SELF));
-		}
-		if (plugin.isHighlightFriends())
-		{
-			players.stream().filter(friend.and(self.negate())).forEach(p -> consumer.accept(p, PlayerRelation.FRIEND));
-		}
-		if (plugin.isHighlightClan())
-		{
-			players.stream().filter(clan.and(self.negate())).forEach(p -> consumer.accept(p, PlayerRelation.CLAN));
-		}
-		if (plugin.isHighlightTeam())
-		{
-			players.stream().filter(team.and(self.negate())).forEach(p -> consumer.accept(p, PlayerRelation.TEAM));
-		}
-		if (plugin.isHighlightTargets())
-		{
-			players.stream().filter(target.and(self.negate())).forEach(p -> consumer.accept(p, PlayerRelation.TARGET));
-		}
-		if (plugin.isHighlightOther())
-		{
-			players.stream().filter(other.and(self.negate())).forEach(p -> consumer.accept(p, PlayerRelation.OTHER));
-		}
-		if (plugin.isHighlightCallers())
-		{
-			players.stream().filter(caller).forEach(p ->
+			if (self.test(p))
+			{
+				consumer.accept(p, PlayerRelation.SELF);
+				continue;
+			}
+			if (friend.test(p))
+			{
+				consumer.accept(p, PlayerRelation.FRIEND);
+				continue;
+			}
+			if (clan.test(p))
+			{
+				consumer.accept(p, PlayerRelation.CLAN);
+				continue;
+			}
+			if (team.test(p))
+			{
+				consumer.accept(p, PlayerRelation.TEAM);
+				continue;
+			}
+			if (target.test(p))
+			{
+				consumer.accept(p, PlayerRelation.TARGET);
+				continue;
+			}
+			if (caller.test(p))
 			{
 				consumer.accept(p, PlayerRelation.CALLER);
-				if (p.getInteracting() != null)
-				{
-					piles.add(p.getInteracting());
-				}
-			});
+				continue;
+			}
+			if (callerTarget.test(p) )
+			{
+				consumer.accept(p, PlayerRelation.CALLER_TARGET);
+				continue;
+			}
+			if (other.test(p))
+			{
+				consumer.accept(p, PlayerRelation.OTHER);
+			}
 		}
-		if (plugin.isHighlightCallerTargets())
-		{
-			players.stream().filter(callerTarget).forEach(p ->
-				consumer.accept(p, PlayerRelation.CALLER_TARGET));
-		}
-	}
+}
 
 	private boolean highlight()
 	{
@@ -142,15 +143,4 @@ public class PlayerIndicatorsService
 			|| plugin.isHighlightFriends() || plugin.isHighlightOther() || plugin.isHighlightTargets()
 			|| plugin.isHighlightCallers() || plugin.isHighlightTeam() || plugin.isHighlightCallerTargets();
 	}
-
-	private boolean nonFriendly(Player player)
-	{
-		return player == null
-			|| (plugin.isHighlightClan() && player.isClanMember())
-			|| (plugin.isHighlightFriends() && client.isFriended(player.getName(), false))
-			|| (plugin.isHighlightCallers() && plugin.isCaller(player))
-			|| (plugin.isHighlightCallerTargets() && piles.contains(player))
-			|| (plugin.isHighlightTeam() && Objects.requireNonNull(client.getLocalPlayer()).getTeam() != 0
-			&& client.getLocalPlayer().getTeam() == player.getTeam());
-	}
 }

runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayUtil.java

@@ -286,14 +286,14 @@ public class OverlayUtil
 
 	public static void renderActorTextAndImage(Graphics2D graphics, Actor actor, String text, Color color, BufferedImage image, int yOffset, int xOffset)
 	{
-		Point textLocation = new Point(actor.getConvexHull().getBounds().x + xOffset,
-			actor.getConvexHull().getBounds().y + yOffset);
+		Point textLocation = 		actor.getCanvasTextLocation(graphics, text, actor.getLogicalHeight() + yOffset);
 
-		renderImageLocation(graphics, textLocation, image);
-		xOffset = image.getWidth() + 1;
-		yOffset = (image.getHeight() - (int) graphics.getFontMetrics().getStringBounds(text, graphics).getHeight());
-		textLocation = new Point(textLocation.getX() + xOffset, textLocation.getY() + image.getHeight() - yOffset);
-		renderTextLocation(graphics, textLocation, text, color);
+		if (textLocation != null)
+		{
+			renderImageLocation(graphics, textLocation, image);
+			textLocation = new Point(textLocation.getX() + xOffset , textLocation.getY());
+			renderTextLocation(graphics, textLocation, text, color);
+		}
 	}
 
 	public static void renderTextLocation(Graphics2D graphics, String txtString, int fontSize, int fontStyle, Color fontColor, Point canvasPoint, boolean shadows, int yOffset)