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
runelite-api/src/main/java/net/runelite/api/ItemID.java
+17 -1
View File
@@ -6062,7 +6062,7 @@ public final class ItemID
public static final int MAGIC_HOOD = 9764;
public static final int RUNECRAFT_CAPE = 9765;
public static final int RUNECRAFT_CAPET = 9766;
public static final int RUNECRAFTING_HOOD = 9767;
public static final int RUNECRAFT_HOOD = 9767;
public static final int HITPOINTS_CAPE = 9768;
public static final int HITPOINTS_CAPET = 9769;
public static final int HITPOINTS_HOOD = 9770;
@@ -11250,5 +11250,21 @@ public final class ItemID
public static final int AVAS_ASSEMBLER_L = 24222;
public static final int FIRE_CAPE_L = 24223;
public static final int INFERNAL_CAPE_L = 24224;
public static final int GRANITE_MAUL_24225 = 24225;
public static final int GRANITE_MAUL_24227 = 24227;
public static final int ORNATE_MAUL_HANDLE = 24229;
public static final int IMBUED_SARADOMIN_MAX_CAPE_L = 24232;
public static final int IMBUED_ZAMORAK_MAX_CAPE_L = 24233;
public static final int IMBUED_GUTHIX_MAX_CAPE_L = 24234;
public static final int HOUSE_ADVERTISEMENT = 24235;
public static final int IMBUED_SARADOMIN_CAPE_BROKEN = 24236;
public static final int IMBUED_SARADOMIN_MAX_CAPE_BROKEN = 24238;
public static final int IMBUED_GUTHIX_CAPE_BROKEN = 24240;
public static final int IMBUED_GUTHIX_MAX_CAPE_BROKEN = 24242;
public static final int IMBUED_ZAMORAK_CAPE_BROKEN = 24244;
public static final int IMBUED_ZAMORAK_MAX_CAPE_BROKEN = 24246;
public static final int IMBUED_SARADOMIN_CAPE_L = 24248;
public static final int IMBUED_GUTHIX_CAPE_L = 24249;
public static final int IMBUED_ZAMORAK_CAPE_L = 24250;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NpcID.java
+7 -3
View File
@@ -2611,9 +2611,6 @@ public final class NpcID
public static final int COMBAT_STONE_2776 = 2776;
public static final int COMBAT_STONE_2777 = 2777;
public static final int COMBAT_STONE_2778 = 2778;
public static final int TOY_SOLDIER = 2779;
public static final int TOY_DOLL = 2780;
public static final int TOY_MOUSE = 2781;
public static final int CLOCKWORK_CAT_2782 = 2782;
public static final int HIRKO = 2783;
public static final int HOLOY = 2784;
@@ -3422,6 +3419,7 @@ public final class NpcID
public static final int SEAMAN_THRESNOR = 3646;
public static final int LUTHAS = 3647;
public static final int CUSTOMS_OFFICER = 3648;
public static final int TOY_SOLDIER = 3649;
public static final int GARDENER_3651 = 3651;
public static final int MAN_3652 = 3652;
public static final int LUMBERJACK_LEIF = 3653;
@@ -8277,5 +8275,11 @@ public final class NpcID
public static final int ARIANWYN_9248 = 9248;
public static final int ESSYLLT_9249 = 9249;
public static final int CAPTAIN_BARNABY_9250 = 9250;
public static final int TOY_SOLDIER_9251 = 9251;
public static final int TOY_DOLL = 9252;
public static final int TOY_DOLL_9253 = 9253;
public static final int TOY_MOUSE = 9254;
public static final int TOY_MOUSE_9255 = 9255;
public static final int PENGUIN_SUIT_9257 = 9257;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/NullItemID.java
+10
View File
@@ -12764,5 +12764,15 @@ public final class NullItemID
public static final int NULL_24218 = 24218;
public static final int NULL_24220 = 24220;
public static final int NULL_24221 = 24221;
public static final int NULL_24226 = 24226;
public static final int NULL_24228 = 24228;
public static final int NULL_24230 = 24230;
public static final int NULL_24231 = 24231;
public static final int NULL_24237 = 24237;
public static final int NULL_24239 = 24239;
public static final int NULL_24241 = 24241;
public static final int NULL_24243 = 24243;
public static final int NULL_24245 = 24245;
public static final int NULL_24247 = 24247;
/* This file is automatically generated. Do not edit. */
}
runelite-api/src/main/java/net/runelite/api/ObjectID.java
+8 -1
View File
@@ -15295,7 +15295,7 @@ public final class ObjectID
public static final int SHRINE = 29088;
public static final int LADDER_29089 = 29089;
public static final int MYSTERIOUS_RUINS_29090 = 29090;
public static final int VENDING_SHRINE = 29091;
public static final int HOUSE_ADVERTISEMENT = 29091;
public static final int LADDER_29092 = 29092;
public static final int MYSTERIOUS_RUINS_29094 = 29094;
public static final int MYSTERIOUS_RUINS_29095 = 29095;
@@ -19354,5 +19354,12 @@ public final class ObjectID
public static final int NOTICEBOARD_37381 = 37381;
public static final int SUPPLY_CHEST = 37382;
public static final int SUPPLY_CHEST_37383 = 37383;
public static final int HOUSE_ADVERTISEMENT_37384 = 37384;
public static final int HOUSE_ADVERTISEMENT_37385 = 37385;
public static final int HOUSE_ADVERTISEMENT_37386 = 37386;
public static final int HOUSE_ADVERTISEMENT_37387 = 37387;
public static final int HOUSE_ADVERTISEMENT_37388 = 37388;
public static final int HOUSE_ADVERTISEMENT_37389 = 37389;
public static final int HOUSE_ADVERTISEMENT_37390 = 37390;
/* This file is automatically generated. Do not edit. */
}
runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesConfig.java
+42 -9
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()
{
runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesOverlay.java
+18 -9
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())
runelite-client/src/main/java/net/runelite/client/plugins/xpglobes/XpGlobesPlugin.java
+9
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();
}
}
runelite-client/src/main/resources/item_variations.json
+27 -4
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,