From dd873c7c0244b2cd25c1e06f7ea28a259d4d17b6 Mon Sep 17 00:00:00 2001 From: Steffen Hauge Date: Sun, 18 Nov 2018 13:42:29 +0100 Subject: [PATCH] Add support for kills left in xp orbs --- .../runelite/client/plugins/xpglobes/XpGlobesOverlay.java | 5 ++++- .../net/runelite/client/plugins/xptracker/XpActionType.java | 2 +- .../runelite/client/plugins/xptracker/XpTrackerService.java | 5 +++++ .../client/plugins/xptracker/XpTrackerServiceImpl.java | 6 ++++++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java index b604c773b2..e8e2d9f785 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java @@ -42,6 +42,7 @@ import javax.inject.Inject; import net.runelite.api.Client; import net.runelite.api.Point; import net.runelite.client.game.SkillIconManager; +import net.runelite.client.plugins.xptracker.XpActionType; import net.runelite.client.plugins.xptracker.XpTrackerService; import net.runelite.client.ui.SkillColor; import net.runelite.client.ui.overlay.Overlay; @@ -250,12 +251,14 @@ public class XpGlobesOverlay extends Overlay if (goalXp != -1) { + XpActionType xpActionType = xpTrackerService.getActionType(mouseOverSkill.getSkill()); + int actionsLeft = xpTrackerService.getActionsLeft(mouseOverSkill.getSkill()); if (actionsLeft != Integer.MAX_VALUE) { String actionsLeftString = decimalFormat.format(actionsLeft); xpTooltip.getChildren().add(LineComponent.builder() - .left("Actions left:") + .left(xpActionType.getLabel() + " left:") .leftColor(Color.ORANGE) .right(actionsLeftString) .build()); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpActionType.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpActionType.java index 5c23ac39d8..50acc52c02 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpActionType.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpActionType.java @@ -29,7 +29,7 @@ import lombok.Getter; @Getter @AllArgsConstructor -enum XpActionType +public enum XpActionType { EXPERIENCE("Actions"), ACTOR_HEALTH("Kills"); diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerService.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerService.java index 17b765cd9d..f423757528 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerService.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerService.java @@ -43,6 +43,11 @@ public interface XpTrackerService */ int getActionsLeft(Skill skill); + /** + * Get the action type + */ + XpActionType getActionType(Skill skill); + /** * Get the amount of xp per hour */ diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerServiceImpl.java b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerServiceImpl.java index aa63b8a0ec..0968d14892 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerServiceImpl.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerServiceImpl.java @@ -57,6 +57,12 @@ class XpTrackerServiceImpl implements XpTrackerService return plugin.getSkillSnapshot(skill).getActionsRemainingToGoal(); } + @Override + public XpActionType getActionType(Skill skill) + { + return plugin.getSkillSnapshot(skill).getActionType(); + } + @Override public int getXpHr(Skill skill) {