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 a6cee1c2b6..37fefa69e1 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 @@ -255,7 +255,8 @@ public class WidgetID static class LevelUp { - static final int TEXT = 1; + static final int SKILL = 0; + static final int LEVEL = 1; } static class QuestCompleted 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 7995627c8f..2955f53911 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 @@ -155,7 +155,8 @@ public enum WidgetInfo BA_DEF_ROLE_SPRITE(WidgetID.BA_DEFENDER_GROUP_ID, WidgetID.BarbarianAssault.ROLE_SPRITE), LEVEL_UP(WidgetID.LEVEL_UP_GROUP_ID, 0), - LEVEL_UP_TEXT(WidgetID.LEVEL_UP_GROUP_ID, WidgetID.LevelUp.TEXT), + LEVEL_UP_SKILL(WidgetID.LEVEL_UP_GROUP_ID, WidgetID.LevelUp.SKILL), + LEVEL_UP_LEVEL(WidgetID.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/screenshot/ScreenshotPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java index ad81d5d8a7..7df0ba15ab 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 @@ -247,18 +247,20 @@ public class ScreenshotPlugin extends Plugin { case LEVEL_UP_GROUP_ID: { - Widget textChild = client.getWidget(WidgetInfo.LEVEL_UP_TEXT); + Widget skillChild = client.getWidget(WidgetInfo.LEVEL_UP_SKILL); + Widget levelChild = client.getWidget(WidgetInfo.LEVEL_UP_LEVEL); - if (textChild == null) + if (skillChild == null || levelChild == null) { return; } // "Your Firemaking level is now 9." - String text = textChild.getText(); + String skillText = skillChild.getText(); + String levelText = levelChild.getText(); - String skillName = text.substring(5, text.indexOf(" level")); - String skillLevel = text.substring(text.lastIndexOf(" ") + 1, text.length() - 1); + String skillName = skillText.substring(skillText.indexOf("a ") + 2, skillText.indexOf(" level.")); + String skillLevel = levelText.substring(levelText.lastIndexOf(" ") + 1, levelText.length() - 1); fileName = skillName + " (" + skillLevel + ")"; break;