Merge remote-tracking branch 'runelite/master'

This commit is contained in:
Owain van Brakel
2022-05-18 17:08:39 +02:00
8 changed files with 316 additions and 250 deletions
@@ -12665,5 +12665,17 @@ public final class ItemID
public static final int AMULET_OF_THE_EYE_26990 = 26990; public static final int AMULET_OF_THE_EYE_26990 = 26990;
public static final int AMULET_OF_THE_EYE_26992 = 26992; public static final int AMULET_OF_THE_EYE_26992 = 26992;
public static final int AMULET_OF_THE_EYE_26994 = 26994; public static final int AMULET_OF_THE_EYE_26994 = 26994;
public static final int ENSOULED_HELLHOUND_HEAD = 26996;
public static final int ENSOULED_HELLHOUND_HEAD_26997 = 26997;
public static final int VOID_KNIGHT_TOP_LOR = 27000;
public static final int VOID_KNIGHT_ROBE_LOR = 27001;
public static final int VOID_KNIGHT_GLOVES_LOR = 27002;
public static final int ELITE_VOID_TOP_LOR = 27003;
public static final int ELITE_VOID_ROBE_LOR = 27004;
public static final int VOID_MAGE_HELM_LOR = 27005;
public static final int VOID_RANGER_HELM_LOR = 27006;
public static final int VOID_MELEE_HELM_LOR = 27007;
public static final int DRAGON_DEFENDER_LT = 27008;
public static final int RUNE_DEFENDER_LT = 27009;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
@@ -9648,6 +9648,7 @@ public final class NpcID
public static final int THE_GREAT_GUARDIAN_11455 = 11455; public static final int THE_GREAT_GUARDIAN_11455 = 11455;
public static final int THE_GREAT_GUARDIAN_11456 = 11456; public static final int THE_GREAT_GUARDIAN_11456 = 11456;
public static final int MENAPHITE_SHADOW = 11462; public static final int MENAPHITE_SHADOW = 11462;
public static final int REANIMATED_HELLHOUND = 11463;
public static final int TARIK_11473 = 11473; public static final int TARIK_11473 = 11473;
public static final int MAISA_11474 = 11474; public static final int MAISA_11474 = 11474;
public static final int MAISA_11475 = 11475; public static final int MAISA_11475 = 11475;
@@ -14120,5 +14120,7 @@ public final class NullItemID
public static final int NULL_26991 = 26991; public static final int NULL_26991 = 26991;
public static final int NULL_26993 = 26993; public static final int NULL_26993 = 26993;
public static final int NULL_26995 = 26995; public static final int NULL_26995 = 26995;
public static final int NULL_26998 = 26998;
public static final int NULL_26999 = 26999;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
@@ -21640,6 +21640,9 @@ public final class NullObjectID
public static final int NULL_43847 = 43847; public static final int NULL_43847 = 43847;
public static final int NULL_43848 = 43848; public static final int NULL_43848 = 43848;
public static final int NULL_43850 = 43850; public static final int NULL_43850 = 43850;
public static final int NULL_43851 = 43851;
public static final int NULL_43852 = 43852;
public static final int NULL_43853 = 43853;
public static final int NULL_43871 = 43871; public static final int NULL_43871 = 43871;
public static final int NULL_43872 = 43872; public static final int NULL_43872 = 43872;
public static final int NULL_43874 = 43874; public static final int NULL_43874 = 43874;
@@ -48,6 +48,7 @@ public enum FairyRings
BIP("(Island) South-west of Mort Myre"), BIP("(Island) South-west of Mort Myre"),
BIQ("Kalphite Hive"), BIQ("Kalphite Hive"),
BIS("Ardougne Zoo - Unicorns"), BIS("Ardougne Zoo - Unicorns"),
BJP("(Island) Isle of Souls"),
BJR("Realm of the Fisher King"), BJR("Realm of the Fisher King"),
BJS("(Island) Near Zul-Andra", "zulrah"), BJS("(Island) Near Zul-Andra", "zulrah"),
BKP("South of Castle Wars"), BKP("South of Castle Wars"),
@@ -6239,13 +6239,15 @@
8839, 8839,
20465, 20465,
24177, 24177,
26463 26463,
27000
], ],
"void knight robe": [ "void knight robe": [
8840, 8840,
20469, 20469,
24179, 24179,
26465 26465,
27001
], ],
"void knight mace": [ "void knight mace": [
8841, 8841,
@@ -6256,7 +6258,8 @@
8842, 8842,
20475, 20475,
24182, 24182,
26467 26467,
27002
], ],
"bronze defender": [ "bronze defender": [
8844, 8844,
@@ -6292,7 +6295,8 @@
8850, 8850,
20461, 20461,
23230, 23230,
24142 24142,
27009
], ],
"zanik": [ "zanik": [
8870, 8870,
@@ -7397,19 +7401,22 @@
11663, 11663,
20477, 20477,
24183, 24183,
26473 26473,
27005
], ],
"void ranger helm": [ "void ranger helm": [
11664, 11664,
20479, 20479,
24184, 24184,
26475 26475,
27006
], ],
"void melee helm": [ "void melee helm": [
11665, 11665,
20481, 20481,
24185, 24185,
26477 26477,
27007
], ],
"void seal": [ "void seal": [
11666, 11666,
@@ -8076,7 +8083,8 @@
19722, 19722,
20463, 20463,
23597, 23597,
24143 24143,
27008
], ],
"bronze set": [ "bronze set": [
12960, 12960,
@@ -8190,13 +8198,15 @@
13072, 13072,
20467, 20467,
24178, 24178,
26469 26469,
27003
], ],
"elite void robe": [ "elite void robe": [
13073, 13073,
20471, 20471,
24180, 24180,
26471 26471,
27004
], ],
"crystal halberd": [ "crystal halberd": [
13080, 13080,
@@ -10673,5 +10683,9 @@
"circlet of water": [ "circlet of water": [
26967, 26967,
26969 26969
],
"ensouled hellhound head": [
26996,
26997
] ]
} }
@@ -1 +1 @@
DE7A8C35396859C56E56307E45F4C3DC35EBA1FAAEBE871FAEC01E47C479AF43 C0218EBB7488D74689407A1A1E7C23F18E6B9C92F27BF184AA7EEE839DBEBA29
@@ -1,7 +1,7 @@
.id 909 .id 909
.int_stack_count 2 .int_stack_count 2
.string_stack_count 0 .string_stack_count 0
.int_var_count 21 .int_var_count 23
.string_var_count 0 .string_var_count 0
iconst 73 iconst 73
iconst 73 iconst 73
@@ -27,31 +27,31 @@
iconst 10551311 iconst 10551311
enum enum
istore 5 istore 5
iconst -1
istore 6
iconst 103 iconst 103
iconst 105 iconst 105
iconst 1960 iconst 1960
iload 1 iload 1
enum enum
istore 6 istore 7
iconst 103 iconst 103
iconst 105 iconst 105
iconst 1961 iconst 1961
iload 1 iload 1
enum enum
istore 7 istore 8
iconst 103 iconst 103
iconst 105 iconst 105
iconst 1135 iconst 1135
iload 1 iload 1
enum enum
istore 8 istore 9
iconst 103 iconst 103
iconst 105 iconst 105
iconst 1136 iconst 1136
iload 1 iload 1
enum enum
istore 9
iconst 0
istore 10 istore 10
iconst 0 iconst 0
istore 11 istore 11
@@ -63,42 +63,71 @@
istore 14 istore 14
iconst 0 iconst 0
istore 15 istore 15
iload 0 iconst 0
if_getwidth
istore 16 istore 16
iload 0 iload 0
if_getheight if_getwidth
istore 17 istore 17
iload 0
if_getheight
istore 18
iconst 0
istore 19
iload 1 iload 1
iconst 1745 iconst 1745
if_icmpeq LABEL70 if_icmpeq LABEL74
jump LABEL84 jump LABEL111
LABEL70: LABEL74:
iconst 0
iload 16
iconst 39387155
if_getwidth
sub
invoke 1045
istore 14
iconst 0 iconst 0
iload 17 iload 17
iconst 39387155 iconst 39387155
if_getheight if_getwidth
sub sub
invoke 1045 invoke 1045
istore 15 istore 15
LABEL84: iconst 0
iload 18
iconst 39387155
if_getheight
sub
invoke 1045
istore 16
iconst 73
iconst 73
iload 1
iconst 10551329
enum
istore 6
iload 6
iconst -1
if_icmpne LABEL98
jump LABEL111
LABEL98:
iconst -1
invoke 5357
iconst 1
if_icmpeq LABEL103
jump LABEL111
LABEL103:
get_varc_int 381
iconst 16384
iload 6
if_getwidth
scale
iconst 42
add
istore 19
LABEL111:
get_varbit 4606 get_varbit 4606
iconst 0 iconst 0
if_icmpne LABEL88 if_icmpne LABEL115
jump LABEL279 jump LABEL308
LABEL88: LABEL115:
get_varbit 4606 get_varbit 4606
iconst 2 iconst 2
if_icmpeq LABEL92 if_icmpeq LABEL119
jump LABEL101 jump LABEL128
LABEL92: LABEL119:
iconst 512 iconst 512
iconst 220 iconst 220
viewport_setfov viewport_setfov
@@ -107,36 +136,36 @@ LABEL92:
iconst 0 iconst 0
iconst 0 iconst 0
viewport_clampfov viewport_clampfov
jump LABEL132 jump LABEL159
LABEL101: LABEL128:
get_varbit 4606 get_varbit 4606
iconst 3 iconst 3
if_icmpeq LABEL105 if_icmpeq LABEL132
jump LABEL124 jump LABEL151
LABEL105: LABEL132:
iconst 256 iconst 256
iconst 256 iconst 256
viewport_setfov viewport_setfov
iload 1 iload 1
iconst 1129 iconst 1129
if_icmpeq LABEL112 if_icmpeq LABEL139
jump LABEL118 jump LABEL145
LABEL112: LABEL139:
iconst 512 iconst 512
iconst 512 iconst 512
iconst 512 iconst 512
iconst 512 iconst 512
viewport_clampfov viewport_clampfov
jump LABEL123 jump LABEL150
LABEL118: LABEL145:
iconst 640 iconst 640
iconst 768 iconst 768
iconst 512 iconst 512
iconst 512 iconst 512
viewport_clampfov viewport_clampfov
LABEL123: LABEL150:
jump LABEL132 jump LABEL159
LABEL124: LABEL151:
iconst 256 iconst 256
iconst 256 iconst 256
viewport_setfov viewport_setfov
@@ -145,52 +174,54 @@ LABEL124:
iconst 512 iconst 512
iconst 512 iconst 512
viewport_clampfov viewport_clampfov
LABEL132: LABEL159:
iconst 50 iconst 50
cam_setfollowheight cam_setfollowheight
iload 2 iload 2
iconst -1 iconst -1
if_icmpne LABEL138 if_icmpne LABEL165
jump LABEL278 jump LABEL307
LABEL138: LABEL165:
iload 3 iload 3
iconst -1 iconst -1
if_icmpne LABEL142 if_icmpne LABEL169
jump LABEL278 jump LABEL307
LABEL142: LABEL169:
viewport_geteffectivesize viewport_geteffectivesize
istore 12
istore 11 istore 11
istore 10
iconst 0
iload 16
iload 10
sub
invoke 1045
iconst 0 iconst 0
iload 17 iload 17
iload 11 iload 11
sub sub
invoke 1045 invoke 1045
iconst 0
iload 18
iload 12
sub
invoke 1045
istore 14
istore 13 istore 13
istore 12
iload 10
iload 11 iload 11
iload 12
iconst 0 iconst 0
iconst 0 iconst 0
iload 2 iload 2
if_setsize if_setsize
iload 10
iconst 0
iload 14
iload 12
sub
invoke 1045
sub
iload 11 iload 11
iconst 0 iconst 0
iload 15 iload 15
iload 13 iload 13
sub sub
iload 19
sub
invoke 1045
sub
iload 12
iconst 0
iload 16
iload 14
sub
invoke 1045 invoke 1045
sub sub
iconst 0 iconst 0
@@ -199,38 +230,26 @@ LABEL142:
if_setsize if_setsize
iload 4 iload 4
iconst -1 iconst -1
if_icmpne LABEL185 if_icmpne LABEL214
jump LABEL268 jump LABEL297
LABEL185: LABEL214:
iload 5 iload 5
iconst -1 iconst -1
if_icmpne LABEL189 if_icmpne LABEL218
jump LABEL268 jump LABEL297
LABEL189: LABEL218:
iload 12
iload 14
sub
iconst 2
div
iload 13 iload 13
iload 15 iload 15
sub sub
iconst 2 iconst 2
div div
iload 14
iload 16
sub
iconst 2
div
istore 14
istore 13 istore 13
istore 12
iconst 0
iload 6
iload 12
sub
invoke 1045
iconst 0
iload 8
iload 12
sub
invoke 1045
istore 8
istore 6
iconst 0 iconst 0
iload 7 iload 7
iload 13 iload 13
@@ -243,34 +262,46 @@ LABEL189:
invoke 1045 invoke 1045
istore 9 istore 9
istore 7 istore 7
iload 6 iconst 0
iload 8
iload 14
sub
invoke 1045
iconst 0
iload 10
iload 14
sub
invoke 1045
istore 10
istore 8
iload 7 iload 7
iload 8
iconst 0 iconst 0
iconst 0 iconst 0
iload 4 iload 4
if_setposition if_setposition
iload 6
iload 7 iload 7
iload 8
iconst 0 iconst 0
iconst 0 iconst 0
iload 5 iload 5
if_setposition if_setposition
iload 6
iload 8
add
iload 7 iload 7
iload 9 iload 9
add add
iload 8
iload 10
add
iconst 1 iconst 1
iconst 1 iconst 1
iload 4 iload 4
if_setsize if_setsize
iload 6
iload 8
add
iload 7 iload 7
iload 9 iload 9
add add
iload 8
iload 10
add
iconst 1 iconst 1
iconst 1 iconst 1
iload 5 iload 5
@@ -282,11 +313,11 @@ LABEL189:
iconst 10551310 iconst 10551310
enum enum
iload 5 iload 5
iload 8
iload 9 iload 9
iload 10
invoke 910 invoke 910
jump LABEL278 jump LABEL307
LABEL268: LABEL297:
iload 1 iload 1
iconst 73 iconst 73
iconst 73 iconst 73
@@ -297,9 +328,9 @@ LABEL268:
iconst 0 iconst 0
iconst 0 iconst 0
invoke 910 invoke 910
LABEL278: LABEL307:
jump LABEL395 jump LABEL426
LABEL279: LABEL308:
iconst 0 iconst 0
iconst 0 iconst 0
iconst 0 iconst 0
@@ -309,106 +340,108 @@ LABEL279:
iconst 128 iconst 128
sconst "outerZoomLimit" sconst "outerZoomLimit"
runelite_callback runelite_callback
if_icmpge LABEL288 if_icmpge LABEL317
jump LABEL304 jump LABEL333
LABEL288: LABEL317:
get_varc_int 73 get_varc_int 73
iconst 896 iconst 896
sconst "innerZoomLimit" sconst "innerZoomLimit"
runelite_callback runelite_callback
if_icmple LABEL292 if_icmple LABEL321
jump LABEL304 jump LABEL333
LABEL292: LABEL321:
get_varc_int 74 get_varc_int 74
iconst 128 iconst 128
sconst "outerZoomLimit" sconst "outerZoomLimit"
runelite_callback runelite_callback
if_icmpge LABEL296 if_icmpge LABEL325
jump LABEL304 jump LABEL333
LABEL296: LABEL325:
get_varc_int 74 get_varc_int 74
iconst 896 iconst 896
sconst "innerZoomLimit" sconst "innerZoomLimit"
runelite_callback runelite_callback
if_icmple LABEL300 if_icmple LABEL329
jump LABEL304 jump LABEL333
LABEL300: LABEL329:
get_varc_int 73 get_varc_int 73
get_varc_int 74 get_varc_int 74
invoke 42 invoke 42
jump LABEL307 jump LABEL336
LABEL304: LABEL333:
iconst 512 iconst 512
iconst 512 iconst 512
invoke 42 invoke 42
LABEL307: LABEL336:
viewport_geteffectivesize viewport_geteffectivesize
istore 12
istore 11 istore 11
istore 10
iload 2 iload 2
iconst -1 iconst -1
if_icmpne LABEL314 if_icmpne LABEL343
jump LABEL395 jump LABEL426
LABEL314: LABEL343:
iload 3 iload 3
iconst -1 iconst -1
if_icmpne LABEL318 if_icmpne LABEL347
jump LABEL395 jump LABEL426
LABEL318: LABEL347:
iload 10
iload 11 iload 11
iload 12
iconst 0 iconst 0
iconst 0 iconst 0
iload 2 iload 2
if_setsize if_setsize
iload 10
iload 14
sub
iload 11 iload 11
iload 15 iload 15
sub sub
iload 19
sub
iload 12
iload 16
sub
iconst 0 iconst 0
iconst 0 iconst 0
iload 3 iload 3
if_setsize if_setsize
iload 4 iload 4
iconst -1 iconst -1
if_icmpne LABEL338 if_icmpne LABEL369
jump LABEL385 jump LABEL416
LABEL338: LABEL369:
iload 5 iload 5
iconst -1 iconst -1
if_icmpne LABEL342 if_icmpne LABEL373
jump LABEL385 jump LABEL416
LABEL342: LABEL373:
iload 6
iload 7 iload 7
iload 8
iconst 0 iconst 0
iconst 0 iconst 0
iload 4 iload 4
if_setposition if_setposition
iload 6
iload 7 iload 7
iload 8
iconst 0 iconst 0
iconst 0 iconst 0
iload 5 iload 5
if_setposition if_setposition
iload 6
iload 8
add
iload 7 iload 7
iload 9 iload 9
add add
iload 8
iload 10
add
iconst 1 iconst 1
iconst 1 iconst 1
iload 4 iload 4
if_setsize if_setsize
iload 6
iload 8
add
iload 7 iload 7
iload 9 iload 9
add add
iload 8
iload 10
add
iconst 1 iconst 1
iconst 1 iconst 1
iload 5 iload 5
@@ -420,11 +453,11 @@ LABEL342:
iconst 10551310 iconst 10551310
enum enum
iload 5 iload 5
iload 8
iload 9 iload 9
iload 10
invoke 910 invoke 910
jump LABEL395 jump LABEL426
LABEL385: LABEL416:
iload 1 iload 1
iconst 73 iconst 73
iconst 73 iconst 73
@@ -435,86 +468,86 @@ LABEL385:
iconst 0 iconst 0
iconst 0 iconst 0
invoke 910 invoke 910
LABEL395: LABEL426:
iconst 73 iconst 73
iconst 73 iconst 73
iload 1 iload 1
iconst 10551312 iconst 10551312
enum enum
istore 18 istore 20
iload 18 iload 20
iconst -1 iconst -1
if_icmpne LABEL405 if_icmpne LABEL436
jump LABEL449 jump LABEL480
LABEL405: LABEL436:
invoke 1972 invoke 1972
iconst 0 iconst 0
if_icmpeq LABEL409 if_icmpeq LABEL440
jump LABEL443 jump LABEL474
LABEL409: LABEL440:
iload 18 iload 20
if_hassub if_hassub
iconst 1 iconst 1
if_icmpeq LABEL414 if_icmpeq LABEL445
jump LABEL443 jump LABEL474
LABEL414: LABEL445:
get_varc_int 173 get_varc_int 173
iconst -2 iconst -2
if_icmpeq LABEL418 if_icmpeq LABEL449
jump LABEL425 jump LABEL456
LABEL418: LABEL449:
iconst 512 iconst 512
iconst 0 iconst 0
iconst 0 iconst 0
iconst 1 iconst 1
iload 18 iload 20
if_setsize if_setsize
jump LABEL442 jump LABEL473
LABEL425: LABEL456:
get_varc_int 173 get_varc_int 173
iconst -3 iconst -3
if_icmpeq LABEL429 if_icmpeq LABEL460
jump LABEL436 jump LABEL467
LABEL429: LABEL460:
iconst 0 iconst 0
iconst 0 iconst 0
iconst 1 iconst 1
iconst 1 iconst 1
iload 18 iload 20
if_setsize if_setsize
jump LABEL442 jump LABEL473
LABEL436: LABEL467:
iconst 512 iconst 512
iconst 334 iconst 334
iconst 0 iconst 0
iconst 0 iconst 0
iload 18 iload 20
if_setsize if_setsize
LABEL442: LABEL473:
jump LABEL449 jump LABEL480
LABEL443: LABEL474:
iconst 512 iconst 512
iconst 334 iconst 334
iconst 0 iconst 0
iconst 0 iconst 0
iload 18 iload 20
if_setsize if_setsize
LABEL449: LABEL480:
iconst 73 iconst 73
iconst 73 iconst 73
iload 1 iload 1
iconst 10551314 iconst 10551314
enum enum
istore 18
iconst 0
istore 19
iconst 0
istore 20 istore 20
iload 18 iconst 0
istore 21
iconst 0
istore 22
iload 20
iconst -1 iconst -1
if_icmpne LABEL463 if_icmpne LABEL494
jump LABEL511 jump LABEL542
LABEL463: LABEL494:
iconst 73 iconst 73
iconst 73 iconst 73
iload 1 iload 1
@@ -522,101 +555,101 @@ LABEL463:
enum enum
if_hassub if_hassub
iconst 1 iconst 1
if_icmpeq LABEL472 if_icmpeq LABEL503
jump LABEL481 jump LABEL512
LABEL472: LABEL503:
get_varbit 4692 get_varbit 4692
iconst 0 iconst 0
if_icmpne LABEL476 if_icmpne LABEL507
jump LABEL479 jump LABEL510
LABEL476: LABEL507:
iconst 0 iconst 0
istore 20 istore 22
jump LABEL481 jump LABEL512
LABEL479: LABEL510:
iconst 38 iconst 38
istore 20 istore 22
LABEL481: LABEL512:
invoke 1972 invoke 1972
iconst 1 iconst 1
if_icmpeq LABEL485 if_icmpeq LABEL516
jump LABEL503 jump LABEL534
LABEL485: LABEL516:
get_varbit 542 get_varbit 542
iconst 0 iconst 0
if_icmpeq LABEL489 if_icmpeq LABEL520
jump LABEL503 jump LABEL534
LABEL489: LABEL520:
get_varbit 6254 get_varbit 6254
iconst 0 iconst 0
if_icmpeq LABEL493 if_icmpeq LABEL524
jump LABEL498 jump LABEL529
LABEL493: LABEL524:
iconst 182 iconst 182
iconst 4 iconst 4
add add
istore 19 istore 21
jump LABEL502 jump LABEL533
LABEL498: LABEL529:
iconst 120 iconst 120
iconst 4 iconst 4
add add
istore 19 istore 21
LABEL502: LABEL533:
jump LABEL505 jump LABEL536
LABEL503: LABEL534:
iconst 0 iconst 0
istore 19 istore 21
LABEL505: LABEL536:
iload 19 iload 21
iload 20 iload 22
iconst 2 iconst 2
iconst 0 iconst 0
iload 18 iload 20
if_setposition if_setposition
LABEL511: LABEL542:
iconst 73 iconst 73
iconst 73 iconst 73
iload 1 iload 1
iconst 10551305 iconst 10551305
enum enum
istore 18 istore 20
iconst 0 iconst 0
istore 19 istore 21
iload 18 iload 20
iconst -1 iconst -1
if_icmpne LABEL523 if_icmpne LABEL554
jump LABEL545 jump LABEL576
LABEL523: LABEL554:
invoke 1972 invoke 1972
iconst 1 iconst 1
if_icmpeq LABEL527 if_icmpeq LABEL558
jump LABEL537 jump LABEL568
LABEL527: LABEL558:
get_varbit 6254 get_varbit 6254
iconst 0 iconst 0
if_icmpeq LABEL531 if_icmpeq LABEL562
jump LABEL534 jump LABEL565
LABEL531: LABEL562:
iconst 182 iconst 182
istore 19 istore 21
jump LABEL536 jump LABEL567
LABEL534: LABEL565:
iconst 120 iconst 120
istore 19 istore 21
LABEL536: LABEL567:
jump LABEL539 jump LABEL570
LABEL537: LABEL568:
iconst 0 iconst 0
istore 19 istore 21
LABEL539: LABEL570:
iload 19 iload 21
iconst 0 iconst 0
iconst 1 iconst 1
iconst 1 iconst 1
iload 18 iload 20
if_setsize if_setsize
LABEL545: LABEL576:
iconst 73 iconst 73
iconst 73 iconst 73
iload 1 iload 1