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

add config checks to trivia, improve readability

Browse Source 
Signed-off-by: PKLite <stonewall@pklite.xyz>
(cherry picked from commit 0c672cffaa0f5b98bf7efa48a58b3666d8e47fcc)
This commit is contained in:
PKLite
2019-09-08 21:32:50 -04:00
parent 06b87dbd30
commit 8a43f10599
3 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -134,7 +134,7 @@ public class PlayerIndicatorsOverlay extends Overlay
} }
OverlayUtil.renderActorTextAndImage(graphics, actor, builtString, color, OverlayUtil.renderActorTextAndImage(graphics, actor, builtString, color,
ImageUtil.resizeImage(Objects.requireNonNull(clanManager ImageUtil.resizeImage(Objects.requireNonNull(clanManager
.getClanImage(clanManager.getRank(actor.getName()))), y, y),0, ACTOR_HORIZONTAL_TEXT_MARGIN); .getClanImage(clanManager.getRank(actor.getName()))), y, y), 0, ACTOR_HORIZONTAL_TEXT_MARGIN);
} }
else else
{ {

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

@@ -449,7 +449,7 @@ public class PlayerIndicatorsPlugin extends Plugin
* @param actor The player to check * @param actor The player to check
* @return true if they are a target, false otherwise * @return true if they are a target, false otherwise
*/ */
private boolean isPile(Actor actor) public boolean isPile(Actor actor)
{ {
if (!(actor instanceof Player)) if (!(actor instanceof Player))
{ {

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

@@ -24,14 +24,12 @@
*/ */
package net.runelite.client.plugins.playerindicators; package net.runelite.client.plugins.playerindicators;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.function.BiConsumer; import java.util.function.BiConsumer;
import java.util.function.Predicate; import java.util.function.Predicate;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
import net.runelite.api.Actor;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.Player; import net.runelite.api.Player;
import net.runelite.client.util.PvPUtil; import net.runelite.client.util.PvPUtil;
@@ -50,7 +48,6 @@ public class PlayerIndicatorsService
private final Predicate<Player> other; private final Predicate<Player> other;
private final Predicate<Player> caller; private final Predicate<Player> caller;
private final Predicate<Player> callerTarget; private final Predicate<Player> callerTarget;
private final List<Actor> piles = new ArrayList<>();
@Inject @Inject
private PlayerIndicatorsService(final Client client, final PlayerIndicatorsPlugin plugin) private PlayerIndicatorsService(final Client client, final PlayerIndicatorsPlugin plugin)
@@ -58,18 +55,32 @@ public class PlayerIndicatorsService
this.client = client; this.client = client;
this.plugin = plugin; this.plugin = plugin;
self = (player) -> client.getLocalPlayer().equals(player); self = (player) -> (client.getLocalPlayer().equals(player)
friend = (player) -> (!player.equals(client.getLocalPlayer()) && client.isFriended(player.getName(), false)); && plugin.getLocationHashMap().containsKey(PlayerRelation.SELF));
clan = (player) -> (player.isClanMember() && !client.isFriended(player.getName(), false));
friend = (player) -> (!player.equals(client.getLocalPlayer())
&& client.isFriended(player.getName(), false)
&& plugin.getLocationHashMap().containsKey(PlayerRelation.FRIEND));
clan = (player) -> (player.isClanMember() && !client.isFriended(player.getName(), false)
&& plugin.getLocationHashMap().containsKey(PlayerRelation.CLAN));
team = (player) -> (Objects.requireNonNull(client.getLocalPlayer()).getTeam() != 0 && !player.isClanMember() team = (player) -> (Objects.requireNonNull(client.getLocalPlayer()).getTeam() != 0 && !player.isClanMember()
&& !client.isFriended(player.getName(), false) && && !client.isFriended(player.getName(), false)
client.getLocalPlayer().getTeam() == player.getTeam()); && client.getLocalPlayer().getTeam() == player.getTeam()
&& plugin.getLocationHashMap().containsKey(PlayerRelation.TEAM));
target = (player) -> (!team.test(player) && !clan.test(player) target = (player) -> (!team.test(player) && !clan.test(player)
&& !friend.test(player) && PvPUtil.isAttackable(client, player) && !self.test(player)); && !friend.test(player) && PvPUtil.isAttackable(client, player)
caller = plugin::isCaller; && !self.test(player) && plugin.getLocationHashMap().containsKey(PlayerRelation.TARGET));
callerTarget = piles::contains;
caller = (player) -> (plugin.isCaller(player) && plugin.getLocationHashMap().containsKey(PlayerRelation.CALLER));
callerTarget = (player) -> (plugin.isPile(player) && plugin.getLocationHashMap().containsKey(PlayerRelation.CALLER_TARGET));
other = (player) -> other = (player) ->
(!PvPUtil.isAttackable(client, player) && !team.test(player) && !clan.test(player) && !friend.test(player)); (!PvPUtil.isAttackable(client, player) && !team.test(player) && !clan.test(player) && !friend.test(player)
&& plugin.getLocationHashMap().containsKey(PlayerRelation.OTHER));
} }
@@ -80,47 +91,45 @@ public class PlayerIndicatorsService
return; return;
} }
piles.clear();
final List<Player> players = client.getPlayers(); final List<Player> players = client.getPlayers();
for (Player p : players) for (Player p : players)
{ {
if (self.test(p) && plugin.getLocationHashMap().containsKey(PlayerRelation.SELF)) if (self.test(p))
{ {
consumer.accept(p, PlayerRelation.SELF); consumer.accept(p, PlayerRelation.SELF);
continue; continue;
} }
if (friend.test(p) && plugin.getLocationHashMap().containsKey(PlayerRelation.FRIEND)) if (friend.test(p))
{ {
consumer.accept(p, PlayerRelation.FRIEND); consumer.accept(p, PlayerRelation.FRIEND);
continue; continue;
} }
if (clan.test(p) && plugin.getLocationHashMap().containsKey(PlayerRelation.CLAN)) if (clan.test(p))
{ {
consumer.accept(p, PlayerRelation.CLAN); consumer.accept(p, PlayerRelation.CLAN);
continue; continue;
} }
if (team.test(p) && plugin.getLocationHashMap().containsKey(PlayerRelation.TEAM)) if (team.test(p))
{ {
consumer.accept(p, PlayerRelation.TEAM); consumer.accept(p, PlayerRelation.TEAM);
continue; continue;
} }
if (target.test(p) && plugin.getLocationHashMap().containsKey(PlayerRelation.TARGET)) if (target.test(p))
{ {
consumer.accept(p, PlayerRelation.TARGET); consumer.accept(p, PlayerRelation.TARGET);
continue; continue;
} }
if (caller.test(p) && plugin.getLocationHashMap().containsKey(PlayerRelation.CALLER)) if (caller.test(p))
{ {
consumer.accept(p, PlayerRelation.CALLER); consumer.accept(p, PlayerRelation.CALLER);
continue; continue;
} }
if (callerTarget.test(p) && plugin.getLocationHashMap().containsKey(PlayerRelation.CALLER_TARGET)) if (callerTarget.test(p) )
{ {
consumer.accept(p, PlayerRelation.CALLER_TARGET); consumer.accept(p, PlayerRelation.CALLER_TARGET);
continue; continue;
} }
if (other.test(p) && plugin.getLocationHashMap().containsKey(PlayerRelation.OTHER)) if (other.test(p))
{ {
consumer.accept(p, PlayerRelation.OTHER); consumer.accept(p, PlayerRelation.OTHER);
} }