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

project: Merge upstream (#1921)

Browse Source 
project: Merge upstream

Co-authored-by: RuneLite Cache-Code Autoupdater <mii7303+rlccau@gmail.com>
Co-authored-by: Adam <Adam@sigterm.info>
Co-authored-by: Runelite auto updater <runelite@runelite.net>
This commit is contained in:
Owain van Brakel
2019-11-07 21:02:38 +01:00
committed by GitHub
co-authored by RuneLite Cache-Code Autoupdater Adam Runelite auto updater
parent 0322b1ec44 514bcdf93b
commit d7ced0a512
8 changed files with 269 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/ItemID.java
+9
View File
@@ -11318,5 +11318,14 @@ public final class ItemID
public static final int SKELETON_LANTERN = 24327; public static final int SKELETON_LANTERN = 24327;
public static final int BOUNTY_CRATE = 24329; public static final int BOUNTY_CRATE = 24329;
public static final int BIRTHDAY_CAKE_24331 = 24331; public static final int BIRTHDAY_CAKE_24331 = 24331;
public static final int BIRTHDAY_CAKE_24332 = 24332;
public static final int DAGONHAI_ROBES_SET = 24333;
public static final int BOUNTY_TARGET_TELEPORT = 24336;
public static final int BOUNTY_HUNTER_HAT_TIER_1 = 24338;
public static final int BOUNTY_HUNTER_HAT_TIER_2 = 24340;
public static final int BOUNTY_HUNTER_HAT_TIER_3 = 24342;
public static final int BOUNTY_HUNTER_HAT_TIER_4 = 24344;
public static final int BOUNTY_HUNTER_HAT_TIER_5 = 24346;
public static final int BOUNTY_HUNTER_HAT_TIER_6 = 24348;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
runelite-api/src/main/java/net/runelite/api/NpcID.java
+2 -8
View File
@@ -286,7 +286,7 @@ public final class NpcID
public static final int DWARF = 290; public static final int DWARF = 290;
public static final int CHAOS_DWARF = 291; public static final int CHAOS_DWARF = 291;
public static final int DWARF_292 = 292; public static final int DWARF_292 = 292;
public static final int SNAILNECK = 293; public static final int ADVENTURER_JON = 293;
public static final int DWARF_294 = 294; public static final int DWARF_294 = 294;
public static final int DWARF_295 = 295; public static final int DWARF_295 = 295;
public static final int DWARF_296 = 296; public static final int DWARF_296 = 296;
@@ -308,7 +308,6 @@ public final class NpcID
public static final int FROG = 312; public static final int FROG = 312;
public static final int REACHER_313 = 313; public static final int REACHER_313 = 313;
public static final int DR_JEKYLL_314 = 314; public static final int DR_JEKYLL_314 = 314;
public static final int GRASSLEGS = 315;
public static final int PAUL = 317; public static final int PAUL = 317;
public static final int DARK_CORE = 318; public static final int DARK_CORE = 318;
public static final int CORPOREAL_BEAST = 319; public static final int CORPOREAL_BEAST = 319;
@@ -7161,8 +7160,6 @@ public final class NpcID
public static final int REVENANT_DARK_BEAST = 7938; public static final int REVENANT_DARK_BEAST = 7938;
public static final int REVENANT_KNIGHT = 7939; public static final int REVENANT_KNIGHT = 7939;
public static final int REVENANT_DRAGON = 7940; public static final int REVENANT_DRAGON = 7940;
public static final int EPIC_MAGER34 = 7941;
public static final int EPIC_MAGER34_7942 = 7942;
public static final int EMBLEM_TRADER_7943 = 7943; public static final int EMBLEM_TRADER_7943 = 7943;
public static final int FISHING_SPOT_7946 = 7946; public static final int FISHING_SPOT_7946 = 7946;
public static final int FISHING_SPOT_7947 = 7947; public static final int FISHING_SPOT_7947 = 7947;
@@ -8267,7 +8264,7 @@ public final class NpcID
public static final int ED_9200 = 9200; public static final int ED_9200 = 9200;
public static final int CRAB_9201 = 9201; public static final int CRAB_9201 = 9201;
public static final int TIDE = 9202; public static final int TIDE = 9202;
public static final int ADVENTURER_JON = 9244; public static final int ADVENTURER_JON_9244 = 9244;
public static final int ARIANWYN_HARD = 9246; public static final int ARIANWYN_HARD = 9246;
public static final int ESSYLLT_HARD = 9247; public static final int ESSYLLT_HARD = 9247;
public static final int ARIANWYN_9248 = 9248; public static final int ARIANWYN_9248 = 9248;
@@ -8319,8 +8316,5 @@ public final class NpcID
public static final int TYPHOR_9296 = 9296; public static final int TYPHOR_9296 = 9296;
public static final int VRITRA = 9297; public static final int VRITRA = 9297;
public static final int MAZ = 9298; public static final int MAZ = 9298;
public static final int MAD_MELVIN96 = 9299;
public static final int GOBLIN_9300 = 9300;
public static final int BUTTERFLY_9301 = 9301;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+9 -1
View File
@@ -12805,6 +12805,14 @@ public final class NullItemID
public static final int NULL_24326 = 24326; public static final int NULL_24326 = 24326;
public static final int NULL_24328 = 24328; public static final int NULL_24328 = 24328;
public static final int NULL_24330 = 24330; public static final int NULL_24330 = 24330;
public static final int NULL_24332 = 24332; public static final int NULL_24334 = 24334;
public static final int NULL_24335 = 24335;
public static final int NULL_24337 = 24337;
public static final int NULL_24339 = 24339;
public static final int NULL_24341 = 24341;
public static final int NULL_24343 = 24343;
public static final int NULL_24345 = 24345;
public static final int NULL_24347 = 24347;
public static final int NULL_24349 = 24349;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+3 -7
View File
@@ -18038,15 +18038,13 @@ public final class NullObjectID
public static final int NULL_37430 = 37430; public static final int NULL_37430 = 37430;
public static final int NULL_37432 = 37432; public static final int NULL_37432 = 37432;
public static final int NULL_37433 = 37433; public static final int NULL_37433 = 37433;
public static final int NULL_37439 = 37439; public static final int NULL_37436 = 37436;
public static final int NULL_37441 = 37441; public static final int NULL_37437 = 37437;
public static final int NULL_37442 = 37442; public static final int NULL_37438 = 37438;
public static final int NULL_37443 = 37443;
public static final int NULL_37446 = 37446; public static final int NULL_37446 = 37446;
public static final int NULL_37447 = 37447; public static final int NULL_37447 = 37447;
public static final int NULL_37448 = 37448; public static final int NULL_37448 = 37448;
public static final int NULL_37449 = 37449; public static final int NULL_37449 = 37449;
public static final int NULL_37450 = 37450;
public static final int NULL_37451 = 37451; public static final int NULL_37451 = 37451;
public static final int NULL_37452 = 37452; public static final int NULL_37452 = 37452;
public static final int NULL_37453 = 37453; public static final int NULL_37453 = 37453;
@@ -18054,7 +18052,5 @@ public final class NullObjectID
public static final int NULL_37455 = 37455; public static final int NULL_37455 = 37455;
public static final int NULL_37456 = 37456; public static final int NULL_37456 = 37456;
public static final int NULL_37457 = 37457; public static final int NULL_37457 = 37457;
public static final int NULL_37458 = 37458;
public static final int NULL_37460 = 37460;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
runelite-api/src/main/java/net/runelite/api/ObjectID.java
-5
View File
@@ -19385,12 +19385,7 @@ public final class ObjectID
public static final int ROUGH_WALL_37431 = 37431; public static final int ROUGH_WALL_37431 = 37431;
public static final int STREAK_INFO = 37434; public static final int STREAK_INFO = 37434;
public static final int SWAMPY_SINK = 37435; public static final int SWAMPY_SINK = 37435;
public static final int BED_37436 = 37436;
public static final int BED_37437 = 37437;
public static final int BLACK_POWDER = 37438;
public static final int SMOKE_BOMB = 37440;
public static final int LOG_PILE_37444 = 37444; public static final int LOG_PILE_37444 = 37444;
public static final int HOTSPOT_MARKER = 37445; public static final int HOTSPOT_MARKER = 37445;
public static final int FOUNTAIN_37459 = 37459;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
runelite-client/src/main/resources/item_variations.json
+10 -1
View File
@@ -9375,7 +9375,8 @@
], ],
"birthday cake": [ "birthday cake": [
23108, 23108,
24331 24331,
24332
], ],
"mystic set": [ "mystic set": [
23110, 23110,
@@ -9629,5 +9630,13 @@
"spooky boots": [ "spooky boots": [
24304, 24304,
24313 24313
],
"bounty hunter hat": [
24338,
24340,
24342,
24344,
24346,
24348
] ]
} }
runelite-client/src/main/scripts/ChatBuilder.hash
+1 -1
View File
@@ -1 +1 @@
E9076990244AE02E1CEB3E8F966C86975CDC654F11655B7B211812FBB5AC23AA B591FB2134EF9FA75FCCEC25A1FD90581D3A7AD0F1E6FBE4267C8AF6010C547C
runelite-client/src/main/scripts/ChatBuilder.rs2asm
+116 -76
View File
@@ -163,12 +163,12 @@ LABEL149:
iload 9 iload 9
iconst -1 iconst -1
if_icmpne LABEL153 if_icmpne LABEL153
jump LABEL645 jump LABEL679
LABEL153: LABEL153:
iload 8 iload 8
iconst -1 iconst -1
if_icmpne LABEL157 if_icmpne LABEL157
jump LABEL645 jump LABEL679
LABEL157: LABEL157:
iload 9 iload 9
chat_gethistory_byuid chat_gethistory_byuid
@@ -183,8 +183,8 @@ LABEL157:
iload 12 iload 12
invoke 193 invoke 193
iconst 1 iconst 1
if_icmpeq CHAT_FILTER ; Jump to our new label instead if_icmpeq CHAT_FILTER
jump LABEL641 jump LABEL675
CHAT_FILTER: CHAT_FILTER:
sload 11 ; Load the message sload 11 ; Load the message
iconst 1 ; Gets changed to 0 if message is blocked iconst 1 ; Gets changed to 0 if message is blocked
@@ -197,7 +197,7 @@ CHAT_FILTER:
iconst 1 ; 2nd half of conditional iconst 1 ; 2nd half of conditional
sstore 11 ; Override the message with our filtered message sstore 11 ; Override the message with our filtered message
if_icmpeq LABEL172 ; Check if we are building this message if_icmpeq LABEL172 ; Check if we are building this message
jump LABEL641 jump LABEL675 ; continue to next message, skipping this
LABEL172: LABEL172:
iload 10 iload 10
sload 9 sload 9
@@ -209,7 +209,7 @@ LABEL172:
invoke 90 invoke 90
iconst 1 iconst 1
if_icmpeq LABEL183 if_icmpeq LABEL183
jump LABEL641 jump LABEL675
LABEL183: LABEL183:
iload 10 iload 10
switch switch
@@ -233,10 +233,10 @@ LABEL186:
sconst "" sconst ""
sconst "addTimestamp" sconst "addTimestamp"
runelite_callback runelite_callback
pop_int pop_int ; pop message id
sload 9 sload 9
sconst ":" sconst ":"
join_string 3 ; We need to append an extra string since we added the timestamp join_string 3 ; + 1 for timestamp
sload 1 sload 1
sload 11 sload 11
sconst "</col>" sconst "</col>"
@@ -260,10 +260,10 @@ LABEL207:
sconst "" sconst ""
sconst "addTimestamp" sconst "addTimestamp"
runelite_callback runelite_callback
pop_int pop_int ; pop message id
sload 9 sload 9
sconst ":" sconst ":"
join_string 3 ; We need to append an extra string since we added the timestamp join_string 3 ; + 1 for timestamp
sload 3 sload 3
sload 11 sload 11
sconst "</col>" sconst "</col>"
@@ -287,13 +287,13 @@ LABEL228:
sconst "" sconst ""
sconst "addTimestamp" sconst "addTimestamp"
runelite_callback runelite_callback
pop_int pop_int ; pop message id
sconst "From " sconst "From "
sload 9 sload 9
sconst ":" sconst ":"
sconst "privateChatFrom" sconst "privateChatFrom"
runelite_callback runelite_callback ; for prepending color tags
join_string 4 ; We need to append an extra string since we added the timestamp join_string 4 ; + 1 for timestamp
sload 2 sload 2
sload 11 sload 11
sconst "</col>" sconst "</col>"
@@ -317,11 +317,11 @@ LABEL250:
sconst "" sconst ""
sconst "addTimestamp" sconst "addTimestamp"
runelite_callback runelite_callback
pop_int pop_int ; pop message id
sload 7 sload 7
sload 11 sload 11
sconst "</col>" sconst "</col>"
join_string 4 ; We need to append an extra string since we added the timestamp join_string 4 ; + 1 for timestamp
iload 7 iload 7
iload 8 iload 8
iconst 10616890 iconst 10616890
@@ -341,11 +341,11 @@ LABEL268:
sconst "" sconst ""
sconst "addTimestamp" sconst "addTimestamp"
runelite_callback runelite_callback
pop_int pop_int ; pop message id
sload 2 sload 2
sload 11 sload 11
sconst "</col>" sconst "</col>"
join_string 4 ; We need to append an extra string since we added the timestamp join_string 4 ; + 1 for timestamp
iload 7 iload 7
iload 8 iload 8
iconst 10616890 iconst 10616890
@@ -382,13 +382,13 @@ LABEL301:
sconst "" sconst ""
sconst "addTimestamp" sconst "addTimestamp"
runelite_callback runelite_callback
pop_int pop_int ; pop message id
sconst "To " sconst "To "
sload 9 sload 9
sconst ":" sconst ":"
sconst "privateChatTo" sconst "privateChatTo"
runelite_callback runelite_callback ; for chat recolors
join_string 4 ; We need to append an extra string since we added the timestamp join_string 4 ; + 1 for timestamp
sload 2 sload 2
sload 11 sload 11
sconst "</col>" sconst "</col>"
@@ -412,11 +412,11 @@ LABEL323:
sconst "" sconst ""
sconst "addTimestamp" sconst "addTimestamp"
runelite_callback runelite_callback
pop_int pop_int ; pop message id
sload 8 sload 8
sload 11 sload 11
sconst "</col>" sconst "</col>"
join_string 4 ; We need to append an extra string since we added the timestamp join_string 4 ; + 1 for time stamp
iload 7 iload 7
iload 8 iload 8
iconst 10616890 iconst 10616890
@@ -436,7 +436,7 @@ LABEL341:
sconst "" sconst ""
sconst "addTimestamp" sconst "addTimestamp"
runelite_callback runelite_callback
pop_int pop_int ; pop message id
sconst "[" sconst "["
sload 5 sload 5
sload 10 sload 10
@@ -444,7 +444,7 @@ LABEL341:
sconst "] " sconst "] "
sload 9 sload 9
sconst ":" sconst ":"
join_string 8 ; We need to append an extra string since we added the timestamp join_string 8 ; + 1 for timestamp
sload 6 sload 6
sload 11 sload 11
sconst "</col>" sconst "</col>"
@@ -553,14 +553,14 @@ LABEL440:
101: LABEL510 101: LABEL510
6: LABEL445 6: LABEL445
7: LABEL445 7: LABEL445
103: LABEL535 103: LABEL552
104: LABEL535 104: LABEL552
9: LABEL445 9: LABEL445
106: LABEL445 106: LABEL445
14: LABEL560 14: LABEL594
90: LABEL445 90: LABEL445
91: LABEL445 91: LABEL445
jump LABEL615 jump LABEL649
LABEL445: LABEL445:
sconst "<col=ffffff>" sconst "<col=ffffff>"
sload 9 sload 9
@@ -634,7 +634,7 @@ LABEL505:
iload 8 iload 8
if_setop if_setop
LABEL509: LABEL509:
jump LABEL627 jump LABEL661
LABEL510: LABEL510:
sconst "<col=ffffff>" sconst "<col=ffffff>"
sload 9 sload 9
@@ -660,8 +660,28 @@ LABEL510:
sconst "Accept trade" sconst "Accept trade"
iload 8 iload 8
if_setop if_setop
jump LABEL627 iload 12
LABEL535: iconst 1
if_icmpeq LABEL538
jump LABEL543
LABEL538:
iconst 6
sconst "Message"
iload 8
if_setop
jump LABEL551
LABEL543:
iconst 6
sconst "Add friend"
iload 8
if_setop
iconst 7
sconst "Add ignore"
iload 8
if_setop
LABEL551:
jump LABEL661
LABEL552:
sconst "<col=ffffff>" sconst "<col=ffffff>"
sload 9 sload 9
sconst "</col>" sconst "</col>"
@@ -686,14 +706,34 @@ LABEL535:
sconst "Accept challenge" sconst "Accept challenge"
iload 8 iload 8
if_setop if_setop
jump LABEL627 iload 12
LABEL560: iconst 1
if_icmpeq LABEL580
jump LABEL585
LABEL580:
iconst 6
sconst "Message"
iload 8
if_setop
jump LABEL593
LABEL585:
iconst 6
sconst "Add friend"
iload 8
if_setop
iconst 7
sconst "Add ignore"
iload 8
if_setop
LABEL593:
jump LABEL661
LABEL594:
sload 12 sload 12
string_length string_length
iconst 0 iconst 0
if_icmpgt LABEL565 if_icmpgt LABEL599
jump LABEL590 jump LABEL624
LABEL565: LABEL599:
iconst 6 iconst 6
sconst "Open" sconst "Open"
iload 8 iload 8
@@ -718,8 +758,8 @@ LABEL565:
sconst "Iii" sconst "Iii"
iload 8 iload 8
if_setonmouseleave if_setonmouseleave
jump LABEL598 jump LABEL632
LABEL590: LABEL624:
iconst -1 iconst -1
sconst "" sconst ""
iload 8 iload 8
@@ -728,7 +768,7 @@ LABEL590:
sconst "" sconst ""
iload 8 iload 8
if_setonmouseleave if_setonmouseleave
LABEL598: LABEL632:
iconst 9 iconst 9
sconst "Clear history" sconst "Clear history"
iload 8 iload 8
@@ -745,8 +785,8 @@ LABEL598:
sconst "is" sconst "is"
iload 8 iload 8
if_setonop if_setonop
jump LABEL627 jump LABEL661
LABEL615: LABEL649:
iconst -1 iconst -1
sconst "" sconst ""
iload 8 iload 8
@@ -759,7 +799,7 @@ LABEL615:
sconst "" sconst ""
iload 8 iload 8
if_setonmouseleave if_setonmouseleave
LABEL627: LABEL661:
iload 5 iload 5
iload 6 iload 6
sub sub
@@ -774,20 +814,20 @@ LABEL627:
iload 7 iload 7
enum enum
istore 8 istore 8
LABEL641: LABEL675:
iload 9 iload 9
chat_getprevuid chat_getprevuid
istore 9 istore 9
jump LABEL149 jump LABEL149
LABEL645: LABEL679:
iload 7 iload 7
istore 13 istore 13
LABEL647: LABEL681:
iload 8 iload 8
iconst -1 iconst -1
if_icmpne LABEL651 if_icmpne LABEL685
jump LABEL708 jump LABEL742
LABEL651: LABEL685:
iload 8 iload 8
if_clearops if_clearops
iconst -1 iconst -1
@@ -814,14 +854,14 @@ LABEL651:
multiply multiply
cc_find cc_find
iconst 1 iconst 1
if_icmpeq LABEL679 if_icmpeq LABEL713
jump LABEL683 jump LABEL717
LABEL679: LABEL713:
sconst "" sconst ""
cc_settext cc_settext
iconst 1 iconst 1
cc_sethide cc_sethide
LABEL683: LABEL717:
iconst 10616890 iconst 10616890
iload 7 iload 7
iconst 2 iconst 2
@@ -830,14 +870,14 @@ LABEL683:
add add
cc_find cc_find
iconst 1 iconst 1
if_icmpeq LABEL693 if_icmpeq LABEL727
jump LABEL697 jump LABEL731
LABEL693: LABEL727:
sconst "" sconst ""
cc_settext cc_settext
iconst 1 iconst 1
cc_sethide cc_sethide
LABEL697: LABEL731:
iload 7 iload 7
iconst 1 iconst 1
add add
@@ -848,8 +888,8 @@ LABEL697:
iload 7 iload 7
enum enum
istore 8 istore 8
jump LABEL647 jump LABEL681
LABEL708: LABEL742:
iload 5 iload 5
iconst 2 iconst 2
sub sub
@@ -863,20 +903,20 @@ LABEL708:
istore 14 istore 14
iload 5 iload 5
iload 14 iload 14
if_icmpgt LABEL723 if_icmpgt LABEL757
jump LABEL725 jump LABEL759
LABEL723: LABEL757:
iload 5 iload 5
istore 14 istore 14
LABEL725: LABEL759:
iload 13 iload 13
istore 7 istore 7
LABEL727: LABEL761:
iload 7 iload 7
iconst 0 iconst 0
if_icmpgt LABEL731 if_icmpgt LABEL765
jump LABEL784 jump LABEL818
LABEL731: LABEL765:
iload 7 iload 7
iconst 1 iconst 1
sub sub
@@ -907,15 +947,15 @@ LABEL731:
multiply multiply
cc_find cc_find
iconst 1 iconst 1
if_icmpeq LABEL763 if_icmpeq LABEL797
jump LABEL768 jump LABEL802
LABEL763: LABEL797:
cc_getx cc_getx
iload 5 iload 5
iconst 0 iconst 0
iconst 0 iconst 0
cc_setposition cc_setposition
LABEL768: LABEL802:
iconst 10616890 iconst 10616890
iload 7 iload 7
iconst 2 iconst 2
@@ -924,17 +964,17 @@ LABEL768:
add add
cc_find cc_find
iconst 1 iconst 1
if_icmpeq LABEL778 if_icmpeq LABEL812
jump LABEL783 jump LABEL817
LABEL778: LABEL812:
cc_getx cc_getx
iload 5 iload 5
iconst 0 iconst 0
iconst 0 iconst 0
cc_setposition cc_setposition
LABEL783: LABEL817:
jump LABEL727 jump LABEL761
LABEL784: LABEL818:
iconst 0 iconst 0
iload 14 iload 14
iconst 10616890 iconst 10616890