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

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2021-10-20 13:16:39 +02:00
parent d5e53c0988 4f7571a6b3
commit 73b40bc302
24 changed files with 435 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/Client.java
+17
View File
@@ -1256,10 +1256,27 @@ public interface Client extends GameEngine
*
* @param inventory the inventory type
* @return the item container
* @see InventoryID
*/
@Nullable
ItemContainer getItemContainer(InventoryID inventory);
/**
* Get an item container by id
*
* @param id the inventory id
* @return the item container
* @see InventoryID
*/
@Nullable
ItemContainer getItemContainer(int id);
/**
* Get all item containers
* @return
*/
HashTable<ItemContainer> getItemContainers();
/**
* Gets the length of the cs2 vm's int stack
*/
runelite-api/src/main/java/net/runelite/api/HashTable.java
+1 -10
View File
@@ -1,12 +1,10 @@
package net.runelite.api;
import java.util.Collection;
/**
* A data structure that uses a hash function to compute an index into an
* array of buckets from which node objects can be quickly obtained.
*/
public interface HashTable<T extends Node>
public interface HashTable<T extends Node> extends Iterable<T>
{
/**
* Gets a node by its hash value.
@@ -15,11 +13,4 @@ public interface HashTable<T extends Node>
* @return the associated node
*/
T get(long value);
/**
* Gets a collection of all nodes stored in this table.
*
* @return the nodes stored
*/
Collection<T> getNodes();
}
runelite-api/src/main/java/net/runelite/api/ItemContainer.java
+8
View File
@@ -32,6 +32,14 @@ import javax.annotation.Nullable;
*/
public interface ItemContainer extends Node
{
/**
* Get the item container id
*
* @return
* @see InventoryID
*/
int getId();
/**
* Gets an array of all items in the container.
*
runelite-api/src/main/java/net/runelite/api/ItemID.java
+25 -2
View File
@@ -4764,7 +4764,7 @@ public final class ItemID
public static final int SNAIL_SHELL = 7800;
public static final int SNAKE_HIDE_7801 = 7801;
public static final int YIN_YANG_AMULET = 7803;
public static final int ZAROS_MJOLNIR = 7804;
public static final int ANCIENT_MJOLNIR = 7804;
public static final int ANGER_SWORD = 7806;
public static final int ANGER_BATTLEAXE = 7807;
public static final int ANGER_MACE = 7808;
@@ -12032,7 +12032,6 @@ public final class ItemID
public static final int MASORI_CHAINSKIRT = 25971;
public static final int MASORI_AMULET = 25973;
public static final int LIGHTBEARER = 25975;
public static final int OSMUMTENS_KHOPESH = 25977;
public static final int KERIS_PARTISAN = 25979;
public static final int KERIS_PARTISAN_OF_BREACHING = 25981;
public static final int ELIDINIS_BROKEN_WARD = 25983;
@@ -12197,5 +12196,29 @@ public final class ItemID
public static final int RED_ICON_26213 = 26213;
public static final int RED_ICON_26214 = 26214;
public static final int RED_ICON_26215 = 26215;
public static final int MASORI_HEADDRESS = 26217;
public static final int OSMUMTENS_FANG = 26219;
public static final int ANCIENT_CEREMONIAL_TOP = 26221;
public static final int ANCIENT_CEREMONIAL_LEGS = 26223;
public static final int ANCIENT_CEREMONIAL_MASK = 26225;
public static final int ANCIENT_CEREMONIAL_GLOVES = 26227;
public static final int ANCIENT_CEREMONIAL_BOOTS = 26229;
public static final int NIHIL_SHARD = 26231;
public static final int ANCIENT_GODSWORD = 26233;
public static final int ZARYTE_VAMBRACES = 26235;
public static final int ZARYTE_BOW_UNCHARGED = 26237;
public static final int ZARYTE_BOW = 26239;
public static final int VIRTUS_MASK = 26241;
public static final int VIRTUS_ROBE_TOP = 26243;
public static final int VIRTUS_ROBE_LEGS = 26245;
public static final int PUMPKIN_PIE = 26247;
public static final int JEREDS_EMPTY_WINE_BOTTLE = 26250;
public static final int AD_COUPON = 26252;
public static final int SAUCEPAN = 26254;
public static final int UGLY_HALLOWEEN_JUMPER_ORANGE = 26256;
public static final int UGLY_HALLOWEEN_JUMPER_BLACK = 26258;
public static final int HAUNTED_WINE_BOTTLE = 26260;
public static final int RUNE_SCIMITAR_26262 = 26262;
public static final int STUDDED_BODY_26264 = 26264;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/Model.java
+1 -1
View File
@@ -80,7 +80,7 @@ public interface Model extends Renderable
int getUvBufferOffset();
void setUvBufferOffset(int bufferOffset);
int getModelHeight();
int getBottomY();
void calculateBoundsCylinder();
runelite-api/src/main/java/net/runelite/api/NpcID.java
+22 -1
View File
@@ -2723,7 +2723,6 @@ public final class NpcID
public static final int COOK_2896 = 2896;
public static final int BANKER_2897 = 2897;
public static final int BANKER_2898 = 2898;
public static final int IFFIE = 2899;
public static final int ELSIE = 2900;
public static final int CLEANER = 2901;
public static final int STRAY_DOG = 2902;
@@ -9477,5 +9476,27 @@ public final class NpcID
public static final int REGENT = 11229;
public static final int GROUP_STORAGE_TUTOR = 11230;
public static final int GROUP_IRON_TUTOR = 11231;
public static final int IFFIE = 11232;
public static final int MONK_11233 = 11233;
public static final int BROTHER_JERED_11234 = 11234;
public static final int BROTHER_JERED_11235 = 11235;
public static final int OZIACH_11236 = 11236;
public static final int OZIACH_11237 = 11237;
public static final int ESTATE_AGENT_11238 = 11238;
public static final int IFFIE_11239 = 11239;
public static final int IFFIE_11240 = 11240;
public static final int OZIACH_11241 = 11241;
public static final int ESTATE_AGENT_11242 = 11242;
public static final int DEATH_11243 = 11243;
public static final int IFFIE_11245 = 11245;
public static final int IFFIE_11246 = 11246;
public static final int JONNY_THE_BEARD_11247 = 11247;
public static final int WOMAN_11248 = 11248;
public static final int DR_HARLOW_11249 = 11249;
public static final int BARBARIAN_11250 = 11250;
public static final int COOK_11251 = 11251;
public static final int BARTENDER_11252 = 11252;
public static final int XI_PLZPETDOGZ_XIX = 11254;
public static final int ROCKING_CHAIR = 11262;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+26
View File
@@ -13734,6 +13734,7 @@ public final class NullItemID
public static final int NULL_25972 = 25972;
public static final int NULL_25974 = 25974;
public static final int NULL_25976 = 25976;
public static final int NULL_25977 = 25977;
public static final int NULL_25978 = 25978;
public static final int NULL_25980 = 25980;
public static final int NULL_25982 = 25982;
@@ -13809,5 +13810,30 @@ public final class NullItemID
public static final int NULL_26181 = 26181;
public static final int NULL_26183 = 26183;
public static final int NULL_26216 = 26216;
public static final int NULL_26218 = 26218;
public static final int NULL_26220 = 26220;
public static final int NULL_26222 = 26222;
public static final int NULL_26224 = 26224;
public static final int NULL_26226 = 26226;
public static final int NULL_26228 = 26228;
public static final int NULL_26230 = 26230;
public static final int NULL_26232 = 26232;
public static final int NULL_26234 = 26234;
public static final int NULL_26236 = 26236;
public static final int NULL_26238 = 26238;
public static final int NULL_26240 = 26240;
public static final int NULL_26242 = 26242;
public static final int NULL_26244 = 26244;
public static final int NULL_26246 = 26246;
public static final int NULL_26248 = 26248;
public static final int NULL_26249 = 26249;
public static final int NULL_26251 = 26251;
public static final int NULL_26253 = 26253;
public static final int NULL_26255 = 26255;
public static final int NULL_26257 = 26257;
public static final int NULL_26259 = 26259;
public static final int NULL_26261 = 26261;
public static final int NULL_26263 = 26263;
public static final int NULL_26265 = 26265;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullNpcID.java
+10
View File
@@ -175,6 +175,7 @@ public final class NullNpcID
public static final int NULL_2780 = 2780;
public static final int NULL_2781 = 2781;
public static final int NULL_2831 = 2831;
public static final int NULL_2899 = 2899;
public static final int NULL_2934 = 2934;
public static final int NULL_2935 = 2935;
public static final int NULL_2936 = 2936;
@@ -1738,5 +1739,14 @@ public final class NullNpcID
public static final int NULL_11222 = 11222;
public static final int NULL_11223 = 11223;
public static final int NULL_11224 = 11224;
public static final int NULL_11244 = 11244;
public static final int NULL_11253 = 11253;
public static final int NULL_11255 = 11255;
public static final int NULL_11256 = 11256;
public static final int NULL_11257 = 11257;
public static final int NULL_11258 = 11258;
public static final int NULL_11259 = 11259;
public static final int NULL_11260 = 11260;
public static final int NULL_11261 = 11261;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+35 -1
View File
@@ -2826,7 +2826,6 @@ public final class NullObjectID
public static final int NULL_5983 = 5983;
public static final int NULL_5984 = 5984;
public static final int NULL_5988 = 5988;
public static final int NULL_5992 = 5992;
public static final int NULL_5993 = 5993;
public static final int NULL_5994 = 5994;
public static final int NULL_5995 = 5995;
@@ -12474,6 +12473,7 @@ public final class NullObjectID
public static final int NULL_26454 = 26454;
public static final int NULL_26455 = 26455;
public static final int NULL_26456 = 26456;
public static final int NULL_26458 = 26458;
public static final int NULL_26459 = 26459;
public static final int NULL_26460 = 26460;
public static final int NULL_26463 = 26463;
@@ -20995,5 +20995,39 @@ public final class NullObjectID
public static final int NULL_42830 = 42830;
public static final int NULL_42835 = 42835;
public static final int NULL_42836 = 42836;
public static final int NULL_42838 = 42838;
public static final int NULL_42839 = 42839;
public static final int NULL_42842 = 42842;
public static final int NULL_42843 = 42843;
public static final int NULL_42844 = 42844;
public static final int NULL_42845 = 42845;
public static final int NULL_42846 = 42846;
public static final int NULL_42847 = 42847;
public static final int NULL_42848 = 42848;
public static final int NULL_42849 = 42849;
public static final int NULL_42850 = 42850;
public static final int NULL_42851 = 42851;
public static final int NULL_42852 = 42852;
public static final int NULL_42853 = 42853;
public static final int NULL_42854 = 42854;
public static final int NULL_42855 = 42855;
public static final int NULL_42856 = 42856;
public static final int NULL_42857 = 42857;
public static final int NULL_42858 = 42858;
public static final int NULL_42869 = 42869;
public static final int NULL_42870 = 42870;
public static final int NULL_42875 = 42875;
public static final int NULL_42876 = 42876;
public static final int NULL_42877 = 42877;
public static final int NULL_42878 = 42878;
public static final int NULL_42879 = 42879;
public static final int NULL_42880 = 42880;
public static final int NULL_42881 = 42881;
public static final int NULL_42882 = 42882;
public static final int NULL_42883 = 42883;
public static final int NULL_42884 = 42884;
public static final int NULL_42885 = 42885;
public static final int NULL_42886 = 42886;
public static final int NULL_42887 = 42887;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+19 -3
View File
@@ -3172,6 +3172,7 @@ public final class ObjectID
public static final int MINERAL_VEIN = 5989;
public static final int MINERAL_VEIN_5990 = 5990;
public static final int MINERAL_VEIN_5991 = 5991;
public static final int DEPLETED_VEIN = 5992;
public static final int ENTRANCE_5998 = 5998;
public static final int BLUE_FIRE = 6009;
public static final int BOILER = 6032;
@@ -11213,7 +11214,7 @@ public final class ObjectID
public static final int BARREL_20431 = 20431;
public static final int CART_TUNNEL_20433 = 20433;
public static final int STAIRS_20435 = 20435;
public static final int DEPLETED_VEIN = 20439;
public static final int DEPLETED_VEIN_20439 = 20439;
public static final int DEPLETED_VEIN_20440 = 20440;
public static final int DEPLETED_VEIN_20441 = 20441;
public static final int DEPLETED_VEIN_20442 = 20442;
@@ -13972,8 +13973,7 @@ public final class ObjectID
public static final int BROKEN_PILLAR = 26420;
public static final int BROKEN_PILLAR_26421 = 26421;
public static final int ROPE_26422 = 26422;
public static final int FROZEN_DOOR = 26457;
public static final int FROZEN_DOOR_26458 = 26458;
public static final int BIRD_SNARE_26457 = 26457;
public static final int BIG_DOOR = 26461;
public static final int BARREL_26462 = 26462;
public static final int LARGE_GEYSER_26491 = 26491;
@@ -21828,5 +21828,21 @@ public final class ObjectID
public static final int ROCKS_42833 = 42833;
public static final int CHEST_42834 = 42834;
public static final int BANK_BOOTH_42837 = 42837;
public static final int FROZEN_DOOR = 42840;
public static final int FROZEN_DOOR_42841 = 42841;
public static final int PLAN = 42859;
public static final int PLAN_42860 = 42860;
public static final int PLAN_42861 = 42861;
public static final int PLAN_42862 = 42862;
public static final int CRATE_42863 = 42863;
public static final int CRATE_42864 = 42864;
public static final int DESK_42865 = 42865;
public static final int TABLE_42866 = 42866;
public static final int CHAIR_42867 = 42867;
public static final int BAR_STOOL = 42868;
public static final int TABLE_42871 = 42871;
public static final int TABLE_42872 = 42872;
public static final int EVERGREEN_42873 = 42873;
public static final int EVERGREEN_42874 = 42874;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
+70 -70
View File
@@ -184,6 +184,7 @@ public final class WidgetID
public static final int CLAN_GUEST_GROUP_ID = 702;
public static final int GRAVESTONE_GROUP_ID = 672;
public static final int POH_TREASURE_CHEST_INVENTORY_GROUP_ID = 674;
public static final int GROUP_IRON_GROUP_ID = 726;
static class WorldMap
{
@@ -443,54 +444,13 @@ public final class WidgetID
static class FixedViewport
{
static final int MINIMAP = 3;
static final int MINIMAP_DRAW_AREA = 8;
static final int FIXED_VIEWPORT = 20;
static final int MULTICOMBAT_INDICATOR = 24;
static final int FRIENDS_CHAT_TAB = 39;
static final int FRIENDS_TAB = 41;
static final int IGNORES_TAB = 40;
static final int LOGOUT_TAB = 42;
static final int OPTIONS_TAB = 43;
static final int EMOTES_TAB = 44;
static final int MUSIC_TAB = 45;
static final int FRIENDS_CHAT_ICON = 46;
static final int FRIENDS_ICON = 48;
static final int IGNORES_ICON = 47;
static final int LOGOUT_ICON = 49;
static final int OPTIONS_ICON = 50;
static final int EMOTES_ICON = 51;
static final int MUSIC_ICON = 52;
static final int COMBAT_TAB = 56;
static final int STATS_TAB = 57;
static final int QUESTS_TAB = 58;
static final int INVENTORY_TAB = 59;
static final int EQUIPMENT_TAB = 60;
static final int PRAYER_TAB = 61;
static final int MAGIC_TAB = 62;
static final int COMBAT_ICON = 63;
static final int STATS_ICON = 64;
static final int QUESTS_ICON = 65;
static final int INVENTORY_ICON = 66;
static final int EQUIPMENT_ICON = 67;
static final int PRAYER_ICON = 68;
static final int MAGIC_ICON = 69;
static final int ROOT_INTERFACE_CONTAINER = 70;
static final int BANK_CONTAINER = 73;
static final int INTERFACE_CONTAINER = 74;
static final int INVENTORY_CONTAINER = 78;
}
static class ResizableViewport
{
static final int RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX = 19;
static final int MULTICOMBAT_INDICATOR = 23;
static final int MINIMAP = 25;
static final int MINIMAP_DRAW_AREA = 34;
static final int MINIMAP_ORB_HOLDER = 37;
static final int MINIMAP = 8;
static final int MINIMAP_DRAW_AREA = 21;
static final int FIXED_VIEWPORT = 32;
static final int MULTICOMBAT_INDICATOR = 36;
static final int FRIENDS_CHAT_TAB = 46;
static final int IGNORES_TAB = 47;
static final int FRIENDS_TAB = 48;
static final int IGNORES_TAB = 47;
static final int LOGOUT_TAB = 49;
static final int OPTIONS_TAB = 50;
static final int EMOTES_TAB = 51;
@@ -516,35 +476,75 @@ public final class WidgetID
static final int EQUIPMENT_ICON = 73;
static final int PRAYER_ICON = 74;
static final int MAGIC_ICON = 75;
static final int INTERFACE_CONTAINER = 76;
static final int ROOT_INTERFACE_CONTAINER = 16;
static final int BANK_CONTAINER = 77;
static final int INTERFACE_CONTAINER = 78;
static final int INVENTORY_CONTAINER = 82;
}
static class ResizableViewport
{
static final int RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX = 15;
static final int MULTICOMBAT_INDICATOR = 19;
static final int MINIMAP = 93;
static final int MINIMAP_DRAW_AREA = 29;
static final int MINIMAP_ORB_HOLDER = 32;
static final int FRIENDS_CHAT_TAB = 42;
static final int IGNORES_TAB = 43;
static final int FRIENDS_TAB = 44;
static final int LOGOUT_TAB = 45;
static final int OPTIONS_TAB = 46;
static final int EMOTES_TAB = 47;
static final int MUSIC_TAB = 48;
static final int FRIENDS_CHAT_ICON = 49;
static final int FRIENDS_ICON = 51;
static final int IGNORES_ICON = 50;
static final int LOGOUT_ICON = 52;
static final int OPTIONS_ICON = 53;
static final int EMOTES_ICON = 54;
static final int MUSIC_ICON = 55;
static final int COMBAT_TAB = 58;
static final int STATS_TAB = 59;
static final int QUESTS_TAB = 60;
static final int INVENTORY_TAB = 61;
static final int EQUIPMENT_TAB = 62;
static final int PRAYER_TAB = 63;
static final int MAGIC_TAB = 64;
static final int COMBAT_ICON = 65;
static final int STATS_ICON = 66;
static final int QUESTS_ICON = 67;
static final int INVENTORY_ICON = 68;
static final int EQUIPMENT_ICON = 69;
static final int PRAYER_ICON = 70;
static final int MAGIC_ICON = 71;
static final int INTERFACE_CONTAINER = 72;
static final int INVENTORY_CONTAINER = 78;
}
static class ResizableViewportBottomLine
{
static final int RESIZABLE_VIEWPORT_BOTTOM_LINE = 19;
static final int MINIMAP = 25;
static final int MINIMAP_DRAW_AREA = 34;
static final int MINIMAP_ORB_HOLDER = 37;
static final int LOGOUT_BUTTON_OVERLAY = 38;
static final int MINIMAP_LOGOUT_BUTTON = 39;
static final int FC_ICON = 50;
static final int FRIEND_ICON = 52;
static final int SETTINGS_ICON = 53;
static final int EMOTE_ICON = 54;
static final int MUSIC_ICON = 55;
static final int INVENTORY_TAB = 62;
static final int PRAYER_TAB = 64;
static final int MAGIC_TAB = 65;
static final int CMB_ICON = 66;
static final int SKILLS_ICON = 67;
static final int QUESTS_ICON = 68;
static final int INVENTORY_ICON = 69;
static final int EQUIP_ICON = 70;
static final int PRAYER_ICON = 71;
static final int MAGIC_ICON = 72;
static final int INTERFACE_CONTAINER = 75;
static final int INVENTORY_CONTAINER = 81;
static final int RESIZABLE_VIEWPORT_BOTTOM_LINE = 15;
static final int MINIMAP = 90;
static final int MINIMAP_DRAW_AREA = 29;
static final int MINIMAP_ORB_HOLDER = 32;
static final int LOGOUT_BUTTON_OVERLAY = 33;
static final int MINIMAP_LOGOUT_BUTTON = 34;
static final int FC_ICON = 43;
static final int FRIEND_ICON = 45;
static final int SETTINGS_ICON = 46;
static final int EMOTE_ICON = 47;
static final int MUSIC_ICON = 48;
static final int INVENTORY_TAB = 54;
static final int PRAYER_TAB = 56;
static final int CMB_ICON = 58;
static final int SKILLS_ICON = 59;
static final int QUESTS_ICON = 60;
static final int INVENTORY_ICON = 61;
static final int EQUIP_ICON = 62;
static final int PRAYER_ICON = 63;
static final int MAGIC_ICON = 64;
static final int INTERFACE_CONTAINER = 69;
static final int INVENTORY_CONTAINER = 75;
}
static class Chatbox
runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
+1 -1
View File
@@ -406,7 +406,7 @@ public enum WidgetInfo
MOTHERLODE_MINE(WidgetID.MOTHERLODE_MINE_GROUP_ID, 0),
GWD_KC(WidgetID.GWD_KC_GROUP_ID, 4),
GWD_KC(WidgetID.GWD_KC_GROUP_ID, 5),
PUZZLE_BOX(WidgetID.PUZZLE_BOX_GROUP_ID, WidgetID.PuzzleBox.VISIBLE_BOX),