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

Merge pull request #9392 from abextm/cache-code-2019-07-18-rev181

Browse Source 
Cache code 2019 07 18 rev181
This commit is contained in:
Abex
2019-07-18 05:37:01 -06:00
committed by GitHub
parent 7cea5ddb7e 9f1149a8ef
commit 046e862170
7 changed files with 323 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/ItemID.java
+64
View File
@@ -10870,5 +10870,69 @@ public final class ItemID
public static final int MASK_OF_RANUL = 23522;
public static final int JAR_OF_EYES = 23525;
public static final int SARACHNIS_CUDGEL = 23528;
public static final int COOKED_KARAMBWAN_23533 = 23533;
public static final int SUPER_COMBAT_POTION4_23543 = 23543;
public static final int SUPER_COMBAT_POTION3_23545 = 23545;
public static final int SUPER_COMBAT_POTION2_23547 = 23547;
public static final int SUPER_COMBAT_POTION1_23549 = 23549;
public static final int RANGING_POTION4_23551 = 23551;
public static final int RANGING_POTION3_23553 = 23553;
public static final int RANGING_POTION2_23555 = 23555;
public static final int RANGING_POTION1_23557 = 23557;
public static final int SANFEW_SERUM4_23559 = 23559;
public static final int SANFEW_SERUM3_23561 = 23561;
public static final int SANFEW_SERUM2_23563 = 23563;
public static final int SANFEW_SERUM1_23565 = 23565;
public static final int SUPER_RESTORE4_23567 = 23567;
public static final int SUPER_RESTORE3_23569 = 23569;
public static final int SUPER_RESTORE2_23571 = 23571;
public static final int SUPER_RESTORE1_23573 = 23573;
public static final int SARADOMIN_BREW4_23575 = 23575;
public static final int SARADOMIN_BREW3_23577 = 23577;
public static final int SARADOMIN_BREW2_23579 = 23579;
public static final int SARADOMIN_BREW1_23581 = 23581;
public static final int STAMINA_POTION4_23583 = 23583;
public static final int STAMINA_POTION3_23585 = 23585;
public static final int STAMINA_POTION2_23587 = 23587;
public static final int STAMINA_POTION1_23589 = 23589;
public static final int HELM_OF_NEITIZNOT_23591 = 23591;
public static final int BARROWS_GLOVES_23593 = 23593;
public static final int BERSERKER_RING_23595 = 23595;
public static final int DRAGON_DEFENDER_23597 = 23597;
public static final int SPIRIT_SHIELD_23599 = 23599;
public static final int RUNE_CROSSBOW_23601 = 23601;
public static final int IMBUED_GUTHIX_CAPE_23603 = 23603;
public static final int IMBUED_ZAMORAK_CAPE_23605 = 23605;
public static final int IMBUED_SARADOMIN_CAPE_23607 = 23607;
public static final int AVAS_ACCUMULATOR_23609 = 23609;
public static final int ARMADYL_CROSSBOW_23611 = 23611;
public static final int STAFF_OF_THE_DEAD_23613 = 23613;
public static final int VESTAS_LONGSWORD_23615 = 23615;
public static final int ZURIELS_STAFF_23617 = 23617;
public static final int MORRIGANS_JAVELIN_23619 = 23619;
public static final int STATIUSS_WARHAMMER_23620 = 23620;
public static final int INFERNAL_CAPE_23622 = 23622;
public static final int SEERS_RING_I_23624 = 23624;
public static final int KODAI_WAND_23626 = 23626;
public static final int GHRAZI_RAPIER_23628 = 23628;
public static final int HEAVY_BALLISTA_23630 = 23630;
public static final int KARILS_LEATHERTOP_23632 = 23632;
public static final int DHAROKS_PLATELEGS_23633 = 23633;
public static final int TORAGS_PLATELEGS_23634 = 23634;
public static final int VERACS_PLATESKIRT_23635 = 23635;
public static final int VERACS_HELM_23636 = 23636;
public static final int TORAGS_HELM_23637 = 23637;
public static final int GUTHANS_HELM_23638 = 23638;
public static final int DHAROKS_HELM_23639 = 23639;
public static final int AMULET_OF_FURY_23640 = 23640;
public static final int BLESSED_SPIRIT_SHIELD_23642 = 23642;
public static final int ETERNAL_BOOTS_23644 = 23644;
public static final int BANDOS_TASSETS_23646 = 23646;
public static final int DRAGON_JAVELIN_23648 = 23648;
public static final int DIAMOND_BOLTS_E_23649 = 23649;
public static final int RUNE_POUCH_23650 = 23650;
public static final int MAGES_BOOK_23652 = 23652;
public static final int AHRIMS_STAFF_23653 = 23653;
public static final int OCCULT_NECKLACE_23654 = 23654;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+1
View File
@@ -7882,5 +7882,6 @@ public final class NpcID
public static final int SARACHNIS = 8713;
public static final int SPAWN_OF_SARACHNIS = 8714;
public static final int SPAWN_OF_SARACHNIS_8715 = 8715;
public static final int JUSTINE = 8721;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+60
View File
@@ -12450,5 +12450,65 @@ public final class NullItemID
public static final int NULL_23527 = 23527;
public static final int NULL_23529 = 23529;
public static final int NULL_23530 = 23530;
public static final int NULL_23531 = 23531;
public static final int NULL_23532 = 23532;
public static final int NULL_23534 = 23534;
public static final int NULL_23535 = 23535;
public static final int NULL_23536 = 23536;
public static final int NULL_23537 = 23537;
public static final int NULL_23538 = 23538;
public static final int NULL_23539 = 23539;
public static final int NULL_23540 = 23540;
public static final int NULL_23541 = 23541;
public static final int NULL_23542 = 23542;
public static final int NULL_23544 = 23544;
public static final int NULL_23546 = 23546;
public static final int NULL_23548 = 23548;
public static final int NULL_23550 = 23550;
public static final int NULL_23552 = 23552;
public static final int NULL_23554 = 23554;
public static final int NULL_23556 = 23556;
public static final int NULL_23558 = 23558;
public static final int NULL_23560 = 23560;
public static final int NULL_23562 = 23562;
public static final int NULL_23564 = 23564;
public static final int NULL_23566 = 23566;
public static final int NULL_23568 = 23568;
public static final int NULL_23570 = 23570;
public static final int NULL_23572 = 23572;
public static final int NULL_23574 = 23574;
public static final int NULL_23576 = 23576;
public static final int NULL_23578 = 23578;
public static final int NULL_23580 = 23580;
public static final int NULL_23582 = 23582;
public static final int NULL_23584 = 23584;
public static final int NULL_23586 = 23586;
public static final int NULL_23588 = 23588;
public static final int NULL_23590 = 23590;
public static final int NULL_23592 = 23592;
public static final int NULL_23594 = 23594;
public static final int NULL_23596 = 23596;
public static final int NULL_23598 = 23598;
public static final int NULL_23600 = 23600;
public static final int NULL_23602 = 23602;
public static final int NULL_23604 = 23604;
public static final int NULL_23606 = 23606;
public static final int NULL_23608 = 23608;
public static final int NULL_23610 = 23610;
public static final int NULL_23612 = 23612;
public static final int NULL_23614 = 23614;
public static final int NULL_23616 = 23616;
public static final int NULL_23618 = 23618;
public static final int NULL_23621 = 23621;
public static final int NULL_23623 = 23623;
public static final int NULL_23625 = 23625;
public static final int NULL_23627 = 23627;
public static final int NULL_23629 = 23629;
public static final int NULL_23631 = 23631;
public static final int NULL_23641 = 23641;
public static final int NULL_23643 = 23643;
public static final int NULL_23645 = 23645;
public static final int NULL_23647 = 23647;
public static final int NULL_23651 = 23651;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+1
View File
@@ -18654,5 +18654,6 @@ public final class ObjectID
public static final int WEB_34897 = 34897;
public static final int WEB_34898 = 34898;
public static final int SLASHED_WEB_34899 = 34899;
public static final int FOG_MARKER = 34905;
/* This file is automatically generated. Do not edit. */
}
runelite-client/src/main/resources/item_variations.json
+154 -24
View File
@@ -130,7 +130,11 @@
169,
171,
173,
2444
2444,
23551,
23553,
23555,
23557
],
"antipoison": [
175,
@@ -3059,7 +3063,11 @@
3024,
3026,
3028,
3030
3030,
23567,
23569,
23571,
23573
],
"agility potion": [
3032,
@@ -3123,7 +3131,8 @@
],
"cooked karambwan": [
3144,
3147
3147,
23533
],
"karambwan paste": [
3152,
@@ -3951,7 +3960,8 @@
4863,
4864,
4865,
4866
4866,
23653
],
"ahrims robetop": [
4712,
@@ -3977,7 +3987,8 @@
4881,
4882,
4883,
4884
4884,
23639
],
"dharoks greataxe": [
4718,
@@ -4001,7 +4012,8 @@
4899,
4900,
4901,
4902
4902,
23633
],
"guthans helm": [
4724,
@@ -4009,7 +4021,8 @@
4905,
4906,
4907,
4908
4908,
23638
],
"guthans warspear": [
4726,
@@ -4057,7 +4070,8 @@
4941,
4942,
4943,
4944
4944,
23632
],
"karils leatherskirt": [
4738,
@@ -4073,7 +4087,8 @@
4953,
4954,
4955,
4956
4956,
23637
],
"torags hammers": [
4747,
@@ -4097,7 +4112,8 @@
4971,
4972,
4973,
4974
4974,
23634
],
"veracs helm": [
4753,
@@ -4105,7 +4121,8 @@
4977,
4978,
4979,
4980
4980,
23636
],
"veracs flail": [
4755,
@@ -4129,7 +4146,8 @@
4995,
4996,
4997,
4998
4998,
23635
],
"sithik portrait": [
4814,
@@ -4812,7 +4830,8 @@
],
"amulet of fury": [
6585,
12436
12436,
23640
],
"white dagger": [
6591,
@@ -4872,7 +4891,11 @@
6685,
6687,
6689,
6691
6691,
23575,
23577,
23579,
23581
],
"slayer gloves": [
6708,
@@ -4889,7 +4912,8 @@
],
"seers ring": [
6731,
11770
11770,
23624
],
"archers ring": [
6733,
@@ -4901,7 +4925,8 @@
],
"berserker ring": [
6737,
11773
11773,
23595
],
"darklight": [
6746,
@@ -5021,6 +5046,10 @@
6886,
6887
],
"mages book": [
6889,
23652
],
"animals bones": [
6904,
6905,
@@ -5240,6 +5269,10 @@
7460,
20583
],
"barrows gloves": [
7462,
23593
],
"cornflour": [
7463,
7466
@@ -6359,6 +6392,10 @@
9183,
9463
],
"rune crossbow": [
9185,
23601
],
"jade bolts": [
9237,
9335
@@ -6381,7 +6418,8 @@
],
"diamond bolts": [
9243,
9340
9340,
23649
],
"dragonstone bolts": [
9244,
@@ -6854,6 +6892,10 @@
10462,
10788
],
"avas accumulator": [
10499,
23609
],
"reindeer hat": [
10507,
10722
@@ -7022,6 +7064,10 @@
10822,
10824
],
"helm of neitiznot": [
10828,
23591
],
"hard hat": [
10862,
10883
@@ -7052,7 +7098,11 @@
10925,
10927,
10929,
10931
10931,
23559,
23561,
23563,
23565
],
"lumberjack top": [
10939,
@@ -7464,6 +7514,10 @@
11736,
11737
],
"armadyl crossbow": [
11785,
23611
],
"steam battlestaff": [
11787,
12795
@@ -7472,6 +7526,10 @@
11789,
12796
],
"staff of the dead": [
11791,
23613
],
"godsword shards": [
11794,
11796,
@@ -7502,6 +7560,10 @@
11820,
11822
],
"bandos tassets": [
11834,
23646
],
"dragon boots": [
11840,
22234
@@ -7694,7 +7756,8 @@
],
"occult necklace": [
12002,
19720
19720,
23654
],
"soft clay pack": [
12009,
@@ -7736,7 +7799,11 @@
12625,
12627,
12629,
12631
12631,
23583,
23585,
23587,
23589
],
"stamina mix": [
12633,
@@ -7836,7 +7903,11 @@
12695,
12697,
12699,
12701
12701,
23543,
23545,
23547,
23549
],
"menagerie": [
12725,
@@ -7854,6 +7925,10 @@
12755,
12756
],
"rune pouch": [
12791,
23650
],
"nest box": [
12792,
12793,
@@ -7865,6 +7940,14 @@
12817,
19559
],
"spirit shield": [
12829,
23599
],
"blessed spirit shield": [
12831,
23642
],
"amulet of the damned": [
12851,
12853
@@ -7917,7 +8000,8 @@
"dragon defender": [
12954,
19722,
20463
20463,
23597
],
"bronze set": [
12960,
@@ -8072,6 +8156,10 @@
13222,
13224
],
"eternal boots": [
13235,
23644
],
"infernal axe": [
13241,
13242
@@ -8348,11 +8436,16 @@
13652,
20784
],
"heavy ballista": [
19481,
23630
],
"dragon javelin": [
19484,
19486,
19488,
19490
19490,
23648
],
"zenyte bracelet": [
19492,
@@ -8606,6 +8699,10 @@
21003,
21205
],
"kodai wand": [
21006,
23626
],
"dragon sword": [
21009,
21206
@@ -8668,7 +8765,8 @@
"infernal cape": [
21287,
21295,
21297
21297,
23622
],
"amethyst javelin": [
21318,
@@ -8730,6 +8828,18 @@
21739,
21752
],
"imbued saradomin cape": [
21791,
23607
],
"imbued guthix cape": [
21793,
23603
],
"imbued zamorak cape": [
21795,
23605
],
"bracelet of ethereum": [
21816,
21817
@@ -8953,6 +9063,10 @@
22323,
22481
],
"ghrazi rapier": [
22324,
23628
],
"scythe of vitur": [
22325,
22486,
@@ -9017,6 +9131,22 @@
22552,
22555
],
"vestas longsword": [
22613,
23615
],
"statiuss warhammer": [
22622,
23620
],
"morrigans javelin": [
22636,
23619
],
"zuriels staff": [
22647,
23617
],
"dragon hasta": [
22731,
22734,
runelite-client/src/main/scripts/QuestListShowProgress.hash
+1 -1
View File
@@ -1 +1 @@
A6B3A7BFE7B688A08F69B91A7FD5C7184D71147D3DAF74B1262369D85DBB3A03
4D9A96A7D57F6B9661273FB645A0510DD0F02C8A9C2E133772065F8AB588614D
runelite-client/src/main/scripts/QuestListShowProgress.rs2asm
+42 -29
View File
@@ -77,14 +77,14 @@ LABEL60:
iload 5
iload 6
if_icmplt LABEL64
jump LABEL108
jump LABEL119
LABEL64:
iload 1
iload 5
cc_find
iconst 1
if_icmpeq LABEL70
jump LABEL103
jump LABEL114
LABEL70:
iload 5
invoke 1358
@@ -96,7 +96,7 @@ LABEL70:
LABEL77:
iconst 901389
istore 4
jump LABEL89
jump LABEL100
LABEL80:
iload 3
iconst 0
@@ -105,11 +105,24 @@ LABEL80:
LABEL84:
iconst 16776960
istore 4
jump LABEL89
jump LABEL100
LABEL87:
iconst 105
iconst 74
iconst 2099
iload 5
enum
iconst 603
if_icmpeq LABEL95
jump LABEL98
LABEL95:
iconst 10461087
istore 4
jump LABEL100
LABEL98:
iconst 16711680
istore 4
LABEL89:
LABEL100:
iload 4
cc_setcolour
iconst 85
@@ -124,54 +137,54 @@ LABEL89:
iload 4
sconst "Iii"
cc_setonmouseleave
LABEL103:
LABEL114:
iload 5
iconst 1
add
istore 5
jump LABEL60
LABEL108:
LABEL119:
iconst 0
invoke 2265
istore 6
istore 5
LABEL112:
LABEL123:
iload 5
iload 6
if_icmplt LABEL116
jump LABEL160
LABEL116:
if_icmplt LABEL127
jump LABEL171
LABEL127:
iload 2
iload 5
cc_find
iconst 1
if_icmpeq LABEL122
jump LABEL155
LABEL122:
if_icmpeq LABEL133
jump LABEL166
LABEL133:
iload 5
invoke 1359
istore 3
iload 3
iconst 2
if_icmpeq LABEL129
jump LABEL132
LABEL129:
if_icmpeq LABEL140
jump LABEL143
LABEL140:
iconst 901389
istore 4
jump LABEL141
LABEL132:
jump LABEL152
LABEL143:
iload 3
iconst 0
if_icmpeq LABEL136
jump LABEL139
LABEL136:
if_icmpeq LABEL147
jump LABEL150
LABEL147:
iconst 16776960
istore 4
jump LABEL141
LABEL139:
jump LABEL152
LABEL150:
iconst 16711680
istore 4
LABEL141:
LABEL152:
iload 4
cc_setcolour
iconst 85
@@ -186,13 +199,13 @@ LABEL141:
iload 4
sconst "Iii"
cc_setonmouseleave
LABEL155:
LABEL166:
iload 5
iconst 1
add
istore 5
jump LABEL112
LABEL160:
jump LABEL123
LABEL171:
sconst "questProgressUpdated"
runelite_callback
runelite_callback
return