ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2022-04-25 11:00:47 +02:00
parent 015facf0cc e73ccc3069
commit 97dd655e5a
33 changed files with 147 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runelite-api/src/main/java/net/runelite/api/Client.java
View File

@@ -420,7 +420,6 @@ public interface Client extends OAuthApi, GameEngine
* <p>
* (getLocalPlayerIndex returns the local index, useful for menus/interacting)
*/
@Nullable
Player getLocalPlayer();
int getLocalPlayerIndex();

6
runelite-api/src/main/java/net/runelite/api/ScriptID.java
View File

@@ -452,4 +452,10 @@ public final class ScriptID
@ScriptArguments(integer = 6)
public static final int INVENTORY_DRAWITEM = 6011;
/**
* Initializes the trade interface
*/
@ScriptArguments(integer = 6)
public static final int TRADE_MAIN_INIT = 755;
}

6
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
View File

@@ -188,6 +188,7 @@ public final class WidgetID
public static final int GROUP_STORAGE_INVENTORY_GROUP_ID = 725;
public static final int GROUP_STORAGE_GROUP_ID = 724;
public static final int WILDERNESS_LOOT_CHEST = 742;
public static final int TRADE_WINDOW_GROUP_ID = 335;
static class WorldMap
{
@@ -1367,4 +1368,9 @@ public final class WidgetID
static final int HEADER = 1;
static final int MEMBERS = 6;
}
static class Trade
{
static final int HEADER = 31;
}
}

2
runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
View File

@@ -930,6 +930,8 @@ public enum WidgetInfo
SHOP_ITEMS_CONTAINER(WidgetID.SHOP_GROUP_ID, WidgetID.Shop.ITEMS_CONTAINER),
POH_TREASURE_CHEST_INVENTORY_CONTAINER(WidgetID.POH_TREASURE_CHEST_INVENTORY_GROUP_ID, 0),
TRADE_WINDOW_HEADER(WidgetID.TRADE_WINDOW_GROUP_ID, WidgetID.Trade.HEADER),
;
private final int groupId;