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

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

Browse Source
This commit is contained in:
ThatGamerBlue
2021-05-19 13:21:08 +01:00
parent 29a3d313a4 a5e39e72af
commit bffed84f28
43 changed files with 2516 additions and 1047 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/ItemID.java
+19
View File
@@ -11859,5 +11859,24 @@ public final class ItemID
public static final int UNGAEL_LAB_NOTES = 25702;
public static final int LITHKREN_VAULT_NOTES = 25704;
public static final int DUSTY_NOTE = 25706;
public static final int BOARD_GAME_PIECE_25708 = 25708;
public static final int STOOL_25710 = 25710;
public static final int STOOL_25711 = 25711;
public static final int CLAN_CLOAK = 25712;
public static final int CLAN_CLOAK_25714 = 25714;
public static final int CLAN_CLOAK_25715 = 25715;
public static final int CLAN_CLOAK_25716 = 25716;
public static final int CLAN_CLOAK_25717 = 25717;
public static final int CLAN_CLOAK_25718 = 25718;
public static final int CLAN_CLOAK_25719 = 25719;
public static final int CLAN_CLOAK_25720 = 25720;
public static final int CLAN_VEXILLUM = 25721;
public static final int CLAN_VEXILLUM_25723 = 25723;
public static final int CLAN_VEXILLUM_25724 = 25724;
public static final int CLAN_VEXILLUM_25725 = 25725;
public static final int CLAN_VEXILLUM_25726 = 25726;
public static final int CLAN_VEXILLUM_25727 = 25727;
public static final int CLAN_VEXILLUM_25728 = 25728;
public static final int CLAN_VEXILLUM_25729 = 25729;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+29 -1
View File
@@ -5970,7 +5970,7 @@ public final class NpcID
public static final int GUARD_6583 = 6583;
public static final int URI_6584 = 6584;
public static final int SHERLOCK = 6586;
public static final int ARMADYLIAN_GUARD = 6587;
public static final int ARMADYLEAN_GUARD = 6587;
public static final int BANDOSIAN_GUARD = 6588;
public static final int DR_FORD = 6589;
public static final int SISTER_SCAROPHIA = 6590;
@@ -7742,6 +7742,8 @@ public final class NpcID
public static final int THIRD_AGE_RANGER = 8636;
public static final int THIRD_AGE_MAGE = 8637;
public static final int URI_8638 = 8638;
public static final int FIRE_8643 = 8643;
public static final int SARADOMINIST_RECRUITER = 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;
@@ -9066,5 +9068,31 @@ public final class NpcID
public static final int KOUREND_GUARD_10729 = 10729;
public static final int KOUREND_HEAD_GUARD_10730 = 10730;
public static final int ARCHER_10731 = 10731;
public static final int ZAMORAKIAN_RECRUITER = 10732;
public static final int MEREDITH = 10733;
public static final int BANKER_10734 = 10734;
public static final int BANKER_10735 = 10735;
public static final int BANKER_10736 = 10736;
public static final int BANKER_10737 = 10737;
public static final int RAQUEEL = 10739;
public static final int RAQUEEL_10740 = 10740;
public static final int RAQUEEL_10741 = 10741;
public static final int RAQUEEL_10742 = 10742;
public static final int RAQUEEL_10743 = 10743;
public static final int RAQUEEL_10744 = 10744;
public static final int RAQUEEL_10745 = 10745;
public static final int RAQUEEL_10746 = 10746;
public static final int GEM = 10748;
public static final int GEM_10749 = 10749;
public static final int GEM_10750 = 10750;
public static final int GEM_10751 = 10751;
public static final int GEM_10752 = 10752;
public static final int GEM_10753 = 10753;
public static final int GEM_10754 = 10754;
public static final int GEM_10755 = 10755;
public static final int GARDENER_JAY_JR = 10756;
public static final int GARDENER_JAY_JR_10757 = 10757;
public static final int GARDENER_JAY_JR_10758 = 10758;
public static final int CLERK_10759 = 10759;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+3
View File
@@ -13638,5 +13638,8 @@ public final class NullItemID
public static final int NULL_25703 = 25703;
public static final int NULL_25705 = 25705;
public static final int NULL_25707 = 25707;
public static final int NULL_25709 = 25709;
public static final int NULL_25713 = 25713;
public static final int NULL_25722 = 25722;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullNpcID.java
+2
View File
@@ -1647,5 +1647,7 @@ public final class NullNpcID
public static final int NULL_10711 = 10711;
public static final int NULL_10712 = 10712;
public static final int NULL_10713 = 10713;
public static final int NULL_10738 = 10738;
public static final int NULL_10747 = 10747;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+70
View File
@@ -18053,6 +18053,7 @@ public final class NullObjectID
public static final int NULL_37481 = 37481;
public static final int NULL_37490 = 37490;
public static final int NULL_37491 = 37491;
public static final int NULL_37582 = 37582;
public static final int NULL_37623 = 37623;
public static final int NULL_37624 = 37624;
public static final int NULL_37625 = 37625;
@@ -19144,6 +19145,13 @@ public final class NullObjectID
public static final int NULL_39123 = 39123;
public static final int NULL_39124 = 39124;
public static final int NULL_39125 = 39125;
public static final int NULL_39139 = 39139;
public static final int NULL_39140 = 39140;
public static final int NULL_39141 = 39141;
public static final int NULL_39142 = 39142;
public static final int NULL_39143 = 39143;
public static final int NULL_39144 = 39144;
public static final int NULL_39145 = 39145;
public static final int NULL_39146 = 39146;
public static final int NULL_39147 = 39147;
public static final int NULL_39148 = 39148;
@@ -20035,6 +20043,7 @@ public final class NullObjectID
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_41005 = 41005;
public static final int NULL_41006 = 41006;
public static final int NULL_41007 = 41007;
public static final int NULL_41008 = 41008;
@@ -20292,5 +20301,66 @@ public final class NullObjectID
public static final int NULL_41597 = 41597;
public static final int NULL_41598 = 41598;
public static final int NULL_41599 = 41599;
public static final int NULL_41608 = 41608;
public static final int NULL_41609 = 41609;
public static final int NULL_41610 = 41610;
public static final int NULL_41611 = 41611;
public static final int NULL_41612 = 41612;
public static final int NULL_41614 = 41614;
public static final int NULL_41616 = 41616;
public static final int NULL_41628 = 41628;
public static final int NULL_41629 = 41629;
public static final int NULL_41630 = 41630;
public static final int NULL_41631 = 41631;
public static final int NULL_41632 = 41632;
public static final int NULL_41633 = 41633;
public static final int NULL_41634 = 41634;
public static final int NULL_41635 = 41635;
public static final int NULL_41636 = 41636;
public static final int NULL_41637 = 41637;
public static final int NULL_41638 = 41638;
public static final int NULL_41639 = 41639;
public static final int NULL_41640 = 41640;
public static final int NULL_41641 = 41641;
public static final int NULL_41642 = 41642;
public static final int NULL_41643 = 41643;
public static final int NULL_41657 = 41657;
public static final int NULL_41658 = 41658;
public static final int NULL_41659 = 41659;
public static final int NULL_41660 = 41660;
public static final int NULL_41661 = 41661;
public static final int NULL_41662 = 41662;
public static final int NULL_41663 = 41663;
public static final int NULL_41664 = 41664;
public static final int NULL_41665 = 41665;
public static final int NULL_41666 = 41666;
public static final int NULL_41667 = 41667;
public static final int NULL_41668 = 41668;
public static final int NULL_41669 = 41669;
public static final int NULL_41670 = 41670;
public static final int NULL_41673 = 41673;
public static final int NULL_41674 = 41674;
public static final int NULL_41675 = 41675;
public static final int NULL_41676 = 41676;
public static final int NULL_41677 = 41677;
public static final int NULL_41698 = 41698;
public static final int NULL_41699 = 41699;
public static final int NULL_41700 = 41700;
public static final int NULL_41702 = 41702;
public static final int NULL_41703 = 41703;
public static final int NULL_41712 = 41712;
public static final int NULL_41722 = 41722;
public static final int NULL_41725 = 41725;
public static final int NULL_41726 = 41726;
public static final int NULL_41727 = 41727;
public static final int NULL_41731 = 41731;
public static final int NULL_41735 = 41735;
public static final int NULL_41736 = 41736;
public static final int NULL_41737 = 41737;
public static final int NULL_41738 = 41738;
public static final int NULL_41739 = 41739;
public static final int NULL_41740 = 41740;
public static final int NULL_41741 = 41741;
public static final int NULL_41742 = 41742;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+91 -1
View File
@@ -14231,6 +14231,7 @@ public final class ObjectID
public static final int CRATE_27100 = 27100;
public static final int CRATES_27101 = 27101;
public static final int CRATES_27102 = 27102;
public static final int ROSES_27106 = 27106;
public static final int CHARCOAL_FURNACE = 27107;
public static final int CHARCOAL_FURNACE_27108 = 27108;
public static final int CHARCOAL_FURNACE_27109 = 27109;
@@ -19491,6 +19492,7 @@ public final class ObjectID
public static final int PORTAL_NEXUS_37555 = 37555;
public static final int PORTAL_NEXUS_37556 = 37556;
public static final int PORTAL_NEXUS_37557 = 37557;
public static final int ROSES_37558 = 37558;
public static final int PORTAL_NEXUS_37559 = 37559;
public static final int PORTAL_NEXUS_37560 = 37560;
public static final int PORTAL_NEXUS_37561 = 37561;
@@ -19502,6 +19504,7 @@ public final class ObjectID
public static final int PORTAL_NEXUS_37567 = 37567;
public static final int PORTAL_NEXUS_37568 = 37568;
public static final int PORTAL_NEXUS_37569 = 37569;
public static final int ROSES_37570 = 37570;
public static final int PORTAL_NEXUS_37571 = 37571;
public static final int PORTAL_NEXUS_37572 = 37572;
public static final int PORTAL_NEXUS_37573 = 37573;
@@ -19524,6 +19527,7 @@ public final class ObjectID
public static final int BARROWS_PORTAL = 37591;
public static final int APE_ATOLL_DUNGEON_PORTAL = 37592;
public static final int WEISS_PORTAL_37593 = 37593;
public static final int TABLE_37594 = 37594;
public static final int DRAYNOR_MANOR_PORTAL_37595 = 37595;
public static final int BATTLEFRONT_PORTAL_37596 = 37596;
public static final int MIND_ALTAR_PORTAL_37597 = 37597;
@@ -19535,6 +19539,7 @@ public final class ObjectID
public static final int BARROWS_PORTAL_37603 = 37603;
public static final int APE_ATOLL_DUNGEON_PORTAL_37604 = 37604;
public static final int WEISS_PORTAL_37605 = 37605;
public static final int TABLE_37606 = 37606;
public static final int DRAYNOR_MANOR_PORTAL_37607 = 37607;
public static final int BATTLEFRONT_PORTAL_37608 = 37608;
public static final int MIND_ALTAR_PORTAL_37609 = 37609;
@@ -19962,6 +19967,19 @@ public final class ObjectID
public static final int DAEYALT_ESSENCE_39095 = 39095;
public static final int MINE_CART_39117 = 39117;
public static final int PLINTH_39118 = 39118;
public static final int TABLE_39126 = 39126;
public static final int TABLE_39127 = 39127;
public static final int TABLE_39128 = 39128;
public static final int TABLE_39129 = 39129;
public static final int TABLE_39130 = 39130;
public static final int TABLE_39131 = 39131;
public static final int TABLE_39132 = 39132;
public static final int TABLE_39133 = 39133;
public static final int TABLE_39134 = 39134;
public static final int TABLE_39135 = 39135;
public static final int TABLE_39136 = 39136;
public static final int STOOL_39137 = 39137;
public static final int STOOL_39138 = 39138;
public static final int LAMP_39152 = 39152;
public static final int BLOOD_TITHE = 39154;
public static final int BLOOD_TITHE_39155 = 39155;
@@ -20930,7 +20948,6 @@ public final class ObjectID
public static final int MAST_40999 = 40999;
public static final int WATER_PUMP_41000 = 41000;
public static final int WATER_PUMP_41004 = 41004;
public static final int FIRE_41005 = 41005;
public static final int DAMAGED_TOTEM_POLE = 41010;
public static final int DAMAGED_TOTEM_POLE_41011 = 41011;
public static final int TOTEM_POLE_41012 = 41012;
@@ -21276,5 +21293,78 @@ public final class ObjectID
public static final int BOXES_41605 = 41605;
public static final int SIGNPOST_41606 = 41606;
public static final int TABLE_41607 = 41607;
public static final int RED_BARRIER_41613 = 41613;
public static final int POSTER_41615 = 41615;
public static final int PORTAL_41617 = 41617;
public static final int PORTAL_41618 = 41618;
public static final int PASSAGE_41619 = 41619;
public static final int DOOR_41620 = 41620;
public static final int BOAT_41621 = 41621;
public static final int GATE_41622 = 41622;
public static final int GATE_41623 = 41623;
public static final int CART_41624 = 41624;
public static final int DOOR_41625 = 41625;
public static final int CLAN_COFFER = 41626;
public static final int STAIRCASE_41627 = 41627;
public static final int STOOL_41644 = 41644;
public static final int LARDER_41645 = 41645;
public static final int WOODEN_BENCH_41646 = 41646;
public static final int TABLE_41647 = 41647;
public static final int TABLE_41648 = 41648;
public static final int TABLE_41649 = 41649;
public static final int ALTAR_41650 = 41650;
public static final int PIANO_41651 = 41651;
public static final int DUMMY_41652 = 41652;
public static final int SOFA_41653 = 41653;
public static final int FIREPLACE_41654 = 41654;
public static final int BOOKCASE_41655 = 41655;
public static final int SWORD_CABINET_41656 = 41656;
public static final int FORTIFIED_GATE = 41671;
public static final int FORTIFIED_GATE_41672 = 41672;
public static final int CLAN_BANNER = 41678;
public static final int CLAN_BANNER_41679 = 41679;
public static final int CLAN_BANNER_41680 = 41680;
public static final int CLAN_BANNER_41681 = 41681;
public static final int CLAN_BANNER_41682 = 41682;
public static final int CLAN_BANNER_41683 = 41683;
public static final int CLAN_BANNER_41684 = 41684;
public static final int CLAN_BANNER_41685 = 41685;
public static final int CLAN_BANNER_41686 = 41686;
public static final int CLAN_BANNER_41687 = 41687;
public static final int CLAN_BANNER_41688 = 41688;
public static final int CLAN_BANNER_41689 = 41689;
public static final int CLAN_BANNER_41690 = 41690;
public static final int CLAN_BANNER_41691 = 41691;
public static final int CLAN_BANNER_41692 = 41692;
public static final int CLAN_BANNER_41693 = 41693;
public static final int TABLE_41694 = 41694;
public static final int TABLE_41695 = 41695;
public static final int HANNIBAL = 41696;
public static final int COOKING_POTS_41697 = 41697;
public static final int CHURCH_PEW_41701 = 41701;
public static final int SUIT_OF_ARMOUR_41704 = 41704;
public static final int SUIT_OF_ARMOUR_41705 = 41705;
public static final int SUIT_OF_ARMOUR_41706 = 41706;
public static final int SUIT_OF_ARMOUR_41707 = 41707;
public static final int SUIT_OF_ARMOUR_41708 = 41708;
public static final int SUIT_OF_ARMOUR_41709 = 41709;
public static final int SUIT_OF_ARMOUR_41710 = 41710;
public static final int SUIT_OF_ARMOUR_41711 = 41711;
public static final int SHIELD_41713 = 41713;
public static final int SHIELD_41714 = 41714;
public static final int SHIELD_41715 = 41715;
public static final int SHIELD_41716 = 41716;
public static final int SHIELD_41717 = 41717;
public static final int SHIELD_41718 = 41718;
public static final int SHIELD_41719 = 41719;
public static final int SHIELD_41720 = 41720;
public static final int SIGN_41721 = 41721;
public static final int BANK_DEPOSIT_BOX_41723 = 41723;
public static final int CLAN_HALL_PORTAL = 41724;
public static final int CLAN_RECRUITMENT_BOARD = 41728;
public static final int CLAN_BANNER_41729 = 41729;
public static final int CLAN_RECRUITMENT_BOARD_41730 = 41730;
public static final int STOOL_41733 = 41733;
public static final int WOODEN_BENCH_41734 = 41734;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
+18 -20
View File
@@ -271,10 +271,8 @@ public class WidgetID
static class FriendsChat
{
static final int TITLE = 1;
static final int NAME = 4;
static final int OWNER = 6;
static final int LIST = 16;
static final int OWNER = 2;
static final int LIST = 12;
}
static class Bank
@@ -558,23 +556,23 @@ public class WidgetID
static final int PARENT = 0;
static final int BUTTONS = 1;
static final int TAB_ALL = 4;
static final int TAB_GAME = 8;
static final int TAB_PUBLIC = 13;
static final int TAB_PRIVATE = 18;
static final int TAB_GAME = 7;
static final int TAB_PUBLIC = 11;
static final int TAB_PRIVATE = 19;
static final int TAB_CLAN = 23;
static final int TAB_TRADE = 28;
static final int REPORT_TEXT = 36;
static final int FRAME = 37;
static final int TRANSPARENT_BACKGROUND = 38;
static final int CONTAINER = 40;
static final int TITLE = 44;
static final int FULL_INPUT = 45;
static final int GE_SEARCH_RESULTS = 53;
static final int MESSAGES = 56;
static final int TRANSPARENT_BACKGROUND_LINES = 57;
static final int INPUT = 58;
static final int MESSAGE_LINES = 59;
static final int FIRST_MESSAGE = 60;
static final int TAB_TRADE = 27;
static final int REPORT_TEXT = 33;
static final int FRAME = 34;
static final int TRANSPARENT_BACKGROUND = 35;
static final int CONTAINER = 37;
static final int TITLE = 41;
static final int FULL_INPUT = 42;
static final int GE_SEARCH_RESULTS = 50;
static final int MESSAGES = 53;
static final int TRANSPARENT_BACKGROUND_LINES = 54;
static final int INPUT = 55;
static final int MESSAGE_LINES = 56;
static final int FIRST_MESSAGE = 57;
}
static class Prayer
runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
-2
View File
@@ -126,8 +126,6 @@ public enum WidgetInfo
EXPLORERS_RING_ALCH_INVENTORY(WidgetID.EXPLORERS_RING_ALCH_GROUP_ID, WidgetID.ExplorersRing.INVENTORY),
FRIENDS_CHAT_TITLE(WidgetID.FRIENDS_CHAT_GROUP_ID, WidgetID.FriendsChat.TITLE),
FRIENDS_CHAT_NAME(WidgetID.FRIENDS_CHAT_GROUP_ID, WidgetID.FriendsChat.NAME),
FRIENDS_CHAT_OWNER(WidgetID.FRIENDS_CHAT_GROUP_ID, WidgetID.FriendsChat.OWNER),
FRIENDS_CHAT_LIST(WidgetID.FRIENDS_CHAT_GROUP_ID, WidgetID.FriendsChat.LIST),