project: Injector and mixins

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

@@ -1,3 +1,13 @@
 package net.runelite.rs.api;
 
-public interface RSFriendLoginUpdate {}
+import net.runelite.api.PendingLogin;
+import net.runelite.mapping.Import;
+
+public interface RSFriendLoginUpdate extends PendingLogin
+{
+	@Import("username")
+	RSUsername getRsName();
+
+	@Import("world")
+	short getWorld();
+}

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

@@ -1,11 +1,12 @@
 package net.runelite.rs.api;
 
+import net.runelite.api.FriendContainer;
 import net.runelite.mapping.Import;
 
 public interface RSFriendSystem
 {
 	@Import("friendsList")
-	RSFriendsList getFriendContainer();
+	FriendContainer getFriendContainer();
 
 	@Import("ignoreList")
 	RSIgnoreList getIgnoreContainer();

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

@@ -1,6 +1,12 @@
 package net.runelite.rs.api;
 
-import net.runelite.api.Friend;
-import net.runelite.api.NameableContainer;
+import net.runelite.api.Deque;
+import net.runelite.api.FriendContainer;
+import net.runelite.api.PendingLogin;
+import net.runelite.mapping.Import;
 
-public interface RSFriendsList extends NameableContainer<Friend> {}
+public interface RSFriendsList extends FriendContainer
+{
+	@Import("friendLoginUpdates")
+	Deque<PendingLogin> getPendingLogins();
+}

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

@@ -1,3 +1,15 @@
 package net.runelite.rs.api;
 
-public interface RSLink {}
+import net.runelite.mapping.Import;
+
+public interface RSLink
+{
+	@Import("previous")
+	RSLink getPrevious();
+
+	@Import("next")
+	RSLink next();
+
+	@Import("remove")
+	void remove();
+}

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

@@ -1,3 +1,25 @@
 package net.runelite.rs.api;
 
-public interface RSLinkDeque {}
+import net.runelite.api.Deque;
+import net.runelite.mapping.Import;
+
+public interface RSLinkDeque extends Deque
+{
+	@Import("current")
+	RSLink getCurrent();
+
+	@Import("current")
+	void setCurrent(RSLink link);
+
+	@Import("sentinel")
+	RSLink getSentinel();
+
+	@Import("last")
+	RSLink last();
+
+	@Import("previous")
+	RSLink previous();
+
+	@Import("addFirst")
+	void addFirst(RSLink val);
+}

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

@@ -48,19 +48,19 @@ public interface RSModel extends RSRenderable, Model
 
 	@Import("indicesCount")
 	@Override
-	int getTrianglesCount();
+	int getFaceCount();
 
 	@Import("indices1")
 	@Override
-	int[] getTrianglesX();
+	int[] getFaceIndices1();
 
 	@Import("indices2")
 	@Override
-	int[] getTrianglesY();
+	int[] getFaceIndices2();
 
 	@Import("indices3")
 	@Override
-	int[] getTrianglesZ();
+	int[] getFaceIndices3();
 
 	@Import("faceColors1")
 	@Override
@@ -76,7 +76,7 @@ public interface RSModel extends RSRenderable, Model
 
 	@Import("faceAlphas")
 	@Override
-	byte[] getTriangleTransparencies();
+	byte[] getFaceTransparencies();
 
 	@Import("faceRenderPriorities")
 	@Override
@@ -184,4 +184,20 @@ public interface RSModel extends RSRenderable, Model
 
 	int[] getVertexNormalsZ();
 	void setVertexNormalsZ(int[] vertexNormalsZ);
+
+	@Import("overrideAmount")
+	@Override
+	byte getOverrideAmount();
+
+	@Import("overrideHue")
+	@Override
+	byte getOverrideHue();
+
+	@Import("overrideSaturation")
+	@Override
+	byte getOverrideSaturation();
+
+	@Import("overrideLuminance")
+	@Override
+	byte getOverrideLuminance();
 }

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

@@ -1,8 +1,9 @@
 package net.runelite.rs.api;
 
+import net.runelite.api.AmbientSoundEffect;
 import net.runelite.mapping.Import;
 
-public interface RSObjectSound
+public interface RSObjectSound extends AmbientSoundEffect
 {
 	@Import("x")
 	int getX();

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

@@ -0,0 +1,4 @@
+package net.runelite.rs.api;
+
+public interface RSRuneLiteIterableLinkDeque
+{}

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

@@ -0,0 +1,4 @@
+package net.runelite.rs.api;
+
+public interface RSRuneLiteIterableNodeDeque
+{}

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

@@ -1,26 +1,11 @@
 package net.runelite.rs.api;
 
-import net.runelite.api.Sequence;
+import net.runelite.api.Animation;
 import net.runelite.api.SequenceDefinition;
 import net.runelite.mapping.Import;
 
-public interface RSSequenceDefinition extends RSNode, SequenceDefinition, Sequence
+public interface RSSequenceDefinition extends RSNode, SequenceDefinition, Animation
 {
-//	@Import("stretches")
-//	boolean getStretches();
-//
-//	@Import("maxLoops")
-//	int getMaxLoops();
-//
-//	@Import("precedenceAnimating") --- All unused
-//	int getPrecedenceAnimating();
-//
-//	@Import("replyMode")
-//	int getReplyMode();
-//
-//	@Import("interleaveLeave")
-//	int[] getInterleaveLeave();
-
 	@Import("frameCount")
 	@Override
 	int getFrameCount();