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

This commit is contained in:
Owain van Brakel
2019-10-28 09:44:51 +01:00
108 changed files with 5789 additions and 2073 deletions

View File

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

View File

@@ -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);
}

View File

@@ -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);
}

View File

@@ -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);
}

View File

@@ -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);
}