Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use getResourceAsStream instead of getResource, for #1617

master
melvinzhang 2018-11-01 12:42:41 +08:00
parent 5264ce75be
commit 0735be1f7b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/magic/ui/MagicImages.java
View File

@ -31,7 +31,7 @@ public final class MagicImages {
public static final BufferedImage BACK_IMAGE;
static {
BufferedImage image = ImageFileIO.toImg(MagicResources.getImageUrl("card-back.jpg"), null);
BufferedImage image = ImageFileIO.toImg(MagicResources.getImageStream("card-back.jpg"), null);
Dimension size = getPreferredImageSize(image);
BACK_IMAGE = ImageHelper.scale(image, size.width, size.height);
}
@ -93,7 +93,7 @@ public final class MagicImages {
return getSmallManaIcon(icon);
}
if (!icons.containsKey(icon)) {
icons.put(icon, new ImageIcon(MagicResources.getImageUrl(icon.getFilename())));
icons.put(icon, new ImageIcon(ImageFileIO.toImg(MagicResources.getImageStream(icon.getFilename()), MISSING_SMALL)));
}
return icons.get(icon);
}
@ -103,7 +103,7 @@ public final class MagicImages {
}
public static BufferedImage loadImage(String name) {
return ImageFileIO.toImg(MagicResources.getImageUrl(name), MISSING_SMALL);
return ImageFileIO.toImg(MagicResources.getImageStream(name), MISSING_SMALL);
}
private static BufferedImage loadTextureImage(String name) {

4
src/magic/utility/MagicResources.java
View File

@ -41,8 +41,8 @@ public final class MagicResources {
return instance.getClass().getResource("/magic/data/icons/mana/" + manaIcon.getFilename());
}
public static URL getImageUrl(final String imageFilename) {
return instance.getClass().getResource("/magic/data/icons/" + imageFilename);
public static InputStream getImageStream(final String imageFilename) {
return instance.getClass().getResourceAsStream("/magic/data/icons/" + imageFilename);
}
public static URL getTextureImageUrl(final String imageFilename) {