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

interface styles: simplify loading sprites

Browse Source 
Co-authored-by: Lotto <prozet@live.se>
This commit is contained in:
Adam
2019-04-06 14:04:48 -04:00
parent ed8a24b069
commit 72cb2ffade
1 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,9 +28,6 @@ package net.runelite.client.plugins.interfacestyles;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.IOException;
import java.io.InputStream;
import javax.imageio.ImageIO;
import javax.inject.Inject; import javax.inject.Inject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.runelite.api.Client; import net.runelite.api.Client;
@@ -123,7 +120,8 @@ public class InterfaceStylesPlugin extends Plugin
{ {
if (skin == config.skin()) if (skin == config.skin())
{ {
SpritePixels spritePixels = getFileSpritePixels(String.valueOf(spriteOverride.getSpriteID()), null); String file = config.skin().toString() + "/" + spriteOverride.getSpriteID() + ".png";
SpritePixels spritePixels = getFileSpritePixels(file);
if (spriteOverride.getSpriteID() == SpriteID.COMPASS_TEXTURE) if (spriteOverride.getSpriteID() == SpriteID.COMPASS_TEXTURE)
{ {
@@ -154,7 +152,8 @@ public class InterfaceStylesPlugin extends Plugin
{ {
if (widgetOverride.getSkin() == config.skin()) if (widgetOverride.getSkin() == config.skin())
{ {
SpritePixels spritePixels = getFileSpritePixels(widgetOverride.getName(), "widget"); String file = config.skin().toString() + "/widget/" + widgetOverride.getName() + ".png";
SpritePixels spritePixels = getFileSpritePixels(file);
if (spritePixels != null) if (spritePixels != null)
{ {
@@ -178,33 +177,18 @@ public class InterfaceStylesPlugin extends Plugin
} }
} }
private SpritePixels getFileSpritePixels(String file, String subfolder) private SpritePixels getFileSpritePixels(String file)
{ {
StringBuilder stringBuilder = new StringBuilder(); try
stringBuilder.append(config.skin().toString() + "/");
if (subfolder != null)
{ {
stringBuilder.append(subfolder + "/"); log.debug("Loading: {}", file);
BufferedImage image = ImageUtil.getResourceStreamFromClass(this.getClass(), file);
return ImageUtil.getImageSpritePixels(image, client);
} }
catch (RuntimeException ex)
stringBuilder.append(file + ".png");
String filePath = stringBuilder.toString();
try (InputStream inputStream = InterfaceStylesPlugin.class.getResourceAsStream(filePath))
{
log.debug("Loading: " + filePath);
BufferedImage spriteImage = ImageIO.read(inputStream);
return ImageUtil.getImageSpritePixels(spriteImage, client);
}
catch (IOException ex)
{ {
log.debug("Unable to load image: ", ex); log.debug("Unable to load image: ", ex);
} }
catch (IllegalArgumentException ex)
{
log.debug("Input stream of file path " + filePath + " could not be read: ", ex);
}
return null; return null;
} }