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
2019-12-05 13:18:03 +01:00
parent b334aa159f e81ff07f07
commit eba140c8a5
9 changed files with 535 additions and 395 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/ItemID.java
+1
View File
@@ -11366,5 +11366,6 @@ public final class ItemID
public static final int HARMONISED_NIGHTMARE_STAFF = 24423;
public static final int VOLATILE_NIGHTMARE_STAFF = 24424;
public static final int ELDRITCH_NIGHTMARE_STAFF = 24425;
public static final int CABBAGE_24426 = 24426;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+1
View File
@@ -12851,5 +12851,6 @@ public final class NullItemID
public static final int NULL_24412 = 24412;
public static final int NULL_24414 = 24414;
public static final int NULL_24415 = 24415;
public static final int NULL_24427 = 24427;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+3
View File
@@ -13793,6 +13793,9 @@ public final class NullObjectID
public static final int NULL_29134 = 29134;
public static final int NULL_29135 = 29135;
public static final int NULL_29150 = 29150;
public static final int NULL_29154 = 29154;
public static final int NULL_29155 = 29155;
public static final int NULL_29156 = 29156;
public static final int NULL_29228 = 29228;
public static final int NULL_29229 = 29229;
public static final int NULL_29265 = 29265;
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+56 -4
View File
@@ -15349,9 +15349,6 @@ public final class ObjectID
public static final int MAHOGANY_ADVENTURE_LOG = 29151;
public static final int GILDED_ADVENTURE_LOG = 29152;
public static final int MARBLE_ADVENTURE_LOG = 29153;
public static final int BASIC_JEWELLERY_BOX = 29154;
public static final int FANCY_JEWELLERY_BOX = 29155;
public static final int ORNATE_JEWELLERY_BOX = 29156;
public static final int BOSS_LAIR_DISPLAY = 29157;
public static final int KRAKEN_DISPLAY = 29158;
public static final int ZULRAH_DISPLAY = 29159;
@@ -16927,7 +16924,7 @@ public final class ObjectID
public static final int CORPOREAL_BEAST_DISPLAY = 31921;
public static final int GILDED_ADVENTURE_LOG_31922 = 31922;
public static final int ALTAR_OF_THE_OCCULT_31923 = 31923;
public static final int ORNATE_JEWELLERY_BOX_31924 = 31924;
public static final int ORNATE_JEWELLERY_BOX = 31924;
public static final int MOUNTED_MAX_CAPE_31925 = 31925;
public static final int BURNING_BRAZIER_31926 = 31926;
public static final int PYROMANCER = 31927;
@@ -19408,5 +19405,60 @@ public final class ObjectID
public static final int DRAGON_TROPHY_DISPLAY_37487 = 37487;
public static final int DRAGON_TROPHY_DISPLAY_37488 = 37488;
public static final int DRAGON_TROPHY_DISPLAY_37489 = 37489;
public static final int BASIC_JEWELLERY_BOX = 37492;
public static final int BASIC_JEWELLERY_BOX_37493 = 37493;
public static final int BASIC_JEWELLERY_BOX_37494 = 37494;
public static final int BASIC_JEWELLERY_BOX_37495 = 37495;
public static final int BASIC_JEWELLERY_BOX_37496 = 37496;
public static final int BASIC_JEWELLERY_BOX_37497 = 37497;
public static final int BASIC_JEWELLERY_BOX_37498 = 37498;
public static final int BASIC_JEWELLERY_BOX_37499 = 37499;
public static final int BASIC_JEWELLERY_BOX_37500 = 37500;
public static final int FANCY_JEWELLERY_BOX = 37501;
public static final int FANCY_JEWELLERY_BOX_37502 = 37502;
public static final int FANCY_JEWELLERY_BOX_37503 = 37503;
public static final int FANCY_JEWELLERY_BOX_37504 = 37504;
public static final int FANCY_JEWELLERY_BOX_37505 = 37505;
public static final int FANCY_JEWELLERY_BOX_37506 = 37506;
public static final int FANCY_JEWELLERY_BOX_37507 = 37507;
public static final int FANCY_JEWELLERY_BOX_37508 = 37508;
public static final int FANCY_JEWELLERY_BOX_37509 = 37509;
public static final int FANCY_JEWELLERY_BOX_37510 = 37510;
public static final int FANCY_JEWELLERY_BOX_37511 = 37511;
public static final int FANCY_JEWELLERY_BOX_37512 = 37512;
public static final int FANCY_JEWELLERY_BOX_37513 = 37513;
public static final int FANCY_JEWELLERY_BOX_37514 = 37514;
public static final int FANCY_JEWELLERY_BOX_37515 = 37515;
public static final int FANCY_JEWELLERY_BOX_37516 = 37516;
public static final int FANCY_JEWELLERY_BOX_37517 = 37517;
public static final int FANCY_JEWELLERY_BOX_37518 = 37518;
public static final int FANCY_JEWELLERY_BOX_37519 = 37519;
public static final int ORNATE_JEWELLERY_BOX_37520 = 37520;
public static final int ORNATE_JEWELLERY_BOX_37521 = 37521;
public static final int ORNATE_JEWELLERY_BOX_37522 = 37522;
public static final int ORNATE_JEWELLERY_BOX_37523 = 37523;
public static final int ORNATE_JEWELLERY_BOX_37524 = 37524;
public static final int ORNATE_JEWELLERY_BOX_37525 = 37525;
public static final int ORNATE_JEWELLERY_BOX_37526 = 37526;
public static final int ORNATE_JEWELLERY_BOX_37527 = 37527;
public static final int ORNATE_JEWELLERY_BOX_37528 = 37528;
public static final int ORNATE_JEWELLERY_BOX_37529 = 37529;
public static final int ORNATE_JEWELLERY_BOX_37530 = 37530;
public static final int ORNATE_JEWELLERY_BOX_37531 = 37531;
public static final int ORNATE_JEWELLERY_BOX_37532 = 37532;
public static final int ORNATE_JEWELLERY_BOX_37533 = 37533;
public static final int ORNATE_JEWELLERY_BOX_37534 = 37534;
public static final int ORNATE_JEWELLERY_BOX_37535 = 37535;
public static final int ORNATE_JEWELLERY_BOX_37536 = 37536;
public static final int ORNATE_JEWELLERY_BOX_37537 = 37537;
public static final int ORNATE_JEWELLERY_BOX_37538 = 37538;
public static final int ORNATE_JEWELLERY_BOX_37539 = 37539;
public static final int ORNATE_JEWELLERY_BOX_37540 = 37540;
public static final int ORNATE_JEWELLERY_BOX_37541 = 37541;
public static final int ORNATE_JEWELLERY_BOX_37542 = 37542;
public static final int ORNATE_JEWELLERY_BOX_37543 = 37543;
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;
/* This file is automatically generated. Do not edit. */
}
runelite-client/src/main/resources/item_variations.json
+2 -1
View File
@@ -2457,7 +2457,8 @@
1967,
22519,
22520,
24367
24367,
24426
],
"empty cup": [
1980,
runelite-client/src/main/scripts/ChatBuilder.hash
+1 -1
View File
@@ -1 +1 @@
B591FB2134EF9FA75FCCEC25A1FD90581D3A7AD0F1E6FBE4267C8AF6010C547C
FAA689813E3E4C1BA5A0B7DF492C6AE48DBD466C50968E97FADF4BBD42A9A166
runelite-client/src/main/scripts/ChatBuilder.rs2asm
+332 -291
View File
File diff suppressed because it is too large Load Diff
runelite-client/src/main/scripts/ChatSplitBuilder.hash
+1 -1
View File
@@ -1 +1 @@
2A7509A05B336AC79015C479B39CDB3E1D3F10A57C6B96B2162E87352B4F25A3
6F98F4F02F8A6B8B774D6B5010B7751260DB766C3E1C43F787A8BE213E7E2C3A
runelite-client/src/main/scripts/ChatSplitBuilder.rs2asm
+138 -97
View File
@@ -1,7 +1,7 @@
.id 89
.int_stack_count 1
.string_stack_count 0
.int_var_count 16
.int_var_count 18
.string_var_count 4
iconst 0
istore 1
@@ -183,24 +183,28 @@ LABEL156:
sstore 2
sconst ""
sstore 3
iconst -1
istore 15
iconst 0
istore 16
get_varc_int 55
get_varc_int 202
if_icmpge LABEL172
jump LABEL282
LABEL172:
if_icmpge LABEL176
jump LABEL317
LABEL176:
get_varc_int 55
clientclock
iconst 3000
sub
if_icmpgt LABEL178
jump LABEL282
LABEL178:
if_icmpgt LABEL182
jump LABEL317
LABEL182:
iconst 14
chat_gethistorylength
iconst 0
if_icmpgt LABEL183
jump LABEL282
LABEL183:
if_icmpgt LABEL187
jump LABEL317
LABEL187:
iconst 14
iconst 0
chat_gethistory_bytypeandline
@@ -212,11 +216,12 @@ LABEL183:
istore 12
iload 12
iconst -1
if_icmpne LABEL196
jump LABEL282
LABEL196:
if_icmpne LABEL200
jump LABEL317
LABEL200:
sload 0
invoke 2066
istore 15
sstore 3
sstore 0
iload 7
@@ -240,9 +245,33 @@ LABEL196:
sload 3
string_length
iconst 0
if_icmpgt LABEL223
jump LABEL248
LABEL223:
if_icmpgt LABEL228
jump LABEL282
LABEL228:
iload 15
iconst -1
if_icmpne LABEL232
jump LABEL282
LABEL232:
iconst 105
iconst 49
iconst 2761
iload 15
enum
istore 16
clienttype
iconst 3
if_icmpne LABEL242
jump LABEL244
LABEL242:
iconst 0
istore 16
LABEL244:
iload 16
iconst 0
if_icmpeq LABEL248
jump LABEL273
LABEL248:
iconst 6
sconst "Open"
iload 10
@@ -267,8 +296,8 @@ LABEL223:
sconst "Iii"
iload 10
if_setonmouseleave
jump LABEL256
LABEL248:
jump LABEL281
LABEL273:
iconst -1
sconst ""
iload 10
@@ -277,7 +306,18 @@ LABEL248:
sconst ""
iload 10
if_setonmouseleave
LABEL256:
LABEL281:
jump LABEL290
LABEL282:
iconst -1
sconst ""
iload 10
if_setonmouserepeat
iconst -1
sconst ""
iload 10
if_setonmouseleave
LABEL290:
iconst 9
sconst "Clear history"
iload 10
@@ -291,7 +331,8 @@ LABEL256:
iconst 2064
iconst -2147483644
sload 3
sconst "is"
iload 15
sconst "isi"
iload 10
if_setonop
iload 9
@@ -304,41 +345,41 @@ LABEL256:
iload 9
enum
istore 10
LABEL282:
LABEL317:
iload 0
istore 12
iconst 0
istore 15
istore 17
get_varp 287
iconst 1
if_icmpeq LABEL290
jump LABEL479
LABEL290:
if_icmpeq LABEL325
jump LABEL514
LABEL325:
get_varc_int 41
iconst 1337
if_icmpne LABEL297
if_icmpne LABEL332
get_varbit 4089
iconst 0
if_icmpeq LABEL297
jump LABEL479
LABEL297:
if_icmpeq LABEL332
jump LABEL514
LABEL332:
iload 12
iconst -1
if_icmpne LABEL301
jump LABEL479
LABEL301:
if_icmpne LABEL336
jump LABEL514
LABEL336:
iload 10
iconst -1
if_icmpne LABEL305
jump LABEL479
LABEL305:
if_icmpne LABEL340
jump LABEL514
LABEL340:
iload 7
iload 4
sub
iconst 57
if_icmplt LABEL311
jump LABEL479
LABEL311:
if_icmplt LABEL346
jump LABEL514
LABEL346:
iload 12
chat_gethistory_byuid
istore 14
@@ -346,19 +387,19 @@ LABEL311:
sstore 2
sstore 1
istore 13
istore 15
iload 15
istore 17
iload 17
sload 1
iload 13
iload 14
invoke 91
iconst 1
if_icmpeq CHAT_FILTER ; Jump to our new label instead
jump LABEL475
jump LABEL510
CHAT_FILTER:
sload 0 ; Load the message
iconst 1 ; Gets changed to 0 if message is blocked
iload 15 ; Load the messageType
iload 17 ; Load the messageType
iload 12 ; Load the id of the messageNode
sconst "chatFilterCheck"
runelite_callback
@@ -366,16 +407,16 @@ CHAT_FILTER:
pop_int ; Pop the messageType
iconst 1 ; 2nd half of conditional
sstore 0 ; Override the message with our filtered message
if_icmpeq LABEL327 ; Check if we are building this message
jump LABEL475
LABEL327:
iload 15
if_icmpeq LABEL362 ; Check if we are building this message
jump LABEL510
LABEL362:
iload 17
switch
3: LABEL330
6: LABEL351
7: LABEL330
jump LABEL372
LABEL330:
3: LABEL365
6: LABEL386
7: LABEL365
jump LABEL407
LABEL365:
iload 7
iload 12 ; Load the id of the messageNode
sconst "" ; Push a container for the timestamp
@@ -403,8 +444,8 @@ LABEL330:
invoke 203
add
istore 7
jump LABEL407
LABEL351:
jump LABEL442
LABEL386:
iload 7
iload 12 ; Load the id of the messageNode
sconst "" ; Push container for the timestamp
@@ -432,8 +473,8 @@ LABEL351:
invoke 203
add
istore 7
jump LABEL407
LABEL372:
jump LABEL442
LABEL407:
iload 7
iload 12 ; Load the id of the messageNode
sconst "" ; Push a container for the timestamp
@@ -441,7 +482,7 @@ LABEL372:
runelite_callback ; Invoke callback
pop_int ; Pop the id of the messageNode
sload 0 ; Load the log in/out message
join_string 2 ; Add the timestamp to the message
join_string 3 ; Add the timestamp to the message
iload 9
iload 10
iconst 10682368
@@ -456,16 +497,16 @@ LABEL372:
invoke 199
add
istore 7
iload 15
iload 17
iconst 5
if_icmpeq LABEL392
jump LABEL407
LABEL392:
if_icmpeq LABEL427
jump LABEL442
LABEL427:
get_varbit 1627
iconst 0
if_icmpeq LABEL396
jump LABEL407
LABEL396:
if_icmpeq LABEL431
jump LABEL442
LABEL431:
iload 13
iconst 500
add
@@ -477,31 +518,31 @@ LABEL396:
sconst "1"
iconst 10616832
if_setontimer
LABEL407:
LABEL442:
iload 10
if_clearops
iload 15
iload 17
iconst 3
if_icmpeq LABEL419
iload 15
if_icmpeq LABEL454
iload 17
iconst 6
if_icmpeq LABEL419
iload 15
if_icmpeq LABEL454
iload 17
iconst 7
if_icmpeq LABEL419
jump LABEL453
LABEL419:
if_icmpeq LABEL454
jump LABEL488
LABEL454:
iload 14
iconst 1
if_icmpeq LABEL423
jump LABEL428
LABEL423:
if_icmpeq LABEL458
jump LABEL463
LABEL458:
iconst 8
sconst "Message"
iload 10
if_setop
jump LABEL436
LABEL428:
jump LABEL471
LABEL463:
iconst 8
sconst "Add friend"
iload 10
@@ -510,7 +551,7 @@ LABEL428:
sconst "Add ignore"
iload 10
if_setop
LABEL436:
LABEL471:
iconst 10
sconst "Report"
iload 10
@@ -527,13 +568,13 @@ LABEL436:
sconst "is"
iload 10
if_setonop
jump LABEL457
LABEL453:
jump LABEL492
LABEL488:
iconst -1
sconst ""
iload 10
if_setonop
LABEL457:
LABEL492:
iconst -1
sconst ""
iload 10
@@ -552,17 +593,17 @@ LABEL457:
iload 9
enum
istore 10
LABEL475:
LABEL510:
iload 12
chat_getprevuid
istore 12
jump LABEL297
LABEL479:
jump LABEL332
LABEL514:
iload 10
iconst -1
if_icmpne LABEL483
jump LABEL540
LABEL483:
if_icmpne LABEL518
jump LABEL575
LABEL518:
iload 10
if_clearops
iconst -1
@@ -589,14 +630,14 @@ LABEL483:
multiply
cc_find
iconst 1
if_icmpeq LABEL511
jump LABEL515
LABEL511:
if_icmpeq LABEL546
jump LABEL550
LABEL546:
sconst ""
cc_settext
iconst 1
cc_sethide
LABEL515:
LABEL550:
iconst 10682368
iload 9
iconst 2
@@ -605,14 +646,14 @@ LABEL515:
add
cc_find
iconst 1
if_icmpeq LABEL525
jump LABEL529
LABEL525:
if_icmpeq LABEL560
jump LABEL564
LABEL560:
sconst ""
cc_settext
iconst 1
cc_sethide
LABEL529:
LABEL564:
iload 9
iconst 1
add
@@ -623,6 +664,6 @@ LABEL529:
iload 9
enum
istore 10
jump LABEL479
LABEL540:
jump LABEL514
LABEL575:
return