From e67561c3555dd35a4d8a2a3cfdc2eed14ea868b6 Mon Sep 17 00:00:00 2001 From: Tyler Hardy Date: Sat, 10 Feb 2018 18:15:59 -0600 Subject: [PATCH] runelite-api: Add/Correct fairy ring panel widgets --- .../main/java/net/runelite/api/widgets/WidgetID.java | 11 ++++++++++- .../java/net/runelite/api/widgets/WidgetInfo.java | 10 ++++++++-- .../client/plugins/fairyring/FairyRingPlugin.java | 2 +- 3 files changed, 19 insertions(+), 4 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 9a824216d9..6549bf397c 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 @@ -36,7 +36,7 @@ package net.runelite.api.widgets; */ public class WidgetID { - public static final int FAIRY_RING_CODE_GROUP_ID = 381; + public static final int FAIRY_RING_PANEL_GROUP_ID = 381; public static final int FAIRY_RING_GROUP_ID = 398; public static final int LOGOUT_PANEL_ID = 182; public static final int BANK_GROUP_ID = 12; @@ -510,6 +510,15 @@ public class WidgetID static final int BOTTOM_BAR = 14; } + static class FairyRingPanel + { + static final int HEADER = 2; + static final int LIST = 7; + static final int FAVORITES = 8; + static final int SEPARATOR = 9; + static final int SCROLLBAR = 152; + } + static class FairyRing { static final int LEFT_ORB_CLOCKWISE = 19; 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 7378e54774..da31af9b92 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 @@ -31,8 +31,6 @@ package net.runelite.api.widgets; */ public enum WidgetInfo { - FAIRY_QUEEN_HIDEOUT_CODE(WidgetID.FAIRY_RING_CODE_GROUP_ID, WidgetID.FairyRingCode.FAIRY_QUEEN_HIDEOUT), - FAIRY_RING_LEFT_ORB_CLOCKWISE(WidgetID.FAIRY_RING_GROUP_ID, WidgetID.FairyRing.LEFT_ORB_CLOCKWISE), FAIRY_RING_LEFT_ORB_COUNTER_CLOCKWISE(WidgetID.FAIRY_RING_GROUP_ID, WidgetID.FairyRing.LEFT_ORB_COUNTER_CLOCKWISE), FAIRY_RING_MIDDLE_ORB_CLOCKWISE(WidgetID.FAIRY_RING_GROUP_ID, WidgetID.FairyRing.MIDDLE_ORB_CLOCKWISE), @@ -346,6 +344,14 @@ public enum WidgetInfo MTA_ENCHANTMENT_BONUS_TEXT(WidgetID.MTA_ENCHANTMENT_GROUP_ID, WidgetID.MTA.BONUS_TEXT_COMPONENT), MTA_ENCHANTMENT_BONUS(WidgetID.MTA_ENCHANTMENT_GROUP_ID, WidgetID.MTA.BONUS_COMPONENT), + FAIRY_RING(WidgetID.FAIRY_RING_GROUP_ID, 0), + + FAIRY_RING_HEADER(WidgetID.FAIRY_RING_PANEL_GROUP_ID, WidgetID.FairyRingPanel.HEADER), + FAIRY_RING_LIST(WidgetID.FAIRY_RING_PANEL_GROUP_ID, WidgetID.FairyRingPanel.LIST), + FAIRY_RING_FAVORITES(WidgetID.FAIRY_RING_PANEL_GROUP_ID, WidgetID.FairyRingPanel.FAVORITES), + FAIRY_RING_LIST_SEPARATOR(WidgetID.FAIRY_RING_PANEL_GROUP_ID, WidgetID.FairyRingPanel.SEPARATOR), + FAIRY_RING_LIST_SCROLLBAR(WidgetID.FAIRY_RING_PANEL_GROUP_ID, WidgetID.FairyRingPanel.SCROLLBAR), + DESTROY_ITEM(WidgetID.DESTROY_ITEM_GROUP_ID, 0), DESTROY_ITEM_NAME(WidgetID.DESTROY_ITEM_GROUP_ID, WidgetID.DestroyItem.DESTROY_ITEM_NAME), DESTROY_ITEM_YES(WidgetID.DESTROY_ITEM_GROUP_ID, WidgetID.DestroyItem.DESTROY_ITEM_YES), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java index 9c23437522..f09938f751 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/fairyring/FairyRingPlugin.java @@ -61,7 +61,7 @@ public class FairyRingPlugin extends Plugin @Subscribe public void onWidgetLoaded(WidgetLoaded widgetLoaded) { - if (widgetLoaded.getGroupId() == WidgetID.FAIRY_RING_CODE_GROUP_ID) + if (widgetLoaded.getGroupId() == WidgetID.FAIRY_RING_PANEL_GROUP_ID) { setWidgetTextToDestination(); }