external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 03:08:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
drdev
2014-06-26 23:16:08 +00:00
parent 65d4cf3e6e
commit ef06a17db6
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
forge-gui-mobile/src/forge/assets/ImageLoader.java
View File

@@ -54,13 +54,13 @@ final class ImageLoader extends CacheLoader<String, Texture> {
path = ForgeConstants.CACHE_CARD_PICS_DIR; path = ForgeConstants.CACHE_CARD_PICS_DIR;
} }
Texture ret = _findFile(key, path, filename); Texture ret = findFile(key, path, filename);
// some S00 cards are really part of 6ED // some S00 cards are really part of 6ED
if (null == ret ) { if (null == ret ) {
String s2kAlias = ImageUtil.getSetFolder("S00"); String s2kAlias = ImageUtil.getSetFolder("S00");
if ( filename.startsWith(s2kAlias) ) { if ( filename.startsWith(s2kAlias) ) {
ret = _findFile(key, path, filename.replace(s2kAlias, ImageUtil.getSetFolder("6ED"))); ret = findFile(key, path, filename.replace(s2kAlias, ImageUtil.getSetFolder("6ED")));
} }
} }
@@ -68,11 +68,11 @@ final class ImageLoader extends CacheLoader<String, Texture> {
String setlessFilename = null; String setlessFilename = null;
if (null == ret && filename.contains("/")) { if (null == ret && filename.contains("/")) {
setlessFilename = filename.substring(filename.indexOf('/') + 1); setlessFilename = filename.substring(filename.indexOf('/') + 1);
ret = _findFile(key, path, setlessFilename); ret = findFile(key, path, setlessFilename);
// try lowering the art index to the minimum for regular cards // try lowering the art index to the minimum for regular cards
if (null == ret && setlessFilename.contains(".full")) { if (null == ret && setlessFilename.contains(".full")) {
ret = _findFile(key, path, setlessFilename.replaceAll("[0-9]*[.]full", "1.full")); ret = findFile(key, path, setlessFilename.replaceAll("[0-9]*[.]full", "1.full"));
} }
} }
@@ -83,7 +83,7 @@ final class ImageLoader extends CacheLoader<String, Texture> {
return ret; return ret;
} }
private static Texture _findFile(String key, String path, String filename) { private static Texture findFile(String key, String path, String filename) {
for (String ext : _FILE_EXTENSIONS) { for (String ext : _FILE_EXTENSIONS) {
File file = new File(path, filename + ext); File file = new File(path, filename + ext);
//System.out.println(String.format("Searching for %s at: %s", key, file.getAbsolutePath())); //System.out.println(String.format("Searching for %s at: %s", key, file.getAbsolutePath()));