From 24e6b242002298691dfca1fc5daf0ef92719de31 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Tue, 27 Mar 2018 23:15:20 +0200 Subject: [PATCH] Add support for drawing player team's names Add support for drawing player names and indicators for players in same team as actual player. Signed-off-by: Tomas Slusny --- .../PlayerIndicatorsConfig.java | 28 +++++++++++++++++-- .../PlayerIndicatorsService.java | 6 ++++ 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsConfig.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsConfig.java index 3475bc44af..b5c204d557 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsConfig.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsConfig.java @@ -104,6 +104,28 @@ public interface PlayerIndicatorsConfig extends Config @ConfigItem( position = 6, + keyName = "drawTeamMemberNames", + name = "Draw team member names", + description = "Configures whether or not names of player's team members should be drawn" + ) + default boolean drawTeamMemberNames() + { + return true; + } + + @ConfigItem( + position = 7, + keyName = "teamMemberColor", + name = "Team member color", + description = "Color of team member names" + ) + default Color getTeamMemberColor() + { + return new Color(19, 110, 247); + } + + @ConfigItem( + position = 8, keyName = "drawNonClanMemberNames", name = "Draw non-clan member names", description = "Configures whether or not names of non-clan members should be drawn" @@ -114,7 +136,7 @@ public interface PlayerIndicatorsConfig extends Config } @ConfigItem( - position = 7, + position = 9, keyName = "nonClanMemberColor", name = "Non-clan member color", description = "Color of non-clan member names" @@ -125,7 +147,7 @@ public interface PlayerIndicatorsConfig extends Config } @ConfigItem( - position = 8, + position = 10, keyName = "drawPlayerTiles", name = "Draw tiles", description = "Configures whether or not tiles under players with rendered names should be drawn" @@ -136,7 +158,7 @@ public interface PlayerIndicatorsConfig extends Config } @ConfigItem( - position = 9, + position = 11, keyName = "drawMinimapNames", name = "Draw names on minimap", description = "Configures whether or not minimap names for players with rendered names should be drawn" diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java index b04c702444..cebddec3c8 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/playerindicators/PlayerIndicatorsService.java @@ -52,6 +52,8 @@ public class PlayerIndicatorsService return; } + final Player localPlayer = client.getLocalPlayer(); + for (Player player : client.getPlayers()) { if (player == null || player.getName() == null) @@ -76,6 +78,10 @@ public class PlayerIndicatorsService { consumer.accept(player, config.getClanMemberColor()); } + else if (config.drawTeamMemberNames() && localPlayer.getTeam() > 0 && localPlayer.getTeam() == player.getTeam()) + { + consumer.accept(player, config.getTeamMemberColor()); + } else if (config.drawNonClanMemberNames() && !isClanMember) { consumer.accept(player, config.getNonClanMemberColor());