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

Merge branch 'pr/19' into upsteam3

Browse Source
This commit is contained in:
xKylee
2020-02-20 17:57:43 +00:00
parent ab4734c7a4 36d41737f3
commit dfd9bf81f8
17 changed files with 271 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/ItemID.java
+7
View File
@@ -11406,5 +11406,12 @@ public final class ItemID
public static final int HARMONISED_ORB = 24511;
public static final int VOLATILE_ORB = 24514;
public static final int ELDRITCH_ORB = 24517;
public static final int VICTORS_CAPE_1000 = 24520;
public static final int CAT_EARS = 24522;
public static final int LOOSE_CAT_HAIR = 24523;
public static final int GERTRUDES_COMB = 24524;
public static final int CAT_EARS_24525 = 24525;
public static final int HELL_CAT_EARS = 24527;
public static final int LAMP_OF_THE_GATHERER = 24528;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+14 -11
View File
@@ -8428,17 +8428,7 @@ public final class NpcID
public static final int STRONG_RONNY = 9410;
public static final int SHURA = 9413;
public static final int SHURA_9414 = 9414;
public static final int THE_NIGHTMARE = 9415;
public static final int THE_NIGHTMARE_9416 = 9416;
public static final int THE_NIGHTMARE_9417 = 9417;
public static final int THE_NIGHTMARE_9418 = 9418;
public static final int THE_NIGHTMARE_9419 = 9419;
public static final int THE_NIGHTMARE_9420 = 9420;
public static final int THE_NIGHTMARE_9421 = 9421;
public static final int THE_NIGHTMARE_9422 = 9422;
public static final int THE_NIGHTMARE_9423 = 9423;
public static final int THE_NIGHTMARE_9424 = 9424;
public static final int THE_NIGHTMARE_9425 = 9425;
public static final int THE_NIGHTMARE = 9425;
public static final int THE_NIGHTMARE_9426 = 9426;
public static final int THE_NIGHTMARE_9427 = 9427;
public static final int THE_NIGHTMARE_9428 = 9428;
@@ -8469,5 +8459,18 @@ public final class NpcID
public static final int PARASITE_9453 = 9453;
public static final int HUSK = 9454;
public static final int HUSK_9455 = 9455;
public static final int THE_NIGHTMARE_9460 = 9460;
public static final int THE_NIGHTMARE_9461 = 9461;
public static final int THE_NIGHTMARE_9462 = 9462;
public static final int THE_NIGHTMARE_9463 = 9463;
public static final int THE_NIGHTMARE_9464 = 9464;
public static final int INFERNAL_PYRELORD = 9465;
public static final int DRAUL_LEPTOC_9467 = 9467;
public static final int HORACIO_9468 = 9468;
public static final int WISE_OLD_MAN_9469 = 9469;
public static final int HANS_9470 = 9470;
public static final int KING_ROALD_9471 = 9471;
public static final int ELLAMARIA_9472 = 9472;
public static final int GNOME_CHILD_9473 = 9473;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+2
View File
@@ -12905,5 +12905,7 @@ public final class NullItemID
public static final int NULL_24516 = 24516;
public static final int NULL_24518 = 24518;
public static final int NULL_24519 = 24519;
public static final int NULL_24521 = 24521;
public static final int NULL_24526 = 24526;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullObjectID.java
+32 -5
View File
@@ -18171,6 +18171,7 @@ public final class NullObjectID
public static final int NULL_37722 = 37722;
public static final int NULL_37723 = 37723;
public static final int NULL_37724 = 37724;
public static final int NULL_37725 = 37725;
public static final int NULL_37732 = 37732;
public static final int NULL_37733 = 37733;
public static final int NULL_37734 = 37734;
@@ -18338,10 +18339,36 @@ public final class NullObjectID
public static final int NULL_37933 = 37933;
public static final int NULL_37934 = 37934;
public static final int NULL_37935 = 37935;
public static final int NULL_37939 = 37939;
public static final int NULL_37940 = 37940;
public static final int NULL_37941 = 37941;
public static final int NULL_37942 = 37942;
public static final int NULL_37943 = 37943;
public static final int NULL_37950 = 37950;
public static final int NULL_37952 = 37952;
public static final int NULL_37953 = 37953;
public static final int NULL_37954 = 37954;
public static final int NULL_37962 = 37962;
public static final int NULL_37963 = 37963;
public static final int NULL_37964 = 37964;
public static final int NULL_37965 = 37965;
public static final int NULL_37966 = 37966;
public static final int NULL_37967 = 37967;
public static final int NULL_37971 = 37971;
public static final int NULL_37972 = 37972;
public static final int NULL_37973 = 37973;
public static final int NULL_37975 = 37975;
public static final int NULL_37977 = 37977;
public static final int NULL_37978 = 37978;
public static final int NULL_37979 = 37979;
public static final int NULL_37980 = 37980;
public static final int NULL_37981 = 37981;
public static final int NULL_37982 = 37982;
public static final int NULL_37983 = 37983;
public static final int NULL_37984 = 37984;
public static final int NULL_37985 = 37985;
public static final int NULL_37986 = 37986;
public static final int NULL_37987 = 37987;
public static final int NULL_37988 = 37988;
public static final int NULL_37989 = 37989;
public static final int NULL_37990 = 37990;
public static final int NULL_37991 = 37991;
public static final int NULL_37992 = 37992;
public static final int NULL_37994 = 37994;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+14 -5
View File
@@ -19541,11 +19541,6 @@ public final class ObjectID
public static final int NIGHTMARE_DISPLAY = 37629;
public static final int NIGHTMARE_TOPIARY = 37630;
public static final int SUPPLIES_37631 = 37631;
public static final int POOL_OF_NIGHTMARES = 37725;
public static final int POOL_OF_NIGHTMARES_37726 = 37726;
public static final int POOL_OF_NIGHTMARES_37727 = 37727;
public static final int POOL_OF_NIGHTMARES_37728 = 37728;
public static final int POOL_OF_NIGHTMARES_37729 = 37729;
public static final int ENERGY_BARRIER_37730 = 37730;
public static final int ENERGY_BARRIER_37731 = 37731;
public static final int SPORE = 37738;
@@ -19588,5 +19583,19 @@ public final class ObjectID
public static final int CRATE_37936 = 37936;
public static final int DOOR_37937 = 37937;
public static final int DOOR_37938 = 37938;
public static final int SCOREBOARD_37949 = 37949;
public static final int COFFIN_37951 = 37951;
public static final int LIGHT_37955 = 37955;
public static final int LIGHT_37956 = 37956;
public static final int LIGHT_37957 = 37957;
public static final int LIGHT_37958 = 37958;
public static final int LIGHT_37959 = 37959;
public static final int LIGHT_37960 = 37960;
public static final int BANNER_37961 = 37961;
public static final int BANQUET_TABLE_37968 = 37968;
public static final int PRESENT_TABLE_37969 = 37969;
public static final int BIRTHDAY_HAT_TABLE_37970 = 37970;
public static final int PARTY_BALLOONS_37974 = 37974;
public static final int TABLE_37976 = 37976;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/kit/KitType.java
+2 -2
View File
@@ -40,14 +40,14 @@ import net.runelite.api.widgets.WidgetInfo;
@AllArgsConstructor
public enum KitType
{
HELMET("Helmet", 0, WidgetInfo.EQUIPMENT_HELMET),
HEAD("Head", 0, WidgetInfo.EQUIPMENT_HELMET),
CAPE("Cape", 1, WidgetInfo.EQUIPMENT_CAPE),
AMULET("Amulet", 2, WidgetInfo.EQUIPMENT_AMULET),
WEAPON("Weapon", 3, WidgetInfo.EQUIPMENT_WEAPON),
TORSO("Torso", 4, WidgetInfo.EQUIPMENT_BODY),
SHIELD("Shield", 5, WidgetInfo.EQUIPMENT_SHIELD),
LEGS("Legs", 7, WidgetInfo.EQUIPMENT_LEGS),
HEAD("Head", 8, null),
HAIR("Hair", 8, null),
HANDS("Hands", 9, WidgetInfo.EQUIPMENT_GLOVES),
BOOTS("Boots", 10, WidgetInfo.EQUIPMENT_BOOTS),
JAW("Jaw", 11, null),
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
+93 -93
View File
@@ -167,11 +167,11 @@ public class WidgetID
static class WorldMap
{
static final int MAPVIEW = 6;
static final int OVERVIEW_MAP = 9;
static final int SEARCH = 24;
static final int SURFACE_SELECTOR = 32;
static final int TOOLTIP = 38;
static final int MAPVIEW = 7;
static final int OVERVIEW_MAP = 10;
static final int SEARCH = 25;
static final int SURFACE_SELECTOR = 33;
static final int TOOLTIP = 39;
static final int OPTION = 46;
}
@@ -368,15 +368,15 @@ public class WidgetID
static class Viewport
{
static final int MINIMAP_RESIZABLE_WIDGET = 18;
static final int MINIMAP_RESIZABLE_CLICKBOX = 19;
static final int MINIMAP_RESIZABLE_DRAW_AREA = 26;
static final int MINIMAP_RESIZABLE_DECORATIONS = 28;
static final int MINIMAP_RESIZABLE_ORB_HOLDER = 29;
static final int MINIMAP_RESIZABLE_LOGOUT_BUTTON = 31;
static final int MINIMAP_RESIZABLE_WIDGET = 19;
static final int MINIMAP_RESIZABLE_CLICKBOX = 20;
static final int MINIMAP_RESIZABLE_DRAW_AREA = 27;
static final int MINIMAP_RESIZABLE_DECORATIONS = 29;
static final int MINIMAP_RESIZABLE_ORB_HOLDER = 30;
static final int MINIMAP_RESIZABLE_LOGOUT_BUTTON = 32;
static final int FIXED_VIEWPORT = 17;
static final int RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX = 13;
static final int RESIZABLE_VIEWPORT_BOTTOM_LINE = 13;
static final int RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX = 14;
static final int RESIZABLE_VIEWPORT_BOTTOM_LINE = 14;
}
static class FixedViewport
@@ -385,38 +385,38 @@ public class WidgetID
static final int MINIMAP_DRAW_AREA = 8;
static final int MULTICOMBAT_INDICATOR = 21;
static final int BANK_PIN = 22;
static final int CLAN_CHAT_TAB = 32;
static final int FRIENDS_TAB = 34;
static final int IGNORES_TAB = 33;
static final int LOGOUT_TAB = 35;
static final int OPTIONS_TAB = 36;
static final int EMOTES_TAB = 37;
static final int MUSIC_TAB = 38;
static final int CLAN_CHAT_ICON = 39;
static final int FRIENDS_ICON = 41;
static final int IGNORES_ICON = 40;
static final int LOGOUT_ICON = 42;
static final int OPTIONS_ICON = 43;
static final int EMOTES_ICON = 44;
static final int MUSIC_ICON = 45;
static final int COMBAT_TAB = 49;
static final int STATS_TAB = 50;
static final int QUESTS_TAB = 51;
static final int INVENTORY_TAB = 52;
static final int EQUIPMENT_TAB = 53;
static final int PRAYER_TAB = 54;
static final int MAGIC_TAB = 55;
static final int COMBAT_ICON = 56;
static final int STATS_ICON = 57;
static final int QUESTS_ICON = 58;
static final int INVENTORY_ICON = 59;
static final int EQUIPMENT_ICON = 60;
static final int PRAYER_ICON = 61;
static final int MAGIC_ICON = 62;
static final int ROOT_INTERFACE_CONTAINER = 63;
static final int BANK_CONTAINER = 65;
static final int INTERFACE_CONTAINER = 66;
static final int INVENTORY_CONTAINER = 70;
static final int CLAN_CHAT_TAB = 33;
static final int FRIENDS_TAB = 35;
static final int IGNORES_TAB = 34;
static final int LOGOUT_TAB = 36;
static final int OPTIONS_TAB = 37;
static final int EMOTES_TAB = 38;
static final int MUSIC_TAB = 39;
static final int CLAN_CHAT_ICON = 40;
static final int FRIENDS_ICON = 42;
static final int IGNORES_ICON = 41;
static final int LOGOUT_ICON = 43;
static final int OPTIONS_ICON = 44;
static final int EMOTES_ICON = 45;
static final int MUSIC_ICON = 46;
static final int COMBAT_TAB = 50;
static final int STATS_TAB = 51;
static final int QUESTS_TAB = 52;
static final int INVENTORY_TAB = 53;
static final int EQUIPMENT_TAB = 54;
static final int PRAYER_TAB = 55;
static final int MAGIC_TAB = 56;
static final int COMBAT_ICON = 57;
static final int STATS_ICON = 58;
static final int QUESTS_ICON = 59;
static final int INVENTORY_ICON = 60;
static final int EQUIPMENT_ICON = 61;
static final int PRAYER_ICON = 62;
static final int MAGIC_ICON = 63;
static final int ROOT_INTERFACE_CONTAINER = 64;
static final int BANK_CONTAINER = 66;
static final int INTERFACE_CONTAINER = 67;
static final int INVENTORY_CONTAINER = 71;
}
static class ResizableViewport
@@ -424,70 +424,70 @@ public class WidgetID
static final int ITEMS_KEPT_ON_DEATH = 13;
static final int BANK_PIN = 13;
static final int MULTICOMBAT_INDICATOR = 17;
static final int CLAN_CHAT_TAB = 36;
static final int FRIENDS_TAB = 38;
static final int IGNORES_TAB = 37;
static final int LOGOUT_TAB = 39;
static final int OPTIONS_TAB = 40;
static final int EMOTES_TAB = 41;
static final int MUSIC_TAB = 42;
static final int CLAN_CHAT_ICON = 43;
static final int FRIENDS_ICON = 45;
static final int IGNORES_ICON = 44;
static final int LOGOUT_ICON = 46;
static final int OPTIONS_ICON = 47;
static final int EMOTES_ICON = 48;
static final int MUSIC_ICON = 49;
static final int COMBAT_TAB = 52;
static final int STATS_TAB = 53;
static final int QUESTS_TAB = 54;
static final int INVENTORY_TAB = 55;
static final int EQUIPMENT_TAB = 56;
static final int PRAYER_TAB = 57;
static final int MAGIC_TAB = 58;
static final int COMBAT_ICON = 59;
static final int STATS_ICON = 60;
static final int QUESTS_ICON = 61;
static final int INVENTORY_ICON = 62;
static final int EQUIPMENT_ICON = 63;
static final int PRAYER_ICON = 64;
static final int MAGIC_ICON = 65;
static final int INTERFACE_CONTAINER = 66;
static final int INVENTORY_CONTAINER = 72;
static final int CLAN_CHAT_TAB = 37;
static final int FRIENDS_TAB = 39;
static final int IGNORES_TAB = 38;
static final int LOGOUT_TAB = 40;
static final int OPTIONS_TAB = 41;
static final int EMOTES_TAB = 42;
static final int MUSIC_TAB = 43;
static final int CLAN_CHAT_ICON = 44;
static final int FRIENDS_ICON = 46;
static final int IGNORES_ICON = 45;
static final int LOGOUT_ICON = 47;
static final int OPTIONS_ICON = 48;
static final int EMOTES_ICON = 49;
static final int MUSIC_ICON = 50;
static final int COMBAT_TAB = 53;
static final int STATS_TAB = 54;
static final int QUESTS_TAB = 55;
static final int INVENTORY_TAB = 56;
static final int EQUIPMENT_TAB = 57;
static final int PRAYER_TAB = 58;
static final int MAGIC_TAB = 59;
static final int COMBAT_ICON = 60;
static final int STATS_ICON = 61;
static final int QUESTS_ICON = 62;
static final int INVENTORY_ICON = 63;
static final int EQUIPMENT_ICON = 64;
static final int PRAYER_ICON = 65;
static final int MAGIC_ICON = 66;
static final int INTERFACE_CONTAINER = 67;
static final int INVENTORY_CONTAINER = 73;
}
static class ResizableViewportBottomLine
{
static final int BANK_PIN = 13;
static final int LOGOUT_BUTTON_OVERLAY = 30;
static final int LOGOUT_BUTTON_OVERLAY = 31;
static final int CMB_TAB = 50;
static final int CMB_ICON = 58;
static final int CMB_ICON = 59;
static final int SKILLS_TAB = 51;
static final int SKILLS_ICON = 59;
static final int SKILLS_ICON = 60;
static final int QUESTS_TAB = 52;
static final int QUESTS_ICON = 60;
static final int INVENTORY_TAB = 54;
static final int INVENTORY_ICON = 61;
static final int QUESTS_ICON = 61;
static final int INVENTORY_TAB = 55;
static final int INVENTORY_ICON = 62;
static final int EQUIP_TAB = 54;
static final int EQUIP_ICON = 62;
static final int PRAYER_TAB = 56;
static final int PRAYER_ICON = 63;
static final int EQUIP_ICON = 63;
static final int PRAYER_TAB = 57;
static final int PRAYER_ICON = 64;
static final int SPELL_TAB = 56;
static final int SPELL_ICON = 53;
static final int FC_TAB = 35;
static final int FC_ICON = 42;
static final int FC_ICON = 43;
static final int IGNORE_TAB = 36;
static final int IGNORE_ICON = 42;
static final int FRIEND_TAB = 37;
static final int FRIEND_ICON = 44;
static final int FRIEND_ICON = 45;
static final int SETTINGS_TAB = 38;
static final int SETTINGS_ICON = 45;
static final int SETTINGS_ICON = 46;
static final int EMOTE_TAB = 39;
static final int EMOTE_ICON = 46;
static final int EMOTE_ICON = 47;
static final int MUSIC_TAB = 40;
static final int MUSIC_ICON = 47;
static final int MAGIC_ICON = 64;
static final int INVENTORY_CONTAINER = 72;
static final int MUSIC_ICON = 48;
static final int MAGIC_ICON = 65;
static final int INVENTORY_CONTAINER = 73;
}
static class Chatbox
@@ -1057,7 +1057,7 @@ public class WidgetID
static class FullScreenMap
{
static final int ROOT = 26;
static final int ROOT = 27;
}
static class QuestList
@@ -1225,4 +1225,4 @@ public class WidgetID
{
static final int CONTAINER = 0;
}
}
}