ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'cache-code-2021-2-23'

Browse Source
This commit is contained in:
Max Weber
2021-02-24 04:39:45 -07:00
parent f7a7d3c1fc c2f27fcdac
commit 03058a7a32
9 changed files with 196 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/ItemID.java
+20 -1
View File
@@ -11620,7 +11620,7 @@ public final class ItemID
public static final int RED_ICON_25241 = 25241;
public static final int RED_ICON_25242 = 25242;
public static final int RED_ICON_25243 = 25243;
public static final int OLD_KEY_25244 = 25244;
public static final int DARK_KEY = 25244;
public static final int RING_OF_SUFFERING_I_25246 = 25246;
public static final int RING_OF_SUFFERING_RI_25248 = 25248;
public static final int SALVE_AMULETI_25250 = 25250;
@@ -11751,5 +11751,24 @@ public final class ItemID
public static final int CRYSTAL_HELM_BETA = 25495;
public static final int CRYSTAL_BODY_BETA = 25496;
public static final int CRYSTAL_LEGS_BETA = 25497;
public static final int CLUE_SCROLL_ELITE_25498 = 25498;
public static final int CLUE_SCROLL_ELITE_25499 = 25499;
public static final int CURSED_BANANA = 25500;
public static final int BANANA_CAPE = 25502;
public static final int LIST_OF_MONKEY_SIGHTINGS = 25504;
public static final int PREMIUM_BANANA = 25505;
public static final int BAMBOO = 25506;
public static final int MONKEY_CAGE = 25507;
public static final int DONIES_CAGED_MONKEY = 25508;
public static final int BOBS_CAGED_MONKEY = 25509;
public static final int AERECKS_CAGED_MONKEY = 25510;
public static final int COWS_CAGED_MONKEY = 25511;
public static final int UNICORNS_CAGED_MONKEY = 25512;
public static final int SHEEPS_CAGED_MONKEY = 25513;
public static final int UNICORN_HORN_25514 = 25514;
public static final int DHAROKS_PLATEBODY_25515 = 25515;
public static final int DHAROKS_GREATAXE_25516 = 25516;
public static final int VOLATILE_NIGHTMARE_STAFF_25517 = 25517;
public static final int ANCESTRAL_HAT_25518 = 25518;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+44 -3
View File
@@ -885,7 +885,6 @@ public final class NpcID
public static final int CLAY_GOLEM = 917;
public static final int CLAY_GOLEM_918 = 918;
public static final int GHOST_920 = 920;
public static final int FATHER_AERECK = 921;
public static final int RESTLESS_GHOST = 922;
public static final int FATHER_URHNEY = 923;
public static final int SKELETON_924 = 924;
@@ -2638,7 +2637,6 @@ public final class NpcID
public static final int PIGLET_2809 = 2809;
public static final int PIGLET_2810 = 2810;
public static final int PIGLET_2811 = 2811;
public static final int BOB_2812 = 2812;
public static final int SHOP_KEEPER = 2813;
public static final int SHOP_ASSISTANT = 2814;
public static final int SHOP_KEEPER_2815 = 2815;
@@ -6164,7 +6162,6 @@ public final class NpcID
public static final int LAMMY_LANGLE = 6814;
public static final int MAN_6815 = 6815;
public static final int GEE = 6816;
public static final int DONIE = 6817;
public static final int MAN_6818 = 6818;
public static final int TOWN_CRIER_6823 = 6823;
public static final int GIANT_BAT_6824 = 6824;
@@ -8922,14 +8919,58 @@ public final class NpcID
public static final int DUCK_10546 = 10546;
public static final int DUCK_10547 = 10547;
public static final int CHICKEN_10556 = 10556;
public static final int ANCIENT_GHOST = 10557;
public static final int ANCIENT_GHOST_10558 = 10558;
public static final int SCRUBFOOT = 10559;
public static final int GARL = 10560;
public static final int RED_FIREFLIES = 10561;
public static final int DONIE = 10562;
public static final int DONIE_10563 = 10563;
public static final int GREEN_FIREFLIES = 10564;
public static final int FATHER_AERECK = 10565;
public static final int GOBLIN_10566 = 10566;
public static final int GOBLIN_10567 = 10567;
public static final int FATHER_AERECK_10568 = 10568;
public static final int DUKE_HORACIO_10569 = 10569;
public static final int AWOWOGEI_10570 = 10570;
public static final int ZEKE_10571 = 10571;
public static final int ELUNED_10572 = 10572;
public static final int MOFINA_10573 = 10573;
public static final int BOB_10574 = 10574;
public static final int FATHER_AERECK_10575 = 10575;
public static final int DONIE_10576 = 10576;
public static final int MONKEY_ON_COW = 10577;
public static final int SHEEP_10578 = 10578;
public static final int MONKEY_ON_UNICORN = 10579;
public static final int BOB_10580 = 10580;
public static final int BOB_10581 = 10581;
public static final int BOB_10582 = 10582;
public static final int DONIE_10583 = 10583;
public static final int DONIE_10584 = 10584;
public static final int DONIE_10585 = 10585;
public static final int DONIE_10586 = 10586;
public static final int FATHER_AERECK_10587 = 10587;
public static final int FATHER_AERECK_10588 = 10588;
public static final int URIUM_SHADE = 10589;
public static final int DAMPE = 10590;
public static final int UNDEAD_ZEALOT = 10591;
public static final int UNDEAD_ZEALOT_10592 = 10592;
public static final int FATHER_AERECK_10593 = 10593;
public static final int SHEEP_10594 = 10594;
public static final int SHEEP_10595 = 10595;
public static final int SHEEP_10596 = 10596;
public static final int SHEEP_10597 = 10597;
public static final int COW_10598 = 10598;
public static final int MONKEY_ON_COW_10599 = 10599;
public static final int MONKEY_ON_COW_10600 = 10600;
public static final int COW_10601 = 10601;
public static final int MONKEY_ON_UNICORN_10603 = 10603;
public static final int MONKEY_ON_UNICORN_10604 = 10604;
public static final int MONKEY_ON_UNICORN_10605 = 10605;
public static final int UNICORN_10607 = 10607;
public static final int UNICORN_10608 = 10608;
public static final int UNICORN1337KILR = 10609;
public static final int BOB_10610 = 10610;
public static final int BOB_10611 = 10611;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+2
View File
@@ -13536,5 +13536,7 @@ public final class NullItemID
public static final int NULL_25480 = 25480;
public static final int NULL_25482 = 25482;
public static final int NULL_25483 = 25483;
public static final int NULL_25501 = 25501;
public static final int NULL_25503 = 25503;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullNpcID.java
+13
View File
@@ -41,6 +41,7 @@ public final class NullNpcID
public static final int NULL_915 = 915;
public static final int NULL_916 = 916;
public static final int NULL_919 = 919;
public static final int NULL_921 = 921;
public static final int NULL_1023 = 1023;
public static final int NULL_1033 = 1033;
public static final int NULL_1034 = 1034;
@@ -173,6 +174,7 @@ public final class NullNpcID
public static final int NULL_2779 = 2779;
public static final int NULL_2780 = 2780;
public static final int NULL_2781 = 2781;
public static final int NULL_2812 = 2812;
public static final int NULL_2831 = 2831;
public static final int NULL_2934 = 2934;
public static final int NULL_2935 = 2935;
@@ -641,6 +643,7 @@ public final class NullNpcID
public static final int NULL_6808 = 6808;
public static final int NULL_6809 = 6809;
public static final int NULL_6810 = 6810;
public static final int NULL_6817 = 6817;
public static final int NULL_6819 = 6819;
public static final int NULL_6820 = 6820;
public static final int NULL_6821 = 6821;
@@ -1618,5 +1621,15 @@ public final class NullNpcID
public static final int NULL_10553 = 10553;
public static final int NULL_10554 = 10554;
public static final int NULL_10555 = 10555;
public static final int NULL_10602 = 10602;
public static final int NULL_10606 = 10606;
public static final int NULL_10612 = 10612;
public static final int NULL_10613 = 10613;
public static final int NULL_10614 = 10614;
public static final int NULL_10615 = 10615;
public static final int NULL_10616 = 10616;
public static final int NULL_10617 = 10617;
public static final int NULL_10618 = 10618;
public static final int NULL_10619 = 10619;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+58 -7
View File
@@ -19970,13 +19970,7 @@ public final class NullObjectID
public static final int NULL_40720 = 40720;
public static final int NULL_40721 = 40721;
public static final int NULL_40722 = 40722;
public static final int NULL_40724 = 40724;
public static final int NULL_40726 = 40726;
public static final int NULL_40727 = 40727;
public static final int NULL_40729 = 40729;
public static final int NULL_40730 = 40730;
public static final int NULL_40740 = 40740;
public static final int NULL_40743 = 40743;
public static final int NULL_40741 = 40741;
public static final int NULL_40747 = 40747;
public static final int NULL_40748 = 40748;
public static final int NULL_40749 = 40749;
@@ -20001,13 +19995,70 @@ public final class NullObjectID
public static final int NULL_40898 = 40898;
public static final int NULL_40907 = 40907;
public static final int NULL_40908 = 40908;
public static final int NULL_40918 = 40918;
public static final int NULL_40919 = 40919;
public static final int NULL_40920 = 40920;
public static final int NULL_40921 = 40921;
public static final int NULL_40922 = 40922;
public static final int NULL_40923 = 40923;
public static final int NULL_40924 = 40924;
public static final int NULL_40925 = 40925;
public static final int NULL_40926 = 40926;
public static final int NULL_40927 = 40927;
public static final int NULL_40928 = 40928;
public static final int NULL_40929 = 40929;
public static final int NULL_40930 = 40930;
public static final int NULL_40931 = 40931;
public static final int NULL_40934 = 40934;
public static final int NULL_40935 = 40935;
public static final int NULL_40936 = 40936;
public static final int NULL_40939 = 40939;
public static final int NULL_40940 = 40940;
public static final int NULL_40941 = 40941;
public static final int NULL_40943 = 40943;
public static final int NULL_40958 = 40958;
public static final int NULL_40960 = 40960;
public static final int NULL_40961 = 40961;
public static final int NULL_40962 = 40962;
public static final int NULL_40973 = 40973;
public static final int NULL_40974 = 40974;
public static final int NULL_40975 = 40975;
public static final int NULL_40976 = 40976;
public static final int NULL_40977 = 40977;
public static final int NULL_40978 = 40978;
public static final int NULL_40979 = 40979;
public static final int NULL_40980 = 40980;
public static final int NULL_40981 = 40981;
public static final int NULL_40983 = 40983;
public static final int NULL_40984 = 40984;
public static final int NULL_40985 = 40985;
public static final int NULL_40986 = 40986;
public static final int NULL_40987 = 40987;
public static final int NULL_40988 = 40988;
public static final int NULL_40989 = 40989;
public static final int NULL_40990 = 40990;
public static final int NULL_40991 = 40991;
public static final int NULL_40992 = 40992;
public static final int NULL_40993 = 40993;
public static final int NULL_40994 = 40994;
public static final int NULL_40995 = 40995;
public static final int NULL_40996 = 40996;
public static final int NULL_40997 = 40997;
public static final int NULL_40998 = 40998;
public static final int NULL_40999 = 40999;
public static final int NULL_41000 = 41000;
public static final int NULL_41001 = 41001;
public static final int NULL_41002 = 41002;
public static final int NULL_41003 = 41003;
public static final int NULL_41004 = 41004;
public static final int NULL_41005 = 41005;
public static final int NULL_41006 = 41006;
public static final int NULL_41007 = 41007;
public static final int NULL_41008 = 41008;
public static final int NULL_41009 = 41009;
public static final int NULL_41010 = 41010;
public static final int NULL_41011 = 41011;
public static final int NULL_41012 = 41012;
public static final int NULL_41022 = 41022;
public static final int NULL_41191 = 41191;
public static final int NULL_41192 = 41192;
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+40 -3
View File
@@ -923,11 +923,13 @@ public final class ObjectID
public static final int SAILS = 1779;
public static final int SAILS_1780 = 1780;
public static final int FLOUR_BIN = 1782;
public static final int WALL_1796 = 1796;
public static final int WATERFALL_ROCKS = 1797;
public static final int DOOR_1804 = 1804;
public static final int DOOR_1805 = 1805;
public static final int WEB_1810 = 1810;
public static final int SLICED_WEB = 1811;
public static final int CRATE_1812 = 1812;
public static final int BANDAGE_TABLE = 1813;
public static final int LEVER_1814 = 1814;
public static final int LEVER_1816 = 1816;
@@ -20737,9 +20739,14 @@ public final class ObjectID
public static final int BARREL_40590 = 40590;
public static final int TREE_40715 = 40715;
public static final int TREE_40716 = 40716;
public static final int FENCE_40723 = 40723;
public static final int CRATE_40723 = 40723;
public static final int CRATES_40724 = 40724;
public static final int ANVIL_40725 = 40725;
public static final int CRATES_40726 = 40726;
public static final int BARREL_40727 = 40727;
public static final int FIRE_40728 = 40728;
public static final int STOOL_40729 = 40729;
public static final int TABLE_40730 = 40730;
public static final int TENT_40731 = 40731;
public static final int BROKEN_POTTERS_WHEEL = 40732;
public static final int POTTERS_WHEEL_40733 = 40733;
@@ -20749,8 +20756,9 @@ public final class ObjectID
public static final int OPENING_40737 = 40737;
public static final int BONES_40738 = 40738;
public static final int CHEST_40739 = 40739;
public static final int CHEST_40741 = 40741;
public static final int LOCKED_CHEST_40742 = 40742;
public static final int CHEST_40740 = 40740;
public static final int DARK_CHEST = 40742;
public static final int DARK_CHEST_40743 = 40743;
public static final int BARREL_40744 = 40744;
public static final int LADDER_40745 = 40745;
public static final int LADDER_40746 = 40746;
@@ -20903,6 +20911,35 @@ public final class ObjectID
public static final int STATUE_40917 = 40917;
public static final int EVERGREEN_40932 = 40932;
public static final int EVERGREEN_40933 = 40933;
public static final int OLD_STALL_40937 = 40937;
public static final int CART_40938 = 40938;
public static final int GALLOWS_40942 = 40942;
public static final int HEROIC_STATUE_40944 = 40944;
public static final int STONE_TABLE_40945 = 40945;
public static final int ROCK_40946 = 40946;
public static final int SMALL_ROCK_40947 = 40947;
public static final int ROCK_40948 = 40948;
public static final int FURNACE_40949 = 40949;
public static final int DEAD_TREE_40950 = 40950;
public static final int DEAD_TREE_40951 = 40951;
public static final int ROOTS_40952 = 40952;
public static final int ROOTS_40953 = 40953;
public static final int ROOTS_40954 = 40954;
public static final int UNICORN = 40955;
public static final int ROCKS_40956 = 40956;
public static final int ROCKS_40957 = 40957;
public static final int ROPE_40959 = 40959;
public static final int BAMBOO_MONKEY_TRAP = 40963;
public static final int BANANA_BARREL = 40964;
public static final int BAMBOO_BARREL = 40965;
public static final int CAGED_MONKEY_BOB = 40966;
public static final int CAGED_MONKEY_DONIE = 40967;
public static final int CAGED_MONKEY_AERECK = 40968;
public static final int CAGED_MONKEY_UNICORN = 40969;
public static final int CAGED_MONKEY_COW = 40970;
public static final int CAGED_MONKEY_SHEEP = 40971;
public static final int FIREWORKS = 40972;
public static final int POST_40982 = 40982;
public static final int POTION_OF_POWER_TABLE_41023 = 41023;
public static final int PEDESTAL_SPACE = 41024;
public static final int PEDESTAL_SPACE_41025 = 41025;
runelite-api/src/main/java/net/runelite/api/ScriptID.java
+1 -1
View File
@@ -318,7 +318,7 @@ public final class ScriptID
* <li>int (WidgetID) drag parent</li>
* </ul>
*/
@ScriptArguments(integer = 7)
@ScriptArguments(integer = 8, string = 1)
public static final int SETTINGS_SLIDER_CHOOSE_ONOP = 3885;
/**
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
+1 -1
View File
@@ -906,7 +906,7 @@ public class WidgetID
static class LmsKDA
{
static final int INFO = 5;
static final int INFO = 6;
}
static class AdventureLog
runelite-client/src/main/resources/item_variations.json
+17 -8
View File
@@ -184,7 +184,8 @@
],
"unicorn horn": [
237,
1487
1487,
25514
],
"wine of zamorak": [
245,
@@ -1353,7 +1354,9 @@
23817,
24253,
24493,
24773
24773,
25498,
25499
],
"radimus notes": [
714,
@@ -3939,7 +3942,8 @@
4887,
4888,
4889,
4890
4890,
25516
],
"dharoks platebody": [
4720,
@@ -3947,7 +3951,8 @@
4893,
4894,
4895,
4896
4896,
25515
],
"dharoks platelegs": [
4722,
@@ -8561,6 +8566,10 @@
21009,
21206
],
"ancestral hat": [
21018,
25518
],
"dragon harpoon": [
21028,
25373
@@ -8967,10 +8976,6 @@
22405,
22446
],
"old key": [
22428,
25244
],
"battlemage potion": [
22449,
22452,
@@ -9422,6 +9427,10 @@
24418,
24524
],
"volatile nightmare staff": [
24424,
25517
],
"iced gingerbread shield": [
24438,
24439,