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
@@ -8658,7 +8658,7 @@ public final class ItemID
public static final int UNSTRUNG_LIGHT_BALLISTA = 19604;
public static final int UNSTRUNG_HEAVY_BALLISTA = 19607;
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 MIND_ALTAR_TELEPORT = 19617;
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_UNCHARGED = 21817;
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 SHAMAN_MASK = 21838;
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 BODY_CORE = 25698;
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. */
}
@@ -1980,7 +1980,6 @@ public final class NpcID
public static final int SRARACHA_2144 = 2144;
public static final int UNDEAD_DRUID = 2145;
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_2149 = 2149;
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 MONKEY_2848 = 2848;
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 FLY_TRAP = 2852;
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 THE_QUEEN_OF_THIEVES = 7908;
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 FISH_MONGER_7912 = 7912;
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_MAGE = 8637;
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 BANKER_8666 = 8666;
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_10699 = 10699;
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. */
}
@@ -11762,10 +11762,13 @@ public final class NullItemID
public static final int NULL_21823 = 21823;
public static final int NULL_21824 = 21824;
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_21828 = 21828;
public static final int NULL_21829 = 21829;
public static final int NULL_21830 = 21830;
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_21834 = 21834;
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_25699 = 25699;
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. */
}
@@ -166,6 +166,7 @@ public final class NullNpcID
public static final int NULL_2024 = 2024;
public static final int NULL_2109 = 2109;
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_2260 = 2260;
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_8641 = 8641;
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_8646 = 8646;
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_10705 = 10705;
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. */
}
@@ -13106,9 +13106,6 @@ public final class NullObjectID
public static final int NULL_27507 = 27507;
public static final int NULL_27508 = 27508;
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_27559 = 27559;
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_39124 = 39124;
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_39147 = 39147;
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_41396 = 41396;
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_41461 = 41461;
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_41535 = 41535;
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_41553 = 41553;
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 BOOKCASE_9611 = 9611;
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 SMALL_TABLE_9615 = 9615;
public static final int TABLE_9615 = 9615;
public static final int COUNTER_9616 = 9616;
public static final int WAREHOUSE_SHELVES = 9617;
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_9695 = 9695;
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_9699 = 9699;
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 PORTRAIT_15690 = 15690;
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 CRATE_15695 = 15695;
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 CRATES_27101 = 27101;
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_27108 = 27108;
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 BIG_BEER_BARREL = 27531;
public static final int CRATE_27532 = 27532;
public static final int CRATE_27533 = 27533;
public static final int CUPBOARD_27534 = 27534;
public static final int CUPBOARD_27535 = 27535;
public static final int CRATES_27533 = 27533;
public static final int SHELVES_27534 = 27534;
public static final int SHELVES_27535 = 27535;
public static final int FOUNTAIN_27536 = 27536;
public static final int FRUIT_STALL = 27537;
public static final int FRUIT_STALL_27538 = 27538;
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 CUPBOARD_27542 = 27542;
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 STOOL_27546 = 27546;
public static final int STOOL_27547 = 27547;
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 EMPTY_BARREL = 27553;
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_32492 = 32492;
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_32505 = 32505;
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_37556 = 37556;
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_37560 = 37560;
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_37568 = 37568;
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_37572 = 37572;
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_37580 = 37580;
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 BATTLEFRONT_PORTAL = 37584;
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 APE_ATOLL_DUNGEON_PORTAL = 37592;
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 BATTLEFRONT_PORTAL_37596 = 37596;
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 APE_ATOLL_DUNGEON_PORTAL_37604 = 37604;
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 BATTLEFRONT_PORTAL_37608 = 37608;
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 MINE_CART_39117 = 39117;
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 BLOOD_TITHE = 39154;
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 CRATES_41332 = 41332;
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 REWARDS_CHEST_41435 = 41435;
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 BROKEN_PILLAR_41459 = 41459;
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_41483 = 41483;
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_41512 = 41512;
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_41540 = 41540;
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 ROCK_41564 = 41564;
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_MINING = 41574;
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_41590 = 41590;
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. */
}
@@ -484,42 +484,42 @@ public class WidgetID
static final int INVENTORY_CONTAINER = 72;
}
public static class ResizableViewport
static class ResizableViewport
{
public static final int MULTICOMBAT_INDICATOR = 18;
static final int FRIENDS_CHAT_TAB = 38;
static final int FRIENDS_TAB = 40;
static final int IGNORES_TAB = 39;
static final int LOGOUT_TAB = 41;
static final int OPTIONS_TAB = 42;
static final int EMOTES_TAB = 43;
static final int MUSIC_TAB = 44;
static final int FRIENDS_CHAT_ICON = 45;
static final int FRIENDS_ICON = 47;
static final int IGNORES_ICON = 46;
static final int LOGOUT_ICON = 48;
static final int OPTIONS_ICON = 49;
static final int EMOTES_ICON = 50;
static final int MUSIC_ICON = 51;
static final int COMBAT_TAB = 54;
static final int STATS_TAB = 55;
static final int QUESTS_TAB = 56;
static final int INVENTORY_TAB = 57;
static final int EQUIPMENT_TAB = 58;
static final int PRAYER_TAB = 59;
static final int MAGIC_TAB = 60;
static final int COMBAT_ICON = 61;
static final int STATS_ICON = 62;
static final int QUESTS_ICON = 63;
static final int INVENTORY_ICON = 64;
static final int EQUIPMENT_ICON = 65;
static final int PRAYER_ICON = 66;
static final int MAGIC_ICON = 67;
static final int INTERFACE_CONTAINER = 68;
static final int INVENTORY_CONTAINER = 74;
static final int MULTICOMBAT_INDICATOR = 18;
static final int FRIENDS_CHAT_TAB = 39;
static final int FRIENDS_TAB = 41;
static final int IGNORES_TAB = 40;
static final int LOGOUT_TAB = 42;
static final int OPTIONS_TAB = 43;
static final int EMOTES_TAB = 44;
static final int MUSIC_TAB = 45;
static final int FRIENDS_CHAT_ICON = 46;
static final int FRIENDS_ICON = 48;
static final int IGNORES_ICON = 47;
static final int LOGOUT_ICON = 49;
static final int OPTIONS_ICON = 50;
static final int EMOTES_ICON = 51;
static final int MUSIC_ICON = 52;
static final int COMBAT_TAB = 55;
static final int STATS_TAB = 56;
static final int QUESTS_TAB = 57;
static final int INVENTORY_TAB = 58;
static final int EQUIPMENT_TAB = 59;
static final int PRAYER_TAB = 60;
static final int MAGIC_TAB = 61;
static final int COMBAT_ICON = 62;
static final int STATS_ICON = 63;
static final int QUESTS_ICON = 64;
static final int INVENTORY_ICON = 65;
static final int EQUIPMENT_ICON = 66;
static final int PRAYER_ICON = 67;
static final int MAGIC_ICON = 68;
static final int INTERFACE_CONTAINER = 69;
static final int INVENTORY_CONTAINER = 75;
}
public static class ResizableViewportBottomLine
static class ResizableViewportBottomLine
{
static final int LOGOUT_BUTTON_OVERLAY = 32;
static final int CMB_TAB = 50;
@@ -534,7 +534,7 @@ public class WidgetID
static final int EQUIP_ICON = 64;
static final int PRAYER_TAB = 58;
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 FC_TAB = 35;
static final int FC_ICON = 44;