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

Increase XP tracker accuracy to 2 decimal places (#5845)

Browse Source
This commit is contained in:
Eric White
2018-10-06 18:10:33 -05:00
committed by Tomas Slusny
parent 9dbf3b6046
commit ab051ae480
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,7 @@ import java.awt.BorderLayout;
import java.awt.Color; import java.awt.Color;
import java.awt.Dimension; import java.awt.Dimension;
import java.io.IOException; import java.io.IOException;
import java.text.DecimalFormat;
import javax.swing.ImageIcon; import javax.swing.ImageIcon;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JMenuItem; import javax.swing.JMenuItem;
@@ -54,6 +55,8 @@ import net.runelite.client.util.StackFormatter;
class XpInfoBox extends JPanel class XpInfoBox extends JPanel
{ {
private static final DecimalFormat TWO_DECIMAL_FORMAT = new DecimalFormat("0.00");
// Templates // Templates
private static final String HTML_TOOL_TIP_TEMPLATE = private static final String HTML_TOOL_TIP_TEMPLATE =
"<html>%s actions done<br/>" "<html>%s actions done<br/>"
@@ -197,8 +200,8 @@ class XpInfoBox extends JPanel
actionsLeft.setText(htmlLabel("Actions: ", xpSnapshotSingle.getActionsRemainingToGoal())); actionsLeft.setText(htmlLabel("Actions: ", xpSnapshotSingle.getActionsRemainingToGoal()));
// Update progress bar // Update progress bar
progressBar.setValue(xpSnapshotSingle.getSkillProgressToGoal()); progressBar.setValue((int) xpSnapshotSingle.getSkillProgressToGoal());
progressBar.setCenterLabel(xpSnapshotSingle.getSkillProgressToGoal() + "%"); progressBar.setCenterLabel(TWO_DECIMAL_FORMAT.format(xpSnapshotSingle.getSkillProgressToGoal()) + "%");
progressBar.setLeftLabel("Lvl. " + xpSnapshotSingle.getStartLevel()); progressBar.setLeftLabel("Lvl. " + xpSnapshotSingle.getStartLevel());
progressBar.setRightLabel(xpSnapshotSingle.getEndGoalXp() == Experience.MAX_SKILL_XP progressBar.setRightLabel(xpSnapshotSingle.getEndGoalXp() == Experience.MAX_SKILL_XP
? "200M" ? "200M"

2
runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpSnapshotSingle.java
View File

@@ -38,7 +38,7 @@ class XpSnapshotSingle
private int xpGainedInSession; private int xpGainedInSession;
private int xpRemainingToGoal; private int xpRemainingToGoal;
private int xpPerHour; private int xpPerHour;
private int skillProgressToGoal; private double skillProgressToGoal;
private int actionsInSession; private int actionsInSession;
private int actionsRemainingToGoal; private int actionsRemainingToGoal;
private int actionsPerHour; private int actionsPerHour;

4
runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpStateSingle.java
View File

@@ -115,11 +115,11 @@ class XpStateSingle
return Integer.MAX_VALUE; return Integer.MAX_VALUE;
} }
private int getSkillProgress() private double getSkillProgress()
{ {
double xpGained = getCurrentXp() - startLevelExp; double xpGained = getCurrentXp() - startLevelExp;
double xpGoal = endLevelExp - startLevelExp; double xpGoal = endLevelExp - startLevelExp;
return (int) ((xpGained / xpGoal) * 100); return (xpGained / xpGoal) * 100;
} }
private String getTimeTillLevel() private String getTimeTillLevel()