Merge remote-tracking branch 'upstream/master' into 2310-merge

runescape-api/build.gradle

@@ -1,6 +0,0 @@
-group = 'us.runelitepl.rs'
-description = 'RuneScape API'
-
-dependencies {
-    api project(':runelite-api')
-}

runescape-api/runescape-api.gradle.kts

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2019 Owain van Brakel <https://github.com/Owain94>
+ * 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.
+ */
+
+group = "us.runelitepl.rs"
+description = "RuneScape API"
+
+dependencies {
+    api(project(":runelite-api"))
+}

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

@@ -30,6 +30,7 @@ import net.runelite.mapping.Import;
 public interface RSActor extends RSEntity, Actor
 {
 	@Import("targetIndex")
+	@Override
 	int getRSInteracting();
 
 	// Overhead text

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

@@ -208,6 +208,10 @@ public interface RSClient extends RSGameShell, Client
 	@Override
 	RSPlayer getLocalPlayer();
 
+	@Import("localPlayerIndex")
+	@Override
+	int getLocalPlayerIndex();
+
 	@Import("npcCount")
 	int getNpcIndexesCount();
 
@@ -1120,4 +1124,13 @@ public interface RSClient extends RSGameShell, Client
 
 	@Import("VarpDefinition_get")
 	RSVarpDefinition getVarpDefinition(int id);
-}
+
+	@Construct
+	RSTileItem newTileItem();
+
+	@Construct
+	RSNodeDeque newNodeDeque();
+
+	@Import("updateItemPile")
+	void updateItemPile(int localX, int localY);
+}

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

@@ -9,6 +9,10 @@ public interface RSItemDefinition extends ItemDefinition
 	@Override
 	String getName();
 
+	@Import("name")
+	@Override
+	void setName(String name);
+
 	@Import("id")
 	@Override
 	int getId();
@@ -41,6 +45,10 @@ public interface RSItemDefinition extends ItemDefinition
 	@Override
 	boolean isTradeable();
 
+	@Import("isTradable")
+	@Override
+	void setTradeable(boolean yes);
+
 	/**
 	 * You probably want {@link #isStackable}
 	 * <p>
@@ -60,4 +68,7 @@ public interface RSItemDefinition extends ItemDefinition
 	@Import("getShiftClickIndex")
 	@Override
 	int getShiftClickActionIndex();
+
+	@Import("getModel")
+	RSModel getModel(int quantity);
 }

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

@@ -9,4 +9,13 @@ public interface RSNodeDeque
 
 	@Import("sentinel")
 	RSNode getHead();
+
+	@Import("last")
+	RSNode last();
+
+	@Import("previous")
+	RSNode previous();
+
+	@Import("addFirst")
+	void addFirst(RSNode val);
 }

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

@@ -36,4 +36,7 @@ public interface RSScene extends Scene
 
 	@Import("minPlane")
 	int getMinLevel();
+
+	@Import("newGroundItemPile")
+	void newGroundItemPile(int plane, int x, int y, int hash, RSEntity var5, long var6, RSEntity var7, RSEntity var8);
 }