Merge pull request #6389 from Abextm/cache-code-2018-11-08-rev176

Cache code 2018 11 08 rev176
This commit is contained in:
Abex
2018-11-08 05:11:35 -07:00
committed by GitHub
8 changed files with 300 additions and 178 deletions
@@ -9357,8 +9357,6 @@ public final class ItemID
public static final int AHRIMS_ROBETOP_20598 = 20598;
public static final int AHRIMS_ROBESKIRT_20599 = 20599;
public static final int RUNE_ARROW_20600 = 20600;
public static final int ELDER_MAUL = 20601;
public static final int ELDER_WAND = 20604;
public static final int RUNE_ARROW_PACK = 20607;
public static final int BLOODIER_KEY = 20608;
public static final int FAIRY_ENCHANTMENT = 20609;
@@ -9635,7 +9633,7 @@ public final class ItemID
public static final int OVERLOAD_4_20996 = 20996;
public static final int TWISTED_BOW = 20997;
public static final int TWISTED_BUCKLER = 21000;
public static final int ELDER_MAUL_21003 = 21003;
public static final int ELDER_MAUL = 21003;
public static final int KODAI_WAND = 21006;
public static final int DRAGON_SWORD = 21009;
public static final int DRAGON_HUNTER_CROSSBOW = 21012;
@@ -10472,5 +10470,18 @@ public final class ItemID
public static final int KQ_HEAD_TATTERED = 22671;
public static final int STUFFED_KQ_HEAD_TATTERED = 22673;
public static final int SCROLL_SACK = 22675;
public static final int EEK = 22684;
public static final int CLOWN_MASK = 22689;
public static final int CLOWN_BOW_TIE = 22692;
public static final int CLOWN_GOWN = 22695;
public static final int CLOWN_TROUSERS = 22698;
public static final int CLOWN_SHOES = 22701;
public static final int PORTAL_NEXUS = 22704;
public static final int MARBLE_PORTAL_NEXUS = 22705;
public static final int GILDED_PORTAL_NEXUS = 22706;
public static final int CRYSTALLINE_PORTAL_NEXUS = 22707;
public static final int MOUNTED_XERICS_TALISMAN = 22708;
public static final int MOUNTED_DIGSITE_PENDANT = 22709;
public static final int CURATORS_MEDALLION = 22710;
/* This file is automatically generated. Do not edit. */
}
@@ -3116,7 +3116,7 @@ public final class NpcID
public static final int FROG_3290 = 3290;
public static final int POSTIE_PETE = 3291;
public static final int MASTER_CHEF = 3305;
public static final int SURVIVAL_EXPERT = 3306;
public static final int HENJA = 3306;
public static final int COMBAT_INSTRUCTOR = 3307;
public static final int GIELINOR_GUIDE = 3308;
public static final int MAGIC_INSTRUCTOR = 3309;
@@ -3174,7 +3174,7 @@ public final class NpcID
public static final int KOUREND_GUARD = 3361;
public static final int LITARA = 3362;
public static final int STANKERS = 3364;
public static final int JUAN = 3369;
public static final int ANGEL = 3369;
public static final int ELEMENTAL_BALANCE = 3370;
public static final int ELEMENTAL_BALANCE_3371 = 3371;
public static final int ELEMENTAL_BALANCE_3372 = 3372;
@@ -7700,5 +7700,7 @@ public final class NpcID
public static final int WIZARD_CROMPERTY_8481 = 8481;
public static final int SMOKE_DEVIL_8482 = 8482;
public static final int SMOKE_DEVIL_8483 = 8483;
public static final int EEK = 8485;
public static final int SURVIVAL_EXPERT = 8503;
/* This file is automatically generated. Do not edit. */
}
@@ -6391,6 +6391,7 @@ public final class NullObjectID
public static final int NULL_14973 = 14973;
public static final int NULL_14975 = 14975;
public static final int NULL_14976 = 14976;
public static final int NULL_14977 = 14977;
public static final int NULL_14978 = 14978;
public static final int NULL_14984 = 14984;
public static final int NULL_14987 = 14987;
@@ -4319,7 +4319,7 @@ public final class ObjectID
public static final int DEAD_CALQUAT_7805 = 7805;
public static final int DEAD_CALQUAT_7806 = 7806;
public static final int COMPOST_BIN_7808 = 7808;
public static final int TOURNAMENT_SUPPLIES = 7811;
public static final int SUPPLIES = 7811;
public static final int COMPOST_BIN_7813 = 7813;
public static final int ALTAR_7814 = 7814;
public static final int EXIT_PORTAL = 7819;
@@ -8589,12 +8589,11 @@ public final class ObjectID
public static final int RUBBLE_14944 = 14944;
public static final int SAND_14948 = 14948;
public static final int BAMBOO_DOOR_14974 = 14974;
public static final int WALL_14977 = 14977;
public static final int WALL_14979 = 14979;
public static final int WALL_14980 = 14980;
public static final int WALL_14981 = 14981;
public static final int WALL_14982 = 14982;
public static final int WALL_14983 = 14983;
public static final int GATE_14979 = 14979;
public static final int GATE_14980 = 14980;
public static final int GATE_14981 = 14981;
public static final int GATE_14982 = 14982;
public static final int GATE_14983 = 14983;
public static final int STRANGE_SHRINE = 14985;
public static final int CHEST_14986 = 14986;
public static final int CHEST_14988 = 14988;
@@ -17571,6 +17570,80 @@ public final class ObjectID
public static final int PILE_OF_RUBBLE_33341 = 33341;
public static final int HUB_PORTAL = 33343;
public static final int BROKEN_WALL_33344 = 33344;
public static final int PORTAL_NEXUS_SPACE = 33346;
public static final int RUG_SPACE_33347 = 33347;
public static final int BIG_WINDOW = 33348;
public static final int RUG_SPACE_33349 = 33349;
public static final int RUG_SPACE_33350 = 33350;
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_33355 = 33355;
public static final int PORTAL_NEXUS_33356 = 33356;
public static final int PORTAL_NEXUS_33357 = 33357;
public static final int PORTAL_NEXUS_33358 = 33358;
public static final int PORTAL_NEXUS_33359 = 33359;
public static final int PORTAL_NEXUS_33360 = 33360;
public static final int PORTAL_NEXUS_33361 = 33361;
public static final int PORTAL_NEXUS_33362 = 33362;
public static final int PORTAL_NEXUS_33363 = 33363;
public static final int PORTAL_NEXUS_33364 = 33364;
public static final int PORTAL_NEXUS_33365 = 33365;
public static final int PORTAL_NEXUS_33366 = 33366;
public static final int PORTAL_NEXUS_33367 = 33367;
public static final int PORTAL_NEXUS_33368 = 33368;
public static final int PORTAL_NEXUS_33369 = 33369;
public static final int PORTAL_NEXUS_33370 = 33370;
public static final int PORTAL_NEXUS_33371 = 33371;
public static final int PORTAL_NEXUS_33372 = 33372;
public static final int PORTAL_NEXUS_33373 = 33373;
public static final int PORTAL_NEXUS_33374 = 33374;
public static final int PORTAL_NEXUS_33375 = 33375;
public static final int PORTAL_NEXUS_33376 = 33376;
public static final int PORTAL_NEXUS_33377 = 33377;
public static final int PORTAL_NEXUS_33378 = 33378;
public static final int PORTAL_NEXUS_33379 = 33379;
public static final int PORTAL_NEXUS_33380 = 33380;
public static final int PORTAL_NEXUS_33381 = 33381;
public static final int PORTAL_NEXUS_33382 = 33382;
public static final int PORTAL_NEXUS_33383 = 33383;
public static final int PORTAL_NEXUS_33384 = 33384;
public static final int PORTAL_NEXUS_33385 = 33385;
public static final int PORTAL_NEXUS_33386 = 33386;
public static final int PORTAL_NEXUS_33387 = 33387;
public static final int PORTAL_NEXUS_33388 = 33388;
public static final int PORTAL_NEXUS_33389 = 33389;
public static final int PORTAL_NEXUS_33390 = 33390;
public static final int PORTAL_NEXUS_33391 = 33391;
public static final int PORTAL_NEXUS_33392 = 33392;
public static final int PORTAL_NEXUS_33393 = 33393;
public static final int PORTAL_NEXUS_33394 = 33394;
public static final int PORTAL_NEXUS_33395 = 33395;
public static final int PORTAL_NEXUS_33396 = 33396;
public static final int PORTAL_NEXUS_33397 = 33397;
public static final int PORTAL_NEXUS_33398 = 33398;
public static final int PORTAL_NEXUS_33399 = 33399;
public static final int PORTAL_NEXUS_33400 = 33400;
public static final int PORTAL_NEXUS_33401 = 33401;
public static final int PORTAL_NEXUS_33402 = 33402;
public static final int PORTAL_NEXUS_33403 = 33403;
public static final int PORTAL_NEXUS_33404 = 33404;
public static final int PORTAL_NEXUS_33405 = 33405;
public static final int PORTAL_NEXUS_33406 = 33406;
public static final int PORTAL_NEXUS_33407 = 33407;
public static final int PORTAL_NEXUS_33408 = 33408;
public static final int PORTAL_NEXUS_33409 = 33409;
public static final int PORTAL_NEXUS_33410 = 33410;
public static final int XERICS_TALISMAN = 33411;
public static final int XERICS_TALISMAN_33412 = 33412;
public static final int XERICS_TALISMAN_33413 = 33413;
public static final int XERICS_TALISMAN_33414 = 33414;
public static final int XERICS_TALISMAN_33415 = 33415;
public static final int DIGSITE_PENDANT = 33416;
public static final int DIGSITE_PENDANT_33417 = 33417;
public static final int DIGSITE_PENDANT_33418 = 33418;
public static final int XERICS_TALISMAN_33419 = 33419;
public static final int DIGSITE_PENDANT_33420 = 33420;
/* This file is automatically generated. Do not edit. */
}
@@ -1 +1 @@
BE6DF54FF18E3B1D03EC67240FA1F88846AB50B8F3FC88709D0E7E69C7688107
CAA188A44C44A236877F1649C995F8E626DEFDD3637559220389CF3A6A77C0C1
@@ -1,207 +1,213 @@
.id 395
.int_stack_count 3
.string_stack_count 1
.int_var_count 10
.int_var_count 11
.string_var_count 4
load_int 83
load_int 49
load_int 1497
iload 0
get_enum_value
istore 3
iload 0
get_boostedskilllevels
int_to_string
widget_put_text
int_to_string
widget_put_text
iload 0
get_realskilllevels
istore 3
get_realskilllevels
istore 4
iload 0 ; load the skill id from arguments
iload 3 ; load the current real skill level
iload 4 ; load the current real skill level
load_string "skillTabBaseLevel" ; push event name
runelite_callback ; invoke callback
istore 3 ; store the (possibly) edited real skill level
iload 3
int_to_string
runelite_callback ; invoke callback
istore 4 ; store the (possibly) edited real skill level
iload 4
int_to_string
widget_put_text 1
iload 0
get_skillexperiences
istore 4
get_skillexperiences
istore 5
load_string ","
sstore 1
sload 0
load_string " XP:"
string_append 2
sstore 2
iload 4
iload 5
sload 1
invoke 46
sstore 3
load_int 0
istore 5
istore 6
get_varbit 4181
load_int 0
if_icmpeq LABEL29
jump LABEL60
LABEL29:
iload 3
if_icmpeq LABEL35
jump LABEL66
LABEL35:
iload 4
load_int 99
load_string "skillTabMaxLevel" ; push event name
runelite_callback ; invoke callback
if_icmplt LABEL33
jump LABEL59
LABEL33:
runelite_callback ; invoke callback
if_icmplt LABEL39
jump LABEL65
LABEL39:
load_int 105
load_int 105
load_int 256
iload 3
iload 4
load_int 1
iadd
get_enum_value
istore 5
iadd
get_enum_value
istore 6
sload 2
load_string "|Next level at:|Remaining XP:"
concat_string
concat_string
sstore 2
sload 3
load_string "|"
iload 5
iload 6
sload 1
invoke 46
load_string "|"
iload 6
iload 5
iload 4
isub
isub
sload 1
invoke 46
string_append 4
concat_string
concat_string
sstore 3
LABEL59:
jump LABEL78
LABEL60:
LABEL65:
jump LABEL84
LABEL66:
sload 2
load_string "|Next level at:"
concat_string
concat_string
sstore 2
sload 3
load_string "|"
load_int 105
load_int 105
load_int 256
iload 3
iload 4
load_int 1
iadd
get_enum_value
iadd
get_enum_value
sload 1
invoke 46
string_append 2
concat_string
concat_string
sstore 3
LABEL78:
load_int 0
istore 6
LABEL84:
load_int 0
istore 7
load_int 0
istore 8
load_int 0
istore 9
load_int 0
istore 10
invoke 1138
load_int 1
if_icmpeq LABEL90
jump LABEL227
LABEL90:
if_icmpeq LABEL96
jump LABEL233
LABEL96:
iload 0
invoke 1936
istore 6
iload 6
istore 7
iload 7
load_int -1
if_icmpne LABEL97
jump LABEL127
LABEL97:
iload 6
if_icmpne LABEL103
jump LABEL133
LABEL103:
iload 7
load_int 10
idiv
istore 6
iload 6
iload 4
if_icmpgt LABEL105
jump LABEL127
LABEL105:
idiv
istore 7
iload 7
iload 5
if_icmpgt LABEL111
jump LABEL133
LABEL111:
sload 2
load_string "|"
load_string "<col=7c0808>"
load_string "XP to regain:"
load_string "</col>"
string_append 4
concat_string
concat_string
sstore 2
sload 3
load_string "|"
load_string "<col=7c0808>"
iload 6
iload 4
isub
iload 7
iload 5
isub
sload 1
invoke 46
load_string "</col>"
string_append 4
concat_string
concat_string
sstore 3
load_int 1
istore 7
LABEL127:
iload 7
istore 8
LABEL133:
iload 8
load_int 0
if_icmpeq LABEL131
jump LABEL227
LABEL131:
if_icmpeq LABEL137
jump LABEL233
LABEL137:
get_varp 1588
load_int 0
if_icmpgt LABEL135
jump LABEL227
LABEL135:
if_icmpgt LABEL141
jump LABEL233
LABEL141:
iload 0
switch
0: LABEL138
1: LABEL183
2: LABEL138
4: LABEL183
6: LABEL138
jump LABEL227
LABEL138:
switch
0: LABEL144
1: LABEL189
2: LABEL144
4: LABEL189
6: LABEL144
jump LABEL233
LABEL144:
load_int 20
invoke 2031
istore 9
iload 9
istore 10
iload 10
load_int 0
if_icmpgt LABEL145
jump LABEL164
LABEL145:
if_icmpgt LABEL151
jump LABEL170
LABEL151:
sload 2
load_string "|"
load_string "<col=7c0808>"
load_string "XP permitted:"
load_string "</col>"
string_append 4
concat_string
concat_string
sstore 2
sload 3
load_string "|"
load_string "<col=7c0808>"
iload 9
iload 10
sload 1
invoke 46
load_string "</col>"
string_append 4
concat_string
concat_string
sstore 3
jump LABEL182
LABEL164:
jump LABEL188
LABEL170:
load_int 1
istore 8
istore 9
sload 2
load_string "|"
load_string "<col=7c0808>"
load_string "XP permitted:"
load_string "</col>"
string_append 4
concat_string
concat_string
sstore 2
sload 3
load_string "|"
@@ -209,48 +215,48 @@ LABEL164:
load_string "NONE"
load_string "</col>"
string_append 4
concat_string
concat_string
sstore 3
LABEL182:
jump LABEL227
LABEL183:
LABEL188:
jump LABEL233
LABEL189:
load_int 30
invoke 2031
istore 9
iload 9
istore 10
iload 10
load_int 0
if_icmpgt LABEL190
jump LABEL209
LABEL190:
if_icmpgt LABEL196
jump LABEL215
LABEL196:
sload 2
load_string "|"
load_string "<col=7c0808>"
load_string "XP permitted:"
load_string "</col>"
string_append 4
concat_string
concat_string
sstore 2
sload 3
load_string "|"
load_string "<col=7c0808>"
iload 9
iload 10
sload 1
invoke 46
load_string "</col>"
string_append 4
concat_string
concat_string
sstore 3
jump LABEL227
LABEL209:
jump LABEL233
LABEL215:
load_int 1
istore 8
istore 9
sload 2
load_string "|"
load_string "<col=7c0808>"
load_string "XP permitted:"
load_string "</col>"
string_append 4
concat_string
concat_string
sstore 2
sload 3
load_string "|"
@@ -258,30 +264,30 @@ LABEL209:
load_string "NONE"
load_string "</col>"
string_append 4
concat_string
concat_string
sstore 3
LABEL227:
LABEL233:
iload 1
load_int 5
widget_load_child 1
load_int 1
if_icmpeq LABEL233
jump LABEL243
LABEL233:
iload 8
if_icmpeq LABEL239
jump LABEL249
LABEL239:
iload 9
load_int 1
if_icmpeq LABEL237
jump LABEL240
LABEL237:
if_icmpeq LABEL243
jump LABEL246
LABEL243:
load_int 0
widget_put_hidden 1
jump LABEL242
LABEL240:
jump LABEL248
LABEL246:
load_int 1
widget_put_hidden 1
LABEL242:
jump LABEL270
LABEL243:
LABEL248:
jump LABEL276
LABEL249:
iload 1
load_int 5
load_int 5
@@ -300,23 +306,50 @@ LABEL243:
widget_put_spriteid 1
load_int 65793
widget_put_sprite2 1
iload 8
iload 9
load_int 1
if_icmpeq LABEL265
jump LABEL268
LABEL265:
if_icmpeq LABEL271
jump LABEL274
LABEL271:
load_int 0
widget_put_hidden 1
jump LABEL270
LABEL268:
jump LABEL276
LABEL274:
load_int 1
widget_put_hidden 1
LABEL270:
LABEL276:
iload 3
load_int 1
if_icmpeq LABEL280
jump LABEL299
LABEL280:
get_ismembers
load_int 0
if_icmpeq LABEL284
jump LABEL299
LABEL284:
get_varc 103
load_int 0
if_icmpeq LABEL288
jump LABEL299
LABEL288:
load_string "<col=ff0000>"
sload 0
load_string ":"
load_string "</col>"
string_append 4
sstore 2
load_string "<col=ff0000>"
load_string "Members Only"
load_string "</col>"
string_append 3
sstore 3
LABEL299:
invoke 1972
load_int 1
if_icmpeq LABEL274
jump LABEL301
LABEL274:
if_icmpeq LABEL303
jump LABEL330
LABEL303:
load_int 2367
load_int -2147483644
load_int -2147483645
@@ -330,14 +363,14 @@ LABEL274:
widget_put_option_click_listener_widget
get_varc 218
iload 1
if_icmpeq LABEL289
jump LABEL300
LABEL289:
if_icmpeq LABEL318
jump LABEL329
LABEL318:
get_varc 217
load_int -1
if_icmpeq LABEL293
jump LABEL300
LABEL293:
if_icmpeq LABEL322
jump LABEL329
LABEL322:
iload 1
load_int -1
iload 2
@@ -345,9 +378,9 @@ LABEL293:
sload 3
load_int 495
invoke 2344
LABEL300:
jump LABEL316
LABEL301:
LABEL329:
jump LABEL345
LABEL330:
load_int 992
load_int -2147483645
load_int -1
@@ -357,11 +390,11 @@ LABEL301:
load_int 495
load_int 25
load_int 5
idiv
idiv
load_string "IiIssfi"
iload 1
widget_put_mouse_hover_listener_widget
load_int 0
put_varc 2
LABEL316:
return
LABEL345:
return
@@ -1 +1 @@
97557341CEF7AB7480D59D0841E480DD0FD7370D12588A2C02D4A814CAA462CE
7919E8EDC994A53EC15CB5D29A9295C91A871FDA6998DC3B4EBCE8C1A091691E
@@ -6,24 +6,26 @@
load_string "Total level:"
load_string "<br>"
invoke 1007
int_to_string
int_to_string
string_append 3
iload 0
load_string "skillTabTotalLevel" ; push event name
runelite_callback ; invoke callback
runelite_callback ; invoke callback
widget_put_text_widget
iload 0
widget_put_actions_null_widget
load_string "Total XP:"
load_string ""
sstore 0
invoke 1008
invoke 1009
load_string ""
sstore 1
invoke 2685
sstore 1
sstore 0
invoke 1972
load_int 1
if_icmpeq LABEL18
jump LABEL49
LABEL18:
if_icmpeq LABEL20
jump LABEL51
LABEL20:
load_int 1
load_string "Toggle Total XP"
iload 0
@@ -41,14 +43,14 @@ LABEL18:
widget_put_option_click_listener_widget
get_varc 218
iload 0
if_icmpeq LABEL37
jump LABEL48
LABEL37:
if_icmpeq LABEL39
jump LABEL50
LABEL39:
get_varc 217
load_int -1
if_icmpeq LABEL41
jump LABEL48
LABEL41:
if_icmpeq LABEL43
jump LABEL50
LABEL43:
iload 0
load_int -1
iload 1
@@ -56,9 +58,9 @@ LABEL41:
sload 1
load_int 495
invoke 2344
LABEL48:
jump LABEL69
LABEL49:
LABEL50:
jump LABEL71
LABEL51:
load_int 992
load_int -2147483645
load_int -1
@@ -68,7 +70,7 @@ LABEL49:
load_int 495
load_int 25
load_int 5
idiv
idiv
load_string "IiIssfi"
iload 0
widget_put_mouse_hover_listener_widget
@@ -79,5 +81,5 @@ LABEL49:
widget_put_mouse_exit_listener_widget
load_int 0
put_varc 2
LABEL69:
return
LABEL71:
return