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
2020-05-21 13:34:48 +02:00
parent 3d7be11a69 592ca5c112
commit e690df0852
13 changed files with 330 additions and 194 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -317,4 +317,16 @@ public final class ScriptID
*/
@ScriptArguments(integer = 1)
public static final int PVP_WIDGET_BUILDER = 388;
/**
* Called to build the combat interface
*/
@ScriptArguments
public static final int COMBAT_INTERFACE_SETUP = 420;
/**
* Called to build the toplevel interface
*/
@ScriptArguments(integer = 2)
public static final int TOPLEVEL_REDRAW = 907;
}

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

@@ -324,8 +324,8 @@ public class WidgetID
static final int DEPOSIT_EQUIPMENT = 43;
static final int INCINERATOR = 45;
static final int INCINERATOR_CONFIRM = 46;
static final int EQUIPMENT_CONTENT_CONTAINER = 67;
static final int EQUIPMENT_BUTTON = 108;
static final int EQUIPMENT_CONTENT_CONTAINER = 68;
static final int EQUIPMENT_BUTTON = 109;
}
static class GrandExchange
@@ -1282,6 +1282,7 @@ public class WidgetID
// Also used for many other interfaces!
static class BankPin
{
static final int CONTAINER = 0;
static final int TOP_LEFT_TEXT = 2;
static final int FIRST_ENTERED = 3;
static final int SECOND_ENTERED = 4;

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

@@ -165,6 +165,7 @@ public enum WidgetInfo
BANK_ITEM_COUNT_TOP(WidgetID.BANK_GROUP_ID, WidgetID.Bank.ITEM_COUNT_TOP),
BANK_ITEM_COUNT_BAR(WidgetID.BANK_GROUP_ID, WidgetID.Bank.ITEM_COUNT_BAR),
BANK_ITEM_COUNT_BOTTOM(WidgetID.BANK_GROUP_ID, WidgetID.Bank.ITEM_COUNT_BOTTOM),
BANK_PIN_CONTAINER(WidgetID.BANK_PIN_GROUP_ID, WidgetID.BankPin.CONTAINER),
GRAND_EXCHANGE_WINDOW_CONTAINER(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.WINDOW_CONTAINER),
GRAND_EXCHANGE_OFFER_CONTAINER(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.OFFER_CONTAINER),