From c6904ef7ff62b87bbfb61691098cbb9178d19124 Mon Sep 17 00:00:00 2001 From: zjustin Date: Mon, 10 Jan 2022 07:12:44 +1100 Subject: [PATCH] mixins: hide clan members --- .../net/runelite/mixins/EntityHiderBridgeMixin.java | 10 ++++++++++ .../java/net/runelite/mixins/EntityHiderMixin.java | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderBridgeMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderBridgeMixin.java index ea86024a96..b8fd3936ad 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderBridgeMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderBridgeMixin.java @@ -51,6 +51,9 @@ public abstract class EntityHiderBridgeMixin implements RSClient @Inject public static boolean hideClanMates; + @Inject + public static boolean hideClanChatMembers; + @Inject public static boolean hideIgnores; @@ -122,6 +125,13 @@ public abstract class EntityHiderBridgeMixin implements RSClient hideClanMates = state; } + @Inject + @Override + public void setClanChatMembersHidden(boolean state) + { + hideClanChatMembers = state; + } + @Inject @Override public void setIgnoresHidden(boolean state) diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java index 3fe8ceeaab..d7f78944b8 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/EntityHiderMixin.java @@ -53,6 +53,9 @@ public abstract class EntityHiderMixin implements RSScene @Shadow("hideClanMates") private static boolean hideClanMates; + @Shadow("hideClanChatMembers") + private static boolean hideClanChatMembers; + @Shadow("hideLocalPlayer") private static boolean hideLocalPlayer; @@ -168,6 +171,11 @@ public abstract class EntityHiderMixin implements RSScene return !hideClanMates; } + if (player.isClanMember()) + { + return !hideClanChatMembers; + } + if (client.getFriendManager().isIgnored(player.getRsName())) { return !hideIgnores;