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 e559311608..a5d65ccdfb 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 @@ -57,7 +57,7 @@ public class WidgetID public static final int BA_DEFENDER_GROUP_ID = 487; public static final int BA_HEALER_GROUP_ID = 488; public static final int LEVEL_UP_GROUP_ID = 233; - public static final int HUNTER_LEVEL_UP_GROUP_ID = 193; + public static final int DIALOG_SPRITE_GROUP_ID = 193; public static final int QUEST_COMPLETED_GROUP_ID = 277; public static final int CLUE_SCROLL_REWARD_GROUP_ID = 73; public static final int BARROWS_REWARD_GROUP_ID = 155; @@ -66,7 +66,6 @@ public class WidgetID public static final int PUZZLE_BOX_GROUP_ID = 306; public static final int NIGHTMARE_ZONE_GROUP_ID = 202; public static final int BLAST_FURNACE_GROUP_ID = 474; - public static final int LIBRARY_FIND_GROUP_ID = 193; static class WorldMap { @@ -289,9 +288,9 @@ public class WidgetID static final int VISIBLE_BOX = 4; } - static class DialogLibrary + static class DialogSprite { - static final int ITEM = 0; + static final int SPRITE = 0; static final int TEXT = 1; } } 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 4c1d6a3caa..96138f4c04 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 @@ -120,8 +120,9 @@ public enum WidgetInfo COMBAT_SPELL_ICON(WidgetID.COMBAT_GROUP_ID, WidgetID.Combat.SPELL_ICON), COMBAT_SPELL_TEXT(WidgetID.COMBAT_GROUP_ID, WidgetID.Combat.SPELL_TEXT), - DIALOG_LIBRARY_FIND(WidgetID.LIBRARY_FIND_GROUP_ID, WidgetID.DialogLibrary.ITEM), - DIALOG_LIBRARY_FIND_TEXT(WidgetID.LIBRARY_FIND_GROUP_ID, WidgetID.DialogLibrary.TEXT), + DIALOG_SPRITE(WidgetID.DIALOG_SPRITE_GROUP_ID, 0), + DIALOG_SPRITE_SPRITE(WidgetID.DIALOG_SPRITE_GROUP_ID, WidgetID.DialogSprite.SPRITE), + DIALOG_SPRITE_TEXT(WidgetID.DIALOG_SPRITE_GROUP_ID, WidgetID.DialogSprite.TEXT), DIALOG_NPC_NAME(WidgetID.DIALOG_NPC_GROUP_ID, WidgetID.DialogNPC.NAME), DIALOG_NPC_TEXT(WidgetID.DIALOG_NPC_GROUP_ID, WidgetID.DialogNPC.TEXT), @@ -165,10 +166,6 @@ public enum WidgetInfo LEVEL_UP_SKILL(WidgetID.LEVEL_UP_GROUP_ID, WidgetID.LevelUp.SKILL), LEVEL_UP_LEVEL(WidgetID.LEVEL_UP_GROUP_ID, WidgetID.LevelUp.LEVEL), - HUNTER_LEVEL_UP(WidgetID.HUNTER_LEVEL_UP_GROUP_ID, 0), - HUNTER_LEVEL_UP_SKILL(WidgetID.HUNTER_LEVEL_UP_GROUP_ID, WidgetID.LevelUp.SKILL), - HUNTER_LEVEL_UP_LEVEL(WidgetID.HUNTER_LEVEL_UP_GROUP_ID, WidgetID.LevelUp.LEVEL), - QUEST_COMPLETED(WidgetID.QUEST_COMPLETED_GROUP_ID, 0), QUEST_COMPLETED_NAME_TEXT(WidgetID.QUEST_COMPLETED_GROUP_ID, WidgetID.QuestCompleted.NAME_TEXT), diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java index de7bb5265c..567c196f80 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java @@ -143,7 +143,7 @@ public class KourendLibraryPlugin extends Plugin { if (lastBookcaseAnimatedOn != null) { - Widget find = client.getWidget(WidgetInfo.DIALOG_LIBRARY_FIND); + Widget find = client.getWidget(WidgetInfo.DIALOG_SPRITE_SPRITE); if (find != null) { Book book = Book.byId(find.getItemId()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java index 8f5bdac0fa..f7aeb6b8b2 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java @@ -61,7 +61,7 @@ import net.runelite.api.events.WidgetHiddenChanged; import net.runelite.api.widgets.Widget; import static net.runelite.api.widgets.WidgetID.BARROWS_REWARD_GROUP_ID; import static net.runelite.api.widgets.WidgetID.CLUE_SCROLL_REWARD_GROUP_ID; -import static net.runelite.api.widgets.WidgetID.HUNTER_LEVEL_UP_GROUP_ID; +import static net.runelite.api.widgets.WidgetID.DIALOG_SPRITE_GROUP_ID; import static net.runelite.api.widgets.WidgetID.LEVEL_UP_GROUP_ID; import static net.runelite.api.widgets.WidgetID.QUEST_COMPLETED_GROUP_ID; import net.runelite.api.widgets.WidgetInfo; @@ -253,9 +253,9 @@ public class ScreenshotPlugin extends Plugin fileName = parseLevelUpWidget(WidgetInfo.LEVEL_UP_SKILL, WidgetInfo.LEVEL_UP_LEVEL); break; } - case HUNTER_LEVEL_UP_GROUP_ID: + case DIALOG_SPRITE_GROUP_ID: { - fileName = parseLevelUpWidget(WidgetInfo.HUNTER_LEVEL_UP_SKILL, WidgetInfo.HUNTER_LEVEL_UP_LEVEL); + fileName = parseLevelUpWidget(WidgetInfo.DIALOG_SPRITE_SPRITE, WidgetInfo.DIALOG_SPRITE_TEXT); break; } case QUEST_COMPLETED_GROUP_ID: diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java index 8d4efc0e76..cac1a8f7af 100644 --- a/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java +++ b/runelite-client/src/test/java/net/runelite/client/plugins/screenshot/ScreenshotPluginTest.java @@ -35,10 +35,10 @@ import net.runelite.api.Client; import net.runelite.api.events.ChatMessage; import net.runelite.api.events.WidgetHiddenChanged; import net.runelite.api.widgets.Widget; -import static net.runelite.api.widgets.WidgetID.HUNTER_LEVEL_UP_GROUP_ID; +import static net.runelite.api.widgets.WidgetID.DIALOG_SPRITE_GROUP_ID; import static net.runelite.api.widgets.WidgetID.LEVEL_UP_GROUP_ID; -import static net.runelite.api.widgets.WidgetInfo.HUNTER_LEVEL_UP_LEVEL; -import static net.runelite.api.widgets.WidgetInfo.HUNTER_LEVEL_UP_SKILL; +import static net.runelite.api.widgets.WidgetInfo.DIALOG_SPRITE_SPRITE; +import static net.runelite.api.widgets.WidgetInfo.DIALOG_SPRITE_TEXT; import static net.runelite.api.widgets.WidgetInfo.LEVEL_UP_LEVEL; import static net.runelite.api.widgets.WidgetInfo.LEVEL_UP_SKILL; import static net.runelite.api.widgets.WidgetInfo.PACK; @@ -197,18 +197,18 @@ public class ScreenshotPluginTest public void testHunter() { Widget widget = mock(Widget.class); - when(widget.getId()).thenReturn(PACK(HUNTER_LEVEL_UP_GROUP_ID, 0)); + when(widget.getId()).thenReturn(PACK(DIALOG_SPRITE_GROUP_ID, 0)); Widget skillChild = mock(Widget.class); - when(client.getWidget(Matchers.eq(HUNTER_LEVEL_UP_SKILL))).thenReturn(skillChild); + when(client.getWidget(Matchers.eq(DIALOG_SPRITE_SPRITE))).thenReturn(skillChild); Widget levelChild = mock(Widget.class); - when(client.getWidget(Matchers.eq(HUNTER_LEVEL_UP_LEVEL))).thenReturn(levelChild); + when(client.getWidget(Matchers.eq(DIALOG_SPRITE_TEXT))).thenReturn(levelChild); when(skillChild.getText()).thenReturn("Congratulations, you just advanced a Hunter level."); when(levelChild.getText()).thenReturn("Your Hunter level is now 2."); - assertEquals("Hunter(2)", screenshotPlugin.parseLevelUpWidget(HUNTER_LEVEL_UP_SKILL, HUNTER_LEVEL_UP_LEVEL)); + assertEquals("Hunter(2)", screenshotPlugin.parseLevelUpWidget(DIALOG_SPRITE_SPRITE, DIALOG_SPRITE_TEXT)); WidgetHiddenChanged event = new WidgetHiddenChanged(); event.setWidget(widget);