project: Mixins

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

@@ -21,10 +21,6 @@ public interface RSAbstractArchive extends IndexDataBase
 	@Override
 	int[][] getFileIds();
 
-	@Import("getFile")
-	@Override
-	byte[] getFile(int groupId, int fileId);
-
 	@Import("getGroupFileCount")
 	@Override
 	int getGroupFileCount(int groupId);
@@ -32,4 +28,8 @@ public interface RSAbstractArchive extends IndexDataBase
 	@Import("fileCounts")
 	@Override
 	int[] getFileCounts();
+
+	@Import("getFile")
+	@Override
+	byte[] loadData(int groupId, int fileId);
 }

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

@@ -29,6 +29,7 @@ import java.util.Map;
 import net.runelite.api.AmbientSoundEffect;
 import net.runelite.api.Client;
 import net.runelite.api.Deque;
+import net.runelite.api.ModelData;
 import net.runelite.api.SpritePixels;
 import net.runelite.api.World;
 import net.runelite.api.clan.ClanRank;
@@ -1569,4 +1570,10 @@ public interface RSClient extends RSGameEngine, Client
 
 	@Construct
 	RSProjectile newProjectile(int var1, int var2, int var3, int var4, int var5, int var6, int var7, int var8, int var9, int var10, int var11);
+
+	@Construct
+	RSModelData newModelData(ModelData[] var1, int var2);
+
+	@Construct
+	RSEvictingDualNodeHashTable newEvictingDualNodeHashTable(int var1);
 }

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

@@ -8,6 +8,9 @@ public interface RSEvictingDualNodeHashTable extends NodeCache
 	@Import("get")
 	RSDualNode get(long id);
 
+	@Import("put")
+	void put(RSDualNode var1, long var2);
+
 	@Import("dualNode")
 	RSDualNode getDualNode();
 

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

@@ -110,13 +110,19 @@ public interface RSModel extends RSRenderable, Model
 	RSModel toSharedSpotAnimModel(boolean b);
 
 	@Import("rotateY90Ccw")
-	void rotateY90Ccw();
+	void rs$rotateY90Ccw();
 
 	@Import("rotateY180")
-	void rotateY180Ccw();
+	void rs$rotateY180Ccw();
 
 	@Import("rotateY270Ccw")
-	void rotateY270Ccw();
+	void rs$rotateY270Ccw();
+
+	@Import("scale")
+	void rs$scale(int var1, int var2, int var3);
+
+	@Import("offsetBy")
+	void rs$translate(int var1, int var2, int var3);
 
 	@Import("radius")
 	@Override

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

@@ -1,29 +1,40 @@
 package net.runelite.rs.api;
 
+import net.runelite.api.ModelData;
+import net.runelite.mapping.Construct;
 import net.runelite.mapping.Import;
 
-public interface RSModelData extends RSRenderable
+public interface RSModelData extends RSRenderable, ModelData
 {
 	@Import("faceCount")
-	int getTriangleFaceCount();
+	int getFaceCount();
 
 	@Import("indices1")
-	int[] getTrianglePointsX();
+	int[] getFaceIndices1();
 
 	@Import("indices2")
-	int[] getTrianglePointsY();
+	int[] getFaceIndices2();
 
 	@Import("indices3")
-	int[] getTrianglePointsZ();
+	int[] getFaceIndices3();
 
 	@Import("verticesX")
-	int[] getVertexX();
+	int[] getVerticesX();
+
+	@Import("verticesX")
+	void setVerticesX(int[] var1);
 
 	@Import("verticesY")
-	int[] getVertexY();
+	int[] getVerticesY();
+
+	@Import("verticesY")
+	void setVerticesY(int[] var1);
 
 	@Import("verticesZ")
-	int[] getVertexZ();
+	int[] getVerticesZ();
+
+	@Import("verticesZ")
+	void setVerticesZ(int[] var1);
 
 	@Import("texTriangleX")
 	short[] getTexTriangleX();
@@ -37,6 +48,21 @@ public interface RSModelData extends RSRenderable
 	@Import("faceTextures")
 	short[] getFaceTextures();
 
+	@Import("faceTextures")
+	void setFaceTextures(short[] var1);
+
+	@Import("faceAlphas")
+	byte[] getFaceTransparencies();
+
+	@Import("faceAlphas")
+	void setFaceTransparencies(byte[] var1);
+
+	@Import("faceColors")
+	short[] getFaceColors();
+
+	@Import("faceColors")
+	void setFaceColors(short[] var1);
+
 	@Import("textureCoords")
 	byte[] getTextureCoords();
 
@@ -53,7 +79,10 @@ public interface RSModelData extends RSRenderable
 	RSVertexNormal[] getVertexVertices();
 
 	@Import("recolor")
-	void recolor(short var1, short var2);
+	void rs$recolor(short var1, short var2);
+
+	@Import("retexture")
+	void rs$retexture(short var1, short var2);
 
 	@Import("toModel")
 	RSModel toModel(int var1, int var2, int var3, int var4, int var5);
@@ -63,4 +92,13 @@ public interface RSModelData extends RSRenderable
 
 	@Import("contrast")
 	short getContrast();
+
+	@Import("invalidate")
+	void invalidate();
+
+	@Import("copyModelData")
+	RSModelData shallowCopy();
+
+	@Construct
+	RSModelData newModelData(ModelData var1, boolean var2, boolean var3, boolean var4, boolean var5);
 }