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

Merge branch 'token_phase_two' into 'master'

Browse Source 
Add more support for migrating Editions to TokenScripts

See merge request core-developers/forge!885
This commit is contained in:
Jamin Collins
2018-09-06 01:16:27 +00:00
parent 8a1989ef02 8338f62603
commit 925ae63071
7 changed files with 94 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-gui-desktop/src/main/java/forge/ImageFetcher.java
View File

@@ -75,10 +75,10 @@ public class ImageFetcher {
}
}
final String filename = imageKey.substring(2) + ".jpg";
final String tokenUrl = tokenImages.get(filename);
String tokenUrl = tokenImages.get(filename);
if (tokenUrl == null) {
System.err.println("Token " + imageKey + " not found in: " + ForgeConstants.IMAGE_LIST_TOKENS_FILE);
return;
System.err.println("No specified file.. Attempting to download from default Url");
tokenUrl = String.format("%s%s", ForgeConstants.URL_TOKEN_DOWNLOAD, filename);
}
destFile = new File(ForgeConstants.CACHE_TOKEN_PICS_DIR, filename);
downloadUrls.add(tokenUrl);