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

ImageUtil: rename getResourceStreamFromClass to loadImageResource

Browse Source
This commit is contained in:
Max Weber
2020-12-30 23:14:33 -07:00
parent 0fc1a94088
commit 92207c8210
57 changed files with 117 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runelite-client/src/main/java/net/runelite/client/game/SkillIconManager.java
View File

@@ -49,7 +49,7 @@ public class SkillIconManager
String skillIconPath = (small ? "/skill_icons_small/" : "/skill_icons/") String skillIconPath = (small ? "/skill_icons_small/" : "/skill_icons/")
+ skill.getName().toLowerCase() + ".png"; + skill.getName().toLowerCase() + ".png";
log.debug("Loading skill icon from {}", skillIconPath); log.debug("Loading skill icon from {}", skillIconPath);
BufferedImage skillImage = ImageUtil.getResourceStreamFromClass(getClass(), skillIconPath); BufferedImage skillImage = ImageUtil.loadImageResource(getClass(), skillIconPath);
imgCache[skillIdx] = skillImage; imgCache[skillIdx] = skillImage;
return skillImage; return skillImage;

2
runelite-client/src/main/java/net/runelite/client/game/SpriteManager.java
View File

@@ -162,7 +162,7 @@ public class SpriteManager
Class<?> owner = add[0].getClass(); Class<?> owner = add[0].getClass();
for (SpriteOverride o : add) for (SpriteOverride o : add)
{ {
BufferedImage image = ImageUtil.getResourceStreamFromClass(owner, o.getFileName()); BufferedImage image = ImageUtil.loadImageResource(owner, o.getFileName());
SpritePixels sp = ImageUtil.getImageSpritePixels(image, client); SpritePixels sp = ImageUtil.getImageSpritePixels(image, client);
overrides.put(o.getSpriteId(), sp); overrides.put(o.getSpriteId(), sp);
} }

4
runelite-client/src/main/java/net/runelite/client/plugins/account/AccountPlugin.java
View File

@@ -65,8 +65,8 @@ public class AccountPlugin extends Plugin
static static
{ {
LOGIN_IMAGE = ImageUtil.getResourceStreamFromClass(AccountPlugin.class, "login_icon.png"); LOGIN_IMAGE = ImageUtil.loadImageResource(AccountPlugin.class, "login_icon.png");
LOGOUT_IMAGE = ImageUtil.getResourceStreamFromClass(AccountPlugin.class, "logout_icon.png"); LOGOUT_IMAGE = ImageUtil.loadImageResource(AccountPlugin.class, "logout_icon.png");
} }
@Override @Override

2
runelite-client/src/main/java/net/runelite/client/plugins/barbarianassault/BarbarianAssaultPlugin.java
View File

@@ -100,7 +100,7 @@ public class BarbarianAssaultPlugin extends Plugin
overlayManager.add(timerOverlay); overlayManager.add(timerOverlay);
overlayManager.add(healerOverlay); overlayManager.add(healerOverlay);
clockImage = ImageUtil.getResourceStreamFromClass(getClass(), "clock.png"); clockImage = ImageUtil.loadImageResource(getClass(), "clock.png");
} }
@Override @Override

4
runelite-client/src/main/java/net/runelite/client/plugins/boosts/BoostsPlugin.java
View File

@@ -119,8 +119,8 @@ public class BoostsPlugin extends Plugin
Arrays.fill(lastSkillLevels, -1); Arrays.fill(lastSkillLevels, -1);
// Add infoboxes for everything at startup and then determine inside if it will be rendered // Add infoboxes for everything at startup and then determine inside if it will be rendered
infoBoxManager.addInfoBox(new StatChangeIndicator(true, ImageUtil.getResourceStreamFromClass(getClass(), "debuffed.png"), this, config)); infoBoxManager.addInfoBox(new StatChangeIndicator(true, ImageUtil.loadImageResource(getClass(), "debuffed.png"), this, config));
infoBoxManager.addInfoBox(new StatChangeIndicator(false, ImageUtil.getResourceStreamFromClass(getClass(), "buffed.png"), this, config)); infoBoxManager.addInfoBox(new StatChangeIndicator(false, ImageUtil.loadImageResource(getClass(), "buffed.png"), this, config));
for (final Skill skill : Skill.values()) for (final Skill skill : Skill.values())
{ {

4
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
View File

@@ -625,7 +625,7 @@ public class ClueScrollPlugin extends Plugin
return emoteImage; return emoteImage;
} }
emoteImage = ImageUtil.getResourceStreamFromClass(getClass(), "emote.png"); emoteImage = ImageUtil.loadImageResource(getClass(), "emote.png");
return emoteImage; return emoteImage;
} }
@@ -642,7 +642,7 @@ public class ClueScrollPlugin extends Plugin
return mapArrow; return mapArrow;
} }
mapArrow = ImageUtil.getResourceStreamFromClass(getClass(), "/util/clue_arrow.png"); mapArrow = ImageUtil.loadImageResource(getClass(), "/util/clue_arrow.png");
return mapArrow; return mapArrow;
} }

4
runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPanel.java
View File

@@ -134,11 +134,11 @@ class ConfigPanel extends PluginPanel
static static
{ {
final BufferedImage backIcon = ImageUtil.getResourceStreamFromClass(ConfigPanel.class, "config_back_icon.png"); final BufferedImage backIcon = ImageUtil.loadImageResource(ConfigPanel.class, "config_back_icon.png");
BACK_ICON = new ImageIcon(backIcon); BACK_ICON = new ImageIcon(backIcon);
BACK_ICON_HOVER = new ImageIcon(ImageUtil.alphaOffset(backIcon, -100)); BACK_ICON_HOVER = new ImageIcon(ImageUtil.alphaOffset(backIcon, -100));
BufferedImage sectionRetractIcon = ImageUtil.getResourceStreamFromClass(ConfigPanel.class, "/util/arrow_right.png"); BufferedImage sectionRetractIcon = ImageUtil.loadImageResource(ConfigPanel.class, "/util/arrow_right.png");
sectionRetractIcon = ImageUtil.luminanceOffset(sectionRetractIcon, -121); sectionRetractIcon = ImageUtil.luminanceOffset(sectionRetractIcon, -121);
SECTION_EXPAND_ICON = new ImageIcon(sectionRetractIcon); SECTION_EXPAND_ICON = new ImageIcon(sectionRetractIcon);
SECTION_EXPAND_ICON_HOVER = new ImageIcon(ImageUtil.alphaOffset(sectionRetractIcon, -100)); SECTION_EXPAND_ICON_HOVER = new ImageIcon(ImageUtil.alphaOffset(sectionRetractIcon, -100));

2
runelite-client/src/main/java/net/runelite/client/plugins/config/ConfigPlugin.java
View File

@@ -83,7 +83,7 @@ public class ConfigPlugin extends Plugin
)); ));
pluginListPanel.rebuildPluginList(); pluginListPanel.rebuildPluginList();
final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "config_icon.png"); final BufferedImage icon = ImageUtil.loadImageResource(getClass(), "config_icon.png");
navButton = NavigationButton.builder() navButton = NavigationButton.builder()
.tooltip("Configuration") .tooltip("Configuration")

6
runelite-client/src/main/java/net/runelite/client/plugins/config/PluginHubPanel.java
View File

@@ -102,14 +102,14 @@ class PluginHubPanel extends PluginPanel
static static
{ {
BufferedImage missingIcon = ImageUtil.getResourceStreamFromClass(PluginHubPanel.class, "pluginhub_missingicon.png"); BufferedImage missingIcon = ImageUtil.loadImageResource(PluginHubPanel.class, "pluginhub_missingicon.png");
MISSING_ICON = new ImageIcon(missingIcon); MISSING_ICON = new ImageIcon(missingIcon);
BufferedImage helpIcon = ImageUtil.getResourceStreamFromClass(PluginHubPanel.class, "pluginhub_help.png"); BufferedImage helpIcon = ImageUtil.loadImageResource(PluginHubPanel.class, "pluginhub_help.png");
HELP_ICON = new ImageIcon(helpIcon); HELP_ICON = new ImageIcon(helpIcon);
HELP_ICON_HOVER = new ImageIcon(ImageUtil.alphaOffset(helpIcon, -100)); HELP_ICON_HOVER = new ImageIcon(ImageUtil.alphaOffset(helpIcon, -100));
BufferedImage configureIcon = ImageUtil.getResourceStreamFromClass(PluginHubPanel.class, "pluginhub_configure.png"); BufferedImage configureIcon = ImageUtil.loadImageResource(PluginHubPanel.class, "pluginhub_configure.png");
CONFIGURE_ICON = new ImageIcon(configureIcon); CONFIGURE_ICON = new ImageIcon(configureIcon);
CONFIGURE_ICON_HOVER = new ImageIcon(ImageUtil.alphaOffset(configureIcon, -100)); CONFIGURE_ICON_HOVER = new ImageIcon(ImageUtil.alphaOffset(configureIcon, -100));
} }

4
runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListItem.java
View File

@@ -73,8 +73,8 @@ class PluginListItem extends JPanel implements SearchablePlugin
static static
{ {
BufferedImage configIcon = ImageUtil.getResourceStreamFromClass(ConfigPanel.class, "config_edit_icon.png"); BufferedImage configIcon = ImageUtil.loadImageResource(ConfigPanel.class, "config_edit_icon.png");
BufferedImage onStar = ImageUtil.getResourceStreamFromClass(ConfigPanel.class, "star_on.png"); BufferedImage onStar = ImageUtil.loadImageResource(ConfigPanel.class, "star_on.png");
CONFIG_ICON = new ImageIcon(configIcon); CONFIG_ICON = new ImageIcon(configIcon);
ON_STAR = new ImageIcon(onStar); ON_STAR = new ImageIcon(onStar);
CONFIG_ICON_HOVER = new ImageIcon(ImageUtil.luminanceOffset(configIcon, -100)); CONFIG_ICON_HOVER = new ImageIcon(ImageUtil.luminanceOffset(configIcon, -100));

2
runelite-client/src/main/java/net/runelite/client/plugins/config/PluginToggleButton.java
View File

@@ -39,7 +39,7 @@ class PluginToggleButton extends JToggleButton
static static
{ {
BufferedImage onSwitcher = ImageUtil.getResourceStreamFromClass(ConfigPanel.class, "switcher_on.png"); BufferedImage onSwitcher = ImageUtil.loadImageResource(ConfigPanel.class, "switcher_on.png");
ON_SWITCHER = new ImageIcon(onSwitcher); ON_SWITCHER = new ImageIcon(onSwitcher);
OFF_SWITCHER = new ImageIcon(ImageUtil.flipImage( OFF_SWITCHER = new ImageIcon(ImageUtil.flipImage(
ImageUtil.luminanceScale( ImageUtil.luminanceScale(

2
runelite-client/src/main/java/net/runelite/client/plugins/customcursor/CustomCursor.java
View File

@@ -54,6 +54,6 @@ public enum CustomCursor
CustomCursor(String name, String icon) CustomCursor(String name, String icon)
{ {
this.name = name; this.name = name;
this.cursorImage = ImageUtil.getResourceStreamFromClass(CustomCursorPlugin.class, icon); this.cursorImage = ImageUtil.loadImageResource(CustomCursorPlugin.class, icon);
} }
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPanel.java
View File

@@ -174,7 +174,7 @@ class DevToolsPanel extends PluginPanel
final JButton newInfoboxBtn = new JButton("Infobox"); final JButton newInfoboxBtn = new JButton("Infobox");
newInfoboxBtn.addActionListener(e -> newInfoboxBtn.addActionListener(e ->
{ {
Counter counter = new Counter(ImageUtil.getResourceStreamFromClass(getClass(), "devtools_icon.png"), plugin, 42) Counter counter = new Counter(ImageUtil.loadImageResource(getClass(), "devtools_icon.png"), plugin, 42)
{ {
@Override @Override
public String getName() public String getName()

2
runelite-client/src/main/java/net/runelite/client/plugins/devtools/DevToolsPlugin.java
View File

@@ -198,7 +198,7 @@ public class DevToolsPlugin extends Plugin
final DevToolsPanel panel = injector.getInstance(DevToolsPanel.class); final DevToolsPanel panel = injector.getInstance(DevToolsPanel.class);
final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "devtools_icon.png"); final BufferedImage icon = ImageUtil.loadImageResource(getClass(), "devtools_icon.png");
navButton = NavigationButton.builder() navButton = NavigationButton.builder()
.tooltip("Developer Tools") .tooltip("Developer Tools")

2
runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordPlugin.java
View File

@@ -123,7 +123,7 @@ public class DiscordPlugin extends Plugin
@Override @Override
protected void startUp() throws Exception protected void startUp() throws Exception
{ {
final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "discord.png"); final BufferedImage icon = ImageUtil.loadImageResource(getClass(), "discord.png");
discordButton = NavigationButton.builder() discordButton = NavigationButton.builder()
.tab(false) .tab(false)

2
runelite-client/src/main/java/net/runelite/client/plugins/emojis/Emoji.java
View File

@@ -116,7 +116,7 @@ enum Emoji
BufferedImage loadImage() BufferedImage loadImage()
{ {
return ImageUtil.getResourceStreamFromClass(getClass(), this.name().toLowerCase() + ".png"); return ImageUtil.loadImageResource(getClass(), this.name().toLowerCase() + ".png");
} }
static Emoji getEmoji(String trigger) static Emoji getEmoji(String trigger)

4
runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPanel.java
View File

@@ -101,8 +101,8 @@ class FeedPanel extends PluginPanel
static static
{ {
RUNELITE_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(FeedPanel.class, "runelite.png")); RUNELITE_ICON = new ImageIcon(ImageUtil.loadImageResource(FeedPanel.class, "runelite.png"));
OSRS_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(FeedPanel.class, "osrs.png")); OSRS_ICON = new ImageIcon(ImageUtil.loadImageResource(FeedPanel.class, "osrs.png"));
} }
private final FeedConfig config; private final FeedConfig config;

2
runelite-client/src/main/java/net/runelite/client/plugins/feed/FeedPlugin.java
View File

@@ -97,7 +97,7 @@ public class FeedPlugin extends Plugin
{ {
feedPanel = injector.getInstance(FeedPanel.class); feedPanel = injector.getInstance(FeedPanel.class);
final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "icon.png"); final BufferedImage icon = ImageUtil.loadImageResource(getClass(), "icon.png");
navButton = NavigationButton.builder() navButton = NavigationButton.builder()
.tooltip("News Feed") .tooltip("News Feed")

2
runelite-client/src/main/java/net/runelite/client/plugins/friendnotes/FriendNotesPlugin.java
View File

@@ -416,7 +416,7 @@ public class FriendNotesPlugin extends Plugin
return; return;
} }
final BufferedImage iconImg = ImageUtil.getResourceStreamFromClass(getClass(), "note_icon.png"); final BufferedImage iconImg = ImageUtil.loadImageResource(getClass(), "note_icon.png");
if (iconImg == null) if (iconImg == null)
{ {
return; return;

2
runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangeOfferSlot.java
View File

@@ -82,7 +82,7 @@ public class GrandExchangeOfferSlot extends JPanel
static static
{ {
final BufferedImage rightArrow = ImageUtil.alphaOffset(ImageUtil.getResourceStreamFromClass(GrandExchangeOfferSlot.class, "/util/arrow_right.png"), 0.25f); final BufferedImage rightArrow = ImageUtil.alphaOffset(ImageUtil.loadImageResource(GrandExchangeOfferSlot.class, "/util/arrow_right.png"), 0.25f);
RIGHT_ARROW_ICON = new ImageIcon(rightArrow); RIGHT_ARROW_ICON = new ImageIcon(rightArrow);
LEFT_ARROW_ICON = new ImageIcon(ImageUtil.flipImage(rightArrow, true, false)); LEFT_ARROW_ICON = new ImageIcon(ImageUtil.flipImage(rightArrow, true, false));
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/grandexchange/GrandExchangePlugin.java
View File

@@ -289,7 +289,7 @@ public class GrandExchangePlugin extends Plugin
{ {
panel = injector.getInstance(GrandExchangePanel.class); panel = injector.getInstance(GrandExchangePanel.class);
final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "ge_icon.png"); final BufferedImage icon = ImageUtil.loadImageResource(getClass(), "ge_icon.png");
button = NavigationButton.builder() button = NavigationButton.builder()
.tooltip("Grand Exchange") .tooltip("Grand Exchange")

4
runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePanel.java
View File

@@ -206,7 +206,7 @@ public class HiscorePanel extends PluginPanel
for (HiscoreEndpoint endpoint : ENDPOINTS) for (HiscoreEndpoint endpoint : ENDPOINTS)
{ {
final BufferedImage iconImage = ImageUtil.getResourceStreamFromClass(getClass(), endpoint.name().toLowerCase() + ".png"); final BufferedImage iconImage = ImageUtil.loadImageResource(getClass(), endpoint.name().toLowerCase() + ".png");
MaterialTab tab = new MaterialTab(new ImageIcon(iconImage), tabGroup, null); MaterialTab tab = new MaterialTab(new ImageIcon(iconImage), tabGroup, null);
tab.setToolTipText(endpoint.getName() + " Hiscores"); tab.setToolTipText(endpoint.getName() + " Hiscores");
@@ -345,7 +345,7 @@ public class HiscorePanel extends PluginPanel
String skillIcon = directory + skillName + ".png"; String skillIcon = directory + skillName + ".png";
log.debug("Loading skill icon from {}", skillIcon); log.debug("Loading skill icon from {}", skillIcon);
label.setIcon(new ImageIcon(ImageUtil.getResourceStreamFromClass(getClass(), skillIcon))); label.setIcon(new ImageIcon(ImageUtil.loadImageResource(getClass(), skillIcon)));
boolean totalLabel = skill == OVERALL || skill == null; //overall or combat boolean totalLabel = skill == OVERALL || skill == null; //overall or combat
label.setIconTextGap(totalLabel ? 10 : 4); label.setIconTextGap(totalLabel ? 10 : 4);

2
runelite-client/src/main/java/net/runelite/client/plugins/hiscore/HiscorePlugin.java
View File

@@ -94,7 +94,7 @@ public class HiscorePlugin extends Plugin
{ {
hiscorePanel = injector.getInstance(HiscorePanel.class); hiscorePanel = injector.getInstance(HiscorePanel.class);
final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "normal.png"); final BufferedImage icon = ImageUtil.loadImageResource(getClass(), "normal.png");
navButton = NavigationButton.builder() navButton = NavigationButton.builder()
.tooltip("Hiscore") .tooltip("Hiscore")

12
runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPanel.java
View File

@@ -114,12 +114,12 @@ public class InfoPanel extends PluginPanel
static static
{ {
ARROW_RIGHT_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(InfoPanel.class, "/util/arrow_right.png")); ARROW_RIGHT_ICON = new ImageIcon(ImageUtil.loadImageResource(InfoPanel.class, "/util/arrow_right.png"));
GITHUB_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(InfoPanel.class, "github_icon.png")); GITHUB_ICON = new ImageIcon(ImageUtil.loadImageResource(InfoPanel.class, "github_icon.png"));
DISCORD_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(InfoPanel.class, "discord_icon.png")); DISCORD_ICON = new ImageIcon(ImageUtil.loadImageResource(InfoPanel.class, "discord_icon.png"));
PATREON_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(InfoPanel.class, "patreon_icon.png")); PATREON_ICON = new ImageIcon(ImageUtil.loadImageResource(InfoPanel.class, "patreon_icon.png"));
WIKI_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(InfoPanel.class, "wiki_icon.png")); WIKI_ICON = new ImageIcon(ImageUtil.loadImageResource(InfoPanel.class, "wiki_icon.png"));
IMPORT_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(InfoPanel.class, "import_icon.png")); IMPORT_ICON = new ImageIcon(ImageUtil.loadImageResource(InfoPanel.class, "import_icon.png"));
} }
void init() void init()

2
runelite-client/src/main/java/net/runelite/client/plugins/info/InfoPlugin.java
View File

@@ -50,7 +50,7 @@ public class InfoPlugin extends Plugin
final InfoPanel panel = injector.getInstance(InfoPanel.class); final InfoPanel panel = injector.getInstance(InfoPanel.class);
panel.init(); panel.init();
final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "info_icon.png"); final BufferedImage icon = ImageUtil.loadImageResource(getClass(), "info_icon.png");
navButton = NavigationButton.builder() navButton = NavigationButton.builder()
.tooltip("Info") .tooltip("Info")

2
runelite-client/src/main/java/net/runelite/client/plugins/interfacestyles/InterfaceStylesPlugin.java
View File

@@ -264,7 +264,7 @@ public class InterfaceStylesPlugin extends Plugin
try try
{ {
log.debug("Loading: {}", file); log.debug("Loading: {}", file);
BufferedImage image = ImageUtil.getResourceStreamFromClass(this.getClass(), file); BufferedImage image = ImageUtil.loadImageResource(this.getClass(), file);
return ImageUtil.getImageSpritePixels(image, client); return ImageUtil.getImageSpritePixels(image, client);
} }
catch (RuntimeException ex) catch (RuntimeException ex)

2
runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPanel.java
View File

@@ -59,7 +59,7 @@ class KourendLibraryPanel extends PluginPanel
static static
{ {
final BufferedImage resetIcon = ImageUtil.getResourceStreamFromClass(KourendLibraryPanel.class, "/util/reset.png"); final BufferedImage resetIcon = ImageUtil.loadImageResource(KourendLibraryPanel.class, "/util/reset.png");
RESET_ICON = new ImageIcon(resetIcon); RESET_ICON = new ImageIcon(resetIcon);
RESET_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(resetIcon, -100)); RESET_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(resetIcon, -100));
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/kourendlibrary/KourendLibraryPlugin.java
View File

@@ -134,7 +134,7 @@ public class KourendLibraryPlugin extends Plugin
panel = injector.getInstance(KourendLibraryPanel.class); panel = injector.getInstance(KourendLibraryPanel.class);
panel.init(); panel.init();
final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "panel_icon.png"); final BufferedImage icon = ImageUtil.loadImageResource(getClass(), "panel_icon.png");
navButton = NavigationButton.builder() navButton = NavigationButton.builder()
.tooltip("Kourend Library") .tooltip("Kourend Library")

2
runelite-client/src/main/java/net/runelite/client/plugins/loginscreen/LoginScreenPlugin.java
View File

@@ -308,7 +308,7 @@ public class LoginScreenPlugin extends Plugin implements KeyListener
try try
{ {
log.debug("Loading: {}", file); log.debug("Loading: {}", file);
BufferedImage image = ImageUtil.getResourceStreamFromClass(this.getClass(), file); BufferedImage image = ImageUtil.loadImageResource(this.getClass(), file);
return ImageUtil.getImageSpritePixels(image, client); return ImageUtil.getImageSpritePixels(image, client);
} }
catch (RuntimeException ex) catch (RuntimeException ex)

14
runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPanel.java
View File

@@ -131,13 +131,13 @@ class LootTrackerPanel extends PluginPanel
static static
{ {
final BufferedImage singleLootImg = ImageUtil.getResourceStreamFromClass(LootTrackerPlugin.class, "single_loot_icon.png"); final BufferedImage singleLootImg = ImageUtil.loadImageResource(LootTrackerPlugin.class, "single_loot_icon.png");
final BufferedImage groupedLootImg = ImageUtil.getResourceStreamFromClass(LootTrackerPlugin.class, "grouped_loot_icon.png"); final BufferedImage groupedLootImg = ImageUtil.loadImageResource(LootTrackerPlugin.class, "grouped_loot_icon.png");
final BufferedImage backArrowImg = ImageUtil.getResourceStreamFromClass(LootTrackerPlugin.class, "back_icon.png"); final BufferedImage backArrowImg = ImageUtil.loadImageResource(LootTrackerPlugin.class, "back_icon.png");
final BufferedImage visibleImg = ImageUtil.getResourceStreamFromClass(LootTrackerPlugin.class, "visible_icon.png"); final BufferedImage visibleImg = ImageUtil.loadImageResource(LootTrackerPlugin.class, "visible_icon.png");
final BufferedImage invisibleImg = ImageUtil.getResourceStreamFromClass(LootTrackerPlugin.class, "invisible_icon.png"); final BufferedImage invisibleImg = ImageUtil.loadImageResource(LootTrackerPlugin.class, "invisible_icon.png");
final BufferedImage collapseImg = ImageUtil.getResourceStreamFromClass(LootTrackerPlugin.class, "collapsed.png"); final BufferedImage collapseImg = ImageUtil.loadImageResource(LootTrackerPlugin.class, "collapsed.png");
final BufferedImage expandedImg = ImageUtil.getResourceStreamFromClass(LootTrackerPlugin.class, "expanded.png"); final BufferedImage expandedImg = ImageUtil.loadImageResource(LootTrackerPlugin.class, "expanded.png");
SINGLE_LOOT_VIEW = new ImageIcon(singleLootImg); SINGLE_LOOT_VIEW = new ImageIcon(singleLootImg);
SINGLE_LOOT_VIEW_FADED = new ImageIcon(ImageUtil.alphaOffset(singleLootImg, -180)); SINGLE_LOOT_VIEW_FADED = new ImageIcon(ImageUtil.alphaOffset(singleLootImg, -180));

2
runelite-client/src/main/java/net/runelite/client/plugins/loottracker/LootTrackerPlugin.java
View File

@@ -363,7 +363,7 @@ public class LootTrackerPlugin extends Plugin
panel = new LootTrackerPanel(this, itemManager, config); panel = new LootTrackerPanel(this, itemManager, config);
spriteManager.getSpriteAsync(SpriteID.TAB_INVENTORY, 0, panel::loadHeaderIcon); spriteManager.getSpriteAsync(SpriteID.TAB_INVENTORY, 0, panel::loadHeaderIcon);
final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "panel_icon.png"); final BufferedImage icon = ImageUtil.loadImageResource(getClass(), "panel_icon.png");
navButton = NavigationButton.builder() navButton = NavigationButton.builder()
.tooltip("Loot Tracker") .tooltip("Loot Tracker")

2
runelite-client/src/main/java/net/runelite/client/plugins/mta/alchemy/AlchemyRoomTimer.java
View File

@@ -48,7 +48,7 @@ public class AlchemyRoomTimer extends Timer
return image; return image;
} }
image = ImageUtil.getResourceStreamFromClass(AlchemyRoomTimer.class, "/util/reset.png"); image = ImageUtil.loadImageResource(AlchemyRoomTimer.class, "/util/reset.png");
return image; return image;
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/notes/NotesPlugin.java
View File

@@ -65,7 +65,7 @@ public class NotesPlugin extends Plugin
panel = injector.getInstance(NotesPanel.class); panel = injector.getInstance(NotesPanel.class);
panel.init(config); panel.init(config);
final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "notes_icon.png"); final BufferedImage icon = ImageUtil.loadImageResource(getClass(), "notes_icon.png");
navButton = NavigationButton.builder() navButton = NavigationButton.builder()
.tooltip("Notes") .tooltip("Notes")

2
runelite-client/src/main/java/net/runelite/client/plugins/party/PartyWorldMapPoint.java
View File

@@ -34,7 +34,7 @@ import net.runelite.client.ws.PartyMember;
class PartyWorldMapPoint extends WorldMapPoint class PartyWorldMapPoint extends WorldMapPoint
{ {
private static final BufferedImage ARROW = ImageUtil.getResourceStreamFromClass(PartyWorldMapPoint.class, "/util/clue_arrow.png"); private static final BufferedImage ARROW = ImageUtil.loadImageResource(PartyWorldMapPoint.class, "/util/clue_arrow.png");
private BufferedImage partyImage; private BufferedImage partyImage;
private final PartyMember member; private final PartyMember member;

2
runelite-client/src/main/java/net/runelite/client/plugins/poh/PohIcons.java
View File

@@ -143,7 +143,7 @@ public enum PohIcons
return image; return image;
} }
image = ImageUtil.getResourceStreamFromClass(getClass(), getImageResource() + ".png"); image = ImageUtil.loadImageResource(getClass(), getImageResource() + ".png");
return image; return image;
} }

6
runelite-client/src/main/java/net/runelite/client/plugins/poison/PoisonPlugin.java
View File

@@ -71,9 +71,9 @@ public class PoisonPlugin extends Plugin
static static
{ {
HEART_DISEASE = ImageUtil.resizeCanvas(ImageUtil.getResourceStreamFromClass(AlternateSprites.class, AlternateSprites.DISEASE_HEART), 26, 26); HEART_DISEASE = ImageUtil.resizeCanvas(ImageUtil.loadImageResource(AlternateSprites.class, AlternateSprites.DISEASE_HEART), 26, 26);
HEART_POISON = ImageUtil.resizeCanvas(ImageUtil.getResourceStreamFromClass(AlternateSprites.class, AlternateSprites.POISON_HEART), 26, 26); HEART_POISON = ImageUtil.resizeCanvas(ImageUtil.loadImageResource(AlternateSprites.class, AlternateSprites.POISON_HEART), 26, 26);
HEART_VENOM = ImageUtil.resizeCanvas(ImageUtil.getResourceStreamFromClass(AlternateSprites.class, AlternateSprites.VENOM_HEART), 26, 26); HEART_VENOM = ImageUtil.resizeCanvas(ImageUtil.loadImageResource(AlternateSprites.class, AlternateSprites.VENOM_HEART), 26, 26);
} }
@Inject @Inject

4
runelite-client/src/main/java/net/runelite/client/plugins/prayer/PrayerBarOverlay.java
View File

@@ -52,8 +52,8 @@ class PrayerBarOverlay extends Overlay
private static final Color FLICK_HELP_COLOR = Color.white; private static final Color FLICK_HELP_COLOR = Color.white;
private static final Dimension PRAYER_BAR_SIZE = new Dimension(30, 5); private static final Dimension PRAYER_BAR_SIZE = new Dimension(30, 5);
private static final int HD_PRAYER_BAR_PADDING = 1; private static final int HD_PRAYER_BAR_PADDING = 1;
private static final BufferedImage HD_FRONT_BAR = ImageUtil.getResourceStreamFromClass(PrayerPlugin.class, "front.png"); private static final BufferedImage HD_FRONT_BAR = ImageUtil.loadImageResource(PrayerPlugin.class, "front.png");
private static final BufferedImage HD_BACK_BAR = ImageUtil.getResourceStreamFromClass(PrayerPlugin.class, "back.png"); private static final BufferedImage HD_BACK_BAR = ImageUtil.loadImageResource(PrayerPlugin.class, "back.png");
private final Client client; private final Client client;
private final PrayerConfig config; private final PrayerConfig config;

2
runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ScreenMarkerPlugin.java
View File

@@ -125,7 +125,7 @@ public class ScreenMarkerPlugin extends Plugin
pluginPanel = new ScreenMarkerPluginPanel(this); pluginPanel = new ScreenMarkerPluginPanel(this);
pluginPanel.rebuild(); pluginPanel.rebuild();
final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), ICON_FILE); final BufferedImage icon = ImageUtil.loadImageResource(getClass(), ICON_FILE);
navigationButton = NavigationButton.builder() navigationButton = NavigationButton.builder()
.tooltip(PLUGIN_NAME) .tooltip(PLUGIN_NAME)

4
runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerCreationPanel.java
View File

@@ -54,8 +54,8 @@ public class ScreenMarkerCreationPanel extends JPanel
static static
{ {
CONFIRM_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(ScreenMarkerPlugin.class, "confirm_icon.png")); CONFIRM_ICON = new ImageIcon(ImageUtil.loadImageResource(ScreenMarkerPlugin.class, "confirm_icon.png"));
CANCEL_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(ScreenMarkerPlugin.class, "cancel_icon.png")); CANCEL_ICON = new ImageIcon(ImageUtil.loadImageResource(ScreenMarkerPlugin.class, "cancel_icon.png"));
final BufferedImage confirmIcon = ImageUtil.bufferedImageFromImage(CONFIRM_ICON.getImage()); final BufferedImage confirmIcon = ImageUtil.bufferedImageFromImage(CONFIRM_ICON.getImage());
CONFIRM_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(confirmIcon, 0.54f)); CONFIRM_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(confirmIcon, 0.54f));

12
runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPanel.java
View File

@@ -107,7 +107,7 @@ class ScreenMarkerPanel extends JPanel
static static
{ {
final BufferedImage borderImg = ImageUtil.getResourceStreamFromClass(ScreenMarkerPlugin.class, "border_color_icon.png"); final BufferedImage borderImg = ImageUtil.loadImageResource(ScreenMarkerPlugin.class, "border_color_icon.png");
final BufferedImage borderImgHover = ImageUtil.luminanceOffset(borderImg, -150); final BufferedImage borderImgHover = ImageUtil.luminanceOffset(borderImg, -150);
BORDER_COLOR_ICON = new ImageIcon(borderImg); BORDER_COLOR_ICON = new ImageIcon(borderImg);
BORDER_COLOR_HOVER_ICON = new ImageIcon(borderImgHover); BORDER_COLOR_HOVER_ICON = new ImageIcon(borderImgHover);
@@ -115,7 +115,7 @@ class ScreenMarkerPanel extends JPanel
NO_BORDER_COLOR_ICON = new ImageIcon(borderImgHover); NO_BORDER_COLOR_ICON = new ImageIcon(borderImgHover);
NO_BORDER_COLOR_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(borderImgHover, -100)); NO_BORDER_COLOR_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(borderImgHover, -100));
final BufferedImage fillImg = ImageUtil.getResourceStreamFromClass(ScreenMarkerPlugin.class, "fill_color_icon.png"); final BufferedImage fillImg = ImageUtil.loadImageResource(ScreenMarkerPlugin.class, "fill_color_icon.png");
final BufferedImage fillImgHover = ImageUtil.luminanceOffset(fillImg, -150); final BufferedImage fillImgHover = ImageUtil.luminanceOffset(fillImg, -150);
FILL_COLOR_ICON = new ImageIcon(fillImg); FILL_COLOR_ICON = new ImageIcon(fillImg);
FILL_COLOR_HOVER_ICON = new ImageIcon(fillImgHover); FILL_COLOR_HOVER_ICON = new ImageIcon(fillImgHover);
@@ -123,7 +123,7 @@ class ScreenMarkerPanel extends JPanel
NO_FILL_COLOR_ICON = new ImageIcon(fillImgHover); NO_FILL_COLOR_ICON = new ImageIcon(fillImgHover);
NO_FILL_COLOR_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(fillImgHover, -100)); NO_FILL_COLOR_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(fillImgHover, -100));
final BufferedImage opacityImg = ImageUtil.getResourceStreamFromClass(ScreenMarkerPlugin.class, "opacity_icon.png"); final BufferedImage opacityImg = ImageUtil.loadImageResource(ScreenMarkerPlugin.class, "opacity_icon.png");
final BufferedImage opacityImgHover = ImageUtil.luminanceOffset(opacityImg, -150); final BufferedImage opacityImgHover = ImageUtil.luminanceOffset(opacityImg, -150);
FULL_OPACITY_ICON = new ImageIcon(opacityImg); FULL_OPACITY_ICON = new ImageIcon(opacityImg);
FULL_OPACITY_HOVER_ICON = new ImageIcon(opacityImgHover); FULL_OPACITY_HOVER_ICON = new ImageIcon(opacityImgHover);
@@ -131,15 +131,15 @@ class ScreenMarkerPanel extends JPanel
NO_OPACITY_ICON = new ImageIcon(opacityImgHover); NO_OPACITY_ICON = new ImageIcon(opacityImgHover);
NO_OPACITY_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(opacityImgHover, -100)); NO_OPACITY_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(opacityImgHover, -100));
final BufferedImage visibleImg = ImageUtil.getResourceStreamFromClass(ScreenMarkerPlugin.class, "visible_icon.png"); final BufferedImage visibleImg = ImageUtil.loadImageResource(ScreenMarkerPlugin.class, "visible_icon.png");
VISIBLE_ICON = new ImageIcon(visibleImg); VISIBLE_ICON = new ImageIcon(visibleImg);
VISIBLE_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(visibleImg, -100)); VISIBLE_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(visibleImg, -100));
final BufferedImage invisibleImg = ImageUtil.getResourceStreamFromClass(ScreenMarkerPlugin.class, "invisible_icon.png"); final BufferedImage invisibleImg = ImageUtil.loadImageResource(ScreenMarkerPlugin.class, "invisible_icon.png");
INVISIBLE_ICON = new ImageIcon(invisibleImg); INVISIBLE_ICON = new ImageIcon(invisibleImg);
INVISIBLE_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(invisibleImg, -100)); INVISIBLE_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(invisibleImg, -100));
final BufferedImage deleteImg = ImageUtil.getResourceStreamFromClass(ScreenMarkerPlugin.class, "delete_icon.png"); final BufferedImage deleteImg = ImageUtil.loadImageResource(ScreenMarkerPlugin.class, "delete_icon.png");
DELETE_ICON = new ImageIcon(deleteImg); DELETE_ICON = new ImageIcon(deleteImg);
DELETE_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(deleteImg, -100)); DELETE_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(deleteImg, -100));
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/screenmarkers/ui/ScreenMarkerPluginPanel.java
View File

@@ -77,7 +77,7 @@ public class ScreenMarkerPluginPanel extends PluginPanel
static static
{ {
final BufferedImage addIcon = ImageUtil.getResourceStreamFromClass(ScreenMarkerPlugin.class, "add_icon.png"); final BufferedImage addIcon = ImageUtil.loadImageResource(ScreenMarkerPlugin.class, "add_icon.png");
ADD_ICON = new ImageIcon(addIcon); ADD_ICON = new ImageIcon(addIcon);
ADD_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(addIcon, 0.53f)); ADD_HOVER_ICON = new ImageIcon(ImageUtil.alphaOffset(addIcon, 0.53f));
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/screenshot/ScreenshotPlugin.java
View File

@@ -186,7 +186,7 @@ public class ScreenshotPlugin extends Plugin
SCREENSHOT_DIR.mkdirs(); SCREENSHOT_DIR.mkdirs();
keyManager.registerKeyListener(hotkeyListener); keyManager.registerKeyListener(hotkeyListener);
final BufferedImage iconImage = ImageUtil.getResourceStreamFromClass(getClass(), "screenshot.png"); final BufferedImage iconImage = ImageUtil.loadImageResource(getClass(), "screenshot.png");
titleBarButton = NavigationButton.builder() titleBarButton = NavigationButton.builder()
.tab(false) .tab(false)

2
runelite-client/src/main/java/net/runelite/client/plugins/skillcalculator/SkillCalculatorPlugin.java
View File

@@ -64,7 +64,7 @@ public class SkillCalculatorPlugin extends Plugin
@Override @Override
protected void startUp() throws Exception protected void startUp() throws Exception
{ {
final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "calc.png"); final BufferedImage icon = ImageUtil.loadImageResource(getClass(), "calc.png");
final SkillCalculatorPanel uiPanel = new SkillCalculatorPanel(skillIconManager, client, spriteManager, itemManager); final SkillCalculatorPanel uiPanel = new SkillCalculatorPanel(skillIconManager, client, spriteManager, itemManager);
uiNavigationButton = NavigationButton.builder() uiNavigationButton = NavigationButton.builder()

6
runelite-client/src/main/java/net/runelite/client/plugins/statusbars/StatusBarsOverlay.java
View File

@@ -311,9 +311,9 @@ class StatusBarsOverlay extends Overlay
} }
heartIcon = ImageUtil.resizeCanvas(Objects.requireNonNull(spriteManager.getSprite(SpriteID.MINIMAP_ORB_HITPOINTS_ICON, 0)), ICON_DIMENSIONS, ICON_DIMENSIONS); heartIcon = ImageUtil.resizeCanvas(Objects.requireNonNull(spriteManager.getSprite(SpriteID.MINIMAP_ORB_HITPOINTS_ICON, 0)), ICON_DIMENSIONS, ICON_DIMENSIONS);
heartDisease = ImageUtil.resizeCanvas(ImageUtil.getResourceStreamFromClass(AlternateSprites.class, AlternateSprites.DISEASE_HEART), ICON_DIMENSIONS, ICON_DIMENSIONS); heartDisease = ImageUtil.resizeCanvas(ImageUtil.loadImageResource(AlternateSprites.class, AlternateSprites.DISEASE_HEART), ICON_DIMENSIONS, ICON_DIMENSIONS);
heartPoison = ImageUtil.resizeCanvas(ImageUtil.getResourceStreamFromClass(AlternateSprites.class, AlternateSprites.POISON_HEART), ICON_DIMENSIONS, ICON_DIMENSIONS); heartPoison = ImageUtil.resizeCanvas(ImageUtil.loadImageResource(AlternateSprites.class, AlternateSprites.POISON_HEART), ICON_DIMENSIONS, ICON_DIMENSIONS);
heartVenom = ImageUtil.resizeCanvas(ImageUtil.getResourceStreamFromClass(AlternateSprites.class, AlternateSprites.VENOM_HEART), ICON_DIMENSIONS, ICON_DIMENSIONS); heartVenom = ImageUtil.resizeCanvas(ImageUtil.loadImageResource(AlternateSprites.class, AlternateSprites.VENOM_HEART), ICON_DIMENSIONS, ICON_DIMENSIONS);
energyIcon = ImageUtil.resizeCanvas(Objects.requireNonNull(spriteManager.getSprite(SpriteID.MINIMAP_ORB_WALK_ICON, 0)), ICON_DIMENSIONS, ICON_DIMENSIONS); energyIcon = ImageUtil.resizeCanvas(Objects.requireNonNull(spriteManager.getSprite(SpriteID.MINIMAP_ORB_WALK_ICON, 0)), ICON_DIMENSIONS, ICON_DIMENSIONS);
specialIcon = ImageUtil.resizeCanvas(Objects.requireNonNull(spriteManager.getSprite(SpriteID.MINIMAP_ORB_SPECIAL_ICON, 0)), ICON_DIMENSIONS, ICON_DIMENSIONS); specialIcon = ImageUtil.resizeCanvas(Objects.requireNonNull(spriteManager.getSprite(SpriteID.MINIMAP_ORB_SPECIAL_ICON, 0)), ICON_DIMENSIONS, ICON_DIMENSIONS);
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/timetracking/OverviewItemPanel.java
View File

@@ -57,7 +57,7 @@ class OverviewItemPanel extends JPanel
static static
{ {
ARROW_RIGHT_ICON = new ImageIcon(ImageUtil.getResourceStreamFromClass(TimeTrackingPlugin.class, "/util/arrow_right.png")); ARROW_RIGHT_ICON = new ImageIcon(ImageUtil.loadImageResource(TimeTrackingPlugin.class, "/util/arrow_right.png"));
} }
OverviewItemPanel(ItemManager itemManager, TimeTrackingPanel pluginPanel, Tab tab, String title) OverviewItemPanel(ItemManager itemManager, TimeTrackingPanel pluginPanel, Tab tab, String title)

2
runelite-client/src/main/java/net/runelite/client/plugins/timetracking/TimeTrackingPlugin.java
View File

@@ -124,7 +124,7 @@ public class TimeTrackingPlugin extends Plugin
birdHouseTracker.loadFromConfig(); birdHouseTracker.loadFromConfig();
farmingTracker.loadCompletionTimes(); farmingTracker.loadCompletionTimes();
final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "watch.png"); final BufferedImage icon = ImageUtil.loadImageResource(getClass(), "watch.png");
panel = injector.getInstance(TimeTrackingPanel.class); panel = injector.getInstance(TimeTrackingPanel.class);

16
runelite-client/src/main/java/net/runelite/client/plugins/timetracking/clocks/ClockTabPanel.java
View File

@@ -71,14 +71,14 @@ public class ClockTabPanel extends TabContentPanel
static static
{ {
BufferedImage deleteIcon = ImageUtil.getResourceStreamFromClass(TimeTrackingPlugin.class, "delete_icon.png"); BufferedImage deleteIcon = ImageUtil.loadImageResource(TimeTrackingPlugin.class, "delete_icon.png");
BufferedImage lapIcon = ImageUtil.getResourceStreamFromClass(TimeTrackingPlugin.class, "lap_icon.png"); BufferedImage lapIcon = ImageUtil.loadImageResource(TimeTrackingPlugin.class, "lap_icon.png");
BufferedImage pauseIcon = ImageUtil.getResourceStreamFromClass(TimeTrackingPlugin.class, "pause_icon.png"); BufferedImage pauseIcon = ImageUtil.loadImageResource(TimeTrackingPlugin.class, "pause_icon.png");
BufferedImage resetIcon = ImageUtil.getResourceStreamFromClass(TimeTrackingPlugin.class, "reset_icon.png"); BufferedImage resetIcon = ImageUtil.loadImageResource(TimeTrackingPlugin.class, "reset_icon.png");
BufferedImage startIcon = ImageUtil.getResourceStreamFromClass(TimeTrackingPlugin.class, "start_icon.png"); BufferedImage startIcon = ImageUtil.loadImageResource(TimeTrackingPlugin.class, "start_icon.png");
BufferedImage addIcon = ImageUtil.getResourceStreamFromClass(TimeTrackingPlugin.class, "add_icon.png"); BufferedImage addIcon = ImageUtil.loadImageResource(TimeTrackingPlugin.class, "add_icon.png");
BufferedImage loopIcon = ImageUtil.getResourceStreamFromClass(TimeTrackingPlugin.class, "loop_icon.png"); BufferedImage loopIcon = ImageUtil.loadImageResource(TimeTrackingPlugin.class, "loop_icon.png");
BufferedImage loopSelectedIcon = ImageUtil.getResourceStreamFromClass(TimeTrackingPlugin.class, "loop_selected_icon.png"); BufferedImage loopSelectedIcon = ImageUtil.loadImageResource(TimeTrackingPlugin.class, "loop_selected_icon.png");
DELETE_ICON = new ImageIcon(deleteIcon); DELETE_ICON = new ImageIcon(deleteIcon);
DELETE_ICON_HOVER = new ImageIcon(ImageUtil.luminanceOffset(deleteIcon, -80)); DELETE_ICON_HOVER = new ImageIcon(ImageUtil.luminanceOffset(deleteIcon, -80));

2
runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableHeader.java
View File

@@ -54,7 +54,7 @@ class WorldTableHeader extends JPanel
static static
{ {
final BufferedImage arrowDown = ImageUtil.getResourceStreamFromClass(WorldHopperPlugin.class, "arrow_down.png"); final BufferedImage arrowDown = ImageUtil.loadImageResource(WorldHopperPlugin.class, "arrow_down.png");
final BufferedImage arrowUp = ImageUtil.rotateImage(arrowDown, Math.PI); final BufferedImage arrowUp = ImageUtil.rotateImage(arrowDown, Math.PI);
final BufferedImage arrowUpFaded = ImageUtil.luminanceOffset(arrowUp, -80); final BufferedImage arrowUpFaded = ImageUtil.luminanceOffset(arrowUp, -80);
ARROW_UP = new ImageIcon(arrowUpFaded); ARROW_UP = new ImageIcon(arrowUpFaded);

8
runelite-client/src/main/java/net/runelite/client/plugins/worldhopper/WorldTableRow.java
View File

@@ -66,10 +66,10 @@ class WorldTableRow extends JPanel
static static
{ {
FLAG_AUS = new ImageIcon(ImageUtil.getResourceStreamFromClass(WorldHopperPlugin.class, "flag_aus.png")); FLAG_AUS = new ImageIcon(ImageUtil.loadImageResource(WorldHopperPlugin.class, "flag_aus.png"));
FLAG_UK = new ImageIcon(ImageUtil.getResourceStreamFromClass(WorldHopperPlugin.class, "flag_uk.png")); FLAG_UK = new ImageIcon(ImageUtil.loadImageResource(WorldHopperPlugin.class, "flag_uk.png"));
FLAG_US = new ImageIcon(ImageUtil.getResourceStreamFromClass(WorldHopperPlugin.class, "flag_us.png")); FLAG_US = new ImageIcon(ImageUtil.loadImageResource(WorldHopperPlugin.class, "flag_us.png"));
FLAG_GER = new ImageIcon(ImageUtil.getResourceStreamFromClass(WorldHopperPlugin.class, "flag_ger.png")); FLAG_GER = new ImageIcon(ImageUtil.loadImageResource(WorldHopperPlugin.class, "flag_ger.png"));
} }
private final JMenuItem favoriteMenuOption = new JMenuItem(); private final JMenuItem favoriteMenuOption = new JMenuItem();

2
runelite-client/src/main/java/net/runelite/client/plugins/worldmap/RunecraftingAltarPoint.java
View File

@@ -33,7 +33,7 @@ class RunecraftingAltarPoint extends WorldMapPoint
RunecraftingAltarPoint(RunecraftingAltarLocation point) RunecraftingAltarPoint(RunecraftingAltarLocation point)
{ {
super(point.getLocation(), WorldMapPlugin.BLANK_ICON); super(point.getLocation(), WorldMapPlugin.BLANK_ICON);
setImage(ImageUtil.getResourceStreamFromClass(WorldMapPlugin.class, point.getIconPath())); setImage(ImageUtil.loadImageResource(WorldMapPlugin.class, point.getIconPath()));
setTooltip(point.getTooltip()); setTooltip(point.getTooltip());
} }
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/worldmap/TeleportPoint.java
View File

@@ -34,6 +34,6 @@ class TeleportPoint extends WorldMapPoint
{ {
super(data.getLocation(), WorldMapPlugin.BLANK_ICON); super(data.getLocation(), WorldMapPlugin.BLANK_ICON);
setTooltip(data.getTooltip()); setTooltip(data.getTooltip());
setImage(ImageUtil.getResourceStreamFromClass(WorldMapPlugin.class, data.getIconPath())); setImage(ImageUtil.loadImageResource(WorldMapPlugin.class, data.getIconPath()));
} }
} }

14
runelite-client/src/main/java/net/runelite/client/plugins/worldmap/WorldMapPlugin.java
View File

@@ -101,31 +101,31 @@ public class WorldMapPlugin extends Plugin
BLANK_ICON = new BufferedImage(iconBufferSize, iconBufferSize, BufferedImage.TYPE_INT_ARGB); BLANK_ICON = new BufferedImage(iconBufferSize, iconBufferSize, BufferedImage.TYPE_INT_ARGB);
FAIRY_TRAVEL_ICON = new BufferedImage(iconBufferSize, iconBufferSize, BufferedImage.TYPE_INT_ARGB); FAIRY_TRAVEL_ICON = new BufferedImage(iconBufferSize, iconBufferSize, BufferedImage.TYPE_INT_ARGB);
final BufferedImage fairyTravelIcon = ImageUtil.getResourceStreamFromClass(WorldMapPlugin.class, "fairy_ring_travel.png"); final BufferedImage fairyTravelIcon = ImageUtil.loadImageResource(WorldMapPlugin.class, "fairy_ring_travel.png");
FAIRY_TRAVEL_ICON.getGraphics().drawImage(fairyTravelIcon, 1, 1, null); FAIRY_TRAVEL_ICON.getGraphics().drawImage(fairyTravelIcon, 1, 1, null);
NOPE_ICON = new BufferedImage(iconBufferSize, iconBufferSize, BufferedImage.TYPE_INT_ARGB); NOPE_ICON = new BufferedImage(iconBufferSize, iconBufferSize, BufferedImage.TYPE_INT_ARGB);
final BufferedImage nopeImage = ImageUtil.getResourceStreamFromClass(WorldMapPlugin.class, "nope_icon.png"); final BufferedImage nopeImage = ImageUtil.loadImageResource(WorldMapPlugin.class, "nope_icon.png");
NOPE_ICON.getGraphics().drawImage(nopeImage, 1, 1, null); NOPE_ICON.getGraphics().drawImage(nopeImage, 1, 1, null);
NOT_STARTED_ICON = new BufferedImage(questIconBufferSize, questIconBufferSize, BufferedImage.TYPE_INT_ARGB); NOT_STARTED_ICON = new BufferedImage(questIconBufferSize, questIconBufferSize, BufferedImage.TYPE_INT_ARGB);
final BufferedImage notStartedIcon = ImageUtil.getResourceStreamFromClass(WorldMapPlugin.class, "quest_not_started_icon.png"); final BufferedImage notStartedIcon = ImageUtil.loadImageResource(WorldMapPlugin.class, "quest_not_started_icon.png");
NOT_STARTED_ICON.getGraphics().drawImage(notStartedIcon, 4, 4, null); NOT_STARTED_ICON.getGraphics().drawImage(notStartedIcon, 4, 4, null);
STARTED_ICON = new BufferedImage(questIconBufferSize, questIconBufferSize, BufferedImage.TYPE_INT_ARGB); STARTED_ICON = new BufferedImage(questIconBufferSize, questIconBufferSize, BufferedImage.TYPE_INT_ARGB);
final BufferedImage startedIcon = ImageUtil.getResourceStreamFromClass(WorldMapPlugin.class, "quest_started_icon.png"); final BufferedImage startedIcon = ImageUtil.loadImageResource(WorldMapPlugin.class, "quest_started_icon.png");
STARTED_ICON.getGraphics().drawImage(startedIcon, 4, 4, null); STARTED_ICON.getGraphics().drawImage(startedIcon, 4, 4, null);
FINISHED_ICON = new BufferedImage(questIconBufferSize, questIconBufferSize, BufferedImage.TYPE_INT_ARGB); FINISHED_ICON = new BufferedImage(questIconBufferSize, questIconBufferSize, BufferedImage.TYPE_INT_ARGB);
final BufferedImage finishedIcon = ImageUtil.getResourceStreamFromClass(WorldMapPlugin.class, "quest_completed_icon.png"); final BufferedImage finishedIcon = ImageUtil.loadImageResource(WorldMapPlugin.class, "quest_completed_icon.png");
FINISHED_ICON.getGraphics().drawImage(finishedIcon, 4, 4, null); FINISHED_ICON.getGraphics().drawImage(finishedIcon, 4, 4, null);
MINING_SITE_ICON = new BufferedImage(iconBufferSize, iconBufferSize, BufferedImage.TYPE_INT_ARGB); MINING_SITE_ICON = new BufferedImage(iconBufferSize, iconBufferSize, BufferedImage.TYPE_INT_ARGB);
final BufferedImage miningSiteIcon = ImageUtil.getResourceStreamFromClass(WorldMapPlugin.class, "mining_site_icon.png"); final BufferedImage miningSiteIcon = ImageUtil.loadImageResource(WorldMapPlugin.class, "mining_site_icon.png");
MINING_SITE_ICON.getGraphics().drawImage(miningSiteIcon, 1, 1, null); MINING_SITE_ICON.getGraphics().drawImage(miningSiteIcon, 1, 1, null);
ROOFTOP_COURSE_ICON = new BufferedImage(iconBufferSize, iconBufferSize, BufferedImage.TYPE_INT_ARGB); ROOFTOP_COURSE_ICON = new BufferedImage(iconBufferSize, iconBufferSize, BufferedImage.TYPE_INT_ARGB);
final BufferedImage rooftopCourseIcon = ImageUtil.getResourceStreamFromClass(WorldMapPlugin.class, "rooftop_course_icon.png"); final BufferedImage rooftopCourseIcon = ImageUtil.loadImageResource(WorldMapPlugin.class, "rooftop_course_icon.png");
ROOFTOP_COURSE_ICON.getGraphics().drawImage(rooftopCourseIcon, 1, 1, null); ROOFTOP_COURSE_ICON.getGraphics().drawImage(rooftopCourseIcon, 1, 1, null);
} }

2
runelite-client/src/main/java/net/runelite/client/plugins/xptracker/XpTrackerPlugin.java
View File

@@ -157,7 +157,7 @@ public class XpTrackerPlugin extends Plugin
{ {
xpPanel = new XpPanel(this, xpTrackerConfig, client, skillIconManager); xpPanel = new XpPanel(this, xpTrackerConfig, client, skillIconManager);
final BufferedImage icon = ImageUtil.getResourceStreamFromClass(getClass(), "/skill_icons/overall.png"); final BufferedImage icon = ImageUtil.loadImageResource(getClass(), "/skill_icons/overall.png");
navButton = NavigationButton.builder() navButton = NavigationButton.builder()
.tooltip("XP Tracker") .tooltip("XP Tracker")

4
runelite-client/src/main/java/net/runelite/client/ui/ClientUI.java
View File

@@ -108,7 +108,7 @@ public class ClientUI
private static final String CONFIG_CLIENT_BOUNDS = "clientBounds"; private static final String CONFIG_CLIENT_BOUNDS = "clientBounds";
private static final String CONFIG_CLIENT_MAXIMIZED = "clientMaximized"; private static final String CONFIG_CLIENT_MAXIMIZED = "clientMaximized";
private static final String CONFIG_CLIENT_SIDEBAR_CLOSED = "clientSidebarClosed"; private static final String CONFIG_CLIENT_SIDEBAR_CLOSED = "clientSidebarClosed";
public static final BufferedImage ICON = ImageUtil.getResourceStreamFromClass(ClientUI.class, "/runelite.png"); public static final BufferedImage ICON = ImageUtil.loadImageResource(ClientUI.class, "/runelite.png");
@Getter @Getter
private TrayIcon trayIcon; private TrayIcon trayIcon;
@@ -474,7 +474,7 @@ public class ClientUI
// Create hide sidebar button // Create hide sidebar button
sidebarOpenIcon = ImageUtil.getResourceStreamFromClass(ClientUI.class, withTitleBar ? "open.png" : "open_rs.png"); sidebarOpenIcon = ImageUtil.loadImageResource(ClientUI.class, withTitleBar ? "open.png" : "open_rs.png");
sidebarClosedIcon = ImageUtil.flipImage(sidebarOpenIcon, true, false); sidebarClosedIcon = ImageUtil.flipImage(sidebarOpenIcon, true, false);
sidebarNavigationButton = NavigationButton sidebarNavigationButton = NavigationButton

2
runelite-client/src/main/java/net/runelite/client/ui/FatalErrorDialog.java
View File

@@ -81,7 +81,7 @@ public class FatalErrorDialog extends JDialog
try try
{ {
BufferedImage logo = ImageUtil.getResourceStreamFromClass(FatalErrorDialog.class, "runelite_transparent.png"); BufferedImage logo = ImageUtil.loadImageResource(FatalErrorDialog.class, "runelite_transparent.png");
setIconImage(logo); setIconImage(logo);
JLabel runelite = new JLabel(); JLabel runelite = new JLabel();

2
runelite-client/src/main/java/net/runelite/client/ui/SplashScreen.java
View File

@@ -68,7 +68,7 @@ public class SplashScreen extends JFrame implements ActionListener
private SplashScreen() throws IOException private SplashScreen() throws IOException
{ {
BufferedImage logo = ImageUtil.getResourceStreamFromClass(SplashScreen.class, "runelite_transparent.png"); BufferedImage logo = ImageUtil.loadImageResource(SplashScreen.class, "runelite_transparent.png");
setTitle("RuneLite Launcher"); setTitle("RuneLite Launcher");

17
runelite-client/src/main/java/net/runelite/client/util/ImageUtil.java
View File

@@ -331,16 +331,25 @@ public class ImageUtil
return outlinedImage; return outlinedImage;
} }
/**
* @see #loadImageResource(Class, String)
*/
@Deprecated
public static BufferedImage getResourceStreamFromClass(Class<?> c, String path)
{
return loadImageResource(c, path);
}
/** /**
* Reads an image resource from a given path relative to a given class. * Reads an image resource from a given path relative to a given class.
* This method is primarily shorthand for the synchronization and error handling required for * This method is primarily shorthand for the synchronization and error handling required for
* loading image resources from classes. * loading image resources from the classpath.
* *
* @param c The class to be referenced for resource path. * @param c The class to be referenced for the package path.
* @param path The path, relative to the given class. * @param path The path, relative to the given class.
* @return A {@link BufferedImage} of the loaded image resource from the given path. * @return A {@link BufferedImage} of the loaded image resource from the given path.
*/ */
public static BufferedImage getResourceStreamFromClass(final Class c, final String path) public static BufferedImage loadImageResource(final Class<?> c, final String path)
{ {
try try
{ {
@@ -359,7 +368,7 @@ public class ImageUtil
} }
else else
{ {
filePath = c.getPackage().getName().replace(".", "/") + "/" + path; filePath = c.getPackage().getName().replace('.', '/') + "/" + path;
} }
log.warn("Failed to load image from class: {}, path: {}", c.getName(), filePath); log.warn("Failed to load image from class: {}, path: {}", c.getName(), filePath);