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

Merge remote-tracking branch 'runelite/master'

Browse Source
This commit is contained in:
Owain van Brakel
2020-01-23 13:13:07 +01:00
parent 6d4e1ddf85 32c8c497bd
commit 132ac1eb07
14 changed files with 130 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runelite-api/src/main/java/net/runelite/api/ItemID.java
+8
View File
@@ -11386,5 +11386,13 @@ public final class ItemID
public static final int TWISTED_TELEPORT_SCROLL = 24460;
public static final int TWISTED_BLUEPRINTS = 24463;
public static final int TWISTED_HORNS = 24466;
public static final int TWISTED_RELICHUNTER_T1_ARMOUR_SET = 24469;
public static final int TWISTED_RELICHUNTER_T2_ARMOUR_SET = 24472;
public static final int TWISTED_RELICHUNTER_T3_ARMOUR_SET = 24475;
public static final int OPEN_HERB_SACK = 24478;
public static final int SPICE_RACK = 24479;
public static final int OPENED_COAL_BAG = 24480;
public static final int OPENED_GEM_BAG = 24481;
public static final int OPEN_SEED_BOX = 24482;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+6
View File
@@ -12874,5 +12874,11 @@ public final class NullItemID
public static final int NULL_24465 = 24465;
public static final int NULL_24467 = 24467;
public static final int NULL_24468 = 24468;
public static final int NULL_24470 = 24470;
public static final int NULL_24471 = 24471;
public static final int NULL_24473 = 24473;
public static final int NULL_24474 = 24474;
public static final int NULL_24476 = 24476;
public static final int NULL_24477 = 24477;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+2
View File
@@ -19534,5 +19534,7 @@ public final class ObjectID
public static final int DOOR_HOTSPOT_37617 = 37617;
public static final int DOOR_HOTSPOT_37618 = 37618;
public static final int WINDOW_SPACE_37619 = 37619;
public static final int SPICE_RACK = 37620;
public static final int SPICE_RACK_37621 = 37621;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/SpriteID.java
+2
View File
@@ -1594,4 +1594,6 @@ public final class SpriteID
public static final int HEALTHBAR_DEFAULT_BACK_140PX = 2189;
public static final int HEALTHBAR_DEFAULT_FRONT_160PX = 2190;
public static final int HEALTHBAR_DEFAULT_BACK_160PX = 2191;
public static final int WIKI_DESELECTED = 2420;
public static final int WIKI_SELECTED = 2421;
}
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
+5 -4
View File
@@ -171,7 +171,7 @@ public class WidgetID
static final int SEARCH = 24;
static final int SURFACE_SELECTOR = 32;
static final int TOOLTIP = 38;
static final int OPTION = 43;
static final int OPTION = 46;
}
static class SlayerRewards
@@ -342,6 +342,7 @@ public class WidgetID
static final int RUN_ORB_TEXT = 23;
static final int SPEC_ORB = 28;
static final int WORLDMAP_ORB = 41;
static final int WIKI_BANNER = 43;
}
static class LoginClickToPlayScreen
@@ -1187,9 +1188,9 @@ public class WidgetID
static class Options
{
static final int MUSIC_SLIDER = 44;
static final int SOUND_EFFECT_SLIDER = 50;
static final int AREA_SOUND_SLIDER = 56;
static final int MUSIC_SLIDER = 41;
static final int SOUND_EFFECT_SLIDER = 46;
static final int AREA_SOUND_SLIDER = 51;
}
static class AchievementDiary
runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
+1
View File
@@ -163,6 +163,7 @@ public enum WidgetInfo
MINIMAP_SPEC_ORB(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.SPEC_ORB),
MINIMAP_WORLDMAP_ORB(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.WORLDMAP_ORB),
MINIMAP_WORLD_ORB(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.WORLDMAP_ORB),
MINIMAP_WIKI_BANNER(WidgetID.MINIMAP_GROUP_ID, WidgetID.Minimap.WIKI_BANNER),
LMS_INFO(WidgetID.LMS_GROUP_ID, WidgetID.Lms.INFO),
LMS_KDA(WidgetID.LMS_INGAME_GROUP_ID, WidgetID.LmsKDA.INFO),