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-14 17:43:53 +02:00
parent c867fa0ce1 e6947be044
commit 28a7157341
30 changed files with 709 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/IconID.java
+2 -1
View File
@@ -46,7 +46,8 @@ public enum IconID
SKULL(9),
HARDCORE_IRONMAN(10),
NO_ENTRY(11),
CHAIN_LINK(12);
CHAIN_LINK(12),
BOUNTY_HUNTER_EMBLEM(20);
private final int index;
runelite-api/src/main/java/net/runelite/api/ItemID.java
+4 -1
View File
@@ -11457,7 +11457,7 @@ public final class ItemID
public static final int BLIGHTED_BIND_SACK = 24609;
public static final int BLIGHTED_SNARE_SACK = 24611;
public static final int BLIGHTED_ENTANGLE_SACK = 24613;
public static final int BLIGHTED_TELEBLOCK_SACK = 24615;
public static final int BLIGHTED_TELEPORT_SPELL_SACK = 24615;
public static final int VESTAS_BLIGHTED_LONGSWORD = 24617;
public static final int VESTAS_LONGSWORD_INACTIVE = 24619;
public static final int BLIGHTED_VENGEANCE_SACK = 24621;
@@ -11469,5 +11469,8 @@ public final class ItemID
public static final int DIVINE_BASTION_POTION3 = 24638;
public static final int DIVINE_BASTION_POTION2 = 24641;
public static final int DIVINE_BASTION_POTION1 = 24644;
public static final int LOGS_24650 = 24650;
public static final int RAW_SHRIMPS_24652 = 24652;
public static final int BONES_24655 = 24655;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+21 -4
View File
@@ -305,7 +305,7 @@ public final class NpcID
public static final int EMBLEM_TRADER = 308;
public static final int REACHER = 309;
public static final int AYESHA = 310;
public static final int ADAM = 311;
public static final int IRON_MAN_TUTOR = 311;
public static final int FROG = 312;
public static final int REACHER_313 = 313;
public static final int DR_JEKYLL_314 = 314;
@@ -7174,7 +7174,7 @@ public final class NpcID
public static final int REVENANT_DARK_BEAST = 7938;
public static final int REVENANT_KNIGHT = 7939;
public static final int REVENANT_DRAGON = 7940;
public static final int PAUL = 7941;
public static final int IRON_MAN_TUTOR_7941 = 7941;
public static final int EMBLEM_TRADER_7943 = 7943;
public static final int FISHING_SPOT_7946 = 7946;
public static final int FISHING_SPOT_7947 = 7947;
@@ -7481,8 +7481,6 @@ public final class NpcID
public static final int SISTER_SEVI = 8274;
public static final int SISTER_TOEN = 8275;
public static final int SISTER_YRAM = 8276;
public static final int HAMELN_THE_JESTER = 8277;
public static final int HANCHEN_THE_HOUND = 8278;
public static final int KROY = 8279;
public static final int DAMIEN_LEUCURTE = 8280;
public static final int LORD_CROMBWICK = 8281;
@@ -8483,6 +8481,22 @@ public final class NpcID
public static final int SISTER_SENGA = 9471;
public static final int SISTER_SENGA_9472 = 9472;
public static final int ENT_TRUNK = 9474;
public static final int GIELINOR_GUIDE_9476 = 9476;
public static final int SURVIVAL_EXPERT_9477 = 9477;
public static final int FISHING_SPOT_9478 = 9478;
public static final int MASTER_NAVIGATOR = 9479;
public static final int QUEST_GUIDE_9480 = 9480;
public static final int MINING_INSTRUCTOR_9481 = 9481;
public static final int COMBAT_INSTRUCTOR_9482 = 9482;
public static final int GIANT_RAT_9483 = 9483;
public static final int BANKER_9484 = 9484;
public static final int BROTHER_BRACE_9485 = 9485;
public static final int IRON_MAN_TUTOR_9486 = 9486;
public static final int MAGIC_INSTRUCTOR_9487 = 9487;
public static final int CHICKEN_9488 = 9488;
public static final int VELIAF_HURTZ_9489 = 9489;
public static final int HAMELN_THE_JESTER = 9490;
public static final int HANCHEN_THE_HOUND = 9491;
public static final int TANGLEROOT_9492 = 9492;
public static final int TANGLEROOT_9493 = 9493;
public static final int TANGLEROOT_9494 = 9494;
@@ -8495,5 +8509,8 @@ public final class NpcID
public static final int TANGLEROOT_9501 = 9501;
public static final int IORWERTH_WARRIOR_9502 = 9502;
public static final int IORWERTH_WARRIOR_9503 = 9503;
public static final int ACCOUNT_SECURITY_TUTOR = 9504;
public static final int HAMELN_THE_JESTER_9505 = 9505;
public static final int HANCHEN_THE_HOUND_9506 = 9506;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+6
View File
@@ -12969,5 +12969,11 @@ public final class NullItemID
public static final int NULL_24643 = 24643;
public static final int NULL_24645 = 24645;
public static final int NULL_24646 = 24646;
public static final int NULL_24647 = 24647;
public static final int NULL_24648 = 24648;
public static final int NULL_24649 = 24649;
public static final int NULL_24651 = 24651;
public static final int NULL_24653 = 24653;
public static final int NULL_24654 = 24654;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+2
View File
@@ -18333,5 +18333,7 @@ public final class NullObjectID
public static final int NULL_37935 = 37935;
public static final int NULL_37950 = 37950;
public static final int NULL_37958 = 37958;
public static final int NULL_37960 = 37960;
public static final int NULL_37962 = 37962;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+43
View File
@@ -16025,6 +16025,13 @@ public final class ObjectID
public static final int FURNACE_30157 = 30157;
public static final int FURNACE_30158 = 30158;
public static final int RETURN_ORB = 30160;
public static final int LARGE_DOOR_30162 = 30162;
public static final int LARGE_DOOR_30163 = 30163;
public static final int DOOR_30164 = 30164;
public static final int GATE_30165 = 30165;
public static final int GATE_30166 = 30166;
public static final int DOOR_30167 = 30167;
public static final int BOOKCASE_30168 = 30168;
public static final int CRACK_30169 = 30169;
public static final int ROOT_30170 = 30170;
public static final int PORTAL_30172 = 30172;
@@ -16901,6 +16908,7 @@ public final class ObjectID
public static final int OLD_PASSAGEWAY = 31891;
public static final int OLD_PASSAGEWAY_31892 = 31892;
public static final int VELVET_CHAIR_31898 = 31898;
public static final int BOOKCASE_31899 = 31899;
public static final int GOBLIN_CROWD_31900 = 31900;
public static final int GOBLIN_CROWD_31901 = 31901;
public static final int SLAYER_HELMET_DISPLAY_CASE = 31902;
@@ -18505,6 +18513,7 @@ public final class ObjectID
public static final int ATTAS_PLANT_DISPLAY = 34685;
public static final int LEATHER_SHIELDS = 34686;
public static final int BRYOPHYTA_DISPLAY = 34687;
public static final int BOOKCASE_34688 = 34688;
public static final int BLOOMING_HESPORI_SPROUT = 34705;
public static final int SHRIVELLED_PLANT = 34706;
public static final int TWISTED_BUSH = 34712;
@@ -19539,7 +19548,11 @@ public final class ObjectID
public static final int NIGHTMARE_DISPLAY = 37629;
public static final int NIGHTMARE_TOPIARY = 37630;
public static final int SUPPLIES_37631 = 37631;
public static final int BOOKCASE_37725 = 37725;
public static final int BANNER_37726 = 37726;
public static final int BOOKCASE_37727 = 37727;
public static final int RANGE_37728 = 37728;
public static final int TELESCOPE_37729 = 37729;
public static final int ENERGY_BARRIER_37730 = 37730;
public static final int ENERGY_BARRIER_37731 = 37731;
public static final int SPORE = 37738;
@@ -19582,8 +19595,38 @@ public final class ObjectID
public static final int CRATE_37936 = 37936;
public static final int DOOR_37937 = 37937;
public static final int DOOR_37938 = 37938;
public static final int NAVIGATORS_TABLE = 37939;
public static final int DOOR_37940 = 37940;
public static final int DOOR_37941 = 37941;
public static final int LADDER_37942 = 37942;
public static final int LADDER_37943 = 37943;
public static final int ROCKS_37944 = 37944;
public static final int ROCKS_37945 = 37945;
public static final int ROCKS_37946 = 37946;
public static final int FURNACE_37947 = 37947;
public static final int GATE_37948 = 37948;
public static final int SCOREBOARD_37949 = 37949;
public static final int COFFIN_37951 = 37951;
public static final int GATE_37952 = 37952;
public static final int GATE_37953 = 37953;
public static final int GATE_37954 = 37954;
public static final int LADDER_37955 = 37955;
public static final int LADDER_37956 = 37956;
public static final int HANDY_PORTAL = 37957;
public static final int BANK_BOOTH_37959 = 37959;
public static final int DOOR_37961 = 37961;
public static final int DOOR_37963 = 37963;
public static final int DOOR_37964 = 37964;
public static final int TREE_37965 = 37965;
public static final int TREE_37966 = 37966;
public static final int TREE_37967 = 37967;
public static final int TREE_37968 = 37968;
public static final int OAK_37969 = 37969;
public static final int OAK_37970 = 37970;
public static final int TREE_37971 = 37971;
public static final int TREE_37972 = 37972;
public static final int TREE_37973 = 37973;
public static final int TREE_37974 = 37974;
public static final int TREE_37975 = 37975;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ScriptID.java
+1 -1
View File
@@ -309,7 +309,7 @@ public final class ScriptID
* <li> int (WidgetID) * 16, various widgets making up the bank interface </li>
* </ul>
*/
@ScriptArguments(integer = 16)
@ScriptArguments(integer = 17)
public static final int BANKMAIN_SEARCH_REFRESH = 283;
/**
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
+19 -19
View File
@@ -178,7 +178,7 @@ public class WidgetID
static final int OVERVIEW_MAP = 10;
static final int SEARCH = 25;
static final int SURFACE_SELECTOR = 33;
static final int TOOLTIP = 39;
static final int TOOLTIP = 41;
static final int OPTION = 46;
}
@@ -313,19 +313,19 @@ public class WidgetID
static final int BANK_CONTAINER = 1;
static final int INVENTORY_ITEM_CONTAINER = 3;
static final int BANK_TITLE_BAR = 3;
static final int ITEM_COUNT_TOP = 4;
static final int ITEM_COUNT_BAR = 5;
static final int ITEM_COUNT_BOTTOM = 6;
static final int CONTENT_CONTAINER = 8;
static final int TAB_CONTAINER = 9;
static final int ITEM_CONTAINER = 11;
static final int SEARCH_BUTTON_BACKGROUND = 38;
static final int DEPOSIT_INVENTORY = 40;
static final int DEPOSIT_EQUIPMENT = 42;
static final int INCINERATOR = 44;
static final int INCINERATOR_CONFIRM = 45;
static final int EQUIPMENT_CONTENT_CONTAINER = 66;
static final int EQUIPMENT_BUTTON = 107;
static final int ITEM_COUNT_TOP = 5;
static final int ITEM_COUNT_BAR = 6;
static final int ITEM_COUNT_BOTTOM = 7;
static final int CONTENT_CONTAINER = 9;
static final int TAB_CONTAINER = 10;
static final int ITEM_CONTAINER = 12;
static final int SEARCH_BUTTON_BACKGROUND = 39;
static final int DEPOSIT_INVENTORY = 41;
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 class GrandExchange
@@ -585,11 +585,11 @@ public class WidgetID
static final int TITLE = 44;
static final int FULL_INPUT = 45;
static final int GE_SEARCH_RESULTS = 53;
static final int MESSAGES = 55;
static final int TRANSPARENT_BACKGROUND_LINES = 56;
static final int INPUT = 57;
static final int MESSAGE_LINES = 58;
static final int FIRST_MESSAGE = 59;
static final int MESSAGES = 56;
static final int TRANSPARENT_BACKGROUND_LINES = 57;
static final int INPUT = 58;
static final int MESSAGE_LINES = 59;
static final int FIRST_MESSAGE = 60;
}
static class Prayer