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

project: Merge upstream (#2252)

Browse Source 
project: Merge upstream
This commit is contained in:
Owain van Brakel
2020-01-16 14:52:48 +01:00
committed by GitHub
parent 4df88288d9 740c2b135e
commit 1e4a783a64
13 changed files with 595 additions and 476 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildSrc/src/main/kotlin/Dependencies.kt
+2 -2
View File
@@ -25,9 +25,9 @@
object ProjectVersions {
const val launcherVersion = "2.0.4"
const val rlVersion = "1.6.2-SNAPSHOT"
const val rlVersion = "1.6.2"
const val openosrsVersion = "2.1.21-SNAPSHOT"
const val openosrsVersion = "2.1.21"
const val rsversion = 187
const val cacheversion = 165
runelite-api/src/main/java/net/runelite/api/ItemID.java
+12 -8
View File
@@ -11335,13 +11335,13 @@ public final class ItemID
public static final int SCROLL_BOX_MASTER = 24366;
public static final int CABBAGE_24367 = 24367;
public static final int TWISTED_SLAYER_HELMET = 24370;
public static final int TWISTED_LEAGUE_DRAGON_TROPHY = 24372;
public static final int TWISTED_LEAGUE_RUNE_TROPHY = 24374;
public static final int TWISTED_LEAGUE_ADAMANT_TROPHY = 24376;
public static final int TWISTED_LEAGUE_MITHRIL_TROPHY = 24378;
public static final int TWISTED_LEAGUE_STEEL_TROPHY = 24380;
public static final int TWISTED_LEAGUE_IRON_TROPHY = 24382;
public static final int TWISTED_LEAGUE_BRONZE_TROPHY = 24384;
public static final int TWISTED_DRAGON_TROPHY = 24372;
public static final int TWISTED_RUNE_TROPHY = 24374;
public static final int TWISTED_ADAMANT_TROPHY = 24376;
public static final int TWISTED_MITHRIL_TROPHY = 24378;
public static final int TWISTED_STEEL_TROPHY = 24380;
public static final int TWISTED_IRON_TROPHY = 24382;
public static final int TWISTED_BRONZE_TROPHY = 24384;
public static final int TWISTED_HAT_T3 = 24387;
public static final int TWISTED_COAT_T3 = 24389;
public static final int TWISTED_TROUSERS_T3 = 24391;
@@ -11355,7 +11355,7 @@ public final class ItemID
public static final int TWISTED_COAT_T1 = 24407;
public static final int TWISTED_TROUSERS_T1 = 24409;
public static final int TWISTED_BOOTS_T1 = 24411;
public static final int TWISTED_LEAGUE_BANNER = 24413;
public static final int TWISTED_BANNER = 24413;
public static final int RUNE_POUCH_L = 24416;
public static final int INQUISITORS_MACE = 24417;
public static final int SIRENS_TOME = 24418;
@@ -11382,5 +11382,9 @@ public final class ItemID
public static final int SCAPERUNE_TELEPORT = 24441;
public static final int BAKERY_STORAGE_KEY = 24442;
public static final int GINGERBREAD_GNOME = 24443;
public static final int TWISTED_SLAYER_HELMET_I = 24444;
public static final int TWISTED_TELEPORT_SCROLL = 24460;
public static final int TWISTED_BLUEPRINTS = 24463;
public static final int TWISTED_HORNS = 24466;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+8
View File
@@ -993,6 +993,14 @@ public final class NpcID
public static final int BANDIT_1026 = 1026;
public static final int GUARD_BANDIT = 1027;
public static final int BARBARIAN_GUARD = 1028;
public static final int SLEEPWALKER = 1029;
public static final int SLEEPWALKER_1030 = 1030;
public static final int SLEEPWALKER_1031 = 1031;
public static final int SLEEPWALKER_1032 = 1032;
public static final int SLEEPWALKER_1033 = 1033;
public static final int SLEEPWALKER_1034 = 1034;
public static final int SLEEPWALKER_1035 = 1035;
public static final int SLEEPWALKER_1036 = 1036;
public static final int SNAKE = 1037;
public static final int MONKEY_1038 = 1038;
public static final int ALBINO_BAT = 1039;
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+21
View File
@@ -12853,5 +12853,26 @@ public final class NullItemID
public static final int NULL_24415 = 24415;
public static final int NULL_24427 = 24427;
public static final int NULL_24429 = 24429;
public static final int NULL_24445 = 24445;
public static final int NULL_24446 = 24446;
public static final int NULL_24447 = 24447;
public static final int NULL_24448 = 24448;
public static final int NULL_24449 = 24449;
public static final int NULL_24450 = 24450;
public static final int NULL_24451 = 24451;
public static final int NULL_24452 = 24452;
public static final int NULL_24453 = 24453;
public static final int NULL_24454 = 24454;
public static final int NULL_24455 = 24455;
public static final int NULL_24456 = 24456;
public static final int NULL_24457 = 24457;
public static final int NULL_24458 = 24458;
public static final int NULL_24459 = 24459;
public static final int NULL_24461 = 24461;
public static final int NULL_24462 = 24462;
public static final int NULL_24464 = 24464;
public static final int NULL_24465 = 24465;
public static final int NULL_24467 = 24467;
public static final int NULL_24468 = 24468;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+76 -1
View File
@@ -14234,10 +14234,12 @@ public final class ObjectID
public static final int LIGHT_27093 = 27093;
public static final int CLAN_CUP_PORTAL = 27095;
public static final int EXIT_PORTAL_27096 = 27096;
public static final int PORTAL_NEXUS = 27097;
public static final int SOFA = 27098;
public static final int CRATE_27100 = 27100;
public static final int CRATES_27101 = 27101;
public static final int CRATES_27102 = 27102;
public static final int PORTAL_NEXUS_27106 = 27106;
public static final int CHARCOAL_FURNACE = 27107;
public static final int CHARCOAL_FURNACE_27108 = 27108;
public static final int CHARCOAL_FURNACE_27109 = 27109;
@@ -17511,7 +17513,7 @@ public final class ObjectID
public static final int CURTAIN_SPACE_33351 = 33351;
public static final int AMULET_SPACE = 33352;
public static final int AMULET_SPACE_33353 = 33353;
public static final int PORTAL_NEXUS = 33354;
public static final int PORTAL_NEXUS_33354 = 33354;
public static final int PORTAL_NEXUS_33355 = 33355;
public static final int PORTAL_NEXUS_33356 = 33356;
public static final int PORTAL_NEXUS_33357 = 33357;
@@ -19459,5 +19461,78 @@ public final class ObjectID
public static final int ORNATE_JEWELLERY_BOX_37544 = 37544;
public static final int ORNATE_JEWELLERY_BOX_37545 = 37545;
public static final int ORNATE_JEWELLERY_BOX_37546 = 37546;
public static final int PORTAL_NEXUS_37547 = 37547;
public static final int PORTAL_NEXUS_37548 = 37548;
public static final int PORTAL_NEXUS_37549 = 37549;
public static final int PORTAL_NEXUS_37550 = 37550;
public static final int PORTAL_NEXUS_37551 = 37551;
public static final int PORTAL_NEXUS_37552 = 37552;
public static final int PORTAL_NEXUS_37553 = 37553;
public static final int PORTAL_NEXUS_37554 = 37554;
public static final int PORTAL_NEXUS_37555 = 37555;
public static final int PORTAL_NEXUS_37556 = 37556;
public static final int PORTAL_NEXUS_37557 = 37557;
public static final int PORTAL_NEXUS_37558 = 37558;
public static final int PORTAL_NEXUS_37559 = 37559;
public static final int PORTAL_NEXUS_37560 = 37560;
public static final int PORTAL_NEXUS_37561 = 37561;
public static final int PORTAL_NEXUS_37562 = 37562;
public static final int PORTAL_NEXUS_37563 = 37563;
public static final int PORTAL_NEXUS_37564 = 37564;
public static final int PORTAL_NEXUS_37565 = 37565;
public static final int PORTAL_NEXUS_37566 = 37566;
public static final int PORTAL_NEXUS_37567 = 37567;
public static final int PORTAL_NEXUS_37568 = 37568;
public static final int PORTAL_NEXUS_37569 = 37569;
public static final int PORTAL_NEXUS_37570 = 37570;
public static final int PORTAL_NEXUS_37571 = 37571;
public static final int PORTAL_NEXUS_37572 = 37572;
public static final int PORTAL_NEXUS_37573 = 37573;
public static final int PORTAL_NEXUS_37574 = 37574;
public static final int PORTAL_NEXUS_37575 = 37575;
public static final int PORTAL_NEXUS_37576 = 37576;
public static final int PORTAL_NEXUS_37577 = 37577;
public static final int PORTAL_NEXUS_37578 = 37578;
public static final int PORTAL_NEXUS_37579 = 37579;
public static final int PORTAL_NEXUS_37580 = 37580;
public static final int WEISS_PORTAL = 37581;
public static final int LUMBRIDGE_GRAVEYARD_PORTAL = 37582;
public static final int DRAYNOR_MANOR_PORTAL = 37583;
public static final int BATTLEFRONT_PORTAL = 37584;
public static final int MIND_ALTAR_PORTAL = 37585;
public static final int SALVE_GRAVEYARD_PORTAL = 37586;
public static final int FENKENSTRAINS_CASTLE_PORTAL = 37587;
public static final int WEST_ARDOUGNE_PORTAL = 37588;
public static final int HARMONY_ISLAND_PORTAL = 37589;
public static final int CEMETERY_PORTAL = 37590;
public static final int BARROWS_PORTAL = 37591;
public static final int APE_ATOLL_DUNGEON_PORTAL = 37592;
public static final int WEISS_PORTAL_37593 = 37593;
public static final int LUMBRIDGE_GRAVEYARD_PORTAL_37594 = 37594;
public static final int DRAYNOR_MANOR_PORTAL_37595 = 37595;
public static final int BATTLEFRONT_PORTAL_37596 = 37596;
public static final int MIND_ALTAR_PORTAL_37597 = 37597;
public static final int SALVE_GRAVEYARD_PORTAL_37598 = 37598;
public static final int FENKENSTRAINS_CASTLE_PORTAL_37599 = 37599;
public static final int WEST_ARDOUGNE_PORTAL_37600 = 37600;
public static final int HARMONY_ISLAND_PORTAL_37601 = 37601;
public static final int CEMETERY_PORTAL_37602 = 37602;
public static final int BARROWS_PORTAL_37603 = 37603;
public static final int APE_ATOLL_DUNGEON_PORTAL_37604 = 37604;
public static final int WEISS_PORTAL_37605 = 37605;
public static final int LUMBRIDGE_GRAVEYARD_PORTAL_37606 = 37606;
public static final int DRAYNOR_MANOR_PORTAL_37607 = 37607;
public static final int BATTLEFRONT_PORTAL_37608 = 37608;
public static final int MIND_ALTAR_PORTAL_37609 = 37609;
public static final int SALVE_GRAVEYARD_PORTAL_37610 = 37610;
public static final int FENKENSTRAINS_CASTLE_PORTAL_37611 = 37611;
public static final int WEST_ARDOUGNE_PORTAL_37612 = 37612;
public static final int HARMONY_ISLAND_PORTAL_37613 = 37613;
public static final int CEMETERY_PORTAL_37614 = 37614;
public static final int BARROWS_PORTAL_37615 = 37615;
public static final int APE_ATOLL_DUNGEON_PORTAL_37616 = 37616;
public static final int DOOR_HOTSPOT_37617 = 37617;
public static final int DOOR_HOTSPOT_37618 = 37618;
public static final int WINDOW_SPACE_37619 = 37619;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
+9 -9
View File
@@ -263,15 +263,15 @@ public class WidgetID
{
static final int BANK_CONTAINER = 1;
static final int INVENTORY_ITEM_CONTAINER = 3;
static final int BANK_TITLE_BAR = 4;
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 BANK_TITLE_BAR = 3;
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 class GrandExchange
runelite-client/src/main/java/net/runelite/client/plugins/poh/PohIcons.java
+6 -1
View File
@@ -75,7 +75,12 @@ public enum PohIcons
PORTAL_NEXUS_33396, PORTAL_NEXUS_33397, PORTAL_NEXUS_33398, PORTAL_NEXUS_33399, PORTAL_NEXUS_33400, PORTAL_NEXUS_33401, PORTAL_NEXUS_33402,
PORTAL_NEXUS_33403, PORTAL_NEXUS_33404, PORTAL_NEXUS_33405, PORTAL_NEXUS_33406, PORTAL_NEXUS_33407, PORTAL_NEXUS_33408, PORTAL_NEXUS_33409,
PORTAL_NEXUS_33410, PORTAL_NEXUS_33423, PORTAL_NEXUS_33424, PORTAL_NEXUS_33425, PORTAL_NEXUS_33426, PORTAL_NEXUS_33427, PORTAL_NEXUS_33428,
PORTAL_NEXUS_33429, PORTAL_NEXUS_33430, PORTAL_NEXUS_33431
PORTAL_NEXUS_33429, PORTAL_NEXUS_33430, PORTAL_NEXUS_33431, PORTAL_NEXUS_37547, PORTAL_NEXUS_37548, PORTAL_NEXUS_37549, PORTAL_NEXUS_37550,
PORTAL_NEXUS_37551, PORTAL_NEXUS_37552, PORTAL_NEXUS_37553, PORTAL_NEXUS_37554, PORTAL_NEXUS_37555, PORTAL_NEXUS_37556, PORTAL_NEXUS_37557,
PORTAL_NEXUS_37558, PORTAL_NEXUS_37559, PORTAL_NEXUS_37560, PORTAL_NEXUS_37561, PORTAL_NEXUS_37562, PORTAL_NEXUS_37563, PORTAL_NEXUS_37564,
PORTAL_NEXUS_37565, PORTAL_NEXUS_37566, PORTAL_NEXUS_37567, PORTAL_NEXUS_37568, PORTAL_NEXUS_37569, PORTAL_NEXUS_37570, PORTAL_NEXUS_37571,
PORTAL_NEXUS_37572, PORTAL_NEXUS_37573, PORTAL_NEXUS_37574, PORTAL_NEXUS_37575, PORTAL_NEXUS_37576, PORTAL_NEXUS_37577, PORTAL_NEXUS_37578,
PORTAL_NEXUS_37579, PORTAL_NEXUS_37580
),
XERICSTALISMAN("xericstalisman",
XERICS_TALISMAN, XERICS_TALISMAN_33412, XERICS_TALISMAN_33413, XERICS_TALISMAN_33414, XERICS_TALISMAN_33415, XERICS_TALISMAN_33419
runelite-client/src/main/resources/item_variations.json
+2 -1
View File
@@ -7787,7 +7787,8 @@
21890,
23073,
23075,
24370
24370,
24444
],
"slayer ring": [
11866,
runelite-client/src/main/resources/net/runelite/client/plugins/skillcalculator/skill_thieving.json
+24
View File
@@ -6,6 +6,12 @@
"name": "Man / Woman",
"xp": 8
},
{
"level": 1,
"icon": 10851,
"name": "Winter Sq'irkjuice",
"xp": 350
},
{
"level": 2,
"icon": 1965,
@@ -78,6 +84,12 @@
"name": "Fruit Stall",
"xp": 28
},
{
"level": 25,
"icon": 10848,
"name": "Spring Sq'irkjuice",
"xp": 1350
},
{
"level": 27,
"icon": 5318,
@@ -132,6 +144,12 @@
"name": "Fremennik Citizen",
"xp": 65
},
{
"level": 45,
"icon": 10850,
"name": "Autumn Sq'irkjuice",
"xp": 2350
},
{
"level": 49,
"icon": 837,
@@ -192,6 +210,12 @@
"name": "Yanille Watchman",
"xp": 137.5
},
{
"level": 65,
"icon": 10849,
"name": "Summer Sq'irkjuice",
"xp": 3000
},
{
"level": 70,
"icon": 3255,
runelite-client/src/main/scripts/BankSearchLayout.hash
+1 -1
View File
@@ -1 +1 @@
EE35EDE5A14C6D9934C329F6921548C6E7C34810C0D441ECEE130276A38809EA
D3B1299112E56F2F3DABC162507F243C5BCD50C21296F5CABD23A8A6F1CB4A12
runelite-client/src/main/scripts/BankSearchLayout.rs2asm
+431 -449
View File
File diff suppressed because it is too large Load Diff
runelite-client/src/main/scripts/TriggerBankLayout.hash
+1 -1
View File
@@ -1 +1 @@
DC2D875DFF91D7D0184670EC9CD4E5980C051D8D4BD0F591935FD603409A7369
BAA6532BC7BE7C6B39DA194976DA1223646557F982A52DC7E28EFF80F59FD6E3
runelite-client/src/main/scripts/TriggerBankLayout.rs2asm
+2 -3
View File
@@ -1,7 +1,7 @@
.id 276
.int_stack_count 17
.int_stack_count 16
.string_stack_count 0
.int_var_count 17
.int_var_count 16
.string_var_count 0
; Check if we should allow server to relayout bank
@@ -41,6 +41,5 @@ LABEL2:
iload 13
iload 14
iload 15
iload 16
invoke 277
return