From a74f3073ad5f0042ae6c76439aabb1f30b04c73b Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 23 May 2019 10:33:23 +0000 Subject: [PATCH 01/10] Update Object IDs to 2019-05-23-rev180 --- .../java/net/runelite/api/NullObjectID.java | 133 +++-- .../main/java/net/runelite/api/ObjectID.java | 505 +++++++++--------- 2 files changed, 361 insertions(+), 277 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java index 7d5c3edab5..279f795689 100644 --- a/runelite-api/src/main/java/net/runelite/api/NullObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/NullObjectID.java @@ -842,9 +842,16 @@ public final class NullObjectID public static final int NULL_1746 = 1746; public static final int NULL_1747 = 1747; public static final int NULL_1748 = 1748; - public static final int NULL_1754 = 1754; + public static final int NULL_1750 = 1750; + public static final int NULL_1751 = 1751; + public static final int NULL_1752 = 1752; public static final int NULL_1755 = 1755; - public static final int NULL_1762 = 1762; + public static final int NULL_1756 = 1756; + public static final int NULL_1757 = 1757; + public static final int NULL_1758 = 1758; + public static final int NULL_1759 = 1759; + public static final int NULL_1760 = 1760; + public static final int NULL_1761 = 1761; public static final int NULL_1765 = 1765; public static final int NULL_1766 = 1766; public static final int NULL_1769 = 1769; @@ -3242,7 +3249,6 @@ public final class NullObjectID public static final int NULL_6926 = 6926; public static final int NULL_6941 = 6941; public static final int NULL_6942 = 6942; - public static final int NULL_6944 = 6944; public static final int NULL_6949 = 6949; public static final int NULL_6954 = 6954; public static final int NULL_6955 = 6955; @@ -3434,6 +3440,7 @@ public final class NullObjectID public static final int NULL_7389 = 7389; public static final int NULL_7390 = 7390; public static final int NULL_7395 = 7395; + public static final int NULL_7410 = 7410; public static final int NULL_7411 = 7411; public static final int NULL_7412 = 7412; public static final int NULL_7413 = 7413; @@ -3450,11 +3457,39 @@ public final class NullObjectID public static final int NULL_7449 = 7449; public static final int NULL_7450 = 7450; public static final int NULL_7451 = 7451; + public static final int NULL_7455 = 7455; + public static final int NULL_7456 = 7456; + public static final int NULL_7457 = 7457; + public static final int NULL_7458 = 7458; + public static final int NULL_7459 = 7459; + public static final int NULL_7460 = 7460; + public static final int NULL_7461 = 7461; + public static final int NULL_7462 = 7462; + public static final int NULL_7467 = 7467; + public static final int NULL_7468 = 7468; + public static final int NULL_7469 = 7469; + public static final int NULL_7470 = 7470; + public static final int NULL_7471 = 7471; + public static final int NULL_7472 = 7472; + public static final int NULL_7473 = 7473; + public static final int NULL_7474 = 7474; + public static final int NULL_7475 = 7475; + public static final int NULL_7476 = 7476; public static final int NULL_7477 = 7477; public static final int NULL_7478 = 7478; public static final int NULL_7479 = 7479; public static final int NULL_7480 = 7480; public static final int NULL_7481 = 7481; + public static final int NULL_7486 = 7486; + public static final int NULL_7487 = 7487; + public static final int NULL_7488 = 7488; + public static final int NULL_7489 = 7489; + public static final int NULL_7490 = 7490; + public static final int NULL_7491 = 7491; + public static final int NULL_7492 = 7492; + public static final int NULL_7493 = 7493; + public static final int NULL_7494 = 7494; + public static final int NULL_7495 = 7495; public static final int NULL_7503 = 7503; public static final int NULL_7515 = 7515; public static final int NULL_7517 = 7517; @@ -3583,6 +3618,9 @@ public final class NullObjectID public static final int NULL_8722 = 8722; public static final int NULL_8723 = 8723; public static final int NULL_8724 = 8724; + public static final int NULL_8725 = 8725; + public static final int NULL_8726 = 8726; + public static final int NULL_8727 = 8727; public static final int NULL_8728 = 8728; public static final int NULL_8735 = 8735; public static final int NULL_8736 = 8736; @@ -4190,7 +4228,8 @@ public final class NullObjectID public static final int NULL_10069 = 10069; public static final int NULL_10070 = 10070; public static final int NULL_10071 = 10071; - public static final int NULL_10076 = 10076; + public static final int NULL_10072 = 10072; + public static final int NULL_10073 = 10073; public static final int NULL_10092 = 10092; public static final int NULL_10095 = 10095; public static final int NULL_10096 = 10096; @@ -4288,7 +4327,7 @@ public final class NullObjectID public static final int NULL_10341 = 10341; public static final int NULL_10351 = 10351; public static final int NULL_10353 = 10353; - public static final int NULL_10354 = 10354; + public static final int NULL_10356 = 10356; public static final int NULL_10363 = 10363; public static final int NULL_10364 = 10364; public static final int NULL_10365 = 10365; @@ -4393,7 +4432,8 @@ public final class NullObjectID public static final int NULL_10577 = 10577; public static final int NULL_10579 = 10579; public static final int NULL_10581 = 10581; - public static final int NULL_10584 = 10584; + public static final int NULL_10586 = 10586; + public static final int NULL_10587 = 10587; public static final int NULL_10588 = 10588; public static final int NULL_10589 = 10589; public static final int NULL_10590 = 10590; @@ -4422,6 +4462,7 @@ public final class NullObjectID public static final int NULL_10636 = 10636; public static final int NULL_10637 = 10637; public static final int NULL_10638 = 10638; + public static final int NULL_10642 = 10642; public static final int NULL_10643 = 10643; public static final int NULL_10644 = 10644; public static final int NULL_10645 = 10645; @@ -4527,6 +4568,11 @@ public final class NullObjectID public static final int NULL_10767 = 10767; public static final int NULL_10769 = 10769; public static final int NULL_10770 = 10770; + public static final int NULL_10777 = 10777; + public static final int NULL_10778 = 10778; + public static final int NULL_10779 = 10779; + public static final int NULL_10780 = 10780; + public static final int NULL_10781 = 10781; public static final int NULL_10789 = 10789; public static final int NULL_10794 = 10794; public static final int NULL_10796 = 10796; @@ -4541,9 +4587,10 @@ public final class NullObjectID public static final int NULL_10815 = 10815; public static final int NULL_10816 = 10816; public static final int NULL_10818 = 10818; + public static final int NULL_10823 = 10823; public static final int NULL_10825 = 10825; public static final int NULL_10826 = 10826; - public static final int NULL_10830 = 10830; + public static final int NULL_10828 = 10828; public static final int NULL_10835 = 10835; public static final int NULL_10837 = 10837; public static final int NULL_10838 = 10838; @@ -4624,7 +4671,6 @@ public final class NullObjectID public static final int NULL_10940 = 10940; public static final int NULL_10941 = 10941; public static final int NULL_10942 = 10942; - public static final int NULL_10943 = 10943; public static final int NULL_10946 = 10946; public static final int NULL_10947 = 10947; public static final int NULL_10948 = 10948; @@ -4802,14 +4848,10 @@ public final class NullObjectID public static final int NULL_11353 = 11353; public static final int NULL_11355 = 11355; public static final int NULL_11359 = 11359; - public static final int NULL_11362 = 11362; - public static final int NULL_11363 = 11363; - public static final int NULL_11372 = 11372; - public static final int NULL_11379 = 11379; - public static final int NULL_11387 = 11387; - public static final int NULL_11388 = 11388; public static final int NULL_11394 = 11394; - public static final int NULL_11402 = 11402; + public static final int NULL_11395 = 11395; + public static final int NULL_11396 = 11396; + public static final int NULL_11397 = 11397; public static final int NULL_11403 = 11403; public static final int NULL_11407 = 11407; public static final int NULL_11408 = 11408; @@ -4817,6 +4859,7 @@ public final class NullObjectID public static final int NULL_11420 = 11420; public static final int NULL_11421 = 11421; public static final int NULL_11422 = 11422; + public static final int NULL_11429 = 11429; public static final int NULL_11436 = 11436; public static final int NULL_11437 = 11437; public static final int NULL_11438 = 11438; @@ -4941,7 +4984,6 @@ public final class NullObjectID public static final int NULL_11622 = 11622; public static final int NULL_11623 = 11623; public static final int NULL_11628 = 11628; - public static final int NULL_11632 = 11632; public static final int NULL_11642 = 11642; public static final int NULL_11654 = 11654; public static final int NULL_11655 = 11655; @@ -6195,6 +6237,9 @@ public final class NullObjectID public static final int NULL_14394 = 14394; public static final int NULL_14396 = 14396; public static final int NULL_14397 = 14397; + public static final int NULL_14400 = 14400; + public static final int NULL_14401 = 14401; + public static final int NULL_14410 = 14410; public static final int NULL_14416 = 14416; public static final int NULL_14417 = 14417; public static final int NULL_14418 = 14418; @@ -6347,6 +6392,7 @@ public final class NullObjectID public static final int NULL_14838 = 14838; public static final int NULL_14839 = 14839; public static final int NULL_14840 = 14840; + public static final int NULL_14842 = 14842; public static final int NULL_14862 = 14862; public static final int NULL_14863 = 14863; public static final int NULL_14864 = 14864; @@ -6359,16 +6405,20 @@ public final class NullObjectID public static final int NULL_14879 = 14879; public static final int NULL_14881 = 14881; public static final int NULL_14882 = 14882; + public static final int NULL_14893 = 14893; public static final int NULL_14895 = 14895; + public static final int NULL_14900 = 14900; + public static final int NULL_14902 = 14902; + public static final int NULL_14906 = 14906; + public static final int NULL_14907 = 14907; public static final int NULL_14908 = 14908; public static final int NULL_14909 = 14909; public static final int NULL_14912 = 14912; public static final int NULL_14913 = 14913; - public static final int NULL_14925 = 14925; public static final int NULL_14926 = 14926; - public static final int NULL_14945 = 14945; - public static final int NULL_14946 = 14946; - public static final int NULL_14947 = 14947; + public static final int NULL_14933 = 14933; + public static final int NULL_14942 = 14942; + public static final int NULL_14943 = 14943; public static final int NULL_14949 = 14949; public static final int NULL_14950 = 14950; public static final int NULL_14951 = 14951; @@ -6399,13 +6449,8 @@ public final class NullObjectID public static final int NULL_14977 = 14977; public static final int NULL_14978 = 14978; public static final int NULL_14984 = 14984; - public static final int NULL_14987 = 14987; public static final int NULL_14989 = 14989; - public static final int NULL_14990 = 14990; - public static final int NULL_14991 = 14991; - public static final int NULL_14992 = 14992; public static final int NULL_14993 = 14993; - public static final int NULL_14994 = 14994; public static final int NULL_14997 = 14997; public static final int NULL_14999 = 14999; public static final int NULL_15000 = 15000; @@ -6600,11 +6645,6 @@ public final class NullObjectID public static final int NULL_15597 = 15597; public static final int NULL_15606 = 15606; public static final int NULL_15607 = 15607; - public static final int NULL_15608 = 15608; - public static final int NULL_15609 = 15609; - public static final int NULL_15610 = 15610; - public static final int NULL_15611 = 15611; - public static final int NULL_15612 = 15612; public static final int NULL_15613 = 15613; public static final int NULL_15614 = 15614; public static final int NULL_15618 = 15618; @@ -13608,10 +13648,9 @@ public final class NullObjectID public static final int NULL_28906 = 28906; public static final int NULL_28907 = 28907; public static final int NULL_28908 = 28908; + public static final int NULL_28909 = 28909; public static final int NULL_28910 = 28910; public static final int NULL_28911 = 28911; - public static final int NULL_28913 = 28913; - public static final int NULL_28914 = 28914; public static final int NULL_28916 = 28916; public static final int NULL_28917 = 28917; public static final int NULL_28918 = 28918; @@ -13726,11 +13765,6 @@ public final class NullObjectID public static final int NULL_29084 = 29084; public static final int NULL_29086 = 29086; public static final int NULL_29093 = 29093; - public static final int NULL_29094 = 29094; - public static final int NULL_29095 = 29095; - public static final int NULL_29096 = 29096; - public static final int NULL_29097 = 29097; - public static final int NULL_29099 = 29099; public static final int NULL_29109 = 29109; public static final int NULL_29110 = 29110; public static final int NULL_29134 = 29134; @@ -14812,7 +14846,6 @@ public final class NullObjectID public static final int NULL_31603 = 31603; public static final int NULL_31604 = 31604; public static final int NULL_31605 = 31605; - public static final int NULL_31607 = 31607; public static final int NULL_31608 = 31608; public static final int NULL_31614 = 31614; public static final int NULL_31615 = 31615; @@ -14864,7 +14897,6 @@ public final class NullObjectID public static final int NULL_31702 = 31702; public static final int NULL_31720 = 31720; public static final int NULL_31724 = 31724; - public static final int NULL_31725 = 31725; public static final int NULL_31727 = 31727; public static final int NULL_31728 = 31728; public static final int NULL_31729 = 31729; @@ -16154,5 +16186,28 @@ public final class NullObjectID public static final int NULL_34738 = 34738; public static final int NULL_34739 = 34739; public static final int NULL_34740 = 34740; + public static final int NULL_34779 = 34779; + public static final int NULL_34786 = 34786; + public static final int NULL_34787 = 34787; + public static final int NULL_34806 = 34806; + public static final int NULL_34807 = 34807; + public static final int NULL_34808 = 34808; + public static final int NULL_34809 = 34809; + public static final int NULL_34810 = 34810; + public static final int NULL_34811 = 34811; + public static final int NULL_34812 = 34812; + public static final int NULL_34813 = 34813; + public static final int NULL_34814 = 34814; + public static final int NULL_34815 = 34815; + public static final int NULL_34816 = 34816; + public static final int NULL_34817 = 34817; + public static final int NULL_34818 = 34818; + public static final int NULL_34819 = 34819; + public static final int NULL_34820 = 34820; + public static final int NULL_34821 = 34821; + public static final int NULL_34822 = 34822; + public static final int NULL_34823 = 34823; + public static final int NULL_34824 = 34824; + public static final int NULL_34825 = 34825; /* This file is automatically generated. Do not edit. */ } diff --git a/runelite-api/src/main/java/net/runelite/api/ObjectID.java b/runelite-api/src/main/java/net/runelite/api/ObjectID.java index 82bfa6b5d2..e31bd024d8 100644 --- a/runelite-api/src/main/java/net/runelite/api/ObjectID.java +++ b/runelite-api/src/main/java/net/runelite/api/ObjectID.java @@ -914,16 +914,9 @@ public final class ObjectID public static final int DOOR_1742 = 1742; public static final int DOOR_1743 = 1743; public static final int DOOR_1749 = 1749; - public static final int WILLOW = 1750; - public static final int OAK = 1751; - public static final int HOLLOW_TREE_1752 = 1752; - public static final int YEW = 1753; - public static final int WILLOW_1756 = 1756; - public static final int HOLLOW_TREE_1757 = 1757; - public static final int WILLOW_1758 = 1758; - public static final int MAPLE_TREE = 1759; - public static final int WILLOW_1760 = 1760; - public static final int MAGIC_TREE = 1761; + public static final int GRAPEVINE = 1753; + public static final int GRAPEVINE_1754 = 1754; + public static final int GLASS_DOOR = 1762; public static final int PUMP_AND_DRAIN = 1763; public static final int DUMMY_1764 = 1764; public static final int LEAFLETS = 1767; @@ -2518,9 +2511,9 @@ public final class ObjectID public static final int TREE_4532 = 4532; public static final int OAK_TREE = 4533; public static final int WILLOW_TREE = 4534; - public static final int MAPLE_TREE_4535 = 4535; + public static final int MAPLE_TREE = 4535; public static final int YEW_TREE = 4536; - public static final int MAGIC_TREE_4537 = 4537; + public static final int MAGIC_TREE = 4537; public static final int DEAD_TREE_4538 = 4538; public static final int TREE_4539 = 4539; public static final int OAK_TREE_4540 = 4540; @@ -3706,11 +3699,12 @@ public final class ObjectID public static final int BONE_ARCH_6938 = 6938; public static final int BONE_ARCH_6939 = 6939; public static final int BONE_ARCH_6940 = 6940; - public static final int BANK_BOOTH_6943 = 6943; - public static final int BANK_BOOTH_6945 = 6945; - public static final int BANK_BOOTH_6946 = 6946; - public static final int CLOSED_BANK_BOOTH_6947 = 6947; - public static final int BANK_DEPOSIT_BOX = 6948; + public static final int GLASS_DOOR_6943 = 6943; + public static final int EMPTY_STALL = 6944; + public static final int BAKERS_STALL = 6945; + public static final int UTENSIL_STALL = 6946; + public static final int SEED_STALL = 6947; + public static final int HERB_STALL = 6948; public static final int BOULDER_6950 = 6950; public static final int NOTHING = 6951; public static final int NOTHING_6952 = 6952; @@ -3763,7 +3757,7 @@ public final class ObjectID public static final int GIANT_DWARF_7041 = 7041; public static final int GIANT_DWARF_7043 = 7043; public static final int BUFFERS_7044 = 7044; - public static final int SEED_STALL = 7053; + public static final int SEED_STALL_7053 = 7053; public static final int NOTICE = 7054; public static final int OLD_BOOKSHELF = 7058; public static final int OLD_BOOKSHELF_7059 = 7059; @@ -3980,8 +3974,7 @@ public final class ObjectID public static final int TEAK_TABLE_7406 = 7406; public static final int TABLE_7407 = 7407; public static final int TABLE_7408 = 7408; - public static final int BANK_BOOTH_7409 = 7409; - public static final int BANK_BOOTH_7410 = 7410; + public static final int VEGETABLE_STALL = 7409; public static final int TABLE_7417 = 7417; public static final int THRONE_7418 = 7418; public static final int CABINET_7419 = 7419; @@ -4007,45 +4000,17 @@ public final class ObjectID public static final int PIANO_7444 = 7444; public static final int PIANO_STOOL_7445 = 7445; public static final int SMASHED_TABLE_7446 = 7446; - public static final int COAL_TRUCK = 7452; - public static final int ROCKS_7453 = 7453; - public static final int ROCKS_7454 = 7454; - public static final int ROCKS_7455 = 7455; - public static final int ROCKS_7456 = 7456; - public static final int ROCKS_7457 = 7457; - public static final int ROCKS_7458 = 7458; - public static final int ROCKS_7459 = 7459; - public static final int ROCKS_7460 = 7460; - public static final int ROCKS_7461 = 7461; - public static final int ROCKS_7462 = 7462; - public static final int ROCKS_7463 = 7463; - public static final int ROCKS_7464 = 7464; - public static final int PILE_OF_ROCK = 7465; - public static final int PILE_OF_ROCK_7466 = 7466; - public static final int ROCKS_7467 = 7467; - public static final int ROCKS_7468 = 7468; - public static final int ROCKS_7469 = 7469; - public static final int ROCKS_7470 = 7470; - public static final int RUNE_ESSENCE = 7471; - public static final int PORTAL_7472 = 7472; - public static final int PORTAL_7473 = 7473; - public static final int PORTAL_7474 = 7474; - public static final int PORTAL_7475 = 7475; - public static final int PORTAL_7476 = 7476; + public static final int DOOR_7452 = 7452; + public static final int DOOR_7453 = 7453; + public static final int LOCKED_DOOR = 7454; + public static final int WHEAT_7463 = 7463; + public static final int WHEAT_7464 = 7464; + public static final int WHEAT_7465 = 7465; + public static final int APPLE_TREE = 7466; public static final int STOOL_7482 = 7482; public static final int COOKING_POT_7483 = 7483; - public static final int ROCKS_7484 = 7484; - public static final int ROCKS_7485 = 7485; - public static final int ROCKS_7486 = 7486; - public static final int ROCKS_7487 = 7487; - public static final int ROCKS_7488 = 7488; - public static final int ROCKS_7489 = 7489; - public static final int ROCKS_7490 = 7490; - public static final int ROCKS_7491 = 7491; - public static final int ROCKS_7492 = 7492; - public static final int ROCKS_7493 = 7493; - public static final int ROCKS_7494 = 7494; - public static final int ROCKS_7495 = 7495; + public static final int STONE_PILE = 7484; + public static final int STONE_PILE_7485 = 7485; public static final int COUNTER_7496 = 7496; public static final int COUNTER_7497 = 7497; public static final int SHELVES_7498 = 7498; @@ -4414,7 +4379,7 @@ public final class ObjectID public static final int DEAD_WOAD_PLANT_7932 = 7932; public static final int DEAD_WOAD_PLANT_7933 = 7933; public static final int DEAD_WOAD_PLANT_7934 = 7934; - public static final int APPLE_TREE = 7935; + public static final int APPLE_TREE_7935 = 7935; public static final int APPLE_TREE_7936 = 7936; public static final int APPLE_TREE_7937 = 7937; public static final int APPLE_TREE_7938 = 7938; @@ -4917,7 +4882,7 @@ public final class ObjectID public static final int DEAD_MAPLE_8459 = 8459; public static final int DEAD_MAPLE_8460 = 8460; public static final int DEAD_MAPLE_8461 = 8461; - public static final int OAK_8462 = 8462; + public static final int OAK = 8462; public static final int OAK_8463 = 8463; public static final int OAK_8464 = 8464; public static final int OAK_8465 = 8465; @@ -5147,9 +5112,6 @@ public final class ObjectID public static final int HAY_BALE_8715 = 8715; public static final int HAYSTACK_8716 = 8716; public static final int LOOM_8717 = 8717; - public static final int PILE_OF_ROCK_8725 = 8725; - public static final int PILE_OF_ROCK_8726 = 8726; - public static final int ROCKS_8727 = 8727; public static final int STEPS = 8729; public static final int YOUNG_TREE = 8730; public static final int NET_TRAP = 8731; @@ -5887,27 +5849,26 @@ public final class ObjectID public static final int GRAND_EXCHANGE_BOOTH = 10060; public static final int GRAND_EXCHANGE_BOOTH_10061 = 10061; public static final int SACRIFICIAL_BOAT = 10068; - public static final int SIGN_10072 = 10072; - public static final int ROUGH_WALL = 10073; - public static final int TIGHTROPE = 10074; - public static final int TIGHTROPE_10075 = 10075; - public static final int NARROW_WALL = 10077; + public static final int PAINTING_10074 = 10074; + public static final int DRAWERS_10075 = 10075; + public static final int STAFF_OF_BOB_THE_CAT = 10076; + public static final int ARMOUR_10077 = 10077; public static final int CUPBOARD_10078 = 10078; public static final int ROCKS_10079 = 10079; public static final int ROCKS_10080 = 10080; public static final int ROCKS_10081 = 10081; public static final int FURNACE_10082 = 10082; public static final int BANK_BOOTH_10083 = 10083; - public static final int WALL_10084 = 10084; - public static final int GAP_10085 = 10085; - public static final int CRATE_10086 = 10086; + public static final int ARCEUUS_STATUE = 10084; + public static final int HOSIDIUS_STATUE = 10085; + public static final int LOVAKENGJ_STATUE = 10086; public static final int OMINOUS_FISHING_SPOT = 10087; public static final int OMINOUS_FISHING_SPOT_10088 = 10088; public static final int OMINOUS_FISHING_SPOT_10089 = 10089; public static final int SIGNPOST_10090 = 10090; public static final int AQUARIUM = 10091; - public static final int ROUGH_WALL_10093 = 10093; - public static final int ROOF_TOP_BEAMS = 10094; + public static final int PISCARILIUS_STATUE = 10093; + public static final int SHAYZIEN_STATUE = 10094; public static final int BLINDWEED_PATCH = 10097; public static final int BLINDWEED_PATCH_10098 = 10098; public static final int BLINDWEED_PATCH_10099 = 10099; @@ -6016,7 +5977,7 @@ public final class ObjectID public static final int CRATE_10281 = 10281; public static final int CRATES_10282 = 10282; public static final int RIVER = 10283; - public static final int TIGHTROPE_10284 = 10284; + public static final int LADDER_10284 = 10284; public static final int SACK_10286 = 10286; public static final int STAIRS_10287 = 10287; public static final int STAIRS_10288 = 10288; @@ -6070,10 +6031,10 @@ public final class ObjectID public static final int RAT_HOLE_10348 = 10348; public static final int RAT_HOLE_10349 = 10349; public static final int RAT_HOLE_10350 = 10350; - public static final int GAP_10352 = 10352; - public static final int CABLE = 10355; - public static final int ZIP_LINE = 10356; - public static final int TROPICAL_TREE_10357 = 10357; + public static final int WHITE_ROSES = 10352; + public static final int BOULDER_10354 = 10354; + public static final int BANK_BOOTH_10355 = 10355; + public static final int BANK_BOOTH_10357 = 10357; public static final int BED_10358 = 10358; public static final int BED_10359 = 10359; public static final int ROLLED_UP_RUGS_10360 = 10360; @@ -6161,10 +6122,10 @@ public final class ObjectID public static final int TAPESTRY = 10522; public static final int STAIRCASE_10525 = 10525; public static final int STAIRCASE_10526 = 10526; - public static final int ZIP_LINE_10527 = 10527; - public static final int ZIP_LINE_10528 = 10528; - public static final int ZIP_LINE_10529 = 10529; - public static final int ZIP_LINE_10530 = 10530; + public static final int BANK_BOOTH_10527 = 10527; + public static final int CLOSED_BANK_BOOTH_10528 = 10528; + public static final int BANK_DEPOSIT_BOX = 10529; + public static final int BANK_DEPOSIT_CHEST = 10530; public static final int HUMAN_FLAG = 10541; public static final int HUMAN_FLAG_10542 = 10542; public static final int DWARF_FLAG = 10543; @@ -6195,10 +6156,9 @@ public final class ObjectID public static final int BANNER_10578 = 10578; public static final int BANNER_10580 = 10580; public static final int BANNER_10582 = 10582; - public static final int TIGHTROPE_10583 = 10583; - public static final int TREE_10585 = 10585; - public static final int ROUGH_WALL_10586 = 10586; - public static final int CLOTHES_LINE = 10587; + public static final int BANK_BOOTH_10583 = 10583; + public static final int BANK_BOOTH_10584 = 10584; + public static final int CLOSED_BOOTH = 10585; public static final int ICY_CAVERN = 10595; public static final int ICY_CAVERN_10596 = 10596; public static final int DANGER_SIGN_10605 = 10605; @@ -6224,7 +6184,6 @@ public final class ObjectID public static final int ALTAR_10639 = 10639; public static final int ALTAR_10640 = 10640; public static final int DORICS_WHETSTONE = 10641; - public static final int GAP_10642 = 10642; public static final int TORCH = 10658; public static final int FIRE_10660 = 10660; public static final int CHEST_10661 = 10661; @@ -6254,11 +6213,6 @@ public final class ObjectID public static final int STAIRS_10774 = 10774; public static final int STAIRS_10775 = 10775; public static final int STAIRS_10776 = 10776; - public static final int WALL_10777 = 10777; - public static final int GAP_10778 = 10778; - public static final int GAP_10779 = 10779; - public static final int GAP_10780 = 10780; - public static final int LEDGE_10781 = 10781; public static final int ROCK_10782 = 10782; public static final int ROCK_10783 = 10783; public static final int ROCK_10784 = 10784; @@ -6281,21 +6235,20 @@ public final class ObjectID public static final int WASTE_PAPER_BIN = 10809; public static final int COUNTER_10813 = 10813; public static final int SANDPIT = 10814; - public static final int EDGE = 10817; - public static final int TALL_TREE_10819 = 10819; - public static final int GAP_10820 = 10820; - public static final int GAP_10821 = 10821; - public static final int GAP_10822 = 10822; - public static final int GAP_10823 = 10823; + public static final int ARMOUR_STAND = 10817; + public static final int WILLOW = 10819; + public static final int OAK_10820 = 10820; + public static final int HOLLOW_TREE_10821 = 10821; + public static final int YEW = 10822; public static final int FIREPLACE_10824 = 10824; public static final int FOUNTAIN_10827 = 10827; - public static final int GAP_10828 = 10828; - public static final int TIGHTROPE_10829 = 10829; - public static final int POLEVAULT = 10831; - public static final int GAP_10832 = 10832; - public static final int ROUGH_WALL_10833 = 10833; - public static final int TIGHTROPE_10834 = 10834; - public static final int HAND_HOLDS_10836 = 10836; + public static final int WILLOW_10829 = 10829; + public static final int HOLLOW_TREE_10830 = 10830; + public static final int WILLOW_10831 = 10831; + public static final int MAPLE_TREE_10832 = 10832; + public static final int WILLOW_10833 = 10833; + public static final int MAGIC_TREE_10834 = 10834; + public static final int COAL_TRUCK = 10836; public static final int DOORWAY_10848 = 10848; public static final int DOORWAY_10849 = 10849; public static final int CLIMBING_ROCKS_10851 = 10851; @@ -6323,6 +6276,7 @@ public final class ObjectID public static final int LEDGE_10887 = 10887; public static final int LEDGE_10888 = 10888; public static final int LEDGE_10889 = 10889; + public static final int ROCKS_10943 = 10943; public static final int CRATE_10944 = 10944; public static final int CRATE_10945 = 10945; public static final int VINE_PATCH_10949 = 10949; @@ -6445,7 +6399,7 @@ public final class ObjectID public static final int DOOR_11151 = 11151; public static final int DOOR_11152 = 11152; public static final int PEDESTAL_11153 = 11153; - public static final int GAP_11161 = 11161; + public static final int ROCKS_11161 = 11161; public static final int TREATED_PATCH = 11164; public static final int VINE_11166 = 11166; public static final int VINE_11168 = 11168; @@ -6562,44 +6516,48 @@ public final class ObjectID public static final int PORTAL_HOME = 11356; public static final int PORTAL_MACHINE = 11357; public static final int STAIRCASE_11358 = 11358; - public static final int GAP_11360 = 11360; - public static final int TIGHTROPE_11361 = 11361; - public static final int TIGHTROPE_11364 = 11364; - public static final int GAP_11365 = 11365; - public static final int LEDGE_11366 = 11366; - public static final int LEDGE_11367 = 11367; - public static final int LEDGE_11368 = 11368; - public static final int LEDGE_11369 = 11369; - public static final int LEDGE_11370 = 11370; - public static final int EDGE_11371 = 11371; - public static final int WALL_11373 = 11373; - public static final int GAP_11374 = 11374; - public static final int GAP_11375 = 11375; - public static final int GAP_11376 = 11376; - public static final int EDGE_11377 = 11377; - public static final int TIGHTROPE_11378 = 11378; - public static final int BASKET_11380 = 11380; - public static final int MARKET_STALL_11381 = 11381; - public static final int BANNER_11382 = 11382; - public static final int GAP_11383 = 11383; - public static final int TREE_11384 = 11384; - public static final int ROUGH_WALL_11385 = 11385; - public static final int MONKEYBARS = 11386; - public static final int TREE_11389 = 11389; - public static final int DRYING_LINE = 11390; - public static final int ROUGH_WALL_11391 = 11391; - public static final int GAP_11392 = 11392; - public static final int TIGHTROPE_11393 = 11393; - public static final int GAP_11395 = 11395; - public static final int GAP_11396 = 11396; - public static final int TIGHTROPE_11397 = 11397; + public static final int ROCKS_11360 = 11360; + public static final int ROCKS_11361 = 11361; + public static final int ROCKS_11362 = 11362; + public static final int ROCKS_11363 = 11363; + public static final int ROCKS_11364 = 11364; + public static final int ROCKS_11365 = 11365; + public static final int ROCKS_11366 = 11366; + public static final int ROCKS_11367 = 11367; + public static final int ROCKS_11368 = 11368; + public static final int ROCKS_11369 = 11369; + public static final int ROCKS_11370 = 11370; + public static final int ROCKS_11371 = 11371; + public static final int ROCKS_11372 = 11372; + public static final int ROCKS_11373 = 11373; + public static final int ROCKS_11374 = 11374; + public static final int ROCKS_11375 = 11375; + public static final int ROCKS_11376 = 11376; + public static final int ROCKS_11377 = 11377; + public static final int ROCKS_11378 = 11378; + public static final int ROCKS_11379 = 11379; + public static final int ROCKS_11380 = 11380; + public static final int ROCKS_11381 = 11381; + public static final int PILE_OF_ROCK = 11382; + public static final int PILE_OF_ROCK_11383 = 11383; + public static final int PILE_OF_ROCK_11384 = 11384; + public static final int PILE_OF_ROCK_11385 = 11385; + public static final int ROCKS_11386 = 11386; + public static final int ROCKS_11387 = 11387; + public static final int CRYSTALS = 11388; + public static final int CRYSTALS_11389 = 11389; + public static final int ROCKS_11390 = 11390; + public static final int ROCKS_11391 = 11391; + public static final int ROCKS_11392 = 11392; + public static final int EMPTY_WALL = 11393; public static final int OUR_LIVES = 11398; public static final int CAVE_ENTRANCE_11399 = 11399; public static final int WEB_11400 = 11400; public static final int SLASHED_WEB_11401 = 11401; - public static final int PILE_OF_FISH = 11404; - public static final int WOODEN_BEAMS = 11405; - public static final int GAP_11406 = 11406; + public static final int SIGN_11402 = 11402; + public static final int ROUGH_WALL = 11404; + public static final int TIGHTROPE = 11405; + public static final int TIGHTROPE_11406 = 11406; public static final int PIPE_WITH_ROPE = 11409; public static final int PIPE_11410 = 11410; public static final int ROPE_11411 = 11411; @@ -6616,8 +6574,7 @@ public final class ObjectID public static final int ROCKSLIDE_11426 = 11426; public static final int ROCKSLIDE_11427 = 11427; public static final int ROCKSLIDE_11428 = 11428; - public static final int GAP_11429 = 11429; - public static final int GAP_11430 = 11430; + public static final int NARROW_WALL = 11430; public static final int ROCKSLIDE_11431 = 11431; public static final int ROCKSLIDE_11432 = 11432; public static final int ROCKSLIDE_11433 = 11433; @@ -6693,10 +6650,11 @@ public final class ObjectID public static final int COUNTER_11626 = 11626; public static final int SMALL_TABLE_11627 = 11627; public static final int VINE_11629 = 11629; - public static final int GAP_11630 = 11630; - public static final int PLANK_11631 = 11631; - public static final int STEEP_ROOF = 11633; - public static final int GAP_11634 = 11634; + public static final int WALL_11630 = 11630; + public static final int GAP_11631 = 11631; + public static final int CRATE_11632 = 11632; + public static final int ROUGH_WALL_11633 = 11633; + public static final int ROOF_TOP_BEAMS = 11634; public static final int LADDER_11635 = 11635; public static final int TRAPDOOR_11636 = 11636; public static final int TRAPDOOR_11637 = 11637; @@ -6705,7 +6663,7 @@ public final class ObjectID public static final int HURDLE_11640 = 11640; public static final int SKULL_SLOPE = 11641; public static final int STEPPING_STONE_11643 = 11643; - public static final int ZIP_LINE_11644 = 11644; + public static final int ZIP_LINE = 11644; public static final int ZIP_LINE_11645 = 11645; public static final int ZIP_LINE_11646 = 11646; public static final int ZIP_LINE_11647 = 11647; @@ -6764,7 +6722,7 @@ public final class ObjectID public static final int DOOR_11727 = 11727; public static final int DOOR_11728 = 11728; public static final int SILK_STALL_11729 = 11729; - public static final int BAKERS_STALL = 11730; + public static final int BAKERS_STALL_11730 = 11730; public static final int GEM_STALL_11731 = 11731; public static final int FUR_STALL_11732 = 11732; public static final int SPICE_STALL_11733 = 11733; @@ -8206,23 +8164,20 @@ public final class ObjectID public static final int STOOL_14381 = 14381; public static final int BANK_CHEST_14382 = 14382; public static final int BOXES_14395 = 14395; - public static final int MYSTERIOUS_RUINS = 14398; - public static final int MYSTERIOUS_RUINS_14399 = 14399; - public static final int MYSTERIOUS_RUINS_14400 = 14400; - public static final int MYSTERIOUS_RUINS_14401 = 14401; - public static final int MYSTERIOUS_RUINS_14402 = 14402; - public static final int MYSTERIOUS_RUINS_14403 = 14403; - public static final int MYSTERIOUS_RUINS_14404 = 14404; - public static final int MYSTERIOUS_RUINS_14405 = 14405; - public static final int MYSTERIOUS_RUINS_14406 = 14406; - public static final int MYSTERIOUS_RUINS_14407 = 14407; - public static final int MYSTERIOUS_RUINS_14408 = 14408; - public static final int MYSTERIOUS_RUINS_14409 = 14409; - public static final int MYSTERIOUS_RUINS_14410 = 14410; - public static final int MYSTERIOUS_RUINS_14411 = 14411; - public static final int MYSTERIOUS_RUINS_14412 = 14412; - public static final int MYSTERIOUS_RUINS_14413 = 14413; - public static final int MYSTERIOUS_RUINS_14414 = 14414; + public static final int TIGHTROPE_14398 = 14398; + public static final int GAP_14399 = 14399; + public static final int CABLE = 14402; + public static final int ZIP_LINE_14403 = 14403; + public static final int TROPICAL_TREE_14404 = 14404; + public static final int ZIP_LINE_14405 = 14405; + public static final int ZIP_LINE_14406 = 14406; + public static final int ZIP_LINE_14407 = 14407; + public static final int ZIP_LINE_14408 = 14408; + public static final int TIGHTROPE_14409 = 14409; + public static final int TREE_14411 = 14411; + public static final int ROUGH_WALL_14412 = 14412; + public static final int CLOTHES_LINE = 14413; + public static final int GAP_14414 = 14414; public static final int STUDY_DESK_14415 = 14415; public static final int RIFT_14431 = 14431; public static final int GAS_BUBBLE = 14434; @@ -8278,7 +8233,7 @@ public final class ObjectID public static final int MUSHROOM_14540 = 14540; public static final int MUSHROOM_14541 = 14541; public static final int MUSHROOM_14542 = 14542; - public static final int STONE_PILE = 14556; + public static final int STONE_PILE_14556 = 14556; public static final int STONE_PILE_14557 = 14557; public static final int TREE_14564 = 14564; public static final int TREE_14565 = 14565; @@ -8492,19 +8447,18 @@ public final class ObjectID public static final int OBELISK_14829 = 14829; public static final int OBELISK_14830 = 14830; public static final int OBELISK_14831 = 14831; - public static final int MYSTERIOUS_RUINS_14832 = 14832; - public static final int MYSTERIOUS_RUINS_14833 = 14833; - public static final int MYSTERIOUS_RUINS_14834 = 14834; - public static final int MYSTERIOUS_RUINS_14835 = 14835; - public static final int MYSTERIOUS_RUINS_14836 = 14836; - public static final int PORTAL_14841 = 14841; - public static final int PORTAL_14842 = 14842; - public static final int PORTAL_14843 = 14843; - public static final int PORTAL_14844 = 14844; - public static final int PORTAL_14845 = 14845; - public static final int PORTAL_14846 = 14846; - public static final int PORTAL_14847 = 14847; - public static final int PORTAL_14848 = 14848; + public static final int WALL_14832 = 14832; + public static final int GAP_14833 = 14833; + public static final int GAP_14834 = 14834; + public static final int GAP_14835 = 14835; + public static final int LEDGE_14836 = 14836; + public static final int EDGE = 14841; + public static final int TALL_TREE_14843 = 14843; + public static final int GAP_14844 = 14844; + public static final int GAP_14845 = 14845; + public static final int GAP_14846 = 14846; + public static final int GAP_14847 = 14847; + public static final int GAP_14848 = 14848; public static final int CHAIR_14849 = 14849; public static final int CHAIR_14850 = 14850; public static final int TABLE_14851 = 14851; @@ -8536,52 +8490,48 @@ public final class ObjectID public static final int SPINNING_WHEEL_14889 = 14889; public static final int SAND_PIT_14890 = 14890; public static final int BED_14891 = 14891; - public static final int PORTAL_14892 = 14892; - public static final int PORTAL_14893 = 14893; - public static final int PORTAL_14894 = 14894; + public static final int TIGHTROPE_14892 = 14892; + public static final int POLEVAULT = 14894; public static final int FLAX = 14896; - public static final int ALTAR_14897 = 14897; - public static final int ALTAR_14898 = 14898; - public static final int ALTAR_14899 = 14899; - public static final int ALTAR_14900 = 14900; - public static final int ALTAR_14901 = 14901; - public static final int ALTAR_14902 = 14902; - public static final int ALTAR_14903 = 14903; - public static final int ALTAR_14904 = 14904; - public static final int ALTAR_14905 = 14905; - public static final int ALTAR_14906 = 14906; - public static final int ALTAR_14907 = 14907; + public static final int GAP_14897 = 14897; + public static final int ROUGH_WALL_14898 = 14898; + public static final int TIGHTROPE_14899 = 14899; + public static final int HAND_HOLDS_14901 = 14901; + public static final int GAP_14903 = 14903; + public static final int GAP_14904 = 14904; + public static final int TIGHTROPE_14905 = 14905; public static final int GUILD_DOOR_14910 = 14910; - public static final int ALTAR_14911 = 14911; + public static final int TIGHTROPE_14911 = 14911; public static final int SAND = 14914; public static final int SAND_14915 = 14915; public static final int BROKEN_MULTICANNON_14916 = 14916; public static final int STEPPING_STONE_14917 = 14917; public static final int STEPPING_STONE_14918 = 14918; - public static final int PILLAR_14919 = 14919; - public static final int PILLAR_14920 = 14920; - public static final int PILLAR_14921 = 14921; - public static final int PILLAR_14922 = 14922; - public static final int PILLAR_14923 = 14923; - public static final int PILLAR_14924 = 14924; - public static final int MYSTERIOUS_STONE = 14927; - public static final int MYSTERIOUS_GLOW = 14928; - public static final int MYSTERIOUS_GLOW_14929 = 14929; - public static final int MYSTERIOUS_GLOW_14930 = 14930; - public static final int MYSTERIOUS_GLOW_14931 = 14931; - public static final int MYSTERIOUS_GLOW_14932 = 14932; - public static final int MYSTERIOUS_GLOW_14933 = 14933; - public static final int RUINED_PILLAR = 14934; - public static final int RUINED_PILLAR_14935 = 14935; - public static final int PILLAR_14936 = 14936; - public static final int RUINED_PILLAR_14937 = 14937; - public static final int PILLAR_14938 = 14938; - public static final int RUINED_PILLAR_14939 = 14939; - public static final int RUINED_PILLAR_14940 = 14940; - public static final int RUINED_PILLAR_14941 = 14941; - public static final int RUBBLE_14942 = 14942; - public static final int RUBBLE_14943 = 14943; - public static final int RUBBLE_14944 = 14944; + public static final int GAP_14919 = 14919; + public static final int LEDGE_14920 = 14920; + public static final int LEDGE_14921 = 14921; + public static final int LEDGE_14922 = 14922; + public static final int LEDGE_14923 = 14923; + public static final int LEDGE_14924 = 14924; + public static final int EDGE_14925 = 14925; + public static final int WALL_14927 = 14927; + public static final int GAP_14928 = 14928; + public static final int GAP_14929 = 14929; + public static final int GAP_14930 = 14930; + public static final int EDGE_14931 = 14931; + public static final int TIGHTROPE_14932 = 14932; + public static final int CRATE_14934 = 14934; + public static final int BASKET_14935 = 14935; + public static final int MARKET_STALL_14936 = 14936; + public static final int BANNER_14937 = 14937; + public static final int GAP_14938 = 14938; + public static final int TREE_14939 = 14939; + public static final int ROUGH_WALL_14940 = 14940; + public static final int MONKEYBARS = 14941; + public static final int TREE_14944 = 14944; + public static final int DRYING_LINE = 14945; + public static final int ROUGH_WALL_14946 = 14946; + public static final int GAP_14947 = 14947; public static final int SAND_14948 = 14948; public static final int BAMBOO_DOOR_14974 = 14974; public static final int GATE_14979 = 14979; @@ -8591,7 +8541,12 @@ public final class ObjectID public static final int GATE_14983 = 14983; public static final int STRANGE_SHRINE = 14985; public static final int CHEST_14986 = 14986; + public static final int TIGHTROPE_14987 = 14987; public static final int CHEST_14988 = 14988; + public static final int GAP_14990 = 14990; + public static final int GAP_14991 = 14991; + public static final int TIGHTROPE_14992 = 14992; + public static final int PILE_OF_FISH = 14994; public static final int LADDER_14995 = 14995; public static final int LADDER_14996 = 14996; public static final int WATER_SOURCE = 14998; @@ -9011,6 +8966,11 @@ public final class ObjectID public static final int RAILING_15603 = 15603; public static final int GATE_15604 = 15604; public static final int GATE_15605 = 15605; + public static final int WOODEN_BEAMS = 15608; + public static final int GAP_15609 = 15609; + public static final int GAP_15610 = 15610; + public static final int GAP_15611 = 15611; + public static final int GAP_15612 = 15612; public static final int SNOW = 15615; public static final int SNOW_15616 = 15616; public static final int SNOW_15617 = 15617; @@ -9541,7 +9501,7 @@ public final class ObjectID public static final int LADDER_16684 = 16684; public static final int LADDER_16685 = 16685; public static final int PORTAL_16686 = 16686; - public static final int RUNE_ESSENCE_16687 = 16687; + public static final int RUNE_ESSENCE = 16687; public static final int TAR_BARREL = 16688; public static final int TANNING_BARREL = 16689; public static final int HAT_RACK = 16691; @@ -10381,7 +10341,7 @@ public final class ObjectID public static final int DOOR_18489 = 18489; public static final int DOOR_18490 = 18490; public static final int BANK_BOOTH_18491 = 18491; - public static final int CLOSED_BOOTH = 18492; + public static final int CLOSED_BOOTH_18492 = 18492; public static final int SIGNPOST_18493 = 18493; public static final int BOOKCASE_18495 = 18495; public static final int CRANE_18501 = 18501; @@ -11524,7 +11484,7 @@ public final class ObjectID public static final int SACK_PILE_20834 = 20834; public static final int SACK_PILE_20835 = 20835; public static final int LEVER_20836 = 20836; - public static final int LOCKED_DOOR = 20837; + public static final int LOCKED_DOOR_20837 = 20837; public static final int LOCKED_DOOR_20838 = 20838; public static final int ENERGY_BARRIER_20839 = 20839; public static final int EXIT_PORTAL_20843 = 20843; @@ -14077,7 +14037,7 @@ public final class ObjectID public static final int BOOKCASE_26632 = 26632; public static final int STONES_26633 = 26633; public static final int TREASURE_TRAIL_STATISTICS_26634 = 26634; - public static final int CRATE_26635 = 26635; + public static final int PLANK_26635 = 26635; public static final int CHALLENGE_PORTAL = 26642; public static final int CHALLENGE_PORTAL_26643 = 26643; public static final int CHALLENGE_PORTAL_26644 = 26644; @@ -14431,15 +14391,15 @@ public final class ObjectID public static final int BLIGHTED_GOLOVANOVA_SEEDLING_27417 = 27417; public static final int BLIGHTED_GOLOVANOVA_PLANT_27418 = 27418; public static final int BLIGHTED_GOLOVANOVA_PLANT_27419 = 27419; - public static final int BLIGHTED_GOLOVANOVA_PLANT_27420 = 27420; + public static final int GOLOVANOVA_PLANT_27420 = 27420; public static final int BLIGHTED_BOLOGANO_SEEDLING_27421 = 27421; public static final int BLIGHTED_BOLOGANO_PLANT_27422 = 27422; - public static final int BLIGHTED_BOLOGANO_PLANT_27423 = 27423; + public static final int BOLOGANO_PLANT_27423 = 27423; public static final int BLIGHTED_BOLOGANO_PLANT_27424 = 27424; public static final int BLIGHTED_LOGAVANO_SEEDLING_27425 = 27425; public static final int BLIGHTED_LOGAVANO_PLANT_27426 = 27426; public static final int BLIGHTED_LOGAVANO_PLANT_27427 = 27427; - public static final int BLIGHTED_LOGAVANO_PLANT_27428 = 27428; + public static final int LOGAVANO_PLANT_27428 = 27428; public static final int FRUIT_CART = 27429; public static final int SEED_TABLE = 27430; public static final int SACK_27431 = 27431; @@ -14451,7 +14411,7 @@ public final class ObjectID public static final int DOOR_27443 = 27443; public static final int DOOR_27444 = 27444; public static final int FARM_DOOR = 27445; - public static final int GLASS_DOOR = 27485; + public static final int GLASS_DOOR_27485 = 27485; public static final int GLASS_DOOR_27486 = 27486; public static final int GLASS_DOOR_27487 = 27487; public static final int GLASS_DOOR_27488 = 27488; @@ -15102,7 +15062,7 @@ public final class ObjectID public static final int BANK_LIGHT = 28551; public static final int BANK_LIGHT_28552 = 28552; public static final int BANK_PAPERS = 28553; - public static final int ARMOUR_STAND = 28559; + public static final int ARMOUR_STAND_28559 = 28559; public static final int ARMOUR_STAND_28560 = 28560; public static final int DRAWERS_28561 = 28561; public static final int LOVAKITE_FURNACE = 28562; @@ -15287,10 +15247,11 @@ public final class ObjectID public static final int ROPE_28897 = 28897; public static final int ROPE_28898 = 28898; public static final int ALTAR_28900 = 28900; - public static final int GRASS_28901 = 28901; - public static final int GRASS_28904 = 28904; - public static final int SOIL_28909 = 28909; - public static final int HOLE_28912 = 28912; + public static final int BOULDER_28901 = 28901; + public static final int BOULDER_28904 = 28904; + public static final int STEEP_ROOF = 28912; + public static final int GAP_28913 = 28913; + public static final int MYSTERIOUS_RUINS = 28914; public static final int HOLE_28915 = 28915; public static final int INANIMATE_ALTAR = 28922; public static final int AWAKENED_ALTAR = 28923; @@ -15353,10 +15314,15 @@ public final class ObjectID public static final int COFFER = 29087; public static final int SHRINE = 29088; public static final int LADDER_29089 = 29089; - public static final int BANK_DEPOSIT_CHEST = 29090; + public static final int MYSTERIOUS_RUINS_29090 = 29090; public static final int VENDING_SHRINE = 29091; public static final int LADDER_29092 = 29092; - public static final int ARMOUR_STAND_29098 = 29098; + public static final int MYSTERIOUS_RUINS_29094 = 29094; + public static final int MYSTERIOUS_RUINS_29095 = 29095; + public static final int MYSTERIOUS_RUINS_29096 = 29096; + public static final int MYSTERIOUS_RUINS_29097 = 29097; + public static final int MYSTERIOUS_RUINS_29098 = 29098; + public static final int MYSTERIOUS_RUINS_29099 = 29099; public static final int WELL_29100 = 29100; public static final int BARREL_29101 = 29101; public static final int ROCK_29102 = 29102; @@ -16148,9 +16114,9 @@ public final class ObjectID public static final int DOOR_30365 = 30365; public static final int DOOR_30366 = 30366; public static final int LADDER_30367 = 30367; - public static final int CRYSTALS = 30371; - public static final int CRYSTALS_30372 = 30372; - public static final int EMPTY_WALL = 30373; + public static final int MYSTERIOUS_RUINS_30371 = 30371; + public static final int MYSTERIOUS_RUINS_30372 = 30372; + public static final int MYSTERIOUS_RUINS_30373 = 30373; public static final int CAVE_30374 = 30374; public static final int TUNNEL_30375 = 30375; public static final int ROW_BOAT_30376 = 30376; @@ -16779,10 +16745,11 @@ public final class ObjectID public static final int TABLE_31581 = 31581; public static final int BANK_COUNTER_31582 = 31582; public static final int DEADMAN_SUPPLY_CHEST = 31583; - public static final int CLOSED_BOOTH_31584 = 31584; + public static final int MYSTERIOUS_RUINS_31584 = 31584; public static final int SPADE_31585 = 31585; public static final int TABLE_31587 = 31587; public static final int CAVE_ENTRANCE_31606 = 31606; + public static final int MYSTERIOUS_RUINS_31607 = 31607; public static final int STAIRS_31609 = 31609; public static final int STAIRS_31610 = 31610; public static final int LADDER_31611 = 31611; @@ -16849,6 +16816,7 @@ public final class ObjectID public static final int DRIFTWOOD_31721 = 31721; public static final int BURNING_DRIFTWOOD = 31722; public static final int WET_DRIFTWOOD = 31723; + public static final int MYSTERIOUS_RUINS_31725 = 31725; public static final int BANK_DEPOSIT_BOX_31726 = 31726; public static final int TRAPDOOR_31731 = 31731; public static final int CURTAIN_31732 = 31732; @@ -17253,8 +17221,8 @@ public final class ObjectID public static final int SKELETON_32488 = 32488; public static final int MYSTERIOUS_RUINS_32489 = 32489; public static final int MYSTERIOUS_RUINS_32490 = 32490; - public static final int PORTAL_32491 = 32491; - public static final int ALTAR_32492 = 32492; + 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_32504 = 32504; @@ -18576,5 +18544,66 @@ public final class ObjectID public static final int INCONSPICUOUS_BUSH_BEGINNER = 34734; public static final int STASH_BEGINNER = 34735; public static final int ROCKS_34741 = 34741; + public static final int MYSTERIOUS_RUINS_34742 = 34742; + public static final int MYSTERIOUS_RUINS_34743 = 34743; + public static final int MYSTERIOUS_RUINS_34744 = 34744; + public static final int MYSTERIOUS_RUINS_34745 = 34745; + public static final int MYSTERIOUS_RUINS_34746 = 34746; + public static final int MYSTERIOUS_RUINS_34747 = 34747; + public static final int PORTAL_34748 = 34748; + public static final int PORTAL_34749 = 34749; + public static final int PORTAL_34750 = 34750; + public static final int PORTAL_34751 = 34751; + public static final int PORTAL_34752 = 34752; + public static final int PORTAL_34753 = 34753; + public static final int PORTAL_34754 = 34754; + public static final int PORTAL_34755 = 34755; + public static final int PORTAL_34756 = 34756; + public static final int PORTAL_34757 = 34757; + public static final int PORTAL_34758 = 34758; + public static final int PORTAL_34759 = 34759; + public static final int ALTAR_34760 = 34760; + public static final int ALTAR_34761 = 34761; + public static final int ALTAR_34762 = 34762; + public static final int ALTAR_34763 = 34763; + public static final int ALTAR_34764 = 34764; + public static final int ALTAR_34765 = 34765; + public static final int ALTAR_34766 = 34766; + public static final int ALTAR_34767 = 34767; + public static final int ALTAR_34768 = 34768; + public static final int ALTAR_34769 = 34769; + public static final int ALTAR_34770 = 34770; + public static final int ALTAR_34771 = 34771; + public static final int ALTAR_34772 = 34772; + public static final int RUNE_ESSENCE_34773 = 34773; + public static final int PORTAL_34774 = 34774; + public static final int PORTAL_34775 = 34775; + public static final int PORTAL_34776 = 34776; + public static final int PORTAL_34777 = 34777; + public static final int PORTAL_34778 = 34778; + public static final int PILLAR_34780 = 34780; + public static final int PILLAR_34781 = 34781; + public static final int PILLAR_34782 = 34782; + public static final int PILLAR_34783 = 34783; + public static final int PILLAR_34784 = 34784; + public static final int PILLAR_34785 = 34785; + public static final int MYSTERIOUS_STONE = 34788; + public static final int MYSTERIOUS_GLOW = 34789; + public static final int MYSTERIOUS_GLOW_34790 = 34790; + public static final int MYSTERIOUS_GLOW_34791 = 34791; + public static final int MYSTERIOUS_GLOW_34792 = 34792; + public static final int MYSTERIOUS_GLOW_34793 = 34793; + public static final int MYSTERIOUS_GLOW_34794 = 34794; + public static final int RUINED_PILLAR = 34795; + public static final int RUINED_PILLAR_34796 = 34796; + public static final int PILLAR_34797 = 34797; + public static final int RUINED_PILLAR_34798 = 34798; + public static final int PILLAR_34799 = 34799; + public static final int RUINED_PILLAR_34800 = 34800; + public static final int RUINED_PILLAR_34801 = 34801; + public static final int RUINED_PILLAR_34802 = 34802; + public static final int RUBBLE_34803 = 34803; + public static final int RUBBLE_34804 = 34804; + public static final int RUBBLE_34805 = 34805; /* This file is automatically generated. Do not edit. */ } From 7c285228f07937678c054735af129badf22dc05e Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Thu, 23 May 2019 10:33:24 +0000 Subject: [PATCH 02/10] Update NPC IDs to 2019-05-23-rev180 --- .../src/main/java/net/runelite/api/NpcID.java | 57 ++++++++++++------- 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/NpcID.java b/runelite-api/src/main/java/net/runelite/api/NpcID.java index bc496b3cbe..1ab55200fd 100644 --- a/runelite-api/src/main/java/net/runelite/api/NpcID.java +++ b/runelite-api/src/main/java/net/runelite/api/NpcID.java @@ -384,13 +384,13 @@ public final class NpcID public static final int EVIL_BOB_391 = 391; public static final int SERVANT = 392; public static final int SERVANT_393 = 393; - public static final int BANKER = 394; - public static final int BANKER_395 = 395; - public static final int BANKER_396 = 396; - public static final int BANKER_397 = 397; - public static final int BANKER_398 = 398; - public static final int BANKER_399 = 399; - public static final int BANKER_400 = 400; + public static final int ROD_FISHING_SPOT = 394; + public static final int CAT = 395; + public static final int JON = 396; + public static final int TOWN_GUARD = 397; + public static final int TOWN_GUARD_398 = 398; + public static final int TOWN_GUARD_399 = 399; + public static final int TOWN_GUARD_400 = 400; public static final int TURAEL = 401; public static final int MAZCHNA = 402; public static final int VANNAKA = 403; @@ -744,7 +744,7 @@ public final class NpcID public static final int GIANT_ROC = 763; public static final int SHADOW = 764; public static final int QUEEN_SIGRID = 765; - public static final int BANKER_766 = 766; + public static final int BANKER = 766; public static final int ARNOR = 767; public static final int HAMING = 768; public static final int MOLDOF = 769; @@ -865,7 +865,6 @@ public final class NpcID public static final int GRUH = 887; public static final int IRWIN_FEASELBAUM = 888; public static final int ELUNED = 889; - public static final int ISLWYN = 890; public static final int MOSS_GIANT = 891; public static final int GOLRIE = 892; public static final int FATHER_REEN = 893; @@ -1440,7 +1439,7 @@ public final class NpcID public static final int HUNTING_EXPERT = 1503; public static final int HUNTING_EXPERT_1504 = 1504; public static final int FERRET = 1505; - public static final int ROD_FISHING_SPOT = 1506; + public static final int ROD_FISHING_SPOT_1506 = 1506; public static final int ROD_FISHING_SPOT_1507 = 1507; public static final int ROD_FISHING_SPOT_1508 = 1508; public static final int ROD_FISHING_SPOT_1509 = 1509; @@ -1551,7 +1550,7 @@ public final class NpcID public static final int BANKNOTE_EXCHANGE_MERCHANT = 1615; public static final int HIGH_PRIESTESS_ZULHARCINQA = 1616; public static final int PRIESTESS_ZULGWENWYNIG = 1617; - public static final int CAT = 1619; + public static final int CAT_1619 = 1619; public static final int CAT_1620 = 1620; public static final int CAT_1621 = 1621; public static final int CAT_1622 = 1622; @@ -3722,7 +3721,7 @@ public final class NpcID public static final int BRUNDT_THE_CHIEFTAIN = 3926; public static final int GUARD_3928 = 3928; public static final int GUARD_3929 = 3929; - public static final int TOWN_GUARD = 3930; + public static final int TOWN_GUARD_3930 = 3930; public static final int TOWN_GUARD_3931 = 3931; public static final int THORA_THE_BARKEEP = 3932; public static final int YRSA_3933 = 3933; @@ -3791,7 +3790,6 @@ public final class NpcID public static final int MOUSE = 4000; public static final int CHOMPY_CHICK = 4001; public static final int CHOMPY_CHICK_4002 = 4002; - public static final int ILFEEN = 4003; public static final int SHADOW_4004 = 4004; public static final int DARK_BEAST = 4005; public static final int MOURNER_4006 = 4006; @@ -5178,10 +5176,10 @@ public final class NpcID public static final int MURKY_MATT_RUNES = 5450; public static final int RELOBO_BLINYO_LOGS = 5451; public static final int HOFUTHAND_WEAPONS_AND_ARMOUR = 5452; - public static final int BANKER_5453 = 5453; + public static final int RESHI = 5453; public static final int THUMPY = 5454; - public static final int BANKER_5455 = 5455; - public static final int BANKER_5456 = 5456; + public static final int THOMDRIL = 5455; + public static final int KENDALL = 5456; public static final int DRUID_5457 = 5457; public static final int SUSPECT_5458 = 5458; public static final int SUSPECT_5459 = 5459; @@ -5592,8 +5590,12 @@ public final class NpcID public static final int ABYSSAL_SIRE_5891 = 5891; public static final int TZREKJAD = 5892; public static final int TZREKJAD_5893 = 5893; - public static final int PORTAL_5895 = 5895; - public static final int PORTAL_5897 = 5897; + public static final int BAST = 5894; + public static final int BANKER_5895 = 5895; + public static final int BANKER_5896 = 5896; + public static final int BANKER_5897 = 5897; + public static final int BANKER_5904 = 5904; + public static final int BANKER_5905 = 5905; public static final int PROBITA = 5906; public static final int CHAOS_ELEMENTAL_JR_5907 = 5907; public static final int ABYSSAL_SIRE_5908 = 5908; @@ -6019,8 +6021,8 @@ public final class NpcID public static final int FIDELIO = 6525; public static final int SBOTT = 6526; public static final int ROAVAR = 6527; - public static final int FERAL_VAMPYRE_6529 = 6529; - public static final int ABIDOR_CRANK_6530 = 6530; + public static final int BANKER_6529 = 6529; + public static final int BANKER_6530 = 6530; public static final int BLURBERRY = 6531; public static final int BARMAN_6532 = 6532; public static final int ROMILY_WEAKLAX = 6533; @@ -7115,8 +7117,8 @@ public final class NpcID public static final int WEVE = 7777; public static final int IRENE = 7778; public static final int BOBBING_FOSSIL = 7779; - public static final int PUFFER_FISH = 7780; - public static final int PUFFER_FISH_7781 = 7781; + public static final int ISLWYN = 7780; + public static final int PUFFER_FISH = 7781; public static final int FISH_SHOAL = 7782; public static final int CETO = 7783; public static final int MAIRIN = 7784; @@ -7847,6 +7849,17 @@ public final class NpcID 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; + public static final int ISLWYN_8675 = 8675; + public static final int ILFEEN = 8676; + public static final int ILFEEN_8677 = 8677; + public static final int FERAL_VAMPYRE_8678 = 8678; + public static final int ABIDOR_CRANK_8679 = 8679; + public static final int BANKER_8680 = 8680; + public static final int BANKER_8681 = 8681; + public static final int BANKER_8682 = 8682; + public static final int PORTAL_8684 = 8684; + public static final int PORTAL_8686 = 8686; public static final int MOSOL_REI_8696 = 8696; /* This file is automatically generated. Do not edit. */ } From 4e6c1ba8935044d5c220f1e39112678b97535cc5 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Thu, 23 May 2019 10:35:12 +0000 Subject: [PATCH 03/10] Update 180 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4f7e2deaf5..46c78ab25f 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ true true - 179 + 180 From 4d0022014c63e12dab86a9fefeecbb05b91b00dc Mon Sep 17 00:00:00 2001 From: Max Weber Date: Sun, 21 Apr 2019 05:14:33 -0600 Subject: [PATCH 04/10] runelite-client: Remove unnecessary dependency on rs-api --- runelite-client/pom.xml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index dd715d917f..b52cf8c404 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -185,12 +185,6 @@ runelite-api ${project.version} - - net.runelite.rs - runescape-api - ${project.version} - runtime - net.runelite client-patch @@ -301,12 +295,6 @@ ** - - net.runelite.rs:runescape-api - - ** - - net.runelite.pushingpixels:* From 05da1c2b49a574c3a1eb43c124ad58a8170bfbb9 Mon Sep 17 00:00:00 2001 From: Max Weber Date: Tue, 23 Apr 2019 02:11:21 -0600 Subject: [PATCH 05/10] runescape-api: Remove Protect annotation --- .../java/net/runelite/mapping/Protect.java | 40 ------------------- .../java/net/runelite/rs/api/RSClient.java | 2 - .../java/net/runelite/rs/api/RSPlayer.java | 2 - 3 files changed, 44 deletions(-) delete mode 100644 runescape-api/src/main/java/net/runelite/mapping/Protect.java diff --git a/runescape-api/src/main/java/net/runelite/mapping/Protect.java b/runescape-api/src/main/java/net/runelite/mapping/Protect.java deleted file mode 100644 index a5c780a94d..0000000000 --- a/runescape-api/src/main/java/net/runelite/mapping/Protect.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2018, Lotto - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR - * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package net.runelite.mapping; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; - -/** - * Used to indicate a method can only be called from within mixins. - * Calling methods annotated with this annotation outside mixins results in a AbstractMethodError. - * Only works in net.runelite.rs.api.* - */ -@Documented -@Retention(RetentionPolicy.RUNTIME) -public @interface Protect -{ -} diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java index 77836e550f..838a7ea344 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSClient.java @@ -31,7 +31,6 @@ import net.runelite.api.World; import net.runelite.api.widgets.Widget; import net.runelite.mapping.Construct; import net.runelite.mapping.Import; -import net.runelite.mapping.Protect; public interface RSClient extends RSGameEngine, Client { @@ -823,7 +822,6 @@ public interface RSClient extends RSGameEngine, Client void revalidateWidgetScroll(Widget[] group, Widget w, boolean postEvent); @Import("menuAction") - @Protect void menuAction(int var0, int var1, int var2, int var3, String var4, String var5, int var6, int var7); @Import("Viewport_entityCountAtMouse") diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java b/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java index bd8b0b16fb..ec8db1f005 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSPlayer.java @@ -26,7 +26,6 @@ package net.runelite.rs.api; import net.runelite.api.Player; import net.runelite.mapping.Import; -import net.runelite.mapping.Protect; public interface RSPlayer extends RSActor, Player { @@ -63,6 +62,5 @@ public interface RSPlayer extends RSActor, Player int getRsOverheadIcon(); @Import("skullIcon") - @Protect int getRsSkullIcon(); } From 7b595ea1dd5c1c8d4b416c89a91d321d381a471a Mon Sep 17 00:00:00 2001 From: Max Weber Date: Tue, 23 Apr 2019 01:26:54 -0600 Subject: [PATCH 06/10] runelite-api: Move getModelHeight to Renderable --- runelite-api/src/main/java/net/runelite/api/Actor.java | 7 ------- .../src/main/java/net/runelite/api/Renderable.java | 7 +++++-- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/Actor.java b/runelite-api/src/main/java/net/runelite/api/Actor.java index 6357a91ebc..a736b32fa4 100644 --- a/runelite-api/src/main/java/net/runelite/api/Actor.java +++ b/runelite-api/src/main/java/net/runelite/api/Actor.java @@ -153,13 +153,6 @@ public interface Actor extends Renderable @VisibleForDevtools void setSpotAnimFrame(int spotAnimFrame); - /** - * Gets the height of the actors model. - * - * @return the height - */ - int getModelHeight(); - /** * Gets the canvas area of the current tile the actor is standing on. * diff --git a/runelite-api/src/main/java/net/runelite/api/Renderable.java b/runelite-api/src/main/java/net/runelite/api/Renderable.java index 15569316a3..d8d2114a8d 100644 --- a/runelite-api/src/main/java/net/runelite/api/Renderable.java +++ b/runelite-api/src/main/java/net/runelite/api/Renderable.java @@ -31,11 +31,14 @@ public interface Renderable extends Node { /** * Gets the model of the object. - * - * @return the model */ Model getModel(); + /** + * Gets the height of the model. + */ + int getModelHeight(); + void setModelHeight(int modelHeight); void draw(int orientation, int pitchSin, int pitchCos, int yawSin, int yawCos, int x, int y, int z, long hash); From a5f498e965f0c5b5ae109c58fa25fd43d2ded16b Mon Sep 17 00:00:00 2001 From: Max Weber Date: Sun, 12 May 2019 09:37:18 -0600 Subject: [PATCH 07/10] runelite-client: Print client patch build id --- runelite-api/src/main/java/net/runelite/api/Client.java | 2 ++ .../src/main/java/net/runelite/client/rs/ClientLoader.java | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/runelite-api/src/main/java/net/runelite/api/Client.java b/runelite-api/src/main/java/net/runelite/api/Client.java index 17dd82f7bc..213bda81cd 100644 --- a/runelite-api/src/main/java/net/runelite/api/Client.java +++ b/runelite-api/src/main/java/net/runelite/api/Client.java @@ -60,6 +60,8 @@ public interface Client extends GameEngine */ Logger getLogger(); + String getBuildID(); + /** * Gets a list of all valid players from the player cache. * diff --git a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java index 56ba0799d2..fb16dda6d2 100644 --- a/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java +++ b/runelite-client/src/main/java/net/runelite/client/rs/ClientLoader.java @@ -51,6 +51,7 @@ import javax.inject.Inject; import javax.inject.Named; import javax.inject.Singleton; import lombok.extern.slf4j.Slf4j; +import net.runelite.api.Client; import static net.runelite.client.rs.ClientUpdateCheckMode.AUTO; import static net.runelite.client.rs.ClientUpdateCheckMode.NONE; import static net.runelite.client.rs.ClientUpdateCheckMode.VANILLA; @@ -220,6 +221,12 @@ public class ClientLoader Applet rs = (Applet) clientClass.newInstance(); rs.setStub(new RSAppletStub(config)); + + if (rs instanceof Client) + { + log.info("client-patch {}", ((Client) rs).getBuildID()); + } + return rs; } catch (IOException | ClassNotFoundException | InstantiationException | IllegalAccessException From 21206ce622d3ee927a090a5202c1308205ec460f Mon Sep 17 00:00:00 2001 From: Max Weber Date: Thu, 23 May 2019 05:30:39 -0600 Subject: [PATCH 08/10] client: Update broken object ids --- .../client/plugins/agility/Obstacles.java | 41 +++++++------------ .../cluescrolls/clues/CrypticClue.java | 2 +- 2 files changed, 15 insertions(+), 28 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java b/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java index 92df605a36..19f4dc565e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/agility/Obstacles.java @@ -30,20 +30,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Multimap; import java.util.List; import java.util.Set; -import static net.runelite.api.NullObjectID.NULL_10872; -import static net.runelite.api.NullObjectID.NULL_10873; -import static net.runelite.api.NullObjectID.NULL_12945; -import static net.runelite.api.NullObjectID.NULL_18083; -import static net.runelite.api.NullObjectID.NULL_18116; -import static net.runelite.api.NullObjectID.NULL_18122; -import static net.runelite.api.NullObjectID.NULL_18124; -import static net.runelite.api.NullObjectID.NULL_18129; -import static net.runelite.api.NullObjectID.NULL_18130; -import static net.runelite.api.NullObjectID.NULL_18132; -import static net.runelite.api.NullObjectID.NULL_18133; -import static net.runelite.api.NullObjectID.NULL_18135; -import static net.runelite.api.NullObjectID.NULL_18136; -import static net.runelite.api.NullObjectID.NULL_3550; +import static net.runelite.api.NullObjectID.*; import static net.runelite.api.ObjectID.*; import net.runelite.client.game.AgilityShortcut; @@ -57,15 +44,15 @@ class Obstacles PLANK_3572, PLANK_3571, PLANK_3570, ROPE_SWING, PILLAR_3578, LOW_WALL, LOG_BALANCE, LOG_BALANCE_3557, BALANCING_LEDGE_3561, BALANCING_LEDGE, MONKEY_BARS_3564, BALANCING_ROPE, HAND_HOLDS_3583, // Draynor - ROUGH_WALL, TIGHTROPE, TIGHTROPE_10075, NARROW_WALL, WALL_10084, GAP_10085, CRATE_10086, STILE_7527, + ROUGH_WALL, TIGHTROPE, TIGHTROPE_11406, NARROW_WALL, WALL_11630, GAP_11631, CRATE_11632, STILE_7527, // Al-Kharid - ROUGH_WALL_10093, TIGHTROPE_10284, CABLE, ZIP_LINE, TROPICAL_TREE_10357, ROOF_TOP_BEAMS, - TIGHTROPE_10583, GAP_10352, + ROUGH_WALL_11633, TIGHTROPE_14398, CABLE, ZIP_LINE, TROPICAL_TREE_14404, ROOF_TOP_BEAMS, + TIGHTROPE_14409, GAP_14399, // Pyramid STAIRS_10857, LOW_WALL_10865, LEDGE_10860, PLANK_10868, GAP_10882, LEDGE_10886, STAIRS_10857, GAP_10884, GAP_10859, GAP_10861, LOW_WALL_10865, GAP_10859, LEDGE_10888, PLANK_10868, CLIMBING_ROCKS_10851, DOORWAY_10855, // Varrock - ROUGH_WALL_10586, CLOTHES_LINE, GAP_10642, WALL_10777, GAP_10778, GAP_10779, GAP_10780, LEDGE_10781, EDGE, + ROUGH_WALL_14412, CLOTHES_LINE, GAP_14414, WALL_14832, GAP_14833, GAP_14834, GAP_14835, LEDGE_14836, EDGE, // Penguin STEPPING_STONE_21120, STEPPING_STONE_21126, STEPPING_STONE_21128, STEPPING_STONE_21129, STEPPING_STONE_21130, STEPPING_STONE_21131, STEPPING_STONE_21132, STEPPING_STONE_21133, @@ -73,26 +60,26 @@ class Obstacles // Barbarian ROPESWING_23131, LOG_BALANCE_23144, OBSTACLE_NET_20211, BALANCING_LEDGE_23547, LADDER_16682, CRUMBLING_WALL_1948, // Canifis - TALL_TREE_10819, GAP_10820, GAP_10821, GAP_10828, GAP_10822, POLEVAULT, GAP_10823, GAP_10832, + TALL_TREE_14843, GAP_14844, GAP_14845, GAP_14848, GAP_14846, POLEVAULT, GAP_14847, GAP_14897, // Ape atoll STEPPING_STONE_15412, TROPICAL_TREE_15414, MONKEYBARS_15417, SKULL_SLOPE_15483, ROPE_15487, TROPICAL_TREE_16062, // Falador - ROUGH_WALL_10833, TIGHTROPE_10834, HAND_HOLDS_10836, GAP_11161, GAP_11360, TIGHTROPE_11361, - TIGHTROPE_11364, GAP_11365, LEDGE_11366, LEDGE_11367, LEDGE_11369, LEDGE_11370, EDGE_11371, + ROUGH_WALL_14898, TIGHTROPE_14899, HAND_HOLDS_14901, GAP_14903, GAP_14904, TIGHTROPE_14905, + TIGHTROPE_14911, GAP_14919, LEDGE_14920, LEDGE_14921, LEDGE_14922, LEDGE_14924, EDGE_14925, // Wilderness OBSTACLE_PIPE_23137, ROPESWING_23132, STEPPING_STONE_23556, LOG_BALANCE_23542, ROCKS_23640, // Seers - WALL_11373, GAP_11374, TIGHTROPE_11378, GAP_11375, GAP_11376, EDGE_11377, + WALL_14927, GAP_14928, TIGHTROPE_14932, GAP_14929, GAP_14930, EDGE_14931, // Dorgesh-Kaan CABLE_22569, CABLE_22572, LADDER_22564, JUTTING_WALL_22552, TUNNEL_22557, PYLON_22664, CONSOLE, BOILER_22635, STAIRS_22650, STAIRS_22651, STAIRS_22609, STAIRS_22608, // Pollniveach - BASKET_11380, MARKET_STALL_11381, BANNER_11382, GAP_11383, TREE_11384, ROUGH_WALL_11385, - MONKEYBARS, TREE_11389, DRYING_LINE, + BASKET_14935, MARKET_STALL_14936, BANNER_14937, GAP_14938, TREE_14939, ROUGH_WALL_14940, + MONKEYBARS, TREE_14944, DRYING_LINE, // Rellaka - ROUGH_WALL_11391, GAP_11392, TIGHTROPE_11393, GAP_11395, GAP_11396, TIGHTROPE_11397, PILE_OF_FISH, + ROUGH_WALL_14946, GAP_14947, TIGHTROPE_14987, GAP_14990, GAP_14991, TIGHTROPE_14992, PILE_OF_FISH, // Ardougne - GAP_11406, GAP_11429, GAP_11430, STEEP_ROOF, GAP_11630, PLANK_11631, WOODEN_BEAMS, + WOODEN_BEAMS, GAP_15609, PLANK_26635, GAP_15610, GAP_15611, STEEP_ROOF, GAP_15612, // Meiyerditch NULL_12945, ROCK_17958, ROCK_17959, ROCK_17960, BOAT_17961, NULL_18122, NULL_18124, WALL_RUBBLE, WALL_RUBBLE_18038, FLOORBOARDS, FLOORBOARDS_18071, FLOORBOARDS_18072, FLOORBOARDS_18073, NULL_18129, NULL_18130, @@ -103,7 +90,7 @@ class Obstacles FLOORBOARDS_18110, FLOORBOARDS_18112, FLOORBOARDS_18111, FLOORBOARDS_18114, FLOORBOARDS_18113, NULL_18116, FLOORBOARDS_18117, FLOORBOARDS_18118, STAIRS_DOWN, WALL_17980, // Werewolf - STEPPING_STONE_11643, HURDLE, HURDLE_11639, HURDLE_11640, PIPE_11657, SKULL_SLOPE, ZIP_LINE_11644, + STEPPING_STONE_11643, HURDLE, HURDLE_11639, HURDLE_11640, PIPE_11657, SKULL_SLOPE, ZIP_LINE, ZIP_LINE_11645, ZIP_LINE_11646 ); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java index f8582fe1c0..a8129cce78 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/CrypticClue.java @@ -114,7 +114,7 @@ public class CrypticClue extends ClueScroll implements TextClueScroll, NpcClueSc new CrypticClue("I am the one who watches the giants. The giants in turn watch me. I watch with two while they watch with one. Come seek where I may be.", "Kamfreena", new WorldPoint(2845, 3539, 0), "Speak to Kamfreena on the top floor of the Warriors' Guild."), new CrypticClue("In a town where wizards are known to gather, search upstairs in a large house to the north.", "Man", 375, new WorldPoint(2593, 3108, 1), "Search the chest upstairs in the house north of Yanille Wizard's Guild. Kill a man for the key."), new CrypticClue("Probably filled with wizards socks.", "Wizard", DRAWERS_350, new WorldPoint(3116, 9562, 0), "Search the drawers in the basement of the Wizard's Tower south of Draynor Village. Kill one of the Wizards for the key. Fairy ring DIS"), - new CrypticClue("Even the seers say this clue goes right over their heads.", CRATE_26635, new WorldPoint(2707, 3488, 2), "Search the crate on the Seers Agility Course in Seers Village"), + new CrypticClue("Even the seers say this clue goes right over their heads.", CRATE_14934, new WorldPoint(2707, 3488, 2), "Search the crate on the Seers Agility Course in Seers Village"), new CrypticClue("Speak to a Wyse man.", "Wyson the gardener", new WorldPoint(3026, 3378, 0), "Talk to Wyson the gardener at Falador Park."), new CrypticClue("You'll need to look for a town with a central fountain. Look for a locked chest in the town's chapel.", "Monk" , CLOSED_CHEST_5108, new WorldPoint(3256, 3487, 0), "Search the chest by the stairs in the Varrock church. Kill a Monk in Ardougne Monastery to obtain the key."), new CrypticClue("Talk to Ambassador Spanfipple in the White Knights Castle.", "Ambassador Spanfipple", new WorldPoint(2979, 3340, 0), "Ambassador Spanfipple can be found roaming on the first floor of the White Knights Castle."), From 8be5d2c5959163bc5c7afa206f3af77d28765e18 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Thu, 23 May 2019 11:52:45 +0000 Subject: [PATCH 09/10] [maven-release-plugin] prepare release runelite-parent-1.5.24 --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- http-api/pom.xml | 2 +- http-service/pom.xml | 2 +- pom.xml | 4 ++-- protocol-api/pom.xml | 2 +- protocol/pom.xml | 2 +- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-mixins/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- runescape-api/pom.xml | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 279c8f05ee..124392343d 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.24-SNAPSHOT + 1.5.24 cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index acd78bee14..86a93dda4b 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.24-SNAPSHOT + 1.5.24 Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 183d47e500..5ef18b68fe 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.24-SNAPSHOT + 1.5.24 cache diff --git a/http-api/pom.xml b/http-api/pom.xml index d87f850ccc..2cf99a9678 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.24-SNAPSHOT + 1.5.24 Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index b018f6a016..d077bcf2c7 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.24-SNAPSHOT + 1.5.24 Web Service diff --git a/pom.xml b/pom.xml index 46c78ab25f..d3a6e07c00 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.24-SNAPSHOT + 1.5.24 pom RuneLite @@ -59,7 +59,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - HEAD + runelite-parent-1.5.24 diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml index ed9eb46e42..e5c2362c08 100644 --- a/protocol-api/pom.xml +++ b/protocol-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.24-SNAPSHOT + 1.5.24 protocol-api diff --git a/protocol/pom.xml b/protocol/pom.xml index 0566215d29..9038773a42 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.24-SNAPSHOT + 1.5.24 protocol diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index 065207af3d..da3bef7702 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.24-SNAPSHOT + 1.5.24 runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index b52cf8c404..1db0a9bb44 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.24-SNAPSHOT + 1.5.24 client diff --git a/runelite-mixins/pom.xml b/runelite-mixins/pom.xml index d1e4cac819..39af3ae2c9 100644 --- a/runelite-mixins/pom.xml +++ b/runelite-mixins/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.24-SNAPSHOT + 1.5.24 mixins diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index 98e762168a..fefb3506b3 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.24-SNAPSHOT + 1.5.24 script-assembler-plugin diff --git a/runescape-api/pom.xml b/runescape-api/pom.xml index 3990dada08..385ddc491b 100644 --- a/runescape-api/pom.xml +++ b/runescape-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.24-SNAPSHOT + 1.5.24 net.runelite.rs From 46f5a51477ffccb01fb7b9cfdebfb6d35131d447 Mon Sep 17 00:00:00 2001 From: Runelite auto updater Date: Thu, 23 May 2019 11:52:51 +0000 Subject: [PATCH 10/10] [maven-release-plugin] prepare for next development iteration --- cache-client/pom.xml | 2 +- cache-updater/pom.xml | 2 +- cache/pom.xml | 2 +- http-api/pom.xml | 2 +- http-service/pom.xml | 2 +- pom.xml | 4 ++-- protocol-api/pom.xml | 2 +- protocol/pom.xml | 2 +- runelite-api/pom.xml | 2 +- runelite-client/pom.xml | 2 +- runelite-mixins/pom.xml | 2 +- runelite-script-assembler-plugin/pom.xml | 2 +- runescape-api/pom.xml | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cache-client/pom.xml b/cache-client/pom.xml index 124392343d..a8a1ad514a 100644 --- a/cache-client/pom.xml +++ b/cache-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.24 + 1.5.25-SNAPSHOT cache-client diff --git a/cache-updater/pom.xml b/cache-updater/pom.xml index 86a93dda4b..95e8efbb7a 100644 --- a/cache-updater/pom.xml +++ b/cache-updater/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.24 + 1.5.25-SNAPSHOT Cache Updater diff --git a/cache/pom.xml b/cache/pom.xml index 5ef18b68fe..8ba9aaf1e2 100644 --- a/cache/pom.xml +++ b/cache/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.24 + 1.5.25-SNAPSHOT cache diff --git a/http-api/pom.xml b/http-api/pom.xml index 2cf99a9678..9cfe444424 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.24 + 1.5.25-SNAPSHOT Web API diff --git a/http-service/pom.xml b/http-service/pom.xml index d077bcf2c7..2178d7b2ca 100644 --- a/http-service/pom.xml +++ b/http-service/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.24 + 1.5.25-SNAPSHOT Web Service diff --git a/pom.xml b/pom.xml index d3a6e07c00..66f0a9491d 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.runelite runelite-parent - 1.5.24 + 1.5.25-SNAPSHOT pom RuneLite @@ -59,7 +59,7 @@ https://github.com/runelite/runelite scm:git:git://github.com/runelite/runelite scm:git:git@github.com:runelite/runelite - runelite-parent-1.5.24 + HEAD diff --git a/protocol-api/pom.xml b/protocol-api/pom.xml index e5c2362c08..7921cd6527 100644 --- a/protocol-api/pom.xml +++ b/protocol-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.24 + 1.5.25-SNAPSHOT protocol-api diff --git a/protocol/pom.xml b/protocol/pom.xml index 9038773a42..56bf7a91e5 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.24 + 1.5.25-SNAPSHOT protocol diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml index da3bef7702..628b777879 100644 --- a/runelite-api/pom.xml +++ b/runelite-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.24 + 1.5.25-SNAPSHOT runelite-api diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml index 1db0a9bb44..993d1b43ff 100644 --- a/runelite-client/pom.xml +++ b/runelite-client/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.24 + 1.5.25-SNAPSHOT client diff --git a/runelite-mixins/pom.xml b/runelite-mixins/pom.xml index 39af3ae2c9..a22ac12e1f 100644 --- a/runelite-mixins/pom.xml +++ b/runelite-mixins/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.24 + 1.5.25-SNAPSHOT mixins diff --git a/runelite-script-assembler-plugin/pom.xml b/runelite-script-assembler-plugin/pom.xml index fefb3506b3..7b64643772 100644 --- a/runelite-script-assembler-plugin/pom.xml +++ b/runelite-script-assembler-plugin/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.24 + 1.5.25-SNAPSHOT script-assembler-plugin diff --git a/runescape-api/pom.xml b/runescape-api/pom.xml index 385ddc491b..7d49ad3e13 100644 --- a/runescape-api/pom.xml +++ b/runescape-api/pom.xml @@ -29,7 +29,7 @@ net.runelite runelite-parent - 1.5.24 + 1.5.25-SNAPSHOT net.runelite.rs