Merge branch 'runelite' of https://github.com/Noodleeater/runelite into runeLite_personal

 Conflicts:

	runelite-api/src/main/java/net/runelite/api/Client.java

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

runelite-api/src/main/java/net/runelite/api/Client.java

@@ -376,8 +376,6 @@ public interface Client extends GameEngine
 	 */
 	int getPlane();
 
-	void setPlane(int plane);
-
 	/**
 	 * Gets the current scene
 	 */
@@ -2114,6 +2112,8 @@ public interface Client extends GameEngine
 	 */
 	Frames getFrames(int frameId);
 
+	SequenceDefinition getSequenceDefinition(int id);
+
 	/**
 	 * various archives you might want to use for reading data from cache
 	 */

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

@@ -1343,6 +1343,9 @@ public interface RSClient extends RSGameEngine, Client
 	@Import("getParamDefinition")
 	RSParamComposition getRSParamComposition(int id);
 
+	@Import("SequenceDefinition_get")
+	RSSequenceDefinition getSequenceDefinition(int id);
+
 	@Construct
 	RSIntegerNode newIntegerNode(int contents);
 

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

@@ -3,7 +3,7 @@ package net.runelite.rs.api;
 import net.runelite.api.SequenceDefinition;
 import net.runelite.mapping.Import;
 
-public interface RSSequenceDefinition extends SequenceDefinition
+public interface RSSequenceDefinition extends RSNode, SequenceDefinition
 {
 //	@Import("stretches")
 //	boolean getStretches();
@@ -20,6 +20,10 @@ public interface RSSequenceDefinition extends SequenceDefinition
 //	@Import("interleaveLeave")
 //	int[] getInterleaveLeave();
 
+	@Import("frameCount")
+	@Override
+	int getFrameCount();
+
 	@Import("frameIds")
 	@Override
 	int[] getFrameIDs();