ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #1636 from valmir95/master

Browse Source 
Add "Actions left" for Xp globes
This commit is contained in:
Adam
2018-04-19 22:59:31 -04:00
committed by GitHub
parent 4e271f6ce9 91adf17c31
commit a4ad6aea8d
5 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobe.java
View File

@@ -24,9 +24,8 @@
*/ */
package net.runelite.client.plugins.xpglobes; package net.runelite.client.plugins.xpglobes;
import net.runelite.api.Skill;
import java.time.Instant; import java.time.Instant;
import net.runelite.api.Skill;
public class XpGlobe public class XpGlobe
{ {

12
runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java
View File

@@ -42,6 +42,7 @@ import net.runelite.api.Experience;
import net.runelite.api.Point; import net.runelite.api.Point;
import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.Widget;
import net.runelite.client.game.SkillIconManager; import net.runelite.client.game.SkillIconManager;
import net.runelite.client.plugins.xptracker.XpTrackerService;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
import net.runelite.client.ui.overlay.OverlayPosition; import net.runelite.client.ui.overlay.OverlayPosition;
import net.runelite.client.ui.overlay.OverlayPriority; import net.runelite.client.ui.overlay.OverlayPriority;
@@ -54,6 +55,7 @@ public class XpGlobesOverlay extends Overlay
private final Client client; private final Client client;
private final XpGlobesPlugin plugin; private final XpGlobesPlugin plugin;
private final XpGlobesConfig config; private final XpGlobesConfig config;
private final XpTrackerService xpTrackerService;
@Inject @Inject
private SkillIconManager iconManager; private SkillIconManager iconManager;
@@ -68,13 +70,14 @@ public class XpGlobesOverlay extends Overlay
private static final int TOOLTIP_RECT_SIZE_X = 150; private static final int TOOLTIP_RECT_SIZE_X = 150;
@Inject @Inject
public XpGlobesOverlay(Client client, XpGlobesPlugin plugin, XpGlobesConfig config) public XpGlobesOverlay(Client client, XpGlobesPlugin plugin, XpGlobesConfig config, XpTrackerService xpTrackerService)
{ {
setPosition(OverlayPosition.DYNAMIC); setPosition(OverlayPosition.DYNAMIC);
setPriority(OverlayPriority.HIGH); setPriority(OverlayPriority.HIGH);
this.client = client; this.client = client;
this.plugin = plugin; this.plugin = plugin;
this.config = config; this.config = config;
this.xpTrackerService = xpTrackerService;
} }
@Override @Override
@@ -230,7 +233,12 @@ public class XpGlobesOverlay extends Overlay
lines.add(new PanelComponent.Line("Current xp:", Color.ORANGE, skillCurrentXp, Color.WHITE)); lines.add(new PanelComponent.Line("Current xp:", Color.ORANGE, skillCurrentXp, Color.WHITE));
if (mouseOverSkill.getGoalXp() != -1) if (mouseOverSkill.getGoalXp() != -1)
{ {
String skillXpToLvl = decimalFormat.format(mouseOverSkill.getGoalXp() - mouseOverSkill.getCurrentXp()); int actionsLeft = xpTrackerService.getActionsLeft(mouseOverSkill.getSkill());
String actionsLeftString = decimalFormat.format(actionsLeft);
lines.add(new PanelComponent.Line("Actions left:", Color.ORANGE, actionsLeftString, Color.WHITE));
int xpLeft = mouseOverSkill.getGoalXp() - mouseOverSkill.getCurrentXp();
String skillXpToLvl = decimalFormat.format(xpLeft);
lines.add(new PanelComponent.Line("Xp to level:", Color.ORANGE, skillXpToLvl, Color.WHITE)); lines.add(new PanelComponent.Line("Xp to level:", Color.ORANGE, skillXpToLvl, Color.WHITE));
//Create progress bar for skill. //Create progress bar for skill.

6
runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java
View File

@@ -39,13 +39,16 @@ import net.runelite.api.events.ExperienceChanged;
import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameStateChanged;
import net.runelite.client.config.ConfigManager; import net.runelite.client.config.ConfigManager;
import net.runelite.client.plugins.Plugin; import net.runelite.client.plugins.Plugin;
import net.runelite.client.plugins.PluginDependency;
import net.runelite.client.plugins.PluginDescriptor; import net.runelite.client.plugins.PluginDescriptor;
import net.runelite.client.plugins.xptracker.XpTrackerPlugin;
import net.runelite.client.task.Schedule; import net.runelite.client.task.Schedule;
import net.runelite.client.ui.overlay.Overlay; import net.runelite.client.ui.overlay.Overlay;
@PluginDescriptor( @PluginDescriptor(
name = "XP Globes" name = "XP Globes"
) )
@PluginDependency(XpTrackerPlugin.class)
public class XpGlobesPlugin extends Plugin public class XpGlobesPlugin extends Plugin
{ {
private static final int SECONDS_TO_SHOW_GLOBE = 10; private static final int SECONDS_TO_SHOW_GLOBE = 10;
@@ -57,9 +60,6 @@ public class XpGlobesPlugin extends Plugin
@Inject @Inject
private Client client; private Client client;
@Inject
private XpGlobesConfig config;
@Inject @Inject
private XpGlobesOverlay overlay; private XpGlobesOverlay overlay;

7
runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerService.java
View File

@@ -41,4 +41,11 @@ public interface XpTrackerService
* @return * @return
*/ */
int getActionsHr(Skill skill); int getActionsHr(Skill skill);
/**
* Get the number of actions remaining
* @param skill
* @return
*/
int getActionsLeft(Skill skill);
} }

6
runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerServiceImpl.java
View File

@@ -52,4 +52,10 @@ class XpTrackerServiceImpl implements XpTrackerService
SkillXPInfo xpInfo = plugin.getSkillXpInfo(skill); SkillXPInfo xpInfo = plugin.getSkillXpInfo(skill);
return xpInfo.getActionsHr(); return xpInfo.getActionsHr();
} }
@Override
public int getActionsLeft(Skill skill)
{
return plugin.getSkillXpInfo(skill).getActionsRemaining();
}
} }