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

Refactor some the image loading code into forge-core

Browse Source
This commit is contained in:
drdev
2014-10-16 16:17:18 +00:00
parent 0ac7ed44dc
commit 5ba5b70f1f
7 changed files with 183 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
forge-gui/src/main/java/forge/assets/ImageUtil.java
View File

@@ -24,8 +24,9 @@ public class ImageUtil {
}
PaperCard cp = StaticData.instance().getCommonCards().getCard(key);
if ( cp == null )
if (cp == null) {
cp = StaticData.instance().getVariantCards().getCard(key);
}
return cp;
}

6
forge-gui/src/main/java/forge/model/FModel.java
View File

@@ -20,6 +20,7 @@ package forge.model;
import forge.CardStorageReader;
import forge.CardStorageReader.ProgressObserver;
import forge.FThreads;
import forge.ImageKeys;
import forge.StaticData;
import forge.achievement.AchievementCollection;
import forge.achievement.ConstructedAchievements;
@@ -86,6 +87,11 @@ public class FModel {
private static GameFormat.Collection formats;
public static void initialize(final IProgressBar progressBar) {
ImageKeys.initializeDirs(ForgeConstants.CACHE_CARD_PICS_DIR,
ForgeConstants.CACHE_TOKEN_PICS_DIR, ForgeConstants.CACHE_ICON_PICS_DIR,
ForgeConstants.CACHE_BOOSTER_PICS_DIR, ForgeConstants.CACHE_FATPACK_PICS_DIR,
ForgeConstants.CACHE_BOOSTERBOX_PICS_DIR, ForgeConstants.CACHE_PRECON_PICS_DIR,
ForgeConstants.CACHE_TOURNAMENTPACK_PICS_DIR);
// Instantiate preferences: quest and regular
//Preferences are initialized first so that the splash screen can be translated.