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

Remove param

Browse Source
This commit is contained in:
Eradev
2025-08-21 11:10:06 -04:00
committed by Chris H
parent 40190b5442
commit 5569f18053
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -408,8 +408,7 @@ public final class FModel {
final List<String> typeListFile = FileUtil.readFile(ForgeConstants.TYPE_LIST_FILE); final List<String> typeListFile = FileUtil.readFile(ForgeConstants.TYPE_LIST_FILE);
Set<String> addTo = null; loadTypes(typeListFile);
loadTypes(addTo, typeListFile);
File customTypesFilesDir = new File(ForgeConstants.USER_CUSTOM_TYPE_LIST_DIR); File customTypesFilesDir = new File(ForgeConstants.USER_CUSTOM_TYPE_LIST_DIR);
if (customTypesFilesDir.exists() && customTypesFilesDir.isDirectory()) { if (customTypesFilesDir.exists() && customTypesFilesDir.isDirectory()) {
@@ -423,7 +422,7 @@ public final class FModel {
for (File file : txtFiles) { for (File file : txtFiles) {
try { try {
final List<String> customTypeListFile = FileUtil.readFile(file); final List<String> customTypeListFile = FileUtil.readFile(file);
loadTypes(addTo, customTypeListFile); loadTypes(customTypeListFile);
} catch (Exception e) { } catch (Exception e) {
System.err.println("Failed to load custom types from file " + file.getAbsolutePath()); System.err.println("Failed to load custom types from file " + file.getAbsolutePath());
} }
@@ -448,7 +447,9 @@ public final class FModel {
} }
} }
private static void loadTypes(Set<String> addTo, List<String> fileContent) { private static void loadTypes(List<String> fileContent) {
Set<String> addTo = null;
for (final String s : fileContent) { for (final String s : fileContent) {
if (s.equals("[BasicTypes]")) { if (s.equals("[BasicTypes]")) {
addTo = CardType.Constant.BASIC_TYPES; addTo = CardType.Constant.BASIC_TYPES;
@@ -471,6 +472,10 @@ public final class FModel {
} else if (s.equals("[PlanarTypes]")) { } else if (s.equals("[PlanarTypes]")) {
addTo = CardType.Constant.PLANAR_TYPES; addTo = CardType.Constant.PLANAR_TYPES;
} else if (s.length() > 1) { } else if (s.length() > 1) {
if (addTo == null) {
continue;
}
if (s.contains(":")) { if (s.contains(":")) {
String[] k = s.split(":"); String[] k = s.split(":");