From d566998179d3985242a451e484467e6023012374 Mon Sep 17 00:00:00 2001 From: RuneLite Cache-Code Autoupdater Date: Tue, 22 Jun 2021 10:38:20 -0600 Subject: [PATCH] Update Widget IDs to 2021-6-23 --- .../net/runelite/api/widgets/WidgetID.java | 354 +++++++----------- .../net/runelite/api/widgets/WidgetInfo.java | 43 +-- .../client/ui/overlay/WidgetOverlay.java | 8 - 3 files changed, 156 insertions(+), 249 deletions(-) diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java index 7077786d42..1fe9362a0a 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetID.java @@ -172,11 +172,11 @@ public class WidgetID { static final int MAPVIEW = 7; static final int OVERVIEW_MAP = 10; - static final int BOTTOM_BAR = 22; - static final int SEARCH = 25; - static final int SURFACE_SELECTOR = 33; - static final int TOOLTIP = 41; - static final int OPTION = 46; + static final int BOTTOM_BAR = 23; + static final int SEARCH = 26; + static final int SURFACE_SELECTOR = 34; + static final int TOOLTIP = 43; + static final int OPTION = 48; } static class SlayerRewards @@ -209,32 +209,25 @@ public class WidgetID static final int LOGOUT_BUTTON = 6; } - static class PestControlBoat - { - static final int INFO = 3; - } - static class PestControl { - static final int INFO = 3; + static final int ACTIVITY_BAR = 10; + static final int ACTIVITY_PROGRESS = 12; - static final int ACTIVITY_BAR = 12; - static final int ACTIVITY_PROGRESS = 14; + static final int PURPLE_SHIELD = 13; + static final int BLUE_SHIELD = 14; + static final int YELLOW_SHIELD = 15; + static final int RED_SHIELD = 16; - static final int PURPLE_SHIELD = 15; - static final int BLUE_SHIELD = 16; - static final int YELLOW_SHIELD = 17; - static final int RED_SHIELD = 18; + static final int PURPLE_ICON = 17; + static final int BLUE_ICON = 18; + static final int YELLOW_ICON = 19; + static final int RED_ICON = 20; - static final int PURPLE_ICON = 19; - static final int BLUE_ICON = 20; - static final int YELLOW_ICON = 21; - static final int RED_ICON = 22; - - static final int PURPLE_HEALTH = 23; - static final int BLUE_HEALTH = 24; - static final int YELLOW_HEALTH = 25; - static final int RED_HEALTH = 26; + static final int PURPLE_HEALTH = 21; + static final int BLUE_HEALTH = 22; + static final int YELLOW_HEALTH = 23; + static final int RED_HEALTH = 24; } static class FriendList @@ -354,15 +347,15 @@ public class WidgetID { static final int XP_ORB = 1; static final int HEALTH_ORB = 2; - static final int PRAYER_ORB = 12; - static final int QUICK_PRAYER_ORB = 14; // Has the "Quick-prayers" name - static final int PRAYER_ORB_TEXT = 15; - static final int RUN_ORB = 20; - static final int TOGGLE_RUN_ORB = 22; // Has the "Toggle run" name - 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 final int PRAYER_ORB = 13; + static final int QUICK_PRAYER_ORB = 15; // Has the "Quick-prayers" name + static final int PRAYER_ORB_TEXT = 16; + static final int RUN_ORB = 21; + static final int TOGGLE_RUN_ORB = 23; // Has the "Toggle run" name + static final int RUN_ORB_TEXT = 24; + static final int SPEC_ORB = 29; + static final int WORLDMAP_ORB = 43; + static final int WIKI_BANNER = 45; } static class LoginClickToPlayScreen @@ -370,59 +363,12 @@ public class WidgetID static final int MESSAGE_OF_THE_DAY = 7; } - static class Viewport - { - static final int MINIMAP_RESIZABLE_WIDGET = 20; - static final int MINIMAP_RESIZABLE_DRAW_AREA = 28; - static final int MINIMAP_RESIZABLE_ORB_HOLDER = 31; - static final int MINIMAP_RESIZABLE_LOGOUT_BUTTON = 33; - static final int FIXED_VIEWPORT = 17; - static final int RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX = 14; - static final int RESIZABLE_VIEWPORT_BOTTOM_LINE = 14; - } - static class FixedViewport { static final int MINIMAP = 3; static final int MINIMAP_DRAW_AREA = 8; - static final int MULTICOMBAT_INDICATOR = 21; - static final int FRIENDS_CHAT_TAB = 34; - static final int FRIENDS_TAB = 36; - static final int IGNORES_TAB = 35; - static final int LOGOUT_TAB = 37; - static final int OPTIONS_TAB = 38; - static final int EMOTES_TAB = 39; - static final int MUSIC_TAB = 40; - static final int FRIENDS_CHAT_ICON = 41; - static final int FRIENDS_ICON = 43; - static final int IGNORES_ICON = 42; - static final int LOGOUT_ICON = 44; - static final int OPTIONS_ICON = 45; - static final int EMOTES_ICON = 46; - static final int MUSIC_ICON = 47; - static final int COMBAT_TAB = 51; - static final int STATS_TAB = 52; - static final int QUESTS_TAB = 53; - static final int INVENTORY_TAB = 54; - static final int EQUIPMENT_TAB = 55; - static final int PRAYER_TAB = 56; - static final int MAGIC_TAB = 57; - static final int COMBAT_ICON = 58; - static final int STATS_ICON = 59; - static final int QUESTS_ICON = 60; - static final int INVENTORY_ICON = 61; - static final int EQUIPMENT_ICON = 62; - static final int PRAYER_ICON = 63; - static final int MAGIC_ICON = 64; - static final int ROOT_INTERFACE_CONTAINER = 65; - static final int BANK_CONTAINER = 67; - static final int INTERFACE_CONTAINER = 68; - static final int INVENTORY_CONTAINER = 72; - } - - static class ResizableViewport - { - static final int MULTICOMBAT_INDICATOR = 18; + 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; @@ -437,56 +383,89 @@ public class WidgetID static final int OPTIONS_ICON = 50; static final int EMOTES_ICON = 51; static final int MUSIC_ICON = 52; - static final int COMBAT_TAB = 55; - static final int STATS_TAB = 56; - static final int QUESTS_TAB = 57; - static final int INVENTORY_TAB = 58; - static final int EQUIPMENT_TAB = 59; - static final int PRAYER_TAB = 60; - static final int MAGIC_TAB = 61; - static final int COMBAT_ICON = 62; - static final int STATS_ICON = 63; - static final int QUESTS_ICON = 64; - static final int INVENTORY_ICON = 65; - static final int EQUIPMENT_ICON = 66; - static final int PRAYER_ICON = 67; - static final int MAGIC_ICON = 68; - static final int INTERFACE_CONTAINER = 69; - static final int INVENTORY_CONTAINER = 75; + 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 = 33; + static final int MINIMAP_ORB_HOLDER = 36; + static final int FRIENDS_CHAT_TAB = 45; + static final int IGNORES_TAB = 46; + static final int FRIENDS_TAB = 47; + static final int LOGOUT_TAB = 48; + static final int OPTIONS_TAB = 49; + static final int EMOTES_TAB = 50; + static final int MUSIC_TAB = 51; + static final int FRIENDS_CHAT_ICON = 52; + static final int FRIENDS_ICON = 54; + static final int IGNORES_ICON = 53; + static final int LOGOUT_ICON = 55; + static final int OPTIONS_ICON = 56; + static final int EMOTES_ICON = 57; + static final int MUSIC_ICON = 58; + static final int COMBAT_TAB = 61; + static final int STATS_TAB = 62; + static final int QUESTS_TAB = 63; + static final int INVENTORY_TAB = 64; + static final int EQUIPMENT_TAB = 65; + static final int PRAYER_TAB = 66; + static final int MAGIC_TAB = 67; + static final int COMBAT_ICON = 68; + static final int STATS_ICON = 69; + static final int QUESTS_ICON = 70; + static final int INVENTORY_ICON = 71; + static final int EQUIPMENT_ICON = 72; + static final int PRAYER_ICON = 73; + static final int MAGIC_ICON = 74; + static final int INTERFACE_CONTAINER = 75; + static final int INVENTORY_CONTAINER = 81; } static class ResizableViewportBottomLine { - static final int LOGOUT_BUTTON_OVERLAY = 32; - static final int CMB_TAB = 50; - static final int CMB_ICON = 60; - static final int SKILLS_TAB = 51; - static final int SKILLS_ICON = 61; - static final int QUESTS_TAB = 52; - static final int QUESTS_ICON = 62; - static final int INVENTORY_TAB = 56; - static final int INVENTORY_ICON = 63; - static final int EQUIP_TAB = 54; - static final int EQUIP_ICON = 64; - static final int PRAYER_TAB = 58; - static final int PRAYER_ICON = 65; - static final int SPELL_TAB = 56; - static final int SPELL_ICON = 53; - static final int FC_TAB = 35; - static final int FC_ICON = 44; - static final int IGNORE_TAB = 36; - static final int IGNORE_ICON = 42; - static final int FRIEND_TAB = 37; - static final int FRIEND_ICON = 46; - static final int SETTINGS_TAB = 38; - static final int SETTINGS_ICON = 47; - static final int EMOTE_TAB = 39; - static final int EMOTE_ICON = 48; - static final int MUSIC_TAB = 40; - static final int MUSIC_ICON = 49; - static final int MAGIC_ICON = 66; - static final int INTERFACE_CONTAINER = 68; - static final int INVENTORY_CONTAINER = 74; + static final int RESIZABLE_VIEWPORT_BOTTOM_LINE = 19; + static final int MINIMAP = 25; + static final int MINIMAP_DRAW_AREA = 33; + static final int MINIMAP_ORB_HOLDER = 36; + static final int LOGOUT_BUTTON_OVERLAY = 37; + static final int MINIMAP_LOGOUT_BUTTON = 38; + static final int FC_ICON = 49; + static final int FRIEND_ICON = 51; + static final int SETTINGS_ICON = 52; + static final int EMOTE_ICON = 53; + static final int MUSIC_ICON = 54; + static final int INVENTORY_TAB = 61; + static final int PRAYER_TAB = 63; + static final int CMB_ICON = 65; + static final int SKILLS_ICON = 66; + static final int QUESTS_ICON = 67; + static final int INVENTORY_ICON = 68; + static final int EQUIP_ICON = 69; + static final int PRAYER_ICON = 70; + static final int MAGIC_ICON = 71; + static final int INTERFACE_CONTAINER = 74; + static final int INVENTORY_CONTAINER = 80; } static class Chatbox @@ -603,48 +582,40 @@ public class WidgetID static class VolcanicMine { - static final int GENERAL_INFOBOX_GROUP_ID = 4; - static final int TIME_LEFT = 8; - static final int POINTS = 10; - static final int STABILITY = 12; - static final int PLAYER_COUNT = 14; - static final int STABILITY_INFOBOX_GROUP_ID = 5; - static final int VENTS_INFOBOX_GROUP_ID = 16; - static final int VENT_A_PERCENTAGE = 19; - static final int VENT_B_PERCENTAGE = 20; - static final int VENT_C_PERCENTAGE = 21; - static final int VENT_A_STATUS = 23; - static final int VENT_B_STATUS = 24; - static final int VENT_C_STATUS = 25; + static final int TIME_LEFT = 6; + static final int POINTS = 8; + static final int STABILITY = 10; + static final int PLAYER_COUNT = 12; + static final int VENT_A_PERCENTAGE = 16; + static final int VENT_B_PERCENTAGE = 17; + static final int VENT_C_PERCENTAGE = 18; + static final int VENT_A_STATUS = 20; + static final int VENT_B_STATUS = 21; + static final int VENT_C_STATUS = 22; } static class BarbarianAssault { static class ATK { - static final int ROLE_SPRITE = 12; - static final int ROLE = 13; + static final int ROLE_SPRITE = 11; + static final int ROLE = 12; } static class HLR { - static final int TEAMMATE1 = 19; - static final int TEAMMATE2 = 23; - static final int TEAMMATE3 = 27; - static final int TEAMMATE4 = 31; + static final int TEAMMATE1 = 18; + static final int TEAMMATE2 = 22; + static final int TEAMMATE3 = 26; + static final int TEAMMATE4 = 30; } - static final int ROLE_SPRITE = 11; - static final int ROLE = 12; + static final int ROLE_SPRITE = 10; + static final int ROLE = 11; static final int REWARD_TEXT = 57; } - static class GWD - { - static final int CONTAINER = 7; - } - static class LevelUp { static final int SKILL = 1; @@ -658,24 +629,12 @@ public class WidgetID static class Raids { - static final int POINTS_INFOBOX = 7; + static final int POINTS_INFOBOX = 3; } static class Tob { - static final int PARTY_INTERFACE = 6; - static final int PARTY_STATS = 10; - } - - static class ExperienceDrop - { - static final int DROP_1 = 15; - static final int DROP_2 = 16; - static final int DROP_3 = 17; - static final int DROP_4 = 18; - static final int DROP_5 = 19; - static final int DROP_6 = 20; - static final int DROP_7 = 21; + static final int PARTY_STATS = 7; } static class PuzzleBox @@ -737,9 +696,8 @@ public class WidgetID static class Barrows { - static final int BARROWS_BROTHERS = 9; - static final int BARROWS_POTENTIAL = 10; - static final int BARROWS_REWARD_INVENTORY = 3; + static final int BARROWS_BROTHERS = 4; + static final int BARROWS_POTENTIAL = 5; } static class Diary @@ -776,11 +734,6 @@ public class WidgetID static final int WORLD_LIST = 16; } - static class FossilOxygen - { - static final int FOSSIL_ISLAND_OXYGEN_BAR = 4; - } - static class Minigames { static final int TELEPORT_BUTTON = 26; @@ -809,11 +762,10 @@ public class WidgetID static class Pvp { - static final int BOUNTY_HUNTER_INFO = 6; - static final int KILLDEATH_RATIO = 28; - static final int SKULL_CONTAINER = 48; - static final int SAFE_ZONE = 50; - static final int WILDERNESS_LEVEL = 53; // this can also be the Deadman Mode "Protection" text + static final int KILLDEATH_RATIO = 26; + static final int SKULL_CONTAINER = 45; + static final int SAFE_ZONE = 47; + static final int WILDERNESS_LEVEL = 49; // this can also be the Deadman Mode "Protection" text } static class KourendFavour @@ -823,7 +775,7 @@ public class WidgetID static class Zeah { - static final int MESS_HALL_COOKING_DISPLAY = 3; + static final int MESS_HALL_COOKING_DISPLAY = 2; } static class LootingBag @@ -833,12 +785,7 @@ public class WidgetID static class Skotizo { - static final int CONTAINER = 3; - } - - static class FullScreenMap - { - static final int ROOT = 27; + static final int CONTAINER = 2; } static class QuestList @@ -861,17 +808,7 @@ public class WidgetID static class Barrows_Puzzle { static final int PARENT = 0; - static final int CONTAINER = 1; - static final int TOP_ROW_PUZZLE = 2; static final int SEQUENCE_1 = 3; - static final int SEQUENCE_1_TEXT = 4; - static final int SEQUENCE_2 = 5; - static final int SEQUENCE_2_TEXT = 6; - static final int SEQUENCE_3 = 7; - static final int SEQUENCE_3_TEXT = 8; - static final int SEQUENCE_4 = 9; - static final int SEQUENCE_4_TEXT = 10; - static final int NEXT_SHAPE_TEXT = 11; static final int ANSWER1_CONTAINER = 12; static final int ANSWER1 = 13; static final int ANSWER2_CONTAINER = 14; @@ -895,10 +832,10 @@ public class WidgetID static class SettingsSide { - static final int CAMERA_ZOOM_SLIDER_TRACK = 59; - static final int MUSIC_SLIDER = 13; - static final int SOUND_EFFECT_SLIDER = 17; - static final int AREA_SOUND_SLIDER = 21; + static final int CAMERA_ZOOM_SLIDER_TRACK = 61; + static final int MUSIC_SLIDER = 14; + static final int SOUND_EFFECT_SLIDER = 18; + static final int AREA_SOUND_SLIDER = 22; } static class Settings @@ -918,12 +855,12 @@ public class WidgetID static class Lms { - static final int INFO = 3; + static final int INFO = 2; } static class LmsKDA { - static final int INFO = 6; + static final int INFO = 7; } static class AdventureLog @@ -951,11 +888,6 @@ public class WidgetID static final int CONTAINER = 0; } - static class EncounterHealthBar - { - static final int CONTAINER = 6; - } - static class TrailblazerAreas { static final int TELEPORT = 59; diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java index 82ee085d84..7bfb3bc85f 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetInfo.java @@ -74,8 +74,6 @@ public enum WidgetInfo DIARY_QUEST_WIDGET_TITLE(WidgetID.DIARY_QUEST_GROUP_ID, WidgetID.Diary.DIARY_TITLE), DIARY_QUEST_WIDGET_TEXT(WidgetID.DIARY_QUEST_GROUP_ID, WidgetID.Diary.DIARY_TEXT), - PEST_CONTROL_BOAT_INFO(WidgetID.PEST_CONTROL_BOAT_GROUP_ID, WidgetID.PestControlBoat.INFO), - PEST_CONTROL_INFO(WidgetID.PEST_CONTROL_GROUP_ID, WidgetID.PestControl.INFO), PEST_CONTROL_PURPLE_SHIELD(WidgetID.PEST_CONTROL_GROUP_ID, WidgetID.PestControl.PURPLE_SHIELD), PEST_CONTROL_BLUE_SHIELD(WidgetID.PEST_CONTROL_GROUP_ID, WidgetID.PestControl.BLUE_SHIELD), PEST_CONTROL_YELLOW_SHIELD(WidgetID.PEST_CONTROL_GROUP_ID, WidgetID.PestControl.YELLOW_SHIELD), @@ -91,13 +89,10 @@ public enum WidgetInfo PEST_CONTROL_ACTIVITY_BAR(WidgetID.PEST_CONTROL_GROUP_ID, WidgetID.PestControl.ACTIVITY_BAR), PEST_CONTROL_ACTIVITY_PROGRESS(WidgetID.PEST_CONTROL_GROUP_ID, WidgetID.PestControl.ACTIVITY_PROGRESS), - VOLCANIC_MINE_GENERAL_INFOBOX_GROUP(WidgetID.VOLCANIC_MINE_GROUP_ID, WidgetID.VolcanicMine.GENERAL_INFOBOX_GROUP_ID), VOLCANIC_MINE_TIME_LEFT(WidgetID.VOLCANIC_MINE_GROUP_ID, WidgetID.VolcanicMine.TIME_LEFT), VOLCANIC_MINE_POINTS(WidgetID.VOLCANIC_MINE_GROUP_ID, WidgetID.VolcanicMine.POINTS), VOLCANIC_MINE_STABILITY(WidgetID.VOLCANIC_MINE_GROUP_ID, WidgetID.VolcanicMine.STABILITY), VOLCANIC_MINE_PLAYER_COUNT(WidgetID.VOLCANIC_MINE_GROUP_ID, WidgetID.VolcanicMine.PLAYER_COUNT), - VOLCANIC_MINE_VENTS_INFOBOX_GROUP(WidgetID.VOLCANIC_MINE_GROUP_ID, WidgetID.VolcanicMine.VENTS_INFOBOX_GROUP_ID), - VOLCANIC_MINE_STABILITY_INFOBOX_GROUP(WidgetID.VOLCANIC_MINE_GROUP_ID, WidgetID.VolcanicMine.STABILITY_INFOBOX_GROUP_ID), VOLCANIC_MINE_VENT_A_PERCENTAGE(WidgetID.VOLCANIC_MINE_GROUP_ID, WidgetID.VolcanicMine.VENT_A_PERCENTAGE), VOLCANIC_MINE_VENT_B_PERCENTAGE(WidgetID.VOLCANIC_MINE_GROUP_ID, WidgetID.VolcanicMine.VENT_B_PERCENTAGE), VOLCANIC_MINE_VENT_C_PERCENTAGE(WidgetID.VOLCANIC_MINE_GROUP_ID, WidgetID.VolcanicMine.VENT_C_PERCENTAGE), @@ -190,7 +185,7 @@ public enum WidgetInfo LOGIN_CLICK_TO_PLAY_SCREEN(WidgetID.LOGIN_CLICK_TO_PLAY_GROUP_ID, 0), LOGIN_CLICK_TO_PLAY_SCREEN_MESSAGE_OF_THE_DAY(WidgetID.LOGIN_CLICK_TO_PLAY_GROUP_ID, WidgetID.LoginClickToPlayScreen.MESSAGE_OF_THE_DAY), - FIXED_VIEWPORT(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.Viewport.FIXED_VIEWPORT), + FIXED_VIEWPORT(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.FIXED_VIEWPORT), FIXED_VIEWPORT_ROOT_INTERFACE_CONTAINER(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.ROOT_INTERFACE_CONTAINER), FIXED_VIEWPORT_BANK_CONTAINER(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.BANK_CONTAINER), FIXED_VIEWPORT_INTERFACE_CONTAINER(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.INTERFACE_CONTAINER), @@ -226,16 +221,10 @@ public enum WidgetInfo FIXED_VIEWPORT_MINIMAP(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.MINIMAP), FIXED_VIEWPORT_MINIMAP_DRAW_AREA(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.MINIMAP_DRAW_AREA), - RESIZABLE_MINIMAP_WIDGET(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.Viewport.MINIMAP_RESIZABLE_WIDGET), - RESIZABLE_MINIMAP_DRAW_AREA(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.Viewport.MINIMAP_RESIZABLE_DRAW_AREA), - RESIZABLE_MINIMAP_ORB_HOLDER(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.Viewport.MINIMAP_RESIZABLE_ORB_HOLDER), - RESIZABLE_MINIMAP_LOGOUT_BUTTON(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.Viewport.MINIMAP_RESIZABLE_LOGOUT_BUTTON), - - RESIZABLE_MINIMAP_STONES_WIDGET(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.Viewport.MINIMAP_RESIZABLE_WIDGET), - RESIZABLE_MINIMAP_STONES_DRAW_AREA(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.Viewport.MINIMAP_RESIZABLE_DRAW_AREA), - RESIZABLE_MINIMAP_STONES_ORB_HOLDER(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.Viewport.MINIMAP_RESIZABLE_ORB_HOLDER), - - RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.Viewport.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX), + RESIZABLE_MINIMAP_STONES_WIDGET(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.MINIMAP), + RESIZABLE_MINIMAP_STONES_DRAW_AREA(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.MINIMAP_DRAW_AREA), + RESIZABLE_MINIMAP_STONES_ORB_HOLDER(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.MINIMAP_ORB_HOLDER), + RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX), RESIZABLE_VIEWPORT_COMBAT_TAB(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.COMBAT_TAB), RESIZABLE_VIEWPORT_STATS_TAB(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.STATS_TAB), RESIZABLE_VIEWPORT_QUESTS_TAB(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.QUESTS_TAB), @@ -267,7 +256,11 @@ public enum WidgetInfo RESIZABLE_VIEWPORT_INTERFACE_CONTAINER(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.INTERFACE_CONTAINER), RESIZABLE_VIEWPORT_INVENTORY_CONTAINER(WidgetID.RESIZABLE_VIEWPORT_OLD_SCHOOL_BOX_GROUP_ID, WidgetID.ResizableViewport.INVENTORY_CONTAINER), - RESIZABLE_VIEWPORT_BOTTOM_LINE(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.Viewport.RESIZABLE_VIEWPORT_BOTTOM_LINE), + RESIZABLE_MINIMAP_WIDGET(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.MINIMAP), + RESIZABLE_MINIMAP_DRAW_AREA(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.MINIMAP_DRAW_AREA), + RESIZABLE_MINIMAP_ORB_HOLDER(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.MINIMAP_ORB_HOLDER), + RESIZABLE_MINIMAP_LOGOUT_BUTTON(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.MINIMAP_LOGOUT_BUTTON), + RESIZABLE_VIEWPORT_BOTTOM_LINE(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.RESIZABLE_VIEWPORT_BOTTOM_LINE), RESIZABLE_VIEWPORT_BOTTOM_LINE_LOGOUT_BUTTON(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.LOGOUT_BUTTON_OVERLAY), RESIZABLE_VIEWPORT_BOTTOM_LINE_QUESTS_ICON(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.QUESTS_ICON), RESIZABLE_VIEWPORT_BOTTOM_LINE_INVENTORY_TAB(WidgetID.RESIZABLE_VIEWPORT_BOTTOM_LINE_GROUP_ID, WidgetID.ResizableViewportBottomLine.INVENTORY_TAB), @@ -401,8 +394,6 @@ public enum WidgetInfo MOTHERLODE_MINE(WidgetID.MOTHERLODE_MINE_GROUP_ID, 0), - GWD_KC(WidgetID.GWD_KC_GROUP_ID, WidgetID.GWD.CONTAINER), - PUZZLE_BOX(WidgetID.PUZZLE_BOX_GROUP_ID, WidgetID.PuzzleBox.VISIBLE_BOX), LIGHT_BOX(WidgetID.LIGHT_BOX_GROUP_ID, WidgetID.LightBox.LIGHT_BOX), @@ -424,7 +415,6 @@ public enum WidgetInfo RAIDS_POINTS_INFOBOX(WidgetID.RAIDS_GROUP_ID, WidgetID.Raids.POINTS_INFOBOX), - TOB_PARTY_INTERFACE(WidgetID.TOB_PARTY_GROUP_ID, WidgetID.Tob.PARTY_INTERFACE), TOB_PARTY_STATS(WidgetID.TOB_PARTY_GROUP_ID, WidgetID.Tob.PARTY_STATS), BLAST_FURNACE_COFFER(WidgetID.BLAST_FURNACE_GROUP_ID, 2), @@ -435,15 +425,13 @@ public enum WidgetInfo EXPERIENCE_TRACKER_WIDGET(WidgetID.EXPERIENCE_TRACKER_GROUP_ID, WidgetID.ExperienceTracker.WIDGET), EXPERIENCE_TRACKER_BOTTOM_BAR(WidgetID.EXPERIENCE_TRACKER_GROUP_ID, WidgetID.ExperienceTracker.BOTTOM_BAR), - FISHING_TRAWLER_CONTRIBUTION(WidgetID.FISHING_TRAWLER_GROUP_ID, 14), - FISHING_TRAWLER_TIMER(WidgetID.FISHING_TRAWLER_GROUP_ID, 15), + FISHING_TRAWLER_CONTRIBUTION(WidgetID.FISHING_TRAWLER_GROUP_ID, 13), + FISHING_TRAWLER_TIMER(WidgetID.FISHING_TRAWLER_GROUP_ID, 14), - TITHE_FARM(WidgetID.TITHE_FARM_GROUP_ID, 3), + TITHE_FARM(WidgetID.TITHE_FARM_GROUP_ID, 2), - BARROWS_INFO(WidgetID.BARROWS_GROUP_ID, 0), BARROWS_BROTHERS(WidgetID.BARROWS_GROUP_ID, WidgetID.Barrows.BARROWS_BROTHERS), BARROWS_POTENTIAL(WidgetID.BARROWS_GROUP_ID, WidgetID.Barrows.BARROWS_POTENTIAL), - BARROWS_REWARD_INVENTORY(WidgetID.BARROWS_REWARD_GROUP_ID, WidgetID.Barrows.BARROWS_REWARD_INVENTORY), BARROWS_PUZZLE_PARENT(WidgetID.BARROWS_PUZZLE_GROUP_ID, WidgetID.Barrows_Puzzle.PARENT), BARROWS_PUZZLE_ANSWER1(WidgetID.BARROWS_PUZZLE_GROUP_ID, WidgetID.Barrows_Puzzle.ANSWER1), BARROWS_PUZZLE_ANSWER1_CONTAINER(WidgetID.BARROWS_PUZZLE_GROUP_ID, WidgetID.Barrows_Puzzle.ANSWER1_CONTAINER), @@ -484,8 +472,6 @@ public enum WidgetInfo WORLD_SWITCHER_LIST(WidgetID.WORLD_SWITCHER_GROUP_ID, WidgetID.WorldSwitcher.WORLD_LIST), - FOSSIL_ISLAND_OXYGENBAR(WidgetID.FOSSIL_ISLAND_OXYGENBAR_ID, WidgetID.FossilOxygen.FOSSIL_ISLAND_OXYGEN_BAR), - MINIGAME_TELEPORT_BUTTON(WidgetID.MINIGAME_TAB_ID, WidgetID.Minigames.TELEPORT_BUTTON), SPELL_LUMBRIDGE_HOME_TELEPORT(WidgetID.SPELLBOOK_GROUP_ID, WidgetID.StandardSpellBook.LUMBRIDGE_HOME_TELEPORT), @@ -498,7 +484,6 @@ public enum WidgetInfo PVP_WORLD_SAFE_ZONE(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.SAFE_ZONE), PVP_WILDERNESS_LEVEL(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.WILDERNESS_LEVEL), - PVP_BOUNTY_HUNTER_INFO(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.BOUNTY_HUNTER_INFO), PVP_KILLDEATH_COUNTER(WidgetID.PVP_GROUP_ID, WidgetID.Pvp.KILLDEATH_RATIO), KOUREND_FAVOUR_OVERLAY(WidgetID.KOUREND_FAVOUR_GROUP_ID, WidgetID.KourendFavour.KOUREND_FAVOUR_OVERLAY), @@ -534,8 +519,6 @@ public enum WidgetInfo GAUNTLET_TIMER_CONTAINER(WidgetID.GAUNTLET_TIMER_GROUP_ID, WidgetID.GauntletTimer.CONTAINER), HALLOWED_SEPULCHRE_TIMER_CONTAINER(WidgetID.HALLOWED_SEPULCHRE_TIMER_GROUP_ID, WidgetID.HallowedSepulchreTimer.CONTAINER), - HEALTH_OVERLAY_BAR(WidgetID.HEALTH_OVERLAY_BAR_GROUP_ID, WidgetID.EncounterHealthBar.CONTAINER), - TRAILBLAZER_AREA_TELEPORT(WidgetID.TRAILBLAZER_AREAS_GROUP_ID, WidgetID.TrailblazerAreas.TELEPORT), MULTICOMBAT_FIXED(WidgetID.FIXED_VIEWPORT_GROUP_ID, WidgetID.FixedViewport.MULTICOMBAT_INDICATOR), diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java index 47272f8f17..6119b0a5df 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/WidgetOverlay.java @@ -42,15 +42,10 @@ public class WidgetOverlay extends Overlay return Arrays.asList( new WidgetOverlay(client, WidgetInfo.RESIZABLE_MINIMAP_WIDGET, OverlayPosition.CANVAS_TOP_RIGHT), new WidgetOverlay(client, WidgetInfo.RESIZABLE_MINIMAP_STONES_WIDGET, OverlayPosition.CANVAS_TOP_RIGHT), - new WidgetOverlay(client, WidgetInfo.FOSSIL_ISLAND_OXYGENBAR, OverlayPosition.TOP_LEFT), new XpTrackerWidgetOverlay(client, WidgetInfo.EXPERIENCE_TRACKER_WIDGET, OverlayPosition.TOP_RIGHT), new WidgetOverlay(client, WidgetInfo.RAIDS_POINTS_INFOBOX, OverlayPosition.TOP_RIGHT), - new WidgetOverlay(client, WidgetInfo.TOB_PARTY_INTERFACE, OverlayPosition.TOP_LEFT), new WidgetOverlay(client, WidgetInfo.TOB_PARTY_STATS, OverlayPosition.TOP_LEFT), - new WidgetOverlay(client, WidgetInfo.GWD_KC, OverlayPosition.TOP_RIGHT), new WidgetOverlay(client, WidgetInfo.TITHE_FARM, OverlayPosition.TOP_RIGHT), - new WidgetOverlay(client, WidgetInfo.PEST_CONTROL_BOAT_INFO, OverlayPosition.TOP_LEFT), - new WidgetOverlay(client, WidgetInfo.PEST_CONTROL_INFO, OverlayPosition.TOP_LEFT), new WidgetOverlay(client, WidgetInfo.ZEAH_MESS_HALL_COOKING_DISPLAY, OverlayPosition.TOP_LEFT), new WidgetOverlay(client, WidgetInfo.PVP_KILLDEATH_COUNTER, OverlayPosition.TOP_LEFT), new WidgetOverlay(client, WidgetInfo.SKOTIZO_CONTAINER, OverlayPosition.TOP_LEFT), @@ -60,10 +55,7 @@ public class WidgetOverlay extends Overlay new WidgetOverlay(client, WidgetInfo.LMS_KDA, OverlayPosition.TOP_RIGHT), new WidgetOverlay(client, WidgetInfo.GAUNTLET_TIMER_CONTAINER, OverlayPosition.TOP_LEFT), new WidgetOverlay(client, WidgetInfo.HALLOWED_SEPULCHRE_TIMER_CONTAINER, OverlayPosition.TOP_LEFT), - new WidgetOverlay(client, WidgetInfo.HEALTH_OVERLAY_BAR, OverlayPosition.TOP_CENTER), new WidgetOverlay(client, WidgetInfo.NIGHTMARE_PILLAR_HEALTH, OverlayPosition.TOP_LEFT), - new WidgetOverlay(client, WidgetInfo.VOLCANIC_MINE_VENTS_INFOBOX_GROUP, OverlayPosition.BOTTOM_RIGHT), - new WidgetOverlay(client, WidgetInfo.VOLCANIC_MINE_STABILITY_INFOBOX_GROUP, OverlayPosition.BOTTOM_LEFT), new WidgetOverlay(client, WidgetInfo.MULTICOMBAT_FIXED, OverlayPosition.BOTTOM_RIGHT), new WidgetOverlay(client, WidgetInfo.MULTICOMBAT_RESIZEABLE_MODERN, OverlayPosition.CANVAS_TOP_RIGHT), new WidgetOverlay(client, WidgetInfo.MULTICOMBAT_RESIZEABLE_CLASSIC, OverlayPosition.CANVAS_TOP_RIGHT),