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

upstream merge

Browse Source 
upstream merge
This commit is contained in:
Kyle Eldridge
2019-09-12 15:06:22 +01:00
parent 320adb0a07 cfef5ad30c
commit b05f2833af
8 changed files with 138 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesConfig.java
View File

@@ -43,12 +43,45 @@ public interface XpGlobesConfig extends Config
{
return true;
}
@ConfigItem(
keyName = "showXpLeft",
name = "Show XP Left",
description = "Shows XP Left inside the globe tooltip box",
position = 1
)
default boolean showXpLeft()
{
return true;
}
@ConfigItem(
keyName = "showActionsLeft",
name = "Show actions left",
description = "Shows the number of actions left inside the globe tooltip box",
position = 2
)
default boolean showActionsLeft()
{
return true;
}
@ConfigItem(
keyName = "showXpHour",
name = "Show XP/hr",
description = "Shows XP per hour inside the globe tooltip box",
position = 3
)
default boolean showXpHour()
{
return true;
}
@ConfigItem(
keyName = "hideMaxed",
name = "Hide maxed skills",
description = "Stop globes from showing up for level 99 skills ",
position = 1
position = 4
)
default boolean hideMaxed()
{
@@ -59,7 +92,7 @@ public interface XpGlobesConfig extends Config
keyName = "Time to level",
name = "Display TTL",
description = "Displays time left to level",
position = 2
position = 5
)
default boolean enableTimeToLevel()
{
@@ -70,7 +103,7 @@ public interface XpGlobesConfig extends Config
keyName = "enableCustomArcColor",
name = "Enable custom arc color",
description = "Enables the custom coloring of the globe's arc instead of using the skill's default color.",
position = 3
position = 6
)
default boolean enableCustomArcColor()
{
@@ -82,7 +115,7 @@ public interface XpGlobesConfig extends Config
keyName = "Progress arc color",
name = "Progress arc color",
description = "Change the color of the progress arc in the xp orb",
position = 4
position = 7
)
default Color progressArcColor()
{
@@ -94,7 +127,7 @@ public interface XpGlobesConfig extends Config
keyName = "Progress orb outline color",
name = "Progress orb outline color",
description = "Change the color of the progress orb outline",
position = 5
position = 8
)
default Color progressOrbOutLineColor()
{
@@ -106,7 +139,7 @@ public interface XpGlobesConfig extends Config
keyName = "Progress orb background color",
name = "Progress orb background color",
description = "Change the color of the progress orb background",
position = 6
position = 9
)
default Color progressOrbBackgroundColor()
{
@@ -117,7 +150,7 @@ public interface XpGlobesConfig extends Config
keyName = "Progress arc width",
name = "Progress arc width",
description = "Change the stroke width of the progress arc",
position = 7
position = 10
)
default int progressArcStrokeWidth()
{
@@ -128,7 +161,7 @@ public interface XpGlobesConfig extends Config
keyName = "Orb size",
name = "Size of orbs",
description = "Change the size of the xp orbs",
position = 8
position = 11
)
default int xpOrbSize()
{
@@ -139,7 +172,7 @@ public interface XpGlobesConfig extends Config
keyName = "Orb duration",
name = "Duration of orbs",
description = "Change the duration the xp orbs are visible",
position = 9
position = 12
)
default int xpOrbDuration()
{

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

@@ -261,23 +261,32 @@ public class XpGlobesOverlay extends Overlay
{
XpActionType xpActionType = xpTrackerService.getActionType(mouseOverSkill.getSkill());
int actionsLeft = xpTrackerService.getActionsLeft(mouseOverSkill.getSkill());
if (actionsLeft != Integer.MAX_VALUE)
if (plugin.isShowActionsLeft())
{
int actionsLeft = xpTrackerService.getActionsLeft(mouseOverSkill.getSkill());
if (actionsLeft != Integer.MAX_VALUE)
{
String actionsLeftString = decimalFormat.format(actionsLeft);
tableComponent.addRow(ColorUtil.prependColorTag(xpActionType.getLabel() + " left:", Color.ORANGE), actionsLeftString);
}
}
int xpLeft = goalXp - mouseOverSkill.getCurrentXp();
String skillXpToLvl = decimalFormat.format(xpLeft);
tableComponent.addRow(ColorUtil.prependColorTag("XP left:", Color.ORANGE), skillXpToLvl);
int xpHr = xpTrackerService.getXpHr(mouseOverSkill.getSkill());
if (xpHr != 0)
if (plugin.isShowXpLeft())
{
String xpHrString = decimalFormat.format(xpHr);
int xpLeft = goalXp - mouseOverSkill.getCurrentXp();
String skillXpToLvl = decimalFormat.format(xpLeft);
tableComponent.addRow(ColorUtil.prependColorTag("XP left:", Color.ORANGE), skillXpToLvl);
}
if (plugin.isShowXpHour())
{
int xpHr = xpTrackerService.getXpHr(mouseOverSkill.getSkill());
if (xpHr != 0)
{
String xpHrString = decimalFormat.format(xpHr);
tableComponent.addRow(ColorUtil.prependColorTag("XP per hour:", Color.ORANGE), xpHrString);
}
}
if (plugin.isEnableTimeToLevel())

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

@@ -88,6 +88,12 @@ public class XpGlobesPlugin extends Plugin
@Getter(AccessLevel.PACKAGE)
private boolean enableTimeToLevel;
@Getter(AccessLevel.PACKAGE)
private boolean showXpHour;
@Getter(AccessLevel.PACKAGE)
private boolean showActionsLeft;
@Getter(AccessLevel.PACKAGE)
private boolean showXpLeft;
@Getter(AccessLevel.PACKAGE)
private boolean enableCustomArcColor;
@Getter(AccessLevel.PACKAGE)
private Color progressArcColor;
@@ -243,6 +249,9 @@ public class XpGlobesPlugin extends Plugin
this.progressArcStrokeWidth = config.progressArcStrokeWidth();
this.xpOrbSize = config.xpOrbSize();
this.xpOrbDuration = config.xpOrbDuration();
this.showXpLeft = config.showXpLeft();
this.showActionsLeft = config.showActionsLeft();
this.showXpHour = config.showXpHour();
}
}

31
runelite-client/src/main/resources/item_variations.json
View File

@@ -3564,7 +3564,9 @@
"granite maul": [
4153,
12848,
20557
20557,
24225,
24227
],
"leafbladed spear": [
4158,
@@ -8902,17 +8904,38 @@
21739,
21752
],
"imbued saradomin max cape": [
21776,
24232,
24238
],
"imbued zamorak max cape": [
21780,
24233,
24246
],
"imbued guthix max cape": [
21784,
24234,
24242
],
"imbued saradomin cape": [
21791,
23607
23607,
24236,
24248
],
"imbued guthix cape": [
21793,
23603
23603,
24240,
24249
],
"imbued zamorak cape": [
21795,
23605
23605,
24244,
24250
],
"bracelet of ethereum": [
21816,