mtg-genetic-deckbuilding

commit 06fba2116f28868231692bd5a005a2dc3236f23d
parent c8b6e48de05ff68f918b3491dcd82c0236d9dc5b
Author: Kevin Corvisier <git@kevincorvisier.fr>
Date:   Thu,  9 Jan 2025 18:31:04 +0900

Downgrade forge to 1.6.65
Diffstat:
M
pom.xml
 | 
2
+-
M
src/main/java/fr/kevincorvisier/mtg/gdb/GuiFake.java
 | 
12
++++++++----
M
src/main/java/fr/kevincorvisier/mtg/gdb/Main.java
 | 
6
+++---
M
src/main/java/fr/kevincorvisier/mtg/gdb/ai/CardPoolService.java
 | 
2
+-

4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
 		<maven.compiler.target>17</maven.compiler.target>
 		<maven.compiler.source>17</maven.compiler.source>
 
-		<forge.version>2.0.01</forge.version>
+		<forge.version>1.6.65</forge.version>
 		<junit.version>5.11.3</junit.version>
 		<logback.version>1.5.12</logback.version>
 		<lombok.version>1.18.36</lombok.version>
diff --git a/src/main/java/fr/kevincorvisier/mtg/gdb/GuiFake.java b/src/main/java/fr/kevincorvisier/mtg/gdb/GuiFake.java
@@ -5,7 +5,8 @@ import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.Collection;
 import java.util.List;
-import java.util.function.Function;
+
+import com.google.common.base.Function;
 
 import forge.gamemodes.match.HostedMatch;
 import forge.gui.download.GuiDownloadService;
@@ -141,21 +142,24 @@ public abstract class GuiFake implements IGuiBase
 	}
 
 	@Override
-	public String showInputDialog(final String message, final String title, final FSkinProp icon, final String initialInput, final List<String> inputOptions, final boolean isNumeric)
+	public String showInputDialog(final String message, final String title, final FSkinProp icon, final String initialInput, final List<String> inputOptions,
+			final boolean isNumeric)
 	{
 		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
-	public <T> List<T> getChoices(final String message, final int min, final int max, final Collection<T> choices, final T selected, final Function<T, String> display)
+	public <T> List<T> getChoices(final String message, final int min, final int max, final Collection<T> choices, final T selected,
+			final Function<T, String> display)
 	{
 		// TODO Auto-generated method stub
 		return null;
 	}
 
 	@Override
-	public <T> List<T> order(final String title, final String top, final int remainingObjectsMin, final int remainingObjectsMax, final List<T> sourceChoices, final List<T> destChoices)
+	public <T> List<T> order(final String title, final String top, final int remainingObjectsMin, final int remainingObjectsMax, final List<T> sourceChoices,
+			final List<T> destChoices)
 	{
 		// TODO Auto-generated method stub
 		return null;
diff --git a/src/main/java/fr/kevincorvisier/mtg/gdb/Main.java b/src/main/java/fr/kevincorvisier/mtg/gdb/Main.java
@@ -39,12 +39,12 @@ public class Main
 				final File resDir = new File(dataDir, "res");
 				final File versionFile = new File(dataDir, "version");
 
-				if (!resDir.exists() || !(versionFile.exists() && "2.0.01".equals(Files.readString(versionFile.toPath()))))
+				if (!resDir.exists() || !(versionFile.exists() && "1.6.65".equals(Files.readString(versionFile.toPath()))))
 				{
 					FileUtil.deleteDirectory(resDir);
 					FileUtil.deleteDirectory(versionFile);
 					downloadForgeRes(dataDir);
-					Files.writeString(versionFile.toPath(), "2.0.01");
+					Files.writeString(versionFile.toPath(), "1.6.65");
 				}
 
 				return resDir.getParentFile().getCanonicalPath() + File.separator;
@@ -58,7 +58,7 @@ public class Main
 		}
 	};
 
-	private static final String FORGE_RELEASE = "https://github.com/Card-Forge/forge/releases/download/forge-2.0.01/forge-installer-2.0.01.tar.bz2";
+	private static final String FORGE_RELEASE = "https://github.com/Card-Forge/forge/releases/download/forge-1.6.65/forge-gui-desktop-1.6.65.tar.bz2";
 	private static final String[] FORGE_RESOURCES = { "res/ai/", "res/cardsfolder/", "res/deckgendecks/", "res/editions/", "res/formats/",
 			"res/languages/en-US.properties", "res/tokenscripts/" };
 
diff --git a/src/main/java/fr/kevincorvisier/mtg/gdb/ai/CardPoolService.java b/src/main/java/fr/kevincorvisier/mtg/gdb/ai/CardPoolService.java
@@ -102,7 +102,7 @@ public class CardPoolService implements Reloadable
 					log.warn("{} is marked as non-playable by AI", card.getName());
 					continue;
 				}
-				if (!format.getFilterRules().test(card))
+				if (!format.getFilterRules().apply(card))
 				{
 					log.warn("{} is not legal in the format, skipping...", card.getName());
 					continue;