Merge remote-tracking branch 'runelite/master'

runescape-api/src/main/java/net/runelite/rs/api/RSActor.java

@@ -102,12 +102,20 @@ public interface RSActor extends RSEntity, Actor
 
 	// Idle animation
 
+	@Import("idleSequence")
+	@Override
+	int getIdlePoseAnimation();
+
 	@Import("idleSequence")
 	@Override
 	void setIdlePoseAnimation(int animation);
 
 	// Movement animation (aka poseAnimation)
 
+	@Import("movementSequence")
+	@Override
+	int getPoseAnimation();
+
 	@Import("movementSequence")
 	@Override
 	void setPoseAnimation(int animation);
@@ -147,10 +155,6 @@ public interface RSActor extends RSEntity, Actor
 	@Import("hitSplatCycles")
 	int[] getHitsplatCycles();
 
-	@Import("idleSequence")
-	@Override
-	int getIdleAnimation();
-
 	@Import("turnLeftSequence")
 	@Override
 	int getTurnLeftAnimation();
@@ -178,8 +182,4 @@ public interface RSActor extends RSEntity, Actor
 	@Import("runSequence")
 	@Override
 	int getRunAnimation();
-
-	@Import("movementSequence")
-	@Override
-	int getMovementAnimation();
 }

runescape-api/src/main/java/net/runelite/rs/api/RSClanChat.java

@@ -1,10 +1,10 @@
 package net.runelite.rs.api;
 
-import net.runelite.api.ClanMember;
-import net.runelite.api.ClanMemberManager;
+import net.runelite.api.FriendsChatManager;
+import net.runelite.api.FriendsChatMember;
 import net.runelite.mapping.Import;
 
-public interface RSClanChat extends RSUserList<ClanMember>, ClanMemberManager
+public interface RSClanChat extends RSUserList<FriendsChatMember>, FriendsChatManager
 {
 	@Import("owner")
 	String getClanOwner();

runescape-api/src/main/java/net/runelite/rs/api/RSClanMate.java

@@ -1,5 +1,5 @@
 package net.runelite.rs.api;
 
-import net.runelite.api.ClanMember;
+import net.runelite.api.FriendsChatMember;
 
-public interface RSClanMate extends RSBuddy, ClanMember {}
+public interface RSClanMate extends RSBuddy, FriendsChatMember {}

runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java

@@ -52,7 +52,7 @@ public interface RSPlayer extends RSActor, Player
 
 	@Import("isClanMember")
 	@Override
-	boolean isClanMember();
+	boolean isFriendsChatMember();
 
 	@Import("isFriend")
 	@Override