xp-tracker: add option to show ttl or percentage til goal

This commit is contained in:
Anthony Alves
2020-04-20 20:52:32 -04:00
parent 240b14453f
commit cb4542469b
3 changed files with 56 additions and 2 deletions

View File

@@ -61,7 +61,7 @@ import net.runelite.client.util.QuantityFormatter;
class XpInfoBox extends JPanel
{
private static final DecimalFormat TWO_DECIMAL_FORMAT = new DecimalFormat("0.00");
static final DecimalFormat TWO_DECIMAL_FORMAT = new DecimalFormat("0.00");
static
{
@@ -247,7 +247,7 @@ class XpInfoBox extends JPanel
// Update progress bar
progressBar.setValue((int) xpSnapshotSingle.getSkillProgressToGoal());
progressBar.setCenterLabel(TWO_DECIMAL_FORMAT.format(xpSnapshotSingle.getSkillProgressToGoal()) + "%");
progressBar.setCenterLabel(xpTrackerConfig.progressBarLabel().getValueFunc().apply(xpSnapshotSingle));
progressBar.setLeftLabel("Lvl. " + xpSnapshotSingle.getStartLevel());
progressBar.setRightLabel(xpSnapshotSingle.getEndGoalXp() == Experience.MAX_SKILL_XP
? "200M"

View File

@@ -0,0 +1,43 @@
/*
* Copyright (c) 2020, Anthony <https://github.com/while-loop>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.plugins.xptracker;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.function.Function;
import static net.runelite.client.plugins.xptracker.XpInfoBox.TWO_DECIMAL_FORMAT;
@Getter
@AllArgsConstructor
public enum XpProgressBarLabel
{
PERCENTAGE((snap) -> TWO_DECIMAL_FORMAT.format(snap.getSkillProgressToGoal()) + "%"),
TIME_TO_LEVEL(XpSnapshotSingle::getTimeTillGoal),
;
private final Function<XpSnapshotSingle, String> valueFunc;
}

View File

@@ -155,4 +155,15 @@ public interface XpTrackerConfig extends Config
{
return XpPanelLabel.ACTIONS_LEFT;
}
@ConfigItem(
position = 11,
keyName = "progressBarLabel",
name = "Progress bar label",
description = "Configures the info box progress bar to show Time to goal or percentage complete"
)
default XpProgressBarLabel progressBarLabel()
{
return XpProgressBarLabel.PERCENTAGE;
}
}