runeliteplus: merge upstream

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

@@ -609,7 +609,7 @@ public interface RSClient extends RSGameShell, Client
 	void setObjectDefinitionLowDetail(boolean lowDetail);
 
 	@Construct
-	RSGroundItem createItem();
+	RSTileItem createItem();
 
 	@Import("Interpreter_intStackSize")
 	@Override
@@ -833,9 +833,9 @@ public interface RSClient extends RSGameShell, Client
 	@Override
 	int getOculusOrbFocalPointY();
 
-	RSGroundItem getLastItemDespawn();
+	RSTileItem getLastItemDespawn();
 
-	void setLastItemDespawn(RSGroundItem lastItemDespawn);
+	void setLastItemDespawn(RSTileItem lastItemDespawn);
 
 	@Construct
 	RSWidget createWidget();

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

@@ -16,7 +16,7 @@ public interface RSTile extends Tile
 	@Override
 	GameObject[] getGameObjects();
 
-	@Import("groundItemPile")
+	@Import("tileItemPile")
 	@Override
 	ItemLayer getItemLayer();
 

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

@@ -1,10 +1,10 @@
 package net.runelite.rs.api;
-
 import net.runelite.api.Item;
 import net.runelite.api.Tile;
+import net.runelite.api.TileItem;
 import net.runelite.mapping.Import;
 
-public interface RSGroundItem extends RSEntity, Item
+public interface RSTileItem extends RSEntity, TileItem, Item
 {
 	@Import("id")
 	@Override

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

@@ -3,7 +3,7 @@ package net.runelite.rs.api;
 import net.runelite.api.ItemLayer;
 import net.runelite.mapping.Import;
 
-public interface RSGroundItemPile extends ItemLayer
+public interface RSTileItemPile extends ItemLayer
 {
 	@Import("x")
 	int getX();