diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java index c669337aa4..f09412171c 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java @@ -328,7 +328,19 @@ public class HiscorePanel extends PluginPanel label.setFont(FontManager.getRunescapeSmallFont()); label.setText("--"); - String skillIcon = "skill_icons_small/" + (skill == null ? "combat" : skill.getName().toLowerCase()) + ".png"; + String skillName = (skill == null ? "combat" : skill.getName().toLowerCase()); + String directory = "/skill_icons"; + if (skillName.equals("combat") || skillName.equals("overall")) + { + // Cannot use SpriteManager as HiscorePlugin loads before a Client is available + directory += "/"; + } + else + { + directory += "_small/"; + } + + String skillIcon = directory + skillName + ".png"; log.debug("Loading skill icon from {}", skillIcon); try diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/agility.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/agility.png deleted file mode 100644 index 19c26d9022..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/agility.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/attack.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/attack.png deleted file mode 100644 index 4d9aaa87f6..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/attack.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/combat.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/combat.png deleted file mode 100644 index b1e17fb28d..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/combat.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/construction.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/construction.png deleted file mode 100644 index 3c8e176a3e..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/construction.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/cooking.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/cooking.png deleted file mode 100644 index 2030f1d25b..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/cooking.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/crafting.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/crafting.png deleted file mode 100644 index 7b5fd52464..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/crafting.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/defence.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/defence.png deleted file mode 100644 index 370a1cc729..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/defence.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/farming.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/farming.png deleted file mode 100644 index 0b9becd5f5..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/farming.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/firemaking.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/firemaking.png deleted file mode 100644 index a9297c8edc..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/firemaking.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/fishing.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/fishing.png deleted file mode 100644 index caa5ca9738..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/fishing.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/fletching.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/fletching.png deleted file mode 100644 index 56b50c4067..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/fletching.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/herblore.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/herblore.png deleted file mode 100644 index fde27351c4..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/herblore.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/hitpoints.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/hitpoints.png deleted file mode 100644 index bf431f7518..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/hitpoints.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/hunter.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/hunter.png deleted file mode 100644 index 88be793bbb..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/hunter.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/magic.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/magic.png deleted file mode 100644 index 5e9974c7bd..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/magic.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/mining.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/mining.png deleted file mode 100644 index 57430882d0..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/mining.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/overall.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/overall.png deleted file mode 100644 index 4b2dd265a4..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/overall.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/prayer.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/prayer.png deleted file mode 100644 index 7c348987eb..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/prayer.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/ranged.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/ranged.png deleted file mode 100644 index 9b73588023..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/ranged.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/runecraft.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/runecraft.png deleted file mode 100644 index 2c52ffe913..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/runecraft.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/slayer.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/slayer.png deleted file mode 100644 index f02563044c..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/slayer.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/smithing.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/smithing.png deleted file mode 100644 index b07ec45b86..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/smithing.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/strength.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/strength.png deleted file mode 100644 index 976c550712..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/strength.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/thieving.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/thieving.png deleted file mode 100644 index 4aca64fdb0..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/thieving.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/woodcutting.png b/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/woodcutting.png deleted file mode 100644 index 379d09b76f..0000000000 Binary files a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/woodcutting.png and /dev/null differ diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/bounty hunter - hunter.png b/runelite-client/src/main/resources/skill_icons_small/bounty hunter - hunter.png similarity index 100% rename from runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/bounty hunter - hunter.png rename to runelite-client/src/main/resources/skill_icons_small/bounty hunter - hunter.png diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/bounty hunter - rogue.png b/runelite-client/src/main/resources/skill_icons_small/bounty hunter - rogue.png similarity index 100% rename from runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/bounty hunter - rogue.png rename to runelite-client/src/main/resources/skill_icons_small/bounty hunter - rogue.png diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/clue scrolls (all).png b/runelite-client/src/main/resources/skill_icons_small/clue scrolls (all).png similarity index 100% rename from runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/clue scrolls (all).png rename to runelite-client/src/main/resources/skill_icons_small/clue scrolls (all).png diff --git a/runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/last man standing.png b/runelite-client/src/main/resources/skill_icons_small/last man standing.png similarity index 100% rename from runelite-client/src/main/resources/net/runelite/client/plugins/hiscore/skill_icons_small/last man standing.png rename to runelite-client/src/main/resources/skill_icons_small/last man standing.png