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

update check

Browse Source
This commit is contained in:
Anthony Calosa
2025-08-08 21:01:58 +08:00
parent 286fcd3fbe
commit f2d65b2515
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -217,7 +217,6 @@ public class Forge implements ApplicationListener {
enableUIMask = "Full"; enableUIMask = "Full";
else if (getForgePreferences().getPref(FPref.UI_ENABLE_BORDER_MASKING).equals("false")) else if (getForgePreferences().getPref(FPref.UI_ENABLE_BORDER_MASKING).equals("false"))
enableUIMask = "Off"; enableUIMask = "Off";
enablePreloadExtendedArt = getForgePreferences().getPrefBoolean(FPref.UI_ENABLE_PRELOAD_EXTENDED_ART);
locale = getForgePreferences().getPref(FPref.UI_LANGUAGE); locale = getForgePreferences().getPref(FPref.UI_LANGUAGE);
autoCache = getForgePreferences().getPrefBoolean(FPref.UI_AUTO_CACHE_SIZE); autoCache = getForgePreferences().getPrefBoolean(FPref.UI_AUTO_CACHE_SIZE);
disposeTextures = getForgePreferences().getPrefBoolean(FPref.UI_ENABLE_DISPOSE_TEXTURES); disposeTextures = getForgePreferences().getPrefBoolean(FPref.UI_ENABLE_DISPOSE_TEXTURES);

7
forge-gui/src/main/java/forge/gamemodes/limited/BoosterDraft.java
View File

@@ -40,8 +40,10 @@ import org.apache.commons.lang3.ArrayUtils;
import java.io.File; import java.io.File;
import java.util.*; import java.util.*;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.function.Predicate; import java.util.function.Predicate;
import java.util.function.Supplier; import java.util.function.Supplier;
import java.util.stream.Collectors;
/** /**
* Booster Draft Format. * Booster Draft Format.
@@ -318,6 +320,7 @@ public class BoosterDraft implements IBoosterDraft {
private static List<CustomLimited> loadCustomDrafts() { private static List<CustomLimited> loadCustomDrafts() {
if (customs.isEmpty()) { if (customs.isEmpty()) {
String[] dList; String[] dList;
ConcurrentLinkedQueue<CustomLimited> queue = new ConcurrentLinkedQueue<>();
// get list of custom draft files // get list of custom draft files
final File dFolder = new File(ForgeConstants.DRAFT_DIR); final File dFolder = new File(ForgeConstants.DRAFT_DIR);
@@ -337,7 +340,7 @@ public class BoosterDraft implements IBoosterDraft {
if (element.endsWith(FILE_EXT)) { if (element.endsWith(FILE_EXT)) {
futures.add(CompletableFuture.supplyAsync(()-> { futures.add(CompletableFuture.supplyAsync(()-> {
final List<String> dfData = FileUtil.readFile(ForgeConstants.DRAFT_DIR + element); final List<String> dfData = FileUtil.readFile(ForgeConstants.DRAFT_DIR + element);
customs.add(CustomLimited.parse(dfData, FModel.getDecks().getCubes())); queue.add(CustomLimited.parse(dfData, FModel.getDecks().getCubes()));
return null; return null;
}).exceptionally(ex -> { }).exceptionally(ex -> {
ex.printStackTrace(); ex.printStackTrace();
@@ -349,6 +352,8 @@ public class BoosterDraft implements IBoosterDraft {
CompletableFuture.allOf(futuresArray).join(); CompletableFuture.allOf(futuresArray).join();
futures.clear(); futures.clear();
} }
// stream().toList() causes crash on Android, use Collectors.toList()
customs.addAll(queue.stream().collect(Collectors.toList()));
} }
return customs; return customs;
} }