From e5f9db4fb4f7d85309a0b8b60e2bf11e8e5dc28e Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 2 Mar 2019 18:59:13 -0500 Subject: [PATCH] api: add methods to get clan owner and chat name Co-authored-by: trimbe --- .../src/main/java/net/runelite/api/Client.java | 14 ++++++++++++++ .../java/net/runelite/mixins/RSClientMixin.java | 14 ++++++++++++++ .../net/runelite/rs/api/RSClanMemberManager.java | 6 ++++++ 3 files changed, 34 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java index 4c44c7e3ef..fa7a54ee55 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -1055,6 +1055,20 @@ public interface Client extends GameEngine */ ClanMember[] getClanMembers(); + /** + * Gets the clan owner of the currently joined clan chat + * + * @return + */ + String getClanOwner(); + + /** + * Gets the clan chat name of the currently joined clan chat + * + * @return + */ + String getClanChatName(); + /** * Gets an array of players in the friends list. * diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java index 7cfef3985c..9b232aa760 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java @@ -727,6 +727,20 @@ public abstract class RSClientMixin implements RSClient return clanMemberManager != null ? getClanMemberManager().getNameables() : null; } + @Inject + @Override + public String getClanOwner() + { + return getClanMemberManager().getClanOwner(); + } + + @Inject + @Override + public String getClanChatName() + { + return getClanMemberManager().getClanChatName(); + } + @Inject @Override public Friend[] getFriends() diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClanMemberManager.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClanMemberManager.java index 2f2cd6781a..36a486c28b 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClanMemberManager.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClanMemberManager.java @@ -24,7 +24,13 @@ */ package net.runelite.rs.api; +import net.runelite.mapping.Import; + public interface RSClanMemberManager extends RSNameableContainer { + @Import("clanOwner") + String getClanOwner(); + @Import("clanChatName") + String getClanChatName(); }