From bb6c2d6381d49583d3b7ec7587c7cdeff868aacb Mon Sep 17 00:00:00 2001 From: RobertCurll Date: Wed, 13 May 2020 21:14:50 -0700 Subject: [PATCH 1/2] skillcalculator: Add comma separators to experience fields --- .../client/plugins/skillcalculator/SkillCalculator.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java index 8b0c10c654..c93b6917ec 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java @@ -367,10 +367,12 @@ class SkillCalculator extends JPanel targetXP = Experience.getXpForLevel(targetLevel); } + final String cXP = String.format("%,d", currentXP); + final String tXP = String.format("%,d", targetXP); uiInput.setCurrentLevelInput(currentLevel); - uiInput.setCurrentXPInput(currentXP); + uiInput.setCurrentXPInput(cXP); uiInput.setTargetLevelInput(targetLevel); - uiInput.setTargetXPInput(targetXP); + uiInput.setTargetXPInput(tXP); calculate(); } From 81427bfd9479fb6f64ec51b1ab6f2c54448cf6e7 Mon Sep 17 00:00:00 2001 From: RobertCurll Date: Wed, 13 May 2020 21:15:27 -0700 Subject: [PATCH 2/2] skillcalculator: Add needed experience tooltip This adds a tooltip to the "Target Experience" field indicating the amount of experience needed to reach that target. --- .../client/plugins/skillcalculator/SkillCalculator.java | 2 ++ .../plugins/skillcalculator/UICalculatorInputArea.java | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java index c93b6917ec..30d6979a54 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculator.java @@ -369,10 +369,12 @@ class SkillCalculator extends JPanel final String cXP = String.format("%,d", currentXP); final String tXP = String.format("%,d", targetXP); + final String nXP = String.format("%,d", targetXP - currentXP); uiInput.setCurrentLevelInput(currentLevel); uiInput.setCurrentXPInput(cXP); uiInput.setTargetLevelInput(targetLevel); uiInput.setTargetXPInput(tXP); + uiInput.setNeededXP(nXP + " XP required to reach target XP"); calculate(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICalculatorInputArea.java b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICalculatorInputArea.java index a15565bd34..06fc201a0e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICalculatorInputArea.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/UICalculatorInputArea.java @@ -94,6 +94,11 @@ class UICalculatorInputArea extends JPanel setInput(uiFieldTargetXP, value); } + void setNeededXP(Object value) + { + uiFieldTargetXP.setToolTipText((String) value); + } + private int getInput(JTextField field) { try