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

xptracker: use enum map for actions and other cleanup

Browse Source
This commit is contained in:
Adam
2021-05-16 13:31:44 -04:00
committed by Adam
parent f00454fe23
commit 6c06ac4eaf
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,6 +24,7 @@
*/ */
package net.runelite.client.plugins.xptracker; package net.runelite.client.plugins.xptracker;
import java.util.Arrays;
import java.util.EnumMap; import java.util.EnumMap;
import java.util.Map; import java.util.Map;
import javax.inject.Inject; import javax.inject.Inject;
@@ -163,10 +164,7 @@ class XpState
else else
{ {
// So we have a decent average off the bat, lets populate all values with what we see. // So we have a decent average off the bat, lets populate all values with what we see.
for (int i = 0; i < action.getActionExps().length; i++) Arrays.fill(action.getActionExps(), actionExp);
{
action.getActionExps()[i] = actionExp;
}
action.setActionsHistoryInitialized(true); action.setActionsHistoryInitialized(true);
} }

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

@@ -26,7 +26,8 @@
*/ */
package net.runelite.client.plugins.xptracker; package net.runelite.client.plugins.xptracker;
import java.util.HashMap; import java.util.Arrays;
import java.util.EnumMap;
import java.util.Map; import java.util.Map;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
@@ -38,7 +39,7 @@ import net.runelite.api.Skill;
class XpStateSingle class XpStateSingle
{ {
private final Skill skill; private final Skill skill;
private final Map<XpActionType, XpAction> actions = new HashMap<>(); private final Map<XpActionType, XpAction> actions = new EnumMap<>(XpActionType.class);
@Getter @Getter
@Setter @Setter
@@ -68,8 +69,7 @@ class XpStateSingle
XpAction getXpAction(final XpActionType type) XpAction getXpAction(final XpActionType type)
{ {
actions.putIfAbsent(type, new XpAction()); return actions.computeIfAbsent(type, k -> new XpAction());
return actions.get(type);
} }
long getCurrentXp() long getCurrentXp()
@@ -148,9 +148,6 @@ class XpStateSingle
private long getSecondsTillLevel() private long getSecondsTillLevel()
{ {
// Java 8 doesn't have good duration / period objects to represent spans of time that can be formatted
// Rather than importing another dependency like joda time (which is practically built into java 10)
// below will be a custom formatter that handles spans larger than 1 day
long seconds = getTimeElapsedInSeconds(); long seconds = getTimeElapsedInSeconds();
if (seconds <= 0 || xpGainedSinceReset <= 0) if (seconds <= 0 || xpGainedSinceReset <= 0)
@@ -172,6 +169,9 @@ class XpStateSingle
return "\u221e"; return "\u221e";
} }
// Java 8 doesn't have good duration / period objects to represent spans of time that can be formatted
// Rather than importing another dependency like joda time (which is practically built into java 10)
// below will be a custom formatter that handles spans larger than 1 day
long durationDays = remainingSeconds / (24 * 60 * 60); long durationDays = remainingSeconds / (24 * 60 * 60);
long durationHours = (remainingSeconds % (24 * 60 * 60)) / (60 * 60); long durationHours = (remainingSeconds % (24 * 60 * 60)) / (60 * 60);
long durationHoursTotal = remainingSeconds / (60 * 60); long durationHoursTotal = remainingSeconds / (60 * 60);
@@ -236,7 +236,7 @@ class XpStateSingle
{ {
if (startXp == -1) if (startXp == -1)
{ {
log.warn("Attempted to update skill state " + skill + " but was not initialized with current xp"); log.warn("Attempted to update skill state {} but was not initialized with current xp", skill);
return false; return false;
} }
@@ -260,10 +260,7 @@ class XpStateSingle
{ {
// populate all values in our action history array with this first value that we see // populate all values in our action history array with this first value that we see
// so the average value of our action history starts out as this first value we see // so the average value of our action history starts out as this first value we see
for (int i = 0; i < action.getActionExps().length; i++) Arrays.fill(action.getActionExps(), actionExp);
{
action.getActionExps()[i] = actionExp;
}
action.setActionsHistoryInitialized(true); action.setActionsHistoryInitialized(true);
} }