From 4b5e9d0c39f97c131c7f8dcef4f3768bf05910b6 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Thu, 22 Feb 2018 08:43:07 -0500
Subject: [PATCH] runescape-api: update to reflect new ChatPlayer relationship

---
 .../net/runelite/rs/api/RSChatPlayer.java     | 36 +++++++++++++++++++
 .../net/runelite/rs/api/RSClanMember.java     |  9 +----
 .../java/net/runelite/rs/api/RSFriend.java    |  6 +---
 3 files changed, 38 insertions(+), 13 deletions(-)
 create mode 100644 runescape-api/src/main/java/net/runelite/rs/api/RSChatPlayer.java

diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSChatPlayer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSChatPlayer.java
new file mode 100644
index 0000000000..4d70862b10
--- /dev/null
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSChatPlayer.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2016-2018, Adam <Adam@sigterm.info>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package net.runelite.rs.api;
+
+import net.runelite.mapping.Import;
+
+public interface RSChatPlayer extends RSNameable
+{
+	@Import("world")
+	int getWorld();
+
+	@Import("rank")
+	int getRSRank();
+}
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClanMember.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClanMember.java
index f51ab29dab..ba65238fa4 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSClanMember.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClanMember.java
@@ -25,14 +25,7 @@
 package net.runelite.rs.api;
 
 import net.runelite.api.ClanMember;
-import net.runelite.mapping.Import;
 
-public interface RSClanMember extends RSNameable, ClanMember
+public interface RSClanMember extends RSChatPlayer, ClanMember
 {
-	@Import("world")
-	@Override
-	int getWorld();
-
-	@Import("rank")
-	byte getRSRank();
 }
diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSFriend.java b/runescape-api/src/main/java/net/runelite/rs/api/RSFriend.java
index 0c8a63ea63..ee30442c02 100644
--- a/runescape-api/src/main/java/net/runelite/rs/api/RSFriend.java
+++ b/runescape-api/src/main/java/net/runelite/rs/api/RSFriend.java
@@ -24,10 +24,6 @@
  */
 package net.runelite.rs.api;
 
-import net.runelite.mapping.Import;
-
-public interface RSFriend extends RSNameable
+public interface RSFriend extends RSChatPlayer
 {
-	@Import("world")
-	int getWorld();
 }