Merge remote-tracking branch 'upstream/master' into master

This commit is contained in:
ThatGamerBlue
2021-04-28 13:44:43 +01:00
26 changed files with 449 additions and 463 deletions
+2 -2
View File
@@ -25,9 +25,9 @@
object ProjectVersions { object ProjectVersions {
const val launcherVersion = "2.2.0" const val launcherVersion = "2.2.0"
const val rlVersion = "1.7.5" const val rlVersion = "1.7.6"
const val openosrsVersion = "4.5.6" const val openosrsVersion = "4.6.0"
const val rsversion = 195 const val rsversion = 195
const val cacheversion = 165 const val cacheversion = 165
@@ -8658,7 +8658,7 @@ public final class ItemID
public static final int UNSTRUNG_LIGHT_BALLISTA = 19604; public static final int UNSTRUNG_LIGHT_BALLISTA = 19604;
public static final int UNSTRUNG_HEAVY_BALLISTA = 19607; public static final int UNSTRUNG_HEAVY_BALLISTA = 19607;
public static final int MONKEY_TAIL = 19610; public static final int MONKEY_TAIL = 19610;
public static final int LUMBRIDGE_GRAVEYARD_TELEPORT = 19613; public static final int ARCEUUS_LIBRARY_TELEPORT = 19613;
public static final int DRAYNOR_MANOR_TELEPORT = 19615; public static final int DRAYNOR_MANOR_TELEPORT = 19615;
public static final int MIND_ALTAR_TELEPORT = 19617; public static final int MIND_ALTAR_TELEPORT = 19617;
public static final int SALVE_GRAVEYARD_TELEPORT = 19619; public static final int SALVE_GRAVEYARD_TELEPORT = 19619;
@@ -9877,9 +9877,6 @@ public final class ItemID
public static final int BRACELET_OF_ETHEREUM = 21816; public static final int BRACELET_OF_ETHEREUM = 21816;
public static final int BRACELET_OF_ETHEREUM_UNCHARGED = 21817; public static final int BRACELET_OF_ETHEREUM_UNCHARGED = 21817;
public static final int REVENANT_ETHER = 21820; public static final int REVENANT_ETHER = 21820;
public static final int REDUNDANT_HAT = 21826;
public static final int REDUNDANT_TOP = 21829;
public static final int REDUNDANT_LEGGINGS = 21832;
public static final int OGRE_ARTEFACT_21837 = 21837; public static final int OGRE_ARTEFACT_21837 = 21837;
public static final int SHAMAN_MASK = 21838; public static final int SHAMAN_MASK = 21838;
public static final int SNOW_IMP_COSTUME_HEAD = 21841; public static final int SNOW_IMP_COSTUME_HEAD = 21841;
@@ -11859,5 +11856,8 @@ public final class ItemID
public static final int MIND_CORE = 25696; public static final int MIND_CORE = 25696;
public static final int BODY_CORE = 25698; public static final int BODY_CORE = 25698;
public static final int CHAOS_CORE = 25700; public static final int CHAOS_CORE = 25700;
public static final int UNGAEL_LAB_NOTES = 25702;
public static final int LITHKREN_VAULT_NOTES = 25704;
public static final int DUSTY_NOTE = 25706;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
@@ -1980,7 +1980,6 @@ public final class NpcID
public static final int SRARACHA_2144 = 2144; public static final int SRARACHA_2144 = 2144;
public static final int UNDEAD_DRUID = 2145; public static final int UNDEAD_DRUID = 2145;
public static final int FISHING_SPOT_2146 = 2146; public static final int FISHING_SPOT_2146 = 2146;
public static final int VEOS = 2147;
public static final int GRAND_EXCHANGE_CLERK = 2148; public static final int GRAND_EXCHANGE_CLERK = 2148;
public static final int GRAND_EXCHANGE_CLERK_2149 = 2149; public static final int GRAND_EXCHANGE_CLERK_2149 = 2149;
public static final int GRAND_EXCHANGE_CLERK_2150 = 2150; public static final int GRAND_EXCHANGE_CLERK_2150 = 2150;
@@ -2675,7 +2674,7 @@ public final class NpcID
public static final int YETI = 2847; public static final int YETI = 2847;
public static final int MONKEY_2848 = 2848; public static final int MONKEY_2848 = 2848;
public static final int BLACK_UNICORN = 2849; public static final int BLACK_UNICORN = 2849;
public static final int VEOS_2850 = 2850; public static final int VEOS = 2850;
public static final int ICE_WARRIOR_2851 = 2851; public static final int ICE_WARRIOR_2851 = 2851;
public static final int FLY_TRAP = 2852; public static final int FLY_TRAP = 2852;
public static final int SHADOW_WARRIOR = 2853; public static final int SHADOW_WARRIOR = 2853;
@@ -7133,7 +7132,7 @@ public final class NpcID
public static final int CONRAD_KING = 7907; public static final int CONRAD_KING = 7907;
public static final int THE_QUEEN_OF_THIEVES = 7908; public static final int THE_QUEEN_OF_THIEVES = 7908;
public static final int LADY_SHAUNA_PISCARILIUS = 7909; public static final int LADY_SHAUNA_PISCARILIUS = 7909;
public static final int COUNCILLOR_HUGHES = 7910; public static final int SOPHIA_HUGHES = 7910;
public static final int BARTENDER_7911 = 7911; public static final int BARTENDER_7911 = 7911;
public static final int FISH_MONGER_7912 = 7912; public static final int FISH_MONGER_7912 = 7912;
public static final int SHOP_KEEPER_7913 = 7913; public static final int SHOP_KEEPER_7913 = 7913;
@@ -7743,7 +7742,6 @@ public final class NpcID
public static final int THIRD_AGE_RANGER = 8636; public static final int THIRD_AGE_RANGER = 8636;
public static final int THIRD_AGE_MAGE = 8637; public static final int THIRD_AGE_MAGE = 8637;
public static final int URI_8638 = 8638; public static final int URI_8638 = 8638;
public static final int DODGY_GEEZER = 8644;
public static final int ARTHUR_THE_CLUE_HUNTER = 8665; public static final int ARTHUR_THE_CLUE_HUNTER = 8665;
public static final int BANKER_8666 = 8666; public static final int BANKER_8666 = 8666;
public static final int PUFFER_FISH_8667 = 8667; public static final int PUFFER_FISH_8667 = 8667;
@@ -9047,5 +9045,26 @@ public final class NpcID
public static final int GHOST_10698 = 10698; public static final int GHOST_10698 = 10698;
public static final int GHOST_10699 = 10699; public static final int GHOST_10699 = 10699;
public static final int FROG_10700 = 10700; public static final int FROG_10700 = 10700;
public static final int MURPHY_10707 = 10707;
public static final int ENORMOUS_TENTACLE_10708 = 10708;
public static final int ENORMOUS_TENTACLE_10709 = 10709;
public static final int GHOSTLY_THRALL = 10714;
public static final int SKELETAL_THRALL = 10715;
public static final int ZOMBIE_THRALL = 10716;
public static final int SKELETON_10717 = 10717;
public static final int SKELETON_10718 = 10718;
public static final int SKELETON_10719 = 10719;
public static final int SKELETON_10720 = 10720;
public static final int SKELETON_10721 = 10721;
public static final int ICE_SPIDER_10722 = 10722;
public static final int VEOS_10723 = 10723;
public static final int VEOS_10724 = 10724;
public static final int SHAYZIEN_SERGEANT_10725 = 10725;
public static final int VEOS_10726 = 10726;
public static final int VEOS_10727 = 10727;
public static final int WOMAN_10728 = 10728;
public static final int KOUREND_GUARD_10729 = 10729;
public static final int KOUREND_HEAD_GUARD_10730 = 10730;
public static final int ARCHER_10731 = 10731;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
@@ -11762,10 +11762,13 @@ public final class NullItemID
public static final int NULL_21823 = 21823; public static final int NULL_21823 = 21823;
public static final int NULL_21824 = 21824; public static final int NULL_21824 = 21824;
public static final int NULL_21825 = 21825; public static final int NULL_21825 = 21825;
public static final int NULL_21826 = 21826;
public static final int NULL_21827 = 21827; public static final int NULL_21827 = 21827;
public static final int NULL_21828 = 21828; public static final int NULL_21828 = 21828;
public static final int NULL_21829 = 21829;
public static final int NULL_21830 = 21830; public static final int NULL_21830 = 21830;
public static final int NULL_21831 = 21831; public static final int NULL_21831 = 21831;
public static final int NULL_21832 = 21832;
public static final int NULL_21833 = 21833; public static final int NULL_21833 = 21833;
public static final int NULL_21834 = 21834; public static final int NULL_21834 = 21834;
public static final int NULL_21835 = 21835; public static final int NULL_21835 = 21835;
@@ -13632,5 +13635,8 @@ public final class NullItemID
public static final int NULL_25697 = 25697; public static final int NULL_25697 = 25697;
public static final int NULL_25699 = 25699; public static final int NULL_25699 = 25699;
public static final int NULL_25701 = 25701; public static final int NULL_25701 = 25701;
public static final int NULL_25703 = 25703;
public static final int NULL_25705 = 25705;
public static final int NULL_25707 = 25707;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
@@ -166,6 +166,7 @@ public final class NullNpcID
public static final int NULL_2024 = 2024; public static final int NULL_2024 = 2024;
public static final int NULL_2109 = 2109; public static final int NULL_2109 = 2109;
public static final int NULL_2124 = 2124; public static final int NULL_2124 = 2124;
public static final int NULL_2147 = 2147;
public static final int NULL_2231 = 2231; public static final int NULL_2231 = 2231;
public static final int NULL_2260 = 2260; public static final int NULL_2260 = 2260;
public static final int NULL_2432 = 2432; public static final int NULL_2432 = 2432;
@@ -884,7 +885,6 @@ public final class NullNpcID
public static final int NULL_8640 = 8640; public static final int NULL_8640 = 8640;
public static final int NULL_8641 = 8641; public static final int NULL_8641 = 8641;
public static final int NULL_8642 = 8642; public static final int NULL_8642 = 8642;
public static final int NULL_8643 = 8643;
public static final int NULL_8645 = 8645; public static final int NULL_8645 = 8645;
public static final int NULL_8646 = 8646; public static final int NULL_8646 = 8646;
public static final int NULL_8647 = 8647; public static final int NULL_8647 = 8647;
@@ -1643,5 +1643,9 @@ public final class NullNpcID
public static final int NULL_10704 = 10704; public static final int NULL_10704 = 10704;
public static final int NULL_10705 = 10705; public static final int NULL_10705 = 10705;
public static final int NULL_10706 = 10706; public static final int NULL_10706 = 10706;
public static final int NULL_10710 = 10710;
public static final int NULL_10711 = 10711;
public static final int NULL_10712 = 10712;
public static final int NULL_10713 = 10713;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
@@ -13106,9 +13106,6 @@ public final class NullObjectID
public static final int NULL_27507 = 27507; public static final int NULL_27507 = 27507;
public static final int NULL_27508 = 27508; public static final int NULL_27508 = 27508;
public static final int NULL_27509 = 27509; public static final int NULL_27509 = 27509;
public static final int NULL_27549 = 27549;
public static final int NULL_27550 = 27550;
public static final int NULL_27551 = 27551;
public static final int NULL_27558 = 27558; public static final int NULL_27558 = 27558;
public static final int NULL_27559 = 27559; public static final int NULL_27559 = 27559;
public static final int NULL_27560 = 27560; public static final int NULL_27560 = 27560;
@@ -19147,16 +19144,6 @@ public final class NullObjectID
public static final int NULL_39123 = 39123; public static final int NULL_39123 = 39123;
public static final int NULL_39124 = 39124; public static final int NULL_39124 = 39124;
public static final int NULL_39125 = 39125; public static final int NULL_39125 = 39125;
public static final int NULL_39126 = 39126;
public static final int NULL_39127 = 39127;
public static final int NULL_39128 = 39128;
public static final int NULL_39129 = 39129;
public static final int NULL_39130 = 39130;
public static final int NULL_39131 = 39131;
public static final int NULL_39132 = 39132;
public static final int NULL_39133 = 39133;
public static final int NULL_39134 = 39134;
public static final int NULL_39135 = 39135;
public static final int NULL_39146 = 39146; public static final int NULL_39146 = 39146;
public static final int NULL_39147 = 39147; public static final int NULL_39147 = 39147;
public static final int NULL_39148 = 39148; public static final int NULL_39148 = 39148;
@@ -20196,6 +20183,16 @@ public final class NullObjectID
public static final int NULL_41395 = 41395; public static final int NULL_41395 = 41395;
public static final int NULL_41396 = 41396; public static final int NULL_41396 = 41396;
public static final int NULL_41397 = 41397; public static final int NULL_41397 = 41397;
public static final int NULL_41401 = 41401;
public static final int NULL_41404 = 41404;
public static final int NULL_41405 = 41405;
public static final int NULL_41406 = 41406;
public static final int NULL_41407 = 41407;
public static final int NULL_41411 = 41411;
public static final int NULL_41419 = 41419;
public static final int NULL_41430 = 41430;
public static final int NULL_41432 = 41432;
public static final int NULL_41433 = 41433;
public static final int NULL_41437 = 41437; public static final int NULL_41437 = 41437;
public static final int NULL_41461 = 41461; public static final int NULL_41461 = 41461;
public static final int NULL_41462 = 41462; public static final int NULL_41462 = 41462;
@@ -20264,6 +20261,7 @@ public final class NullObjectID
public static final int NULL_41534 = 41534; public static final int NULL_41534 = 41534;
public static final int NULL_41535 = 41535; public static final int NULL_41535 = 41535;
public static final int NULL_41536 = 41536; public static final int NULL_41536 = 41536;
public static final int NULL_41538 = 41538;
public static final int NULL_41552 = 41552; public static final int NULL_41552 = 41552;
public static final int NULL_41553 = 41553; public static final int NULL_41553 = 41553;
public static final int NULL_41554 = 41554; public static final int NULL_41554 = 41554;
@@ -5623,9 +5623,9 @@ public final class ObjectID
public static final int EASEL = 9610; public static final int EASEL = 9610;
public static final int BOOKCASE_9611 = 9611; public static final int BOOKCASE_9611 = 9611;
public static final int BED_9612 = 9612; public static final int BED_9612 = 9612;
public static final int LARGE_TABLE = 9613; public static final int TABLE_9613 = 9613;
public static final int TABLE_9614 = 9614; public static final int TABLE_9614 = 9614;
public static final int SMALL_TABLE_9615 = 9615; public static final int TABLE_9615 = 9615;
public static final int COUNTER_9616 = 9616; public static final int COUNTER_9616 = 9616;
public static final int WAREHOUSE_SHELVES = 9617; public static final int WAREHOUSE_SHELVES = 9617;
public static final int WAREHOUSE_SHELVES_9618 = 9618; public static final int WAREHOUSE_SHELVES_9618 = 9618;
@@ -5655,7 +5655,7 @@ public final class ObjectID
public static final int NOTICEBOARD_9694 = 9694; public static final int NOTICEBOARD_9694 = 9694;
public static final int NOTICEBOARD_9695 = 9695; public static final int NOTICEBOARD_9695 = 9695;
public static final int SIGN_9696 = 9696; public static final int SIGN_9696 = 9696;
public static final int LARGE_TABLE_9697 = 9697; public static final int LARGE_TABLE = 9697;
public static final int LARGE_TABLE_9698 = 9698; public static final int LARGE_TABLE_9698 = 9698;
public static final int LARGE_TABLE_9699 = 9699; public static final int LARGE_TABLE_9699 = 9699;
public static final int LARGE_TABLE_9700 = 9700; public static final int LARGE_TABLE_9700 = 9700;
@@ -8988,7 +8988,7 @@ public final class ObjectID
public static final int COOKING_SHELVES_15686 = 15686; public static final int COOKING_SHELVES_15686 = 15686;
public static final int PORTRAIT_15690 = 15690; public static final int PORTRAIT_15690 = 15690;
public static final int PAINTING_15691 = 15691; public static final int PAINTING_15691 = 15691;
public static final int CRATE_15692 = 15692; public static final int CRATES_15692 = 15692;
public static final int CRATES_15693 = 15693; public static final int CRATES_15693 = 15693;
public static final int CRATE_15695 = 15695; public static final int CRATE_15695 = 15695;
public static final int CRATE_15696 = 15696; public static final int CRATE_15696 = 15696;
@@ -14231,7 +14231,6 @@ public final class ObjectID
public static final int CRATE_27100 = 27100; public static final int CRATE_27100 = 27100;
public static final int CRATES_27101 = 27101; public static final int CRATES_27101 = 27101;
public static final int CRATES_27102 = 27102; public static final int CRATES_27102 = 27102;
public static final int PORTAL_NEXUS_27106 = 27106;
public static final int CHARCOAL_FURNACE = 27107; public static final int CHARCOAL_FURNACE = 27107;
public static final int CHARCOAL_FURNACE_27108 = 27108; public static final int CHARCOAL_FURNACE_27108 = 27108;
public static final int CHARCOAL_FURNACE_27109 = 27109; public static final int CHARCOAL_FURNACE_27109 = 27109;
@@ -14415,22 +14414,25 @@ public final class ObjectID
public static final int BENCH_27530 = 27530; public static final int BENCH_27530 = 27530;
public static final int BIG_BEER_BARREL = 27531; public static final int BIG_BEER_BARREL = 27531;
public static final int CRATE_27532 = 27532; public static final int CRATE_27532 = 27532;
public static final int CRATE_27533 = 27533; public static final int CRATES_27533 = 27533;
public static final int CUPBOARD_27534 = 27534; public static final int SHELVES_27534 = 27534;
public static final int CUPBOARD_27535 = 27535; public static final int SHELVES_27535 = 27535;
public static final int FOUNTAIN_27536 = 27536; public static final int FOUNTAIN_27536 = 27536;
public static final int FRUIT_STALL = 27537; public static final int FRUIT_STALL = 27537;
public static final int FRUIT_STALL_27538 = 27538; public static final int FRUIT_STALL_27538 = 27538;
public static final int DRAWERS_27539 = 27539; public static final int DRAWERS_27539 = 27539;
public static final int DRAWERS_27540 = 27540; public static final int CUPBOARD_27540 = 27540;
public static final int PIANO_27541 = 27541; public static final int PIANO_27541 = 27541;
public static final int CUPBOARD_27542 = 27542; public static final int CUPBOARD_27542 = 27542;
public static final int POTS_27543 = 27543; public static final int POTS_27543 = 27543;
public static final int ROUND_TABLE = 27544; public static final int TABLE_27544 = 27544;
public static final int DRAWERS_27545 = 27545; public static final int DRAWERS_27545 = 27545;
public static final int STOOL_27546 = 27546; public static final int STOOL_27546 = 27546;
public static final int STOOL_27547 = 27547; public static final int STOOL_27547 = 27547;
public static final int STOOL_27548 = 27548; public static final int STOOL_27548 = 27548;
public static final int BOOKCASE_27549 = 27549;
public static final int BOOKCASE_27550 = 27550;
public static final int BOOKCASE_27551 = 27551;
public static final int BARREL_OF_FISH = 27552; public static final int BARREL_OF_FISH = 27552;
public static final int EMPTY_BARREL = 27553; public static final int EMPTY_BARREL = 27553;
public static final int COOLING_CHEST = 27554; public static final int COOLING_CHEST = 27554;
@@ -17201,7 +17203,7 @@ public final class ObjectID
public static final int MYSTERIOUS_RUINS_32491 = 32491; public static final int MYSTERIOUS_RUINS_32491 = 32491;
public static final int MYSTERIOUS_RUINS_32492 = 32492; public static final int MYSTERIOUS_RUINS_32492 = 32492;
public static final int GLOWING_ORB = 32501; public static final int GLOWING_ORB = 32501;
public static final int ROCKFALL_32503 = 32503; public static final int BOULDER_32503 = 32503;
public static final int BOULDER_32504 = 32504; public static final int BOULDER_32504 = 32504;
public static final int BOULDER_32505 = 32505; public static final int BOULDER_32505 = 32505;
public static final int OBELISK_32506 = 32506; public static final int OBELISK_32506 = 32506;
@@ -19489,7 +19491,6 @@ public final class ObjectID
public static final int PORTAL_NEXUS_37555 = 37555; public static final int PORTAL_NEXUS_37555 = 37555;
public static final int PORTAL_NEXUS_37556 = 37556; public static final int PORTAL_NEXUS_37556 = 37556;
public static final int PORTAL_NEXUS_37557 = 37557; public static final int PORTAL_NEXUS_37557 = 37557;
public static final int PORTAL_NEXUS_37558 = 37558;
public static final int PORTAL_NEXUS_37559 = 37559; public static final int PORTAL_NEXUS_37559 = 37559;
public static final int PORTAL_NEXUS_37560 = 37560; public static final int PORTAL_NEXUS_37560 = 37560;
public static final int PORTAL_NEXUS_37561 = 37561; public static final int PORTAL_NEXUS_37561 = 37561;
@@ -19501,7 +19502,6 @@ public final class ObjectID
public static final int PORTAL_NEXUS_37567 = 37567; public static final int PORTAL_NEXUS_37567 = 37567;
public static final int PORTAL_NEXUS_37568 = 37568; public static final int PORTAL_NEXUS_37568 = 37568;
public static final int PORTAL_NEXUS_37569 = 37569; public static final int PORTAL_NEXUS_37569 = 37569;
public static final int PORTAL_NEXUS_37570 = 37570;
public static final int PORTAL_NEXUS_37571 = 37571; public static final int PORTAL_NEXUS_37571 = 37571;
public static final int PORTAL_NEXUS_37572 = 37572; public static final int PORTAL_NEXUS_37572 = 37572;
public static final int PORTAL_NEXUS_37573 = 37573; public static final int PORTAL_NEXUS_37573 = 37573;
@@ -19513,7 +19513,6 @@ public final class ObjectID
public static final int PORTAL_NEXUS_37579 = 37579; public static final int PORTAL_NEXUS_37579 = 37579;
public static final int PORTAL_NEXUS_37580 = 37580; public static final int PORTAL_NEXUS_37580 = 37580;
public static final int WEISS_PORTAL = 37581; public static final int WEISS_PORTAL = 37581;
public static final int LUMBRIDGE_GRAVEYARD_PORTAL = 37582;
public static final int DRAYNOR_MANOR_PORTAL = 37583; public static final int DRAYNOR_MANOR_PORTAL = 37583;
public static final int BATTLEFRONT_PORTAL = 37584; public static final int BATTLEFRONT_PORTAL = 37584;
public static final int MIND_ALTAR_PORTAL = 37585; public static final int MIND_ALTAR_PORTAL = 37585;
@@ -19525,7 +19524,6 @@ public final class ObjectID
public static final int BARROWS_PORTAL = 37591; public static final int BARROWS_PORTAL = 37591;
public static final int APE_ATOLL_DUNGEON_PORTAL = 37592; public static final int APE_ATOLL_DUNGEON_PORTAL = 37592;
public static final int WEISS_PORTAL_37593 = 37593; public static final int WEISS_PORTAL_37593 = 37593;
public static final int LUMBRIDGE_GRAVEYARD_PORTAL_37594 = 37594;
public static final int DRAYNOR_MANOR_PORTAL_37595 = 37595; public static final int DRAYNOR_MANOR_PORTAL_37595 = 37595;
public static final int BATTLEFRONT_PORTAL_37596 = 37596; public static final int BATTLEFRONT_PORTAL_37596 = 37596;
public static final int MIND_ALTAR_PORTAL_37597 = 37597; public static final int MIND_ALTAR_PORTAL_37597 = 37597;
@@ -19537,7 +19535,6 @@ public final class ObjectID
public static final int BARROWS_PORTAL_37603 = 37603; public static final int BARROWS_PORTAL_37603 = 37603;
public static final int APE_ATOLL_DUNGEON_PORTAL_37604 = 37604; public static final int APE_ATOLL_DUNGEON_PORTAL_37604 = 37604;
public static final int WEISS_PORTAL_37605 = 37605; public static final int WEISS_PORTAL_37605 = 37605;
public static final int LUMBRIDGE_GRAVEYARD_PORTAL_37606 = 37606;
public static final int DRAYNOR_MANOR_PORTAL_37607 = 37607; public static final int DRAYNOR_MANOR_PORTAL_37607 = 37607;
public static final int BATTLEFRONT_PORTAL_37608 = 37608; public static final int BATTLEFRONT_PORTAL_37608 = 37608;
public static final int MIND_ALTAR_PORTAL_37609 = 37609; public static final int MIND_ALTAR_PORTAL_37609 = 37609;
@@ -19965,16 +19962,6 @@ public final class ObjectID
public static final int DAEYALT_ESSENCE_39095 = 39095; public static final int DAEYALT_ESSENCE_39095 = 39095;
public static final int MINE_CART_39117 = 39117; public static final int MINE_CART_39117 = 39117;
public static final int PLINTH_39118 = 39118; public static final int PLINTH_39118 = 39118;
public static final int BOX_39136 = 39136;
public static final int TABLE_39137 = 39137;
public static final int TABLE_39138 = 39138;
public static final int TABLE_39139 = 39139;
public static final int STAIRS_39140 = 39140;
public static final int STAIRS_39141 = 39141;
public static final int STATUE_39142 = 39142;
public static final int STATUE_39143 = 39143;
public static final int CHEST_39144 = 39144;
public static final int BIG_CHEST_39145 = 39145;
public static final int LAMP_39152 = 39152; public static final int LAMP_39152 = 39152;
public static final int BLOOD_TITHE = 39154; public static final int BLOOD_TITHE = 39154;
public static final int BLOOD_TITHE_39155 = 39155; public static final int BLOOD_TITHE_39155 = 39155;
@@ -21188,6 +21175,32 @@ public final class ObjectID
public static final int FISHING_ROD_41330 = 41330; public static final int FISHING_ROD_41330 = 41330;
public static final int CRATES_41332 = 41332; public static final int CRATES_41332 = 41332;
public static final int WATER_41333 = 41333; public static final int WATER_41333 = 41333;
public static final int BROKEN_RAIL = 41398;
public static final int BROKEN_RAIL_41399 = 41399;
public static final int RAIL = 41400;
public static final int BROKEN_RAIL_41402 = 41402;
public static final int BROKEN_RAIL_41403 = 41403;
public static final int BAILING_BUCKETS = 41408;
public static final int HAMMERS_41409 = 41409;
public static final int AXES = 41410;
public static final int SACRED_FORGE = 41412;
public static final int PORTAL_NEXUS_41413 = 41413;
public static final int PORTAL_NEXUS_41414 = 41414;
public static final int PORTAL_NEXUS_41415 = 41415;
public static final int ARCEUUS_LIBRARY_PORTAL = 41416;
public static final int ARCEUUS_LIBRARY_PORTAL_41417 = 41417;
public static final int ARCEUUS_LIBRARY_PORTAL_41418 = 41418;
public static final int CRATES_41420 = 41420;
public static final int CRATE_41421 = 41421;
public static final int SKELETON_41422 = 41422;
public static final int COOKING_RANGE_41423 = 41423;
public static final int CRATE_41424 = 41424;
public static final int CRATES_41425 = 41425;
public static final int COMPOST_BIN_41426 = 41426;
public static final int LADDER_41427 = 41427;
public static final int LADDER_41428 = 41428;
public static final int GANGPLANK_41429 = 41429;
public static final int SHELVES_41431 = 41431;
public static final int STASH_CHART = 41434; public static final int STASH_CHART = 41434;
public static final int REWARDS_CHEST_41435 = 41435; public static final int REWARDS_CHEST_41435 = 41435;
public static final int REWARDS_CHEST_41436 = 41436; public static final int REWARDS_CHEST_41436 = 41436;
@@ -21214,7 +21227,7 @@ public final class ObjectID
public static final int STRUCTURAL_PILLAR = 41458; public static final int STRUCTURAL_PILLAR = 41458;
public static final int BROKEN_PILLAR_41459 = 41459; public static final int BROKEN_PILLAR_41459 = 41459;
public static final int STRUCTURAL_PILLAR_41460 = 41460; public static final int STRUCTURAL_PILLAR_41460 = 41460;
public static final int SACRED_FORGE = 41481; public static final int SACRED_FORGE_41481 = 41481;
public static final int BIG_DOOR_41482 = 41482; public static final int BIG_DOOR_41482 = 41482;
public static final int BIG_DOOR_41483 = 41483; public static final int BIG_DOOR_41483 = 41483;
public static final int BIG_DOOR_41484 = 41484; public static final int BIG_DOOR_41484 = 41484;
@@ -21224,7 +21237,6 @@ public final class ObjectID
public static final int MINE_CART_41511 = 41511; public static final int MINE_CART_41511 = 41511;
public static final int MINE_CART_41512 = 41512; public static final int MINE_CART_41512 = 41512;
public static final int VAULT_DOOR = 41537; public static final int VAULT_DOOR = 41537;
public static final int TRAP_41538 = 41538;
public static final int SECURITY_BARRIER = 41539; public static final int SECURITY_BARRIER = 41539;
public static final int SECURITY_BARRIER_41540 = 41540; public static final int SECURITY_BARRIER_41540 = 41540;
public static final int SIMPLE_LOCKBOX = 41541; public static final int SIMPLE_LOCKBOX = 41541;
@@ -21243,7 +21255,7 @@ public final class ObjectID
public static final int SMALL_ROCK_41563 = 41563; public static final int SMALL_ROCK_41563 = 41563;
public static final int ROCK_41564 = 41564; public static final int ROCK_41564 = 41564;
public static final int CHARM_OF_FISHING = 41571; public static final int CHARM_OF_FISHING = 41571;
public static final int CHARM_OF_PREPERATION = 41572; public static final int CHARM_OF_PREPARATION = 41572;
public static final int CHARM_OF_DEFENCE = 41573; public static final int CHARM_OF_DEFENCE = 41573;
public static final int CHARM_OF_MINING = 41574; public static final int CHARM_OF_MINING = 41574;
public static final int CHARM_OF_BOOST = 41575; public static final int CHARM_OF_BOOST = 41575;
@@ -21256,5 +21268,13 @@ public final class ObjectID
public static final int GOLEM_RUBBLE = 41589; public static final int GOLEM_RUBBLE = 41589;
public static final int GOLEM_RUBBLE_41590 = 41590; public static final int GOLEM_RUBBLE_41590 = 41590;
public static final int BARREL_41593 = 41593; public static final int BARREL_41593 = 41593;
public static final int GATE_41600 = 41600;
public static final int GATE_41601 = 41601;
public static final int GATE_41602 = 41602;
public static final int STAIRCASE_41603 = 41603;
public static final int BARREL_41604 = 41604;
public static final int BOXES_41605 = 41605;
public static final int SIGNPOST_41606 = 41606;
public static final int TABLE_41607 = 41607;
/* This file is automatically generated. Do not edit. */ /* This file is automatically generated. Do not edit. */
} }
@@ -484,42 +484,42 @@ public class WidgetID
static final int INVENTORY_CONTAINER = 72; static final int INVENTORY_CONTAINER = 72;
} }
public static class ResizableViewport static class ResizableViewport
{ {
public static final int MULTICOMBAT_INDICATOR = 18; static final int MULTICOMBAT_INDICATOR = 18;
static final int FRIENDS_CHAT_TAB = 38; static final int FRIENDS_CHAT_TAB = 39;
static final int FRIENDS_TAB = 40; static final int FRIENDS_TAB = 41;
static final int IGNORES_TAB = 39; static final int IGNORES_TAB = 40;
static final int LOGOUT_TAB = 41; static final int LOGOUT_TAB = 42;
static final int OPTIONS_TAB = 42; static final int OPTIONS_TAB = 43;
static final int EMOTES_TAB = 43; static final int EMOTES_TAB = 44;
static final int MUSIC_TAB = 44; static final int MUSIC_TAB = 45;
static final int FRIENDS_CHAT_ICON = 45; static final int FRIENDS_CHAT_ICON = 46;
static final int FRIENDS_ICON = 47; static final int FRIENDS_ICON = 48;
static final int IGNORES_ICON = 46; static final int IGNORES_ICON = 47;
static final int LOGOUT_ICON = 48; static final int LOGOUT_ICON = 49;
static final int OPTIONS_ICON = 49; static final int OPTIONS_ICON = 50;
static final int EMOTES_ICON = 50; static final int EMOTES_ICON = 51;
static final int MUSIC_ICON = 51; static final int MUSIC_ICON = 52;
static final int COMBAT_TAB = 54; static final int COMBAT_TAB = 55;
static final int STATS_TAB = 55; static final int STATS_TAB = 56;
static final int QUESTS_TAB = 56; static final int QUESTS_TAB = 57;
static final int INVENTORY_TAB = 57; static final int INVENTORY_TAB = 58;
static final int EQUIPMENT_TAB = 58; static final int EQUIPMENT_TAB = 59;
static final int PRAYER_TAB = 59; static final int PRAYER_TAB = 60;
static final int MAGIC_TAB = 60; static final int MAGIC_TAB = 61;
static final int COMBAT_ICON = 61; static final int COMBAT_ICON = 62;
static final int STATS_ICON = 62; static final int STATS_ICON = 63;
static final int QUESTS_ICON = 63; static final int QUESTS_ICON = 64;
static final int INVENTORY_ICON = 64; static final int INVENTORY_ICON = 65;
static final int EQUIPMENT_ICON = 65; static final int EQUIPMENT_ICON = 66;
static final int PRAYER_ICON = 66; static final int PRAYER_ICON = 67;
static final int MAGIC_ICON = 67; static final int MAGIC_ICON = 68;
static final int INTERFACE_CONTAINER = 68; static final int INTERFACE_CONTAINER = 69;
static final int INVENTORY_CONTAINER = 74; static final int INVENTORY_CONTAINER = 75;
} }
public static class ResizableViewportBottomLine static class ResizableViewportBottomLine
{ {
static final int LOGOUT_BUTTON_OVERLAY = 32; static final int LOGOUT_BUTTON_OVERLAY = 32;
static final int CMB_TAB = 50; static final int CMB_TAB = 50;
@@ -534,7 +534,7 @@ public class WidgetID
static final int EQUIP_ICON = 64; static final int EQUIP_ICON = 64;
static final int PRAYER_TAB = 58; static final int PRAYER_TAB = 58;
static final int PRAYER_ICON = 65; static final int PRAYER_ICON = 65;
public static final int SPELL_TAB = 56; static final int SPELL_TAB = 56;
static final int SPELL_ICON = 53; static final int SPELL_ICON = 53;
static final int FC_TAB = 35; static final int FC_TAB = 35;
static final int FC_ICON = 44; static final int FC_ICON = 44;
@@ -298,7 +298,7 @@ public class CrypticClue extends ClueScroll implements TextClueScroll, NpcClueSc
new CrypticClue("I would make a chemistry joke, but I'm afraid I wouldn't get a reaction.", "Chemist", new WorldPoint(2932, 3212, 0), "Talk to the Chemist in Rimmington"), new CrypticClue("I would make a chemistry joke, but I'm afraid I wouldn't get a reaction.", "Chemist", new WorldPoint(2932, 3212, 0), "Talk to the Chemist in Rimmington"),
new CrypticClue("Show this to Hazelmere.", "Hazelmere", new WorldPoint(2677, 3088, 1), "Located upstairs in the house east of Yanille, north of fairy ring CLS."), new CrypticClue("Show this to Hazelmere.", "Hazelmere", new WorldPoint(2677, 3088, 1), "Located upstairs in the house east of Yanille, north of fairy ring CLS."),
new CrypticClue("Does one really need a fire to stay warm here?", new WorldPoint(3816, 3810, 0), "Dig next to the fire near the Volcanic Mine entrance on Fossil Island."), new CrypticClue("Does one really need a fire to stay warm here?", new WorldPoint(3816, 3810, 0), "Dig next to the fire near the Volcanic Mine entrance on Fossil Island."),
new CrypticClue("Search the open crate found in the Hosidius kitchens.", CRATE_27533, new WorldPoint(1683, 3616, 0), "The kitchens are north-west of the town in Hosidius."), new CrypticClue("Search the open crate found in the Hosidius kitchens.", CRATES_27533, new WorldPoint(1683, 3616, 0), "The kitchens are north-west of the town in Hosidius."),
new CrypticClue("Dig under Ithoi's cabin.", new WorldPoint(2529, 2838, 0), "Dig under Ithoi's cabin in the Corsair Cove."), new CrypticClue("Dig under Ithoi's cabin.", new WorldPoint(2529, 2838, 0), "Dig under Ithoi's cabin in the Corsair Cove."),
new CrypticClue("Search the drawers, upstairs in the bank to the East of Varrock.", DRAWERS_7194, new WorldPoint(3250, 3420, 1), "Search the drawers upstairs in Varrock east bank."), new CrypticClue("Search the drawers, upstairs in the bank to the East of Varrock.", DRAWERS_7194, new WorldPoint(3250, 3420, 1), "Search the drawers upstairs in Varrock east bank."),
new CrypticClue("Speak to Hazelmere.", "Hazelmere", new WorldPoint(2677, 3088, 1), "Located upstairs in the house east of Yanille, north of fairy ring CLS. Answer: 6859", "What is 19 to the power of 3?"), new CrypticClue("Speak to Hazelmere.", "Hazelmere", new WorldPoint(2677, 3088, 1), "Located upstairs in the house east of Yanille, north of fairy ring CLS. Answer: 6859", "What is 19 to the power of 3?"),
@@ -201,7 +201,7 @@ public class SkillChallengeClue extends ClueScroll implements NpcClueScroll, Nam
any("", item(ItemID.ANGLER_BOOTS), item(ItemID.SPIRIT_ANGLER_BOOTS)))), any("", item(ItemID.ANGLER_BOOTS), item(ItemID.SPIRIT_ANGLER_BOOTS)))),
new SkillChallengeClue("Chop a redwood log.", "chop a redwood log whilst sporting the finest lumberjack gear.", true, ANY_AXE, all("Lumberjack outfit", item(ItemID.LUMBERJACK_HAT), item(ItemID.LUMBERJACK_TOP), item(ItemID.LUMBERJACK_LEGS), item(ItemID.LUMBERJACK_BOOTS))), new SkillChallengeClue("Chop a redwood log.", "chop a redwood log whilst sporting the finest lumberjack gear.", true, ANY_AXE, all("Lumberjack outfit", item(ItemID.LUMBERJACK_HAT), item(ItemID.LUMBERJACK_TOP), item(ItemID.LUMBERJACK_LEGS), item(ItemID.LUMBERJACK_BOOTS))),
new SkillChallengeClue("Craft a light orb in the Dorgesh-Kaan bank.", item(ItemID.CAVE_GOBLIN_WIRE), item(ItemID.EMPTY_LIGHT_ORB)), new SkillChallengeClue("Craft a light orb in the Dorgesh-Kaan bank.", item(ItemID.CAVE_GOBLIN_WIRE), item(ItemID.EMPTY_LIGHT_ORB)),
new SkillChallengeClue("Kill a reanimated Abyssal Demon.", "kill a reanimated abyssal.", xOfItem(ItemID.SOUL_RUNE, 4), xOfItem(ItemID.BLOOD_RUNE, 1), any("Nature Rune x4", xOfItem(ItemID.NATURE_RUNE, 4), item(ItemID.BRYOPHYTAS_STAFF)), range("Ensouled abyssal head", ItemID.ENSOULED_ABYSSAL_HEAD, ItemID.ENSOULED_ABYSSAL_HEAD_13508)), new SkillChallengeClue("Kill a reanimated Abyssal Demon.", "kill a reanimated abyssal.", xOfItem(ItemID.SOUL_RUNE, 4), xOfItem(ItemID.BLOOD_RUNE, 2), any("Nature Rune x4", xOfItem(ItemID.NATURE_RUNE, 4), item(ItemID.BRYOPHYTAS_STAFF)), range("Ensouled abyssal head", ItemID.ENSOULED_ABYSSAL_HEAD, ItemID.ENSOULED_ABYSSAL_HEAD_13508)),
new SkillChallengeClue("Kill a Fiyr shade inside Mort'tons shade catacombs.", any("Any Silver Shade Key", item(ItemID.SILVER_KEY_RED), item(ItemID.SILVER_KEY_BROWN), item(ItemID.SILVER_KEY_CRIMSON), item(ItemID.SILVER_KEY_BLACK), item(ItemID.SILVER_KEY_PURPLE))) new SkillChallengeClue("Kill a Fiyr shade inside Mort'tons shade catacombs.", any("Any Silver Shade Key", item(ItemID.SILVER_KEY_RED), item(ItemID.SILVER_KEY_BROWN), item(ItemID.SILVER_KEY_CRIMSON), item(ItemID.SILVER_KEY_BLACK), item(ItemID.SILVER_KEY_PURPLE)))
); );
@@ -340,7 +340,7 @@ enum ItemIdentification
PADDEWWA_TELEPORT(Type.TABLET, "Paddew", "PDW", ItemID.PADDEWWA_TELEPORT), PADDEWWA_TELEPORT(Type.TABLET, "Paddew", "PDW", ItemID.PADDEWWA_TELEPORT),
SENNTISTEN_TELEPORT(Type.TABLET, "Sennt", "SNT", ItemID.SENNTISTEN_TELEPORT), SENNTISTEN_TELEPORT(Type.TABLET, "Sennt", "SNT", ItemID.SENNTISTEN_TELEPORT),
LUMBRIDGE_GRAVEYARD_TELEPORT(Type.TABLET, "L.Grave", "L.GRV", ItemID.LUMBRIDGE_GRAVEYARD_TELEPORT), ARCEUUS_LIBRARY_TELEPORT(Type.TABLET, "Arc.Lib", "A.LIB", ItemID.ARCEUUS_LIBRARY_TELEPORT),
DRAYNOR_MANOR_TELEPORT(Type.TABLET, "D.Manor", "D.MNR", ItemID.DRAYNOR_MANOR_TELEPORT), DRAYNOR_MANOR_TELEPORT(Type.TABLET, "D.Manor", "D.MNR", ItemID.DRAYNOR_MANOR_TELEPORT),
MIND_ALTAR_TELEPORT(Type.TABLET, "M.Altar", "M.ALT", ItemID.MIND_ALTAR_TELEPORT), MIND_ALTAR_TELEPORT(Type.TABLET, "M.Altar", "M.ALT", ItemID.MIND_ALTAR_TELEPORT),
SALVE_GRAVEYARD_TELEPORT(Type.TABLET, "S.Grave", "S.GRV", ItemID.SALVE_GRAVEYARD_TELEPORT), SALVE_GRAVEYARD_TELEPORT(Type.TABLET, "S.Grave", "S.GRV", ItemID.SALVE_GRAVEYARD_TELEPORT),
@@ -312,7 +312,7 @@ public class MenuEntrySwapperPlugin extends Plugin
Arrays.asList( Arrays.asList(
"annakarl", "ape atoll dungeon", "ardougne", "barrows", "battlefront", "camelot", "carrallangar", "annakarl", "ape atoll dungeon", "ardougne", "barrows", "battlefront", "camelot", "carrallangar",
"catherby", "cemetery", "draynor manor", "falador", "fenkenstrain's castle", "fishing guild", "ghorrock", "catherby", "cemetery", "draynor manor", "falador", "fenkenstrain's castle", "fishing guild", "ghorrock",
"grand exchange", "great kourend", "harmony island", "kharyrll", "lumbridge", "lumbridge graveyard", "grand exchange", "great kourend", "harmony island", "kharyrll", "lumbridge", "arceuus library",
"lunar isle", "marim", "mind altar", "salve graveyard", "seers' village", "senntisten", "troll stronghold", "lunar isle", "marim", "mind altar", "salve graveyard", "seers' village", "senntisten", "troll stronghold",
"varrock", "watchtower", "waterbirth island", "weiss", "west ardougne", "yanille" "varrock", "watchtower", "waterbirth island", "weiss", "west ardougne", "yanille"
).forEach(location -> swap(location, "portal nexus", "teleport menu", config::swapPortalNexus)); ).forEach(location -> swap(location, "portal nexus", "teleport menu", config::swapPortalNexus));
@@ -61,7 +61,7 @@ public enum PohIcons
DRAYNORMANOR("draynormanor", DRAYNOR_MANOR_PORTAL, DRAYNOR_MANOR_PORTAL_37595, DRAYNOR_MANOR_PORTAL_37607), DRAYNORMANOR("draynormanor", DRAYNOR_MANOR_PORTAL, DRAYNOR_MANOR_PORTAL_37595, DRAYNOR_MANOR_PORTAL_37607),
FENKENSTRAINSCASTLE("fenkenstrainscastle", FENKENSTRAINS_CASTLE_PORTAL, FENKENSTRAINS_CASTLE_PORTAL_37599, FENKENSTRAINS_CASTLE_PORTAL_37611), FENKENSTRAINSCASTLE("fenkenstrainscastle", FENKENSTRAINS_CASTLE_PORTAL, FENKENSTRAINS_CASTLE_PORTAL_37599, FENKENSTRAINS_CASTLE_PORTAL_37611),
HARMONYISLAND("harmonyisland", HARMONY_ISLAND_PORTAL, HARMONY_ISLAND_PORTAL_37601, HARMONY_ISLAND_PORTAL_37613), HARMONYISLAND("harmonyisland", HARMONY_ISLAND_PORTAL, HARMONY_ISLAND_PORTAL_37601, HARMONY_ISLAND_PORTAL_37613),
LUMBRIDGEGRAVEYARD("lumbridgegraveyard", LUMBRIDGE_GRAVEYARD_PORTAL, LUMBRIDGE_GRAVEYARD_PORTAL_37594, LUMBRIDGE_GRAVEYARD_PORTAL_37606), ARCEUUSLIBRARY("arceuuslibrary", ARCEUUS_LIBRARY_PORTAL, ARCEUUS_LIBRARY_PORTAL_41417, ARCEUUS_LIBRARY_PORTAL_41418),
MINDALTAR("mindaltar", MIND_ALTAR_PORTAL, MIND_ALTAR_PORTAL_37597, MIND_ALTAR_PORTAL_37609), MINDALTAR("mindaltar", MIND_ALTAR_PORTAL, MIND_ALTAR_PORTAL_37597, MIND_ALTAR_PORTAL_37609),
SALVEGRAVEYARD("salvegraveyard", SALVE_GRAVEYARD_PORTAL, SALVE_GRAVEYARD_PORTAL_37598, SALVE_GRAVEYARD_PORTAL_37610), SALVEGRAVEYARD("salvegraveyard", SALVE_GRAVEYARD_PORTAL, SALVE_GRAVEYARD_PORTAL_37598, SALVE_GRAVEYARD_PORTAL_37610),
WESTARDOUGNE("westardougne", WEST_ARDOUGNE_PORTAL, WEST_ARDOUGNE_PORTAL_37600, WEST_ARDOUGNE_PORTAL_37612), WESTARDOUGNE("westardougne", WEST_ARDOUGNE_PORTAL, WEST_ARDOUGNE_PORTAL_37600, WEST_ARDOUGNE_PORTAL_37612),
@@ -88,10 +88,10 @@ public enum PohIcons
PORTAL_NEXUS_33410, PORTAL_NEXUS_33423, PORTAL_NEXUS_33424, PORTAL_NEXUS_33425, PORTAL_NEXUS_33426, PORTAL_NEXUS_33427, PORTAL_NEXUS_33428, PORTAL_NEXUS_33410, PORTAL_NEXUS_33423, PORTAL_NEXUS_33424, PORTAL_NEXUS_33425, PORTAL_NEXUS_33426, PORTAL_NEXUS_33427, PORTAL_NEXUS_33428,
PORTAL_NEXUS_33429, PORTAL_NEXUS_33430, PORTAL_NEXUS_33431, PORTAL_NEXUS_37547, PORTAL_NEXUS_37548, PORTAL_NEXUS_37549, PORTAL_NEXUS_37550, PORTAL_NEXUS_33429, PORTAL_NEXUS_33430, PORTAL_NEXUS_33431, PORTAL_NEXUS_37547, PORTAL_NEXUS_37548, PORTAL_NEXUS_37549, PORTAL_NEXUS_37550,
PORTAL_NEXUS_37551, PORTAL_NEXUS_37552, PORTAL_NEXUS_37553, PORTAL_NEXUS_37554, PORTAL_NEXUS_37555, PORTAL_NEXUS_37556, PORTAL_NEXUS_37557, PORTAL_NEXUS_37551, PORTAL_NEXUS_37552, PORTAL_NEXUS_37553, PORTAL_NEXUS_37554, PORTAL_NEXUS_37555, PORTAL_NEXUS_37556, PORTAL_NEXUS_37557,
PORTAL_NEXUS_37558, PORTAL_NEXUS_37559, PORTAL_NEXUS_37560, PORTAL_NEXUS_37561, PORTAL_NEXUS_37562, PORTAL_NEXUS_37563, PORTAL_NEXUS_37564, PORTAL_NEXUS_37559, PORTAL_NEXUS_37560, PORTAL_NEXUS_37561, PORTAL_NEXUS_37562, PORTAL_NEXUS_37563, PORTAL_NEXUS_37564, PORTAL_NEXUS_37565,
PORTAL_NEXUS_37565, PORTAL_NEXUS_37566, PORTAL_NEXUS_37567, PORTAL_NEXUS_37568, PORTAL_NEXUS_37569, PORTAL_NEXUS_37570, PORTAL_NEXUS_37571, PORTAL_NEXUS_37566, PORTAL_NEXUS_37567, PORTAL_NEXUS_37568, PORTAL_NEXUS_37569, PORTAL_NEXUS_37571, PORTAL_NEXUS_37572, PORTAL_NEXUS_37573,
PORTAL_NEXUS_37572, PORTAL_NEXUS_37573, PORTAL_NEXUS_37574, PORTAL_NEXUS_37575, PORTAL_NEXUS_37576, PORTAL_NEXUS_37577, PORTAL_NEXUS_37578, PORTAL_NEXUS_37574, PORTAL_NEXUS_37575, PORTAL_NEXUS_37576, PORTAL_NEXUS_37577, PORTAL_NEXUS_37578, PORTAL_NEXUS_37579, PORTAL_NEXUS_37580,
PORTAL_NEXUS_37579, PORTAL_NEXUS_37580 PORTAL_NEXUS_41413, PORTAL_NEXUS_41414, PORTAL_NEXUS_41415
), ),
XERICSTALISMAN("xericstalisman", XERICSTALISMAN("xericstalisman",
XERICS_TALISMAN, XERICS_TALISMAN_33412, XERICS_TALISMAN_33413, XERICS_TALISMAN_33414, XERICS_TALISMAN_33415, XERICS_TALISMAN_33419 XERICS_TALISMAN, XERICS_TALISMAN_33412, XERICS_TALISMAN_33413, XERICS_TALISMAN_33414, XERICS_TALISMAN_33415, XERICS_TALISMAN_33419
@@ -46,7 +46,7 @@ public class PohOverlay extends Overlay
PohIcons.SENNTISTEN, PohIcons.KHARYLL, PohIcons.ANNAKARL, PohIcons.KOUREND, PohIcons.MARIM, PohIcons.SENNTISTEN, PohIcons.KHARYLL, PohIcons.ANNAKARL, PohIcons.KOUREND, PohIcons.MARIM,
PohIcons.TROLLSTRONGHOLD, PohIcons.CARRALLANGAR, PohIcons.CATHERBY, PohIcons.WEISS, PohIcons.GHORROCK, PohIcons.TROLLSTRONGHOLD, PohIcons.CARRALLANGAR, PohIcons.CATHERBY, PohIcons.WEISS, PohIcons.GHORROCK,
PohIcons.APEATOLLDUNGEON, PohIcons.BARROWS, PohIcons.BATTLEFRONT, PohIcons.CEMETERY, PohIcons.DRAYNORMANOR, PohIcons.APEATOLLDUNGEON, PohIcons.BARROWS, PohIcons.BATTLEFRONT, PohIcons.CEMETERY, PohIcons.DRAYNORMANOR,
PohIcons.FENKENSTRAINSCASTLE, PohIcons.HARMONYISLAND, PohIcons.LUMBRIDGEGRAVEYARD, PohIcons.MINDALTAR, PohIcons.SALVEGRAVEYARD, PohIcons.FENKENSTRAINSCASTLE, PohIcons.HARMONYISLAND, PohIcons.ARCEUUSLIBRARY, PohIcons.MINDALTAR, PohIcons.SALVEGRAVEYARD,
PohIcons.WESTARDOUGNE, PohIcons.WESTARDOUGNE,
}; };
@@ -59,7 +59,7 @@ enum TeleportLocationData
FISHING_GUILD(TeleportType.LUNAR_MAGIC, "Fishing Guild", 85, new WorldPoint(2612, 3391, 0), "fishing_guild_teleport_icon.png"), FISHING_GUILD(TeleportType.LUNAR_MAGIC, "Fishing Guild", 85, new WorldPoint(2612, 3391, 0), "fishing_guild_teleport_icon.png"),
CATHERBY(TeleportType.LUNAR_MAGIC, "Catherby", 87, new WorldPoint(2802, 3449, 0), "catherby_teleport_icon.png"), CATHERBY(TeleportType.LUNAR_MAGIC, "Catherby", 87, new WorldPoint(2802, 3449, 0), "catherby_teleport_icon.png"),
ICE_PLATEAU(TeleportType.LUNAR_MAGIC, "Ice Plateau", 89, new WorldPoint(2973, 3939, 0), "ice_plateau_teleport_icon.png"), ICE_PLATEAU(TeleportType.LUNAR_MAGIC, "Ice Plateau", 89, new WorldPoint(2973, 3939, 0), "ice_plateau_teleport_icon.png"),
LUMBRIDGE_GRAVEYARD(TeleportType.ARCEUUS_MAGIC, "Lumbridge Graveyard", 6, new WorldPoint(3241, 3194, 0), "lumbridge_graveyard_teleport_icon.png"), ARCEUUS_LIBRARY(TeleportType.ARCEUUS_MAGIC, "Arceuus Library", 6, new WorldPoint(1632, 3838, 0), "arceuus_library_teleport_icon_arceuus.png"),
DRAYNOR_MANOR(TeleportType.ARCEUUS_MAGIC, "Draynor Manor", 17, new WorldPoint(3108, 3352, 0), "draynor_manor_teleport_icon.png"), DRAYNOR_MANOR(TeleportType.ARCEUUS_MAGIC, "Draynor Manor", 17, new WorldPoint(3108, 3352, 0), "draynor_manor_teleport_icon.png"),
BATTLEFRONT(TeleportType.ARCEUUS_MAGIC, "Battlefront", 23, new WorldPoint(1349, 3739, 0), "battlefront_teleport_icon.png"), BATTLEFRONT(TeleportType.ARCEUUS_MAGIC, "Battlefront", 23, new WorldPoint(1349, 3739, 0), "battlefront_teleport_icon.png"),
MIND_ALTAR(TeleportType.ARCEUUS_MAGIC, "Mind Altar", 28, new WorldPoint(2979, 3509, 0), "mind_altar_teleport_icon.png"), MIND_ALTAR(TeleportType.ARCEUUS_MAGIC, "Mind Altar", 28, new WorldPoint(2979, 3509, 0), "mind_altar_teleport_icon.png"),
Binary file not shown.

After

Width:  |  Height:  |  Size: 268 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 259 B

@@ -6,12 +6,6 @@
"name": "Wind Strike", "name": "Wind Strike",
"xp": 5.5 "xp": 5.5
}, },
{
"level": 3,
"sprite": 1247,
"name": "Reanimate Goblin",
"xp": 6
},
{ {
"level": 3, "level": 3,
"sprite": 16, "sprite": 16,
@@ -32,8 +26,8 @@
}, },
{ {
"level": 6, "level": 6,
"sprite": 1269, "sprite": 1252,
"name": "Lumbridge Graveyard Teleport", "name": "Arceuus Library Teleport",
"xp": 10 "xp": 10
}, },
{ {
@@ -48,12 +42,6 @@
"name": "Enchant Sapphire Bolt", "name": "Enchant Sapphire Bolt",
"xp": 17.5 "xp": 17.5
}, },
{
"level": 7,
"sprite": 1264,
"name": "Reanimate Monkey",
"xp": 14
},
{ {
"level": 9, "level": 9,
"sprite": 19, "sprite": 19,
@@ -66,12 +54,6 @@
"name": "Weaken", "name": "Weaken",
"xp": 21 "xp": 21
}, },
{
"level": 12,
"sprite": 1258,
"name": "Reanimate Imp",
"xp": 24
},
{ {
"level": 13, "level": 13,
"sprite": 21, "sprite": 21,
@@ -92,13 +74,13 @@
}, },
{ {
"level": 16, "level": 16,
"sprite": 1259, "sprite": 1247,
"name": "Reanimate Minotaur", "name": "Basic Reanimation",
"xp": 32 "xp": 32
}, },
{ {
"level": 17, "level": 17,
"sprite": 1269, "sprite": 1253,
"name": "Draynor Manor Teleport", "name": "Draynor Manor Teleport",
"xp": 16 "xp": 16
}, },
@@ -108,12 +90,6 @@
"name": "Wind Bolt", "name": "Wind Bolt",
"xp": 13.5 "xp": 13.5
}, },
{
"level": 19,
"sprite": 1257,
"name": "Reanimate Scorpion",
"xp": 38
},
{ {
"level": 19, "level": 19,
"sprite": 24, "sprite": 24,
@@ -132,18 +108,6 @@
"name": "Low Level Alchemy", "name": "Low Level Alchemy",
"xp": 31 "xp": 31
}, },
{
"level": 21,
"sprite": 1256,
"name": "Reanimate Bear",
"xp": 42
},
{
"level": 22,
"sprite": 1260,
"name": "Reanimate Unicorn",
"xp": 44
},
{ {
"level": 23, "level": 23,
"sprite": 26, "sprite": 26,
@@ -162,12 +126,6 @@
"name": "Varrock Teleport", "name": "Varrock Teleport",
"xp": 35 "xp": 35
}, },
{
"level": 26,
"sprite": 1268,
"name": "Reanimate Dog",
"xp": 52
},
{ {
"level": 27, "level": 27,
"sprite": 28, "sprite": 28,
@@ -182,7 +140,7 @@
}, },
{ {
"level": 28, "level": 28,
"sprite": 1271, "sprite": 1256,
"name": "Mind Altar Teleport", "name": "Mind Altar Teleport",
"xp": 22 "xp": 22
}, },
@@ -198,12 +156,6 @@
"name": "Earth Bolt", "name": "Earth Bolt",
"xp": 19.5 "xp": 19.5
}, },
{
"level": 30,
"sprite": 1251,
"name": "Reanimate Chaos Druid",
"xp": 60
},
{ {
"level": 31, "level": 31,
"sprite": 30, "sprite": 30,
@@ -218,7 +170,7 @@
}, },
{ {
"level": 34, "level": 34,
"sprite": 1300, "sprite": 1257,
"name": "Respawn Teleport", "name": "Respawn Teleport",
"xp": 27 "xp": 27
}, },
@@ -228,12 +180,6 @@
"name": "Fire Bolt", "name": "Fire Bolt",
"xp": 22.5 "xp": 22.5
}, },
{
"level": 37,
"sprite": 1255,
"name": "Reanimate Giant",
"xp": 74
},
{ {
"level": 37, "level": 37,
"sprite": 33, "sprite": 33,
@@ -248,22 +194,22 @@
}, },
{ {
"level": 40, "level": 40,
"sprite": 1301, "sprite": 1254,
"name": "Salve Graveyard Teleport", "name": "Salve Graveyard Teleport",
"xp": 30 "xp": 30
}, },
{
"level": 40,
"sprite": 1254,
"name": "Reanimate Ogre",
"xp": 80
},
{ {
"level": 40, "level": 40,
"sprite": 355, "sprite": 355,
"name": "Teleport To House", "name": "Teleport To House",
"xp": 30 "xp": 30
}, },
{
"level": 41,
"sprite": 1248,
"name": "Adept Reanimation",
"xp": 80
},
{ {
"level": 41, "level": 41,
"sprite": 35, "sprite": 35,
@@ -276,24 +222,12 @@
"name": "Superheat Item", "name": "Superheat Item",
"xp": 53 "xp": 53
}, },
{
"level": 43,
"sprite": 1250,
"name": "Reanimate Elf",
"xp": 86
},
{ {
"level": 45, "level": 45,
"sprite": 37, "sprite": 37,
"name": "Camelot Teleport", "name": "Camelot Teleport",
"xp": 55.5 "xp": 55.5
}, },
{
"level": 46,
"sprite": 1252,
"name": "Reanimate Troll",
"xp": 92
},
{ {
"level": 47, "level": 47,
"sprite": 38, "sprite": 38,
@@ -302,7 +236,7 @@
}, },
{ {
"level": 48, "level": 48,
"sprite": 1302, "sprite": 1259,
"name": "Fenkenstrain's Castle Teleport", "name": "Fenkenstrain's Castle Teleport",
"xp": 50 "xp": 50
}, },
@@ -348,12 +282,6 @@
"name": "Ardougne Teleport", "name": "Ardougne Teleport",
"xp": 61 "xp": 61
}, },
{
"level": 52,
"sprite": 1266,
"name": "Reanimate Horror",
"xp": 104
},
{ {
"level": 52, "level": 52,
"sprite": 337, "sprite": 337,
@@ -402,12 +330,6 @@
"name": "Enchant Diamond Jewellery", "name": "Enchant Diamond Jewellery",
"xp": 67 "xp": 67
}, },
{
"level": 57,
"sprite": 1261,
"name": "Reanimate Kalphite",
"xp": 114
},
{ {
"level": 58, "level": 58,
"sprite": 55, "sprite": 55,
@@ -464,7 +386,7 @@
}, },
{ {
"level": 61, "level": 61,
"sprite": 1303, "sprite": 1260,
"name": "West Ardougne Teleport", "name": "West Ardougne Teleport",
"xp": 68 "xp": 68
}, },
@@ -474,12 +396,6 @@
"name": "Trollheim Teleport", "name": "Trollheim Teleport",
"xp": 68 "xp": 68
}, },
{
"level": 62,
"sprite": 1253,
"name": "Reanimate Dagannoth",
"xp": 124
},
{ {
"level": 62, "level": 62,
"sprite": 330, "sprite": 330,
@@ -518,16 +434,10 @@
}, },
{ {
"level": 65, "level": 65,
"sprite": 1304, "sprite": 1261,
"name": "Harmony Island Teleport", "name": "Harmony Island Teleport",
"xp": 74 "xp": 74
}, },
{
"level": 65,
"sprite": 1267,
"name": "Reanimate Bloodveld",
"xp": 130
},
{ {
"level": 65, "level": 65,
"sprite": 563, "sprite": 563,
@@ -612,12 +522,6 @@
"name": "Moonclan Teleport", "name": "Moonclan Teleport",
"xp": 66 "xp": 66
}, },
{
"level": 69,
"sprite": 1262,
"name": "Reanimate Tzhaar",
"xp": 138
},
{ {
"level": 70, "level": 70,
"sprite": 51, "sprite": 51,
@@ -644,7 +548,7 @@
}, },
{ {
"level": 71, "level": 71,
"sprite": 1305, "sprite": 1264,
"name": "Cemetery Teleport", "name": "Cemetery Teleport",
"xp": 82 "xp": 82
}, },
@@ -662,15 +566,15 @@
}, },
{ {
"level": 72, "level": 72,
"sprite": 344, "sprite": 1249,
"name": "Lassar Teleport", "name": "Expert Reanimation",
"xp": 82 "xp": 138
}, },
{ {
"level": 72, "level": 72,
"sprite": 1248, "sprite": 344,
"name": "Reanimate Demon", "name": "Lassar Teleport",
"xp": 144 "xp": 82
}, },
{ {
"level": 72, "level": 72,
@@ -770,16 +674,10 @@
}, },
{ {
"level": 78, "level": 78,
"sprite": 1308, "sprite": 1266,
"name": "Resurrect Crops", "name": "Resurrect Crops",
"xp": 90 "xp": 90
}, },
{
"level": 78,
"sprite": 1263,
"name": "Reanimate Aviansie",
"xp": 156
},
{ {
"level": 79, "level": 79,
"sprite": 321, "sprite": 321,
@@ -860,7 +758,7 @@
}, },
{ {
"level": 83, "level": 83,
"sprite": 1306, "sprite": 1262,
"name": "Barrows Teleport", "name": "Barrows Teleport",
"xp": 90 "xp": 90
}, },
@@ -876,12 +774,6 @@
"name": "Boost Potion Share", "name": "Boost Potion Share",
"xp": 88 "xp": 88
}, },
{
"level": 85,
"sprite": 1265,
"name": "Reanimate Abyssal Creature",
"xp": 170
},
{ {
"level": 85, "level": 85,
"sprite": 363, "sprite": 363,
@@ -978,6 +870,12 @@
"name": "Earth Surge", "name": "Earth Surge",
"xp": 48 "xp": 48
}, },
{
"level": 90,
"sprite": 1250,
"name": "Master Reanimation",
"xp": 170
},
{ {
"level": 90, "level": 90,
"sprite": 575, "sprite": 575,
@@ -992,7 +890,7 @@
}, },
{ {
"level": 90, "level": 90,
"sprite": 1307, "sprite": 1263,
"name": "Ape Atoll Teleport", "name": "Ape Atoll Teleport",
"xp": 100 "xp": 100
}, },
@@ -1026,12 +924,6 @@
"name": "Enchant Zenyte Jewellery", "name": "Enchant Zenyte Jewellery",
"xp": 110 "xp": 110
}, },
{
"level": 93,
"sprite": 1249,
"name": "Reanimate Dragon",
"xp": 186
},
{ {
"level": 94, "level": 94,
"sprite": 328, "sprite": 328,
Binary file not shown.

Before

Width:  |  Height:  |  Size: 259 B

@@ -1 +1 @@
91023012B55ED61B5DA93FAD2CB6A92EBB9AA8C8633AC5AC6FB337C2AFC6365F 1D8F698FFDA4B0D72798938A0EFB4D7F58988E9AF3FA706A7CD9402FE14E201C
@@ -18,7 +18,7 @@
1129: LABEL109 1129: LABEL109
1130: LABEL87 1130: LABEL87
1131: LABEL9 1131: LABEL9
jump LABEL201 jump LABEL204
LABEL9: LABEL9:
iconst 10747939 iconst 10747939
if_getwidth if_getwidth
@@ -107,7 +107,7 @@ LABEL77:
LABEL84: LABEL84:
clientclock clientclock
set_varc_int 384 set_varc_int 384
jump LABEL201 jump LABEL204
LABEL87: LABEL87:
get_varbit 4084 get_varbit 4084
iconst 1 iconst 1
@@ -133,7 +133,7 @@ LABEL99:
LABEL106: LABEL106:
clientclock clientclock
set_varc_int 384 set_varc_int 384
jump LABEL201 jump LABEL204
LABEL109: LABEL109:
invoke 3297 invoke 3297
iconst 1 iconst 1
@@ -157,18 +157,21 @@ LABEL121:
enum enum
2122 2122
LABEL128: LABEL128:
jump LABEL201 jump LABEL204
LABEL129: LABEL129:
get_varbit 6257 get_varbit 6257
iconst 1 iconst 1
if_icmpeq LABEL133 if_icmpeq LABEL136
jump LABEL137 get_varbit 542
LABEL133: iconst 1
if_icmpeq LABEL136
jump LABEL140
LABEL136:
iconst 1 iconst 1
iconst 39387169 iconst 39387169
if_sethide if_sethide
jump LABEL192 jump LABEL195
LABEL137: LABEL140:
iconst 0 iconst 0
iconst 39387169 iconst 39387169
if_sethide if_sethide
@@ -177,11 +180,11 @@ LABEL137:
2308 2308
get_varbit 6255 get_varbit 6255
switch switch
1: LABEL154 1: LABEL157
2: LABEL146 2: LABEL149
3: LABEL162 3: LABEL165
jump LABEL170 jump LABEL173
LABEL146: LABEL149:
iconst 1718 iconst 1718
iconst 39387171 iconst 39387171
if_setgraphic if_setgraphic
@@ -189,8 +192,8 @@ LABEL146:
sconst "Toggle single-tap mode" sconst "Toggle single-tap mode"
iconst 39387169 iconst 39387169
if_setop if_setop
jump LABEL177 jump LABEL180
LABEL154: LABEL157:
iconst 1717 iconst 1717
iconst 39387171 iconst 39387171
if_setgraphic if_setgraphic
@@ -198,8 +201,8 @@ LABEL154:
sconst "Toggle tap-to-drop mode" sconst "Toggle tap-to-drop mode"
iconst 39387169 iconst 39387169
if_setop if_setop
jump LABEL177 jump LABEL180
LABEL162: LABEL165:
iconst 1716 iconst 1716
iconst 39387171 iconst 39387171
if_setgraphic if_setgraphic
@@ -207,8 +210,8 @@ LABEL162:
sconst "Show Keyboard" sconst "Show Keyboard"
iconst 39387169 iconst 39387169
if_setop if_setop
jump LABEL177 jump LABEL180
LABEL170: LABEL173:
iconst 1715 iconst 1715
iconst 39387171 iconst 39387171
if_setgraphic if_setgraphic
@@ -216,26 +219,26 @@ LABEL170:
sconst "" sconst ""
iconst 39387169 iconst 39387169
if_setop if_setop
LABEL177: LABEL180:
get_varbit 6255 get_varbit 6255
iconst 3 iconst 3
if_icmpne LABEL181 if_icmpne LABEL184
jump LABEL189 jump LABEL192
LABEL181: LABEL184:
get_varbit 6256 get_varbit 6256
iconst 0 iconst 0
if_icmpeq LABEL185 if_icmpeq LABEL188
jump LABEL189 jump LABEL192
LABEL185: LABEL188:
iconst 155 iconst 155
iconst 39387171 iconst 39387171
if_settrans if_settrans
jump LABEL192 jump LABEL195
LABEL189: LABEL192:
iconst 0 iconst 0
iconst 39387171 iconst 39387171
if_settrans if_settrans
LABEL192: LABEL195:
invoke 2581 invoke 2581
get_varbit 6254 get_varbit 6254
invoke 633 invoke 633
@@ -245,5 +248,5 @@ LABEL192:
pop_int pop_int
clientclock clientclock
set_varc_int 384 set_varc_int 384
LABEL201: LABEL204:
return return
@@ -1 +1 @@
1CCC672616971AEB7A1E4C00885367CEFC75A873DD22A37BE99652F2DA107653 F62F3A22CA5AEAECCEFAA3A9EEDA095D778CC8BE08CD15CC4ECDC91159924746
@@ -92,7 +92,7 @@ LABEL84:
get_varbit 4606 get_varbit 4606
iconst 0 iconst 0
if_icmpne LABEL88 if_icmpne LABEL88
jump LABEL253 jump LABEL279
LABEL88: LABEL88:
get_varbit 4606 get_varbit 4606
iconst 2 iconst 2
@@ -107,26 +107,57 @@ LABEL92:
iconst 0 iconst 0
iconst 0 iconst 0
viewport_clampfov viewport_clampfov
jump LABEL106 jump LABEL132
LABEL101: LABEL101:
get_varbit 4606
iconst 3
if_icmpeq LABEL105
jump LABEL124
LABEL105:
iconst 256
iconst 256
viewport_setfov
iload 1
iconst 1129
if_icmpeq LABEL112
jump LABEL118
LABEL112:
iconst 512 iconst 512
iconst 512 iconst 512
iconst 512 iconst 512
iconst 512 iconst 512
viewport_clampfov viewport_clampfov
LABEL106: jump LABEL123
LABEL118:
iconst 640
iconst 768
iconst 512
iconst 512
viewport_clampfov
LABEL123:
jump LABEL132
LABEL124:
iconst 256
iconst 256
viewport_setfov
iconst 512
iconst 512
iconst 512
iconst 512
viewport_clampfov
LABEL132:
iconst 50 iconst 50
cam_setfollowheight cam_setfollowheight
iload 2 iload 2
iconst -1 iconst -1
if_icmpne LABEL112 if_icmpne LABEL138
jump LABEL252 jump LABEL278
LABEL112: LABEL138:
iload 3 iload 3
iconst -1 iconst -1
if_icmpne LABEL116 if_icmpne LABEL142
jump LABEL252 jump LABEL278
LABEL116: LABEL142:
viewport_geteffectivesize viewport_geteffectivesize
istore 11 istore 11
istore 10 istore 10
@@ -168,14 +199,14 @@ LABEL116:
if_setsize if_setsize
iload 4 iload 4
iconst -1 iconst -1
if_icmpne LABEL159 if_icmpne LABEL185
jump LABEL242 jump LABEL268
LABEL159: LABEL185:
iload 5 iload 5
iconst -1 iconst -1
if_icmpne LABEL163 if_icmpne LABEL189
jump LABEL242 jump LABEL268
LABEL163: LABEL189:
iload 12 iload 12
iload 14 iload 14
sub sub
@@ -254,8 +285,8 @@ LABEL163:
iload 8 iload 8
iload 9 iload 9
invoke 910 invoke 910
jump LABEL252 jump LABEL278
LABEL242: LABEL268:
iload 1 iload 1
iconst 73 iconst 73
iconst 73 iconst 73
@@ -266,9 +297,9 @@ LABEL242:
iconst 0 iconst 0
iconst 0 iconst 0
invoke 910 invoke 910
LABEL252: LABEL278:
jump LABEL369 jump LABEL395
LABEL253: LABEL279:
iconst 0 iconst 0
iconst 0 iconst 0
iconst 0 iconst 0
@@ -278,52 +309,52 @@ LABEL253:
iconst 128 iconst 128
sconst "outerZoomLimit" sconst "outerZoomLimit"
runelite_callback runelite_callback
if_icmpge LABEL262 if_icmpge LABEL288
jump LABEL278 jump LABEL304
LABEL262: LABEL288:
get_varc_int 73 get_varc_int 73
iconst 896 iconst 896
sconst "innerZoomLimit" sconst "innerZoomLimit"
runelite_callback runelite_callback
if_icmple LABEL266 if_icmple LABEL292
jump LABEL278 jump LABEL304
LABEL266: LABEL292:
get_varc_int 74 get_varc_int 74
iconst 128 iconst 128
sconst "outerZoomLimit" sconst "outerZoomLimit"
runelite_callback runelite_callback
if_icmpge LABEL270 if_icmpge LABEL296
jump LABEL278 jump LABEL304
LABEL270: LABEL296:
get_varc_int 74 get_varc_int 74
iconst 896 iconst 896
sconst "innerZoomLimit" sconst "innerZoomLimit"
runelite_callback runelite_callback
if_icmple LABEL274 if_icmple LABEL300
jump LABEL278 jump LABEL304
LABEL274: LABEL300:
get_varc_int 73 get_varc_int 73
get_varc_int 74 get_varc_int 74
invoke 42 invoke 42
jump LABEL281 jump LABEL307
LABEL278: LABEL304:
iconst 512 iconst 512
iconst 512 iconst 512
invoke 42 invoke 42
LABEL281: LABEL307:
viewport_geteffectivesize viewport_geteffectivesize
istore 11 istore 11
istore 10 istore 10
iload 2 iload 2
iconst -1 iconst -1
if_icmpne LABEL288 if_icmpne LABEL314
jump LABEL369 jump LABEL395
LABEL288: LABEL314:
iload 3 iload 3
iconst -1 iconst -1
if_icmpne LABEL292 if_icmpne LABEL318
jump LABEL369 jump LABEL395
LABEL292: LABEL318:
iload 10 iload 10
iload 11 iload 11
iconst 0 iconst 0
@@ -342,14 +373,14 @@ LABEL292:
if_setsize if_setsize
iload 4 iload 4
iconst -1 iconst -1
if_icmpne LABEL312 if_icmpne LABEL338
jump LABEL359 jump LABEL385
LABEL312: LABEL338:
iload 5 iload 5
iconst -1 iconst -1
if_icmpne LABEL316 if_icmpne LABEL342
jump LABEL359 jump LABEL385
LABEL316: LABEL342:
iload 6 iload 6
iload 7 iload 7
iconst 0 iconst 0
@@ -392,8 +423,8 @@ LABEL316:
iload 8 iload 8
iload 9 iload 9
invoke 910 invoke 910
jump LABEL369 jump LABEL395
LABEL359: LABEL385:
iload 1 iload 1
iconst 73 iconst 73
iconst 73 iconst 73
@@ -404,7 +435,7 @@ LABEL359:
iconst 0 iconst 0
iconst 0 iconst 0
invoke 910 invoke 910
LABEL369: LABEL395:
iconst 73 iconst 73
iconst 73 iconst 73
iload 1 iload 1
@@ -413,62 +444,62 @@ LABEL369:
istore 18 istore 18
iload 18 iload 18
iconst -1 iconst -1
if_icmpne LABEL379 if_icmpne LABEL405
jump LABEL423 jump LABEL449
LABEL379: LABEL405:
invoke 1972 invoke 1972
iconst 0 iconst 0
if_icmpeq LABEL383 if_icmpeq LABEL409
jump LABEL417 jump LABEL443
LABEL383: LABEL409:
iload 18 iload 18
if_hassub if_hassub
iconst 1 iconst 1
if_icmpeq LABEL388 if_icmpeq LABEL414
jump LABEL417 jump LABEL443
LABEL388: LABEL414:
get_varc_int 173 get_varc_int 173
iconst -2 iconst -2
if_icmpeq LABEL392 if_icmpeq LABEL418
jump LABEL399 jump LABEL425
LABEL392: LABEL418:
iconst 512 iconst 512
iconst 0 iconst 0
iconst 0 iconst 0
iconst 1 iconst 1
iload 18 iload 18
if_setsize if_setsize
jump LABEL416 jump LABEL442
LABEL399: LABEL425:
get_varc_int 173 get_varc_int 173
iconst -3 iconst -3
if_icmpeq LABEL403 if_icmpeq LABEL429
jump LABEL410 jump LABEL436
LABEL403: LABEL429:
iconst 0 iconst 0
iconst 0 iconst 0
iconst 1 iconst 1
iconst 1 iconst 1
iload 18 iload 18
if_setsize if_setsize
jump LABEL416 jump LABEL442
LABEL410: LABEL436:
iconst 512 iconst 512
iconst 334 iconst 334
iconst 0 iconst 0
iconst 0 iconst 0
iload 18 iload 18
if_setsize if_setsize
LABEL416: LABEL442:
jump LABEL423 jump LABEL449
LABEL417: LABEL443:
iconst 512 iconst 512
iconst 334 iconst 334
iconst 0 iconst 0
iconst 0 iconst 0
iload 18 iload 18
if_setsize if_setsize
LABEL423: LABEL449:
iconst 73 iconst 73
iconst 73 iconst 73
iload 1 iload 1
@@ -481,9 +512,9 @@ LABEL423:
istore 20 istore 20
iload 18 iload 18
iconst -1 iconst -1
if_icmpne LABEL437 if_icmpne LABEL463
jump LABEL481 jump LABEL511
LABEL437: LABEL463:
iconst 73 iconst 73
iconst 73 iconst 73
iload 1 iload 1
@@ -491,54 +522,59 @@ LABEL437:
enum enum
if_hassub if_hassub
iconst 1 iconst 1
if_icmpeq LABEL446 if_icmpeq LABEL472
jump LABEL455 jump LABEL481
LABEL446: LABEL472:
get_varbit 4692 get_varbit 4692
iconst 0 iconst 0
if_icmpne LABEL450 if_icmpne LABEL476
jump LABEL453 jump LABEL479
LABEL450: LABEL476:
iconst 0 iconst 0
istore 20 istore 20
jump LABEL455 jump LABEL481
LABEL453: LABEL479:
iconst 38 iconst 38
istore 20 istore 20
LABEL455: LABEL481:
invoke 1972 invoke 1972
iconst 1 iconst 1
if_icmpeq LABEL459 if_icmpeq LABEL485
jump LABEL473 jump LABEL503
LABEL459: LABEL485:
get_varbit 542
iconst 0
if_icmpeq LABEL489
jump LABEL503
LABEL489:
get_varbit 6254 get_varbit 6254
iconst 0 iconst 0
if_icmpeq LABEL463 if_icmpeq LABEL493
jump LABEL468 jump LABEL498
LABEL463: LABEL493:
iconst 182 iconst 182
iconst 4 iconst 4
add add
istore 19 istore 19
jump LABEL472 jump LABEL502
LABEL468: LABEL498:
iconst 120 iconst 120
iconst 4 iconst 4
add add
istore 19 istore 19
LABEL472: LABEL502:
jump LABEL475 jump LABEL505
LABEL473: LABEL503:
iconst 0 iconst 0
istore 19 istore 19
LABEL475: LABEL505:
iload 19 iload 19
iload 20 iload 20
iconst 2 iconst 2
iconst 0 iconst 0
iload 18 iload 18
if_setposition if_setposition
LABEL481: LABEL511:
iconst 73 iconst 73
iconst 73 iconst 73
iload 1 iload 1
@@ -549,38 +585,38 @@ LABEL481:
istore 19 istore 19
iload 18 iload 18
iconst -1 iconst -1
if_icmpne LABEL493 if_icmpne LABEL523
jump LABEL515 jump LABEL545
LABEL493: LABEL523:
invoke 1972 invoke 1972
iconst 1 iconst 1
if_icmpeq LABEL497 if_icmpeq LABEL527
jump LABEL507 jump LABEL537
LABEL497: LABEL527:
get_varbit 6254 get_varbit 6254
iconst 0 iconst 0
if_icmpeq LABEL501 if_icmpeq LABEL531
jump LABEL504 jump LABEL534
LABEL501: LABEL531:
iconst 182 iconst 182
istore 19 istore 19
jump LABEL506 jump LABEL536
LABEL504: LABEL534:
iconst 120 iconst 120
istore 19 istore 19
LABEL506: LABEL536:
jump LABEL509 jump LABEL539
LABEL507: LABEL537:
iconst 0 iconst 0
istore 19 istore 19
LABEL509: LABEL539:
iload 19 iload 19
iconst 0 iconst 0
iconst 1 iconst 1
iconst 1 iconst 1
iload 18 iload 18
if_setsize if_setsize
LABEL515: LABEL545:
iload 0 iload 0
iload 1 iload 1
invoke 920 invoke 920
@@ -1 +1 @@
0CEA896F74B3F885C26633865A18FDAE02AD6C78C114646FCA710018F6271C55 8567736DBA2A2558DBD5883204C10FF794768C18DB4D85FE44C0959EB7F40885
@@ -13,42 +13,50 @@
istore 0 istore 0
get_varc_int 41 get_varc_int 41
iconst 1337 iconst 1337
if_icmpeq LABEL8 if_icmpeq LABEL15
jump LABEL24 get_varbit 542
LABEL8:
invoke 922
iconst 1 iconst 1
if_icmpeq LABEL12 if_icmpeq LABEL11
jump LABEL15 jump LABEL31
LABEL12: LABEL11:
iconst 1
istore 0
jump LABEL24
LABEL15:
getwindowmode getwindowmode
iconst 1 iconst 1
if_icmpne LABEL15
jump LABEL31
LABEL15:
invoke 922
iconst 1
if_icmpeq LABEL19 if_icmpeq LABEL19
jump LABEL24 jump LABEL22
LABEL19: LABEL19:
iconst 1
istore 0
jump LABEL31
LABEL22:
getwindowmode
iconst 1
if_icmpeq LABEL26
jump LABEL31
LABEL26:
iconst 0 iconst 0
set_varc_int 41 set_varc_int 41
iconst 0 iconst 0
iconst 0 iconst 0
invoke 183 invoke 183
LABEL24: LABEL31:
iload 0 iload 0
iconst 10616869 iconst 10616869
if_sethide if_sethide
get_varbit 6374 get_varbit 6374
iconst 1 iconst 1
if_icmpeq LABEL31 if_icmpeq LABEL38
jump LABEL48 jump LABEL55
LABEL31: LABEL38:
getwindowmode getwindowmode
iconst 1 iconst 1
if_icmpne LABEL35 if_icmpne LABEL42
jump LABEL48 jump LABEL55
LABEL35: LABEL42:
iconst 1 iconst 1
iconst 0 iconst 0
iconst 2 iconst 2
@@ -61,8 +69,8 @@ LABEL35:
iconst 0 iconst 0
iconst 10617392 iconst 10617392
if_setposition if_setposition
jump LABEL60 jump LABEL67
LABEL48: LABEL55:
iconst 0 iconst 0
iconst 0 iconst 0
iconst 0 iconst 0
@@ -75,7 +83,7 @@ LABEL48:
iconst 0 iconst 0
iconst 10617392 iconst 10617392
if_setposition if_setposition
LABEL60: LABEL67:
iconst 10616870 iconst 10616870
cc_deleteall cc_deleteall
iconst 10616889 iconst 10616889
@@ -84,14 +92,14 @@ LABEL60:
istore 1 istore 1
clientclock clientclock
get_varc_int 223 get_varc_int 223
if_icmplt LABEL70 if_icmplt LABEL77
jump LABEL82 jump LABEL89
LABEL70: LABEL77:
invoke 900 invoke 900
iconst 1129 iconst 1129
if_icmpne LABEL74 if_icmpne LABEL81
jump LABEL82 jump LABEL89
LABEL74: LABEL81:
iconst 1 iconst 1
istore 1 istore 1
iconst 2155 iconst 2155
@@ -99,26 +107,26 @@ LABEL74:
sconst "i" sconst "i"
iconst 10616870 iconst 10616870
if_setontimer if_setontimer
jump LABEL86 jump LABEL93
LABEL82: LABEL89:
iconst -1 iconst -1
sconst "" sconst ""
iconst 10616870 iconst 10616870
if_setontimer if_setontimer
LABEL86: LABEL93:
invoke 921 invoke 921
iconst 0 iconst 0
if_icmpeq LABEL90 if_icmpeq LABEL97
jump LABEL156 jump LABEL163
LABEL90: LABEL97:
iconst 1 iconst 1
iconst 10616870 iconst 10616870
if_setnoclickthrough if_setnoclickthrough
iload 1 iload 1
iconst 0 iconst 0
if_icmpeq LABEL97 if_icmpeq LABEL104
jump LABEL135 jump LABEL142
LABEL97: LABEL104:
iconst 10616870 iconst 10616870
iconst 5 iconst 5
iconst 0 iconst 0
@@ -157,7 +165,7 @@ LABEL97:
cc_setcolour cc_setcolour
iconst 1 iconst 1
cc_setfill cc_setfill
LABEL135: LABEL142:
iconst 10617392 iconst 10617392
iconst 792 iconst 792
iconst 789 iconst 789
@@ -169,20 +177,20 @@ LABEL135:
invoke 838 invoke 838
invoke 2373 invoke 2373
iconst 1 iconst 1
if_icmpeq LABEL148 if_icmpeq LABEL155
jump LABEL152 jump LABEL159
LABEL148: LABEL155:
iconst 255 iconst 255
iconst 10616835 iconst 10616835
if_settrans if_settrans
jump LABEL155 jump LABEL162
LABEL152: LABEL159:
iconst 0 iconst 0
iconst 10616835 iconst 10616835
if_settrans if_settrans
LABEL155: LABEL162:
return return
LABEL156: LABEL163:
iconst 16384 iconst 16384
iconst 25 iconst 25
div div
@@ -191,38 +199,38 @@ LABEL156:
istore 3 istore 3
get_varbit 2570 get_varbit 2570
iconst 1 iconst 1
if_icmpeq LABEL166 if_icmpeq LABEL173
jump LABEL170 jump LABEL177
LABEL166: LABEL173:
iconst 1 iconst 1
iconst 10616870 iconst 10616870
if_setnoclickthrough if_setnoclickthrough
jump LABEL176 jump LABEL183
LABEL170: LABEL177:
iconst 0 iconst 0
iconst 10616870 iconst 10616870
if_setnoclickthrough if_setnoclickthrough
iconst 1 iconst 1
iconst 10616870 iconst 10616870
2006 2006
LABEL176: LABEL183:
iconst 0 iconst 0
istore 4 istore 4
iload 1 iload 1
iconst 0 iconst 0
if_icmpeq LABEL182 if_icmpeq LABEL189
jump LABEL332 jump LABEL339
LABEL182: LABEL189:
invoke 1972 invoke 1972
iconst 0 iconst 0
if_icmpeq LABEL186 if_icmpeq LABEL193
jump LABEL266 jump LABEL273
LABEL186: LABEL193:
iload 4 iload 4
iconst 20 iconst 20
if_icmplt LABEL190 if_icmplt LABEL197
jump LABEL265 jump LABEL272
LABEL190: LABEL197:
iconst 10616870 iconst 10616870
iconst 3 iconst 3
iload 4 iload 4
@@ -297,12 +305,12 @@ LABEL190:
sub sub
istore 3 istore 3
istore 4 istore 4
jump LABEL186 jump LABEL193
LABEL265: LABEL272:
sconst "chatboxBackgroundBuilt" sconst "chatboxBackgroundBuilt"
runelite_callback runelite_callback
jump LABEL332 jump LABEL339
LABEL266: LABEL273:
iconst 10616870 iconst 10616870
iconst 3 iconst 3
iload 4 iload 4
@@ -369,7 +377,7 @@ LABEL266:
cc_settrans cc_settrans
iconst 130 iconst 130
cc_settrans 1 cc_settrans 1
LABEL332: LABEL339:
iconst 10617392 iconst 10617392
iconst 1190 iconst 1190
iconst 1187 iconst 1187
@@ -381,24 +389,24 @@ LABEL332:
invoke 838 invoke 838
iload 0 iload 0
iconst 1 iconst 1
if_icmpeq LABEL345 if_icmpeq LABEL352
jump LABEL349 jump LABEL356
LABEL345: LABEL352:
iconst 255 iconst 255
iconst 10616835 iconst 10616835
if_settrans if_settrans
jump LABEL380 jump LABEL387
LABEL349: LABEL356:
invoke 1972 invoke 1972
iconst 0 iconst 0
if_icmpeq LABEL353 if_icmpeq LABEL360
jump LABEL357 jump LABEL364
LABEL353: LABEL360:
iconst 155 iconst 155
iconst 10616835 iconst 10616835
if_settrans if_settrans
jump LABEL380 jump LABEL387
LABEL357: LABEL364:
iconst 255 iconst 255
iconst 10616835 iconst 10616835
if_settrans if_settrans
@@ -422,5 +430,5 @@ LABEL357:
cc_setfill cc_setfill
iconst 225 iconst 225
cc_settrans cc_settrans
LABEL380: LABEL387:
return return