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-12-09 16:30:14 +01:00
parent 2a75213297 479de04b73
commit 3eb2cf3ff3
20 changed files with 646 additions and 1210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java
View File

@@ -322,10 +322,10 @@ public final class WidgetID
static final int OFFER6 = 12;
static final int OFFER7 = 13;
static final int OFFER8 = 14;
static final int OFFER_CONTAINER = 24;
static final int OFFER_DESCRIPTION = 25;
static final int OFFER_PRICE = 26;
static final int OFFER_CONFIRM_BUTTON = 27;
static final int OFFER_CONTAINER = 25;
static final int OFFER_DESCRIPTION = 26;
static final int OFFER_PRICE = 27;
static final int OFFER_CONFIRM_BUTTON = 28;
}
static class GrandExchangeInventory
@@ -927,10 +927,10 @@ public final class WidgetID
static class SettingsSide
{
static final int CAMERA_ZOOM_SLIDER_TRACK = 98;
static final int MUSIC_SLIDER = 27;
static final int SOUND_EFFECT_SLIDER = 41;
static final int AREA_SOUND_SLIDER = 55;
static final int CAMERA_ZOOM_SLIDER_TRACK = 100;
static final int MUSIC_SLIDER = 29;
static final int SOUND_EFFECT_SLIDER = 43;
static final int AREA_SOUND_SLIDER = 57;
}
static class Settings

3
runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java
View File

@@ -156,7 +156,6 @@ public enum WidgetInfo
GRAND_EXCHANGE_WINDOW_CONTAINER(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.WINDOW_CONTAINER),
GRAND_EXCHANGE_OFFER_CONTAINER(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.OFFER_CONTAINER),
GRAND_EXCHANGE_OFFER_TEXT(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.OFFER_DESCRIPTION),
GRAND_EXCHANGE_OFFER_PRICE(WidgetID.GRAND_EXCHANGE_GROUP_ID, WidgetID.GrandExchange.OFFER_PRICE),
GRAND_EXCHANGE_INVENTORY_ITEMS_CONTAINER(WidgetID.GRAND_EXCHANGE_INVENTORY_GROUP_ID, WidgetID.GrandExchangeInventory.INVENTORY_ITEM_CONTAINER),
@@ -495,7 +494,7 @@ public enum WidgetInfo
WORLD_SWITCHER_LIST(WidgetID.WORLD_SWITCHER_GROUP_ID, WidgetID.WorldSwitcher.WORLD_LIST),
FOSSIL_ISLAND_OXYGENBAR(WidgetID.FOSSIL_ISLAND_OXYGENBAR_ID, 2),
FOSSIL_ISLAND_OXYGENBAR(WidgetID.FOSSIL_ISLAND_OXYGENBAR_ID, 1),
MINIGAME_TELEPORT_BUTTON(WidgetID.MINIGAME_TAB_ID, WidgetID.Minigames.TELEPORT_BUTTON),