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

Merge branch 'master' into newmaster

Browse Source
This commit is contained in:
Anthony Calosa
2022-07-09 17:08:43 +08:00
parent 3e3abed344 fb67263b5f
commit 2f4481e76f
7 changed files with 405 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-gui-mobile/src/forge/Forge.java
View File

@@ -55,6 +55,7 @@ import java.io.File;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Deque;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

5
forge-gui-mobile/src/forge/assets/FSkinFont.java
View File

@@ -47,11 +47,6 @@ public class FSkinFont {
static {
FileUtil.ensureDirectoryExists(ForgeConstants.FONTS_DIR);
}
public static void clear() {
fonts.clear();
//reset maxFontSize and Preload
preloadAll("");
}
public static FSkinFont get(final int unscaledSize) {
return _get((int)Utils.scale(unscaledSize));
}

4
forge-gui-mobile/src/forge/assets/ImageCache.java
View File

@@ -133,9 +133,7 @@ public class ImageCache {
if(imageKey.startsWith(ImageKeys.CARD_PREFIX) || imageKey.startsWith(ImageKeys.TOKEN_PREFIX))
return getImage(ii.getImageKey(false), true, false);
}
boolean useDefaultNotFound = imageKey != null && !(imageKey.startsWith(ImageKeys.PRECON_PREFIX) || imageKey.startsWith(ImageKeys.FATPACK_PREFIX)
|| imageKey.startsWith(ImageKeys.BOOSTERBOX_PREFIX) || imageKey.startsWith(ImageKeys.BOOSTER_PREFIX) || imageKey.startsWith(ImageKeys.TOURNAMENTPACK_PREFIX));
return getImage(ii.getImageKey(false), useDefaultNotFound, true);
return getImage(ii.getImageKey(false), true, true);
}
/**

2
forge-gui-mobile/src/forge/screens/SplashScreen.java
View File

@@ -307,7 +307,7 @@ public class SplashScreen extends FContainer {
+ "Forge is open source software, released under the GNU General Public License.";
if (Forge.forcedEnglishonCJKMissing && !clear) {
clear = true;
FSkinFont.clear();
FSkinFont.preloadAll("");
disclaimerFont = FSkinFont.get(9);
}
g.drawText(disclaimer, disclaimerFont, FProgressBar.SEL_FORE_COLOR,