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

reverting module refactoring changes

Browse Source
This commit is contained in:
teferi
2014-03-02 14:19:50 +00:00
parent f3aa6a56a6
commit 076783aac4
14942 changed files with 16214 additions and 16196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29678
.gitattributes vendored
View File

File diff suppressed because it is too large Load Diff

154
.gitignore vendored
View File

@@ -4,96 +4,96 @@
/.metadata
forge-ai/forge-ai.iml
forge-ai/target
forge-bundle/target
forge-core/forge-core.iml
forge-core/target
forge-game/target
forge-gui/forge-gui.iml
forge-gui/forge.profile.properties
forge-gui/res/*.log
forge-gui/res/PerSetTrackingResults
forge-gui/res/cardsfolder/*.bat
forge-gui/res/decks
forge-gui/res/layouts
forge-gui/res/pics*
forge-gui/res/pics_product
forge-gui/res/skins/*.log
forge-gui/res/skins/PerSetTrackingResults
forge-gui/res/skins/Thumbs.db
forge-gui/res/skins/dark_ascension/*.log
forge-gui/res/skins/dark_ascension/PerSetTrackingResults
forge-gui/res/skins/dark_ascension/Thumbs.db
forge-gui/res/skins/dark_ascension/decks
forge-gui/res/skins/dark_ascension/layouts
forge-gui/res/skins/dark_ascension/pics*
forge-gui/res/skins/dark_ascension/pics_product
forge-gui/res/skins/decks
forge-gui/res/skins/default/*.log
forge-gui/res/skins/default/PerSetTrackingResults
forge-gui/res/skins/default/Thumbs.db
forge-gui/res/skins/default/decks
forge-gui/res/skins/default/layouts
forge-gui/res/skins/default/pics*
forge-gui/res/skins/default/pics_product
forge-gui/res/skins/firebloom/*.log
forge-gui/res/skins/firebloom/PerSetTrackingResults
forge-gui/res/skins/firebloom/Thumbs.db
forge-gui/res/skins/firebloom/decks
forge-gui/res/skins/firebloom/layouts
forge-gui/res/skins/firebloom/pics*
forge-gui/res/skins/firebloom/pics_product
forge-gui/res/skins/journeyman/*.log
forge-gui/res/skins/journeyman/PerSetTrackingResults
forge-gui/res/skins/journeyman/Thumbs.db
forge-gui/res/skins/journeyman/decks
forge-gui/res/skins/journeyman/layouts
forge-gui/res/skins/journeyman/pics*
forge-gui/res/skins/journeyman/pics_product
forge-gui/res/skins/layouts
forge-gui/res/skins/marble_blue/*.log
forge-gui/res/skins/marble_blue/PerSetTrackingResults
forge-gui/res/skins/marble_blue/Thumbs.db
forge-gui/res/skins/marble_blue/decks
forge-gui/res/skins/marble_blue/layouts
forge-gui/res/skins/marble_blue/pics*
forge-gui/res/skins/marble_blue/pics_product
forge-gui/res/skins/pics*
forge-gui/res/skins/pics_product
forge-gui/res/skins/rebel/*.log
forge-gui/res/skins/rebel/PerSetTrackingResults
forge-gui/res/skins/rebel/Thumbs.db
forge-gui/res/skins/rebel/decks
forge-gui/res/skins/rebel/layouts
forge-gui/res/skins/rebel/pics*
forge-gui/res/skins/rebel/pics_product
forge-gui/res/skins/smith/*.log
forge-gui/res/skins/smith/PerSetTrackingResults
forge-gui/res/skins/smith/Thumbs.db
forge-gui/res/skins/smith/decks
forge-gui/res/skins/smith/layouts
forge-gui/res/skins/smith/pics*
forge-gui/res/skins/smith/pics_product
forge-gui/res/skins/the_dale/*.log
forge-gui/res/skins/the_dale/PerSetTrackingResults
forge-gui/res/skins/the_dale/Thumbs.db
forge-gui/res/skins/the_dale/decks
forge-gui/res/skins/the_dale/layouts
forge-gui/res/skins/the_dale/pics*
forge-gui/res/skins/the_dale/pics_product
forge-gui/res/skins/the_simpsons/*.log
forge-gui/res/skins/the_simpsons/PerSetTrackingResults
forge-gui/res/skins/the_simpsons/Thumbs.db
forge-gui/res/skins/the_simpsons/decks
forge-gui/res/skins/the_simpsons/layouts
forge-gui/res/skins/the_simpsons/pics*
forge-gui/res/skins/the_simpsons/pics_product
forge-gui/target
forge-gui/tools/PerSetTrackingResults
forge-gui/tools/oracleScript.log
forge-m-android/bin
forge-m-android/target
forge-m-base/bin
forge-m-base/target
forge-m-desktop/bin
forge-m-desktop/libs
forge-m-desktop/res
forge-m-desktop/target
forge-net/target
forge-resources/src/main/resources/cardsfolder/*.bat
forge-resources/src/main/resources/skins/*.log
forge-resources/src/main/resources/skins/PerSetTrackingResults
forge-resources/src/main/resources/skins/Thumbs.db
forge-resources/src/main/resources/skins/dark_ascension/*.log
forge-resources/src/main/resources/skins/dark_ascension/PerSetTrackingResults
forge-resources/src/main/resources/skins/dark_ascension/Thumbs.db
forge-resources/src/main/resources/skins/dark_ascension/decks
forge-resources/src/main/resources/skins/dark_ascension/layouts
forge-resources/src/main/resources/skins/dark_ascension/pics*
forge-resources/src/main/resources/skins/dark_ascension/pics_product
forge-resources/src/main/resources/skins/decks
forge-resources/src/main/resources/skins/default/*.log
forge-resources/src/main/resources/skins/default/PerSetTrackingResults
forge-resources/src/main/resources/skins/default/Thumbs.db
forge-resources/src/main/resources/skins/default/decks
forge-resources/src/main/resources/skins/default/layouts
forge-resources/src/main/resources/skins/default/pics*
forge-resources/src/main/resources/skins/default/pics_product
forge-resources/src/main/resources/skins/firebloom/*.log
forge-resources/src/main/resources/skins/firebloom/PerSetTrackingResults
forge-resources/src/main/resources/skins/firebloom/Thumbs.db
forge-resources/src/main/resources/skins/firebloom/decks
forge-resources/src/main/resources/skins/firebloom/layouts
forge-resources/src/main/resources/skins/firebloom/pics*
forge-resources/src/main/resources/skins/firebloom/pics_product
forge-resources/src/main/resources/skins/journeyman/*.log
forge-resources/src/main/resources/skins/journeyman/PerSetTrackingResults
forge-resources/src/main/resources/skins/journeyman/Thumbs.db
forge-resources/src/main/resources/skins/journeyman/decks
forge-resources/src/main/resources/skins/journeyman/layouts
forge-resources/src/main/resources/skins/journeyman/pics*
forge-resources/src/main/resources/skins/journeyman/pics_product
forge-resources/src/main/resources/skins/layouts
forge-resources/src/main/resources/skins/marble_blue/*.log
forge-resources/src/main/resources/skins/marble_blue/PerSetTrackingResults
forge-resources/src/main/resources/skins/marble_blue/Thumbs.db
forge-resources/src/main/resources/skins/marble_blue/decks
forge-resources/src/main/resources/skins/marble_blue/layouts
forge-resources/src/main/resources/skins/marble_blue/pics*
forge-resources/src/main/resources/skins/marble_blue/pics_product
forge-resources/src/main/resources/skins/pics*
forge-resources/src/main/resources/skins/pics_product
forge-resources/src/main/resources/skins/rebel/*.log
forge-resources/src/main/resources/skins/rebel/PerSetTrackingResults
forge-resources/src/main/resources/skins/rebel/Thumbs.db
forge-resources/src/main/resources/skins/rebel/decks
forge-resources/src/main/resources/skins/rebel/layouts
forge-resources/src/main/resources/skins/rebel/pics*
forge-resources/src/main/resources/skins/rebel/pics_product
forge-resources/src/main/resources/skins/smith/*.log
forge-resources/src/main/resources/skins/smith/PerSetTrackingResults
forge-resources/src/main/resources/skins/smith/Thumbs.db
forge-resources/src/main/resources/skins/smith/decks
forge-resources/src/main/resources/skins/smith/layouts
forge-resources/src/main/resources/skins/smith/pics*
forge-resources/src/main/resources/skins/smith/pics_product
forge-resources/src/main/resources/skins/the_dale/*.log
forge-resources/src/main/resources/skins/the_dale/PerSetTrackingResults
forge-resources/src/main/resources/skins/the_dale/Thumbs.db
forge-resources/src/main/resources/skins/the_dale/decks
forge-resources/src/main/resources/skins/the_dale/layouts
forge-resources/src/main/resources/skins/the_dale/pics*
forge-resources/src/main/resources/skins/the_dale/pics_product
forge-resources/src/main/resources/skins/the_simpsons/*.log
forge-resources/src/main/resources/skins/the_simpsons/PerSetTrackingResults
forge-resources/src/main/resources/skins/the_simpsons/Thumbs.db
forge-resources/src/main/resources/skins/the_simpsons/decks
forge-resources/src/main/resources/skins/the_simpsons/layouts
forge-resources/src/main/resources/skins/the_simpsons/pics*
forge-resources/src/main/resources/skins/the_simpsons/pics_product
forge-resources/target
/forge.profile.properties
/nbactions.xml
/pom.xml.next

17
forge-ai/.classpath
View File

@@ -1,14 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
<classpathentry kind="src" path="src/main/java" including="**/*.java"/>
<classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="/forge-core"/>
<classpathentry kind="src" path="/forge-resources"/>
<classpathentry kind="var" path="M2_REPO/com/google/guava/guava/15.0/guava-15.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"/>
<classpathentry kind="src" path="/forge-game"/>
<classpathentry kind="var" path="M2_REPO/com/googlecode/minlog/1.2/minlog-1.2.jar"/>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

40
forge-ai/.project
View File

@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>forge-ai</name>
<comment>Forge lets you play the card game Magic: The Gathering against a computer opponent
using all of the rules. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects>
<project>forge-core</project>
<project>forge-resources</project>
<project>forge-game</project>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
<name>forge-ai</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>

15
forge-ai/pom.xml
View File

@@ -16,22 +16,13 @@
<dependency>
<groupId>forge</groupId>
<artifactId>forge-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>forge</groupId>
<artifactId>forge-game</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode</groupId>
<artifactId>minlog</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>
</project>

2
forge-ai/src/main/java/forge/ai/AiProfileUtil.java
View File

@@ -40,7 +40,7 @@ import java.util.Map;
public class AiProfileUtil {
private static Map<String, Map<AiProps, String>> loadedProfiles = new HashMap<String, Map<AiProps, String>>();
private static final String AI_PROFILE_DIR = AiProfileUtil.class.getResource("/").getFile()+"ai";
private static final String AI_PROFILE_DIR = "res/ai";
private static final String AI_PROFILE_EXT = ".ai";
public static final String AI_PROFILE_RANDOM_MATCH = "* Random (Match) *";

156
forge-bundle/pom.xml
View File

@@ -1,156 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>forge</artifactId>
<groupId>forge</groupId>
<version>1.5.14-SNAPSHOT</version>
</parent>
<artifactId>forge-bundle</artifactId>
<name>Forge Bundle</name>
<packaging>pom</packaging>
<dependencies>
<dependency>
<groupId>forge</groupId>
<artifactId>forge-gui</artifactId>
</dependency>
<dependency>
<groupId>forge</groupId>
<artifactId>forge-resources</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>parse-version</id>
<goals>
<goal>parse-version</goal>
</goals>
</execution>
</executions>
</plugin>
<!--plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<id>resources</id>
<goals>
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
</execution>
</executions>
</plugin-->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<id>jar-with-dependencies</id>
<phase>generate-resources</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<appendAssemblyId>true</appendAssemblyId>
<attach>false</attach>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifest>
<mainClass>forge.view.Main</mainClass>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
</archive>
</configuration>
</execution>
<!--execution>
<id>cardsfolder</id>
<phase>generate-resources</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<attach>false</attach>
<descriptors>
<descriptor>src/main/conf/cardsfolder.xml</descriptor>
</descriptors>
<finalName>cardsfolder</finalName>
</configuration>
</execution-->
<execution>
<id>windows-linux</id>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<appendAssemblyId>false</appendAssemblyId>
<descriptors>
<descriptor>src/main/conf/windows-linux.xml</descriptor>
</descriptors>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>com.akathist.maven.plugins.launch4j</groupId>
<artifactId>launch4j-maven-plugin</artifactId>
<executions>
<execution>
<id>l4j-gui</id>
<phase>generate-resources</phase>
<goals>
<goal>launch4j</goal>
</goals>
<configuration>
<headerType>gui</headerType>
<outfile>${project.build.directory}/forge.exe</outfile>
<jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
<dontWrapJar>true</dontWrapJar>
<errTitle>forge</errTitle>
<icon>src/main/conf/forge.ico</icon>
<classPath>
<mainClass>forge.view.Main</mainClass>
<addDependencies>false</addDependencies>
<preCp>%EXEDIR%/res</preCp>
</classPath>
<jre>
<minVersion>1.7.0</minVersion>
<maxHeapSize>1024</maxHeapSize>
</jre>
<versionInfo>
<fileVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</fileVersion>
<txtFileVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</txtFileVersion>
<fileDescription>Forge</fileDescription>
<copyright>Forge</copyright>
<productVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</productVersion>
<txtProductVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</txtProductVersion>
<productName>Forge</productName>
<internalName>forge</internalName>
<originalFilename>forge.exe</originalFilename>
</versionInfo>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

45
forge-bundle/src/main/conf/windows-linux.xml
View File

@@ -1,45 +0,0 @@
<assembly>
<id>bundle</id>
<formats>
<format>tar.bz2</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<scope>provided</scope>
<unpack>true</unpack>
<outputDirectory>/res</outputDirectory>
</dependencySet>
</dependencySets>
<fileSets>
<fileSet>
<directory>${project.basedir}/src/main/resources</directory>
<includes>
<include>forge.sh</include>
<include>forge.command</include>
<include>forge.bat</include>
</includes>
<outputDirectory>/</outputDirectory>
<filtered>true</filtered>
</fileSet>
<fileSet>
<directory>${project.basedir}/src/main/resources</directory>
<excludes>
<!--exclude>res/cardsfolder/**</exclude-->
<exclude>forge.sh</exclude>
<exclude>forge.command</exclude>
<exclude>forge.bat</exclude>
</excludes>
<outputDirectory>/</outputDirectory>
</fileSet>
<fileSet>
<directory>${project.build.directory}</directory>
<outputDirectory>/</outputDirectory>
<includes>
<include>forge.exe</include>
<!--include>res/**</include-->
<include>${project.build.finalName}-jar-with-dependencies.jar</include>
</includes>
</fileSet>
</fileSets>
</assembly>

4
forge-bundle/src/main/resources/forge.bat
View File

@@ -1,4 +0,0 @@
@echo off
SETLOCAL
cd %~dp0
java -Xmx1024M -cp "%~dp0res";"%~dp0${project.build.finalName}-jar-with-dependencies.jar" forge.view.Main

3
forge-bundle/src/main/resources/forge.command
View File

@@ -1,3 +0,0 @@
#!/bin/sh
cd "`dirname \"$0\"`"
java -Xmx1024m -cp res:${project.build.finalName}-jar-with-dependencies.jar forge.view.Main

3
forge-bundle/src/main/resources/forge.sh
View File

@@ -1,3 +0,0 @@
#!/bin/sh
cd "`dirname \"$0\"`"
java -Xmx1024m -cp res:${project.build.finalName}-jar-with-dependencies.jar forge.view.Main

13
forge-core/.classpath
View File

@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
<classpathentry kind="src" path="src/main/java" including="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="/forge-resources"/>
<classpathentry kind="var" path="M2_REPO/com/google/guava/guava/15.0/guava-15.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"/>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

38
forge-core/.project
View File

@@ -1,21 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>forge-core</name>
<comment>Forge lets you play the card game Magic: The Gathering against a computer opponent
using all of the rules. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects>
<project>forge-resources</project>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
<name>forge-core</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>

7
forge-core/pom.xml
View File

@@ -13,18 +13,15 @@
<name>Forge Core</name>
<dependencies>
<dependency>
<groupId>forge</groupId>
<artifactId>forge-resources</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>15.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.1</version>
</dependency>
</dependencies>
</project>

2
forge-core/src/main/java/forge/StaticData.java
View File

@@ -56,7 +56,7 @@ public class StaticData {
this.boosters = new StorageBase<SealedProduct.Template>("Boosters", editions.getBoosterGenerator());
this.specialBoosters = new StorageBase<SealedProduct.Template>("Special boosters", new SealedProduct.Template.Reader(new File(blockDataFolder, "boosters-special.txt")));
this.tournaments = new StorageBase<SealedProduct.Template>("Starter sets", new SealedProduct.Template.Reader(new File(blockDataFolder, "starters.txt")));
this.fatPacks = new StorageBase<FatPack.Template>("Fat packs", new FatPack.Template.Reader(StaticData.class.getResource("/").getFile()+"/blockdata/fatpacks.txt"));
this.fatPacks = new StorageBase<FatPack.Template>("Fat packs", new FatPack.Template.Reader("res/blockdata/fatpacks.txt"));
this.printSheets = new StorageBase<PrintSheet>("Special print runs", new PrintSheet.Reader(new File(blockDataFolder, "printsheets.txt")));
}

15
forge-game/.classpath
View File

@@ -1,12 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
<classpathentry kind="src" path="src/main/java" including="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="/forge-core"/>
<classpathentry kind="src" path="/forge-resources"/>
<classpathentry kind="var" path="M2_REPO/com/google/guava/guava/15.0/guava-15.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"/>
<classpathentry kind="var" path="M2_REPO/com/googlecode/minlog/1.2/minlog-1.2.jar"/>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

39
forge-game/.project
View File

@@ -1,22 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>forge-game</name>
<comment>Forge lets you play the card game Magic: The Gathering against a computer opponent
using all of the rules. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects>
<project>forge-core</project>
<project>forge-resources</project>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
<name>forge-game</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>

10
forge-game/pom.xml
View File

@@ -16,18 +16,12 @@
<dependency>
<groupId>forge</groupId>
<artifactId>forge-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode</groupId>
<artifactId>minlog</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>
</project>

53
forge-gui/.classpath
View File

@@ -1,49 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
<classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
<classpathentry kind="src" path="src/main/java" including="**/*.java"/>
<classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="src" path="/forge-core"/>
<classpathentry kind="src" path="/forge-resources"/>
<classpathentry kind="var" path="M2_REPO/com/google/guava/guava/15.0/guava-15.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar"/>
<classpathentry kind="src" path="/forge-game"/>
<classpathentry kind="var" path="M2_REPO/com/googlecode/minlog/1.2/minlog-1.2.jar"/>
<classpathentry kind="src" path="/forge-ai"/>
<classpathentry kind="src" path="/forge-net"/>
<classpathentry kind="var" path="M2_REPO/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar"/>
<classpathentry kind="var" path="M2_REPO/com/miglayout/miglayout/3.7.4/miglayout-3.7.4.jar"/>
<classpathentry kind="var" path="M2_REPO/com/mortennobel/java-image-scaling/0.8.5/java-image-scaling-0.8.5.jar"/>
<classpathentry kind="var" path="M2_REPO/com/jhlabs/filters/2.0.235/filters-2.0.235.jar"/>
<classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.4.5/xstream-1.4.5.jar"/>
<classpathentry kind="var" path="M2_REPO/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar"/>
<classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
<classpathentry kind="var" path="M2_REPO/org/testng/testng/6.8.7/testng-6.8.7.jar"/>
<classpathentry kind="var" path="M2_REPO/junit/junit/4.10/junit-4.10.jar"/>
<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/>
<classpathentry kind="var" path="M2_REPO/com/beust/jcommander/1.27/jcommander-1.27.jar"/>
<classpathentry kind="var" path="M2_REPO/org/yaml/snakeyaml/1.12/snakeyaml-1.12.jar"/>
<classpathentry kind="var" path="M2_REPO/org/powermock/powermock-module-testng/1.5.2/powermock-module-testng-1.5.2.jar"/>
<classpathentry kind="var" path="M2_REPO/org/powermock/powermock-core/1.5.2/powermock-core-1.5.2.jar"/>
<classpathentry kind="var" path="M2_REPO/org/powermock/powermock-reflect/1.5.2/powermock-reflect-1.5.2.jar"/>
<classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.2/objenesis-1.2.jar"/>
<classpathentry kind="var" path="M2_REPO/org/javassist/javassist/3.18.0-GA/javassist-3.18.0-GA.jar"/>
<classpathentry kind="var" path="M2_REPO/org/powermock/powermock-module-testng-common/1.5.2/powermock-module-testng-common-1.5.2.jar"/>
<classpathentry kind="var" path="M2_REPO/org/powermock/powermock-api-mockito/1.5.2/powermock-api-mockito-1.5.2.jar"/>
<classpathentry kind="var" path="M2_REPO/org/mockito/mockito-all/1.9.5/mockito-all-1.9.5.jar"/>
<classpathentry kind="var" path="M2_REPO/org/powermock/powermock-api-support/1.5.2/powermock-api-support-1.5.2.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-websocket/8.1.14.v20131031/jetty-websocket-8.1.14.v20131031.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-util/8.1.14.v20131031/jetty-util-8.1.14.v20131031.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-io/8.1.14.v20131031/jetty-io-8.1.14.v20131031.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-http/8.1.14.v20131031/jetty-http-8.1.14.v20131031.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-server/8.1.14.v20131031/jetty-server-8.1.14.v20131031.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-continuation/8.1.14.v20131031/jetty-continuation-8.1.14.v20131031.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-servlet/8.1.14.v20131031/jetty-servlet-8.1.14.v20131031.jar"/>
<classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-security/8.1.14.v20131031/jetty-security-8.1.14.v20131031.jar"/>
<classpathentry kind="var" path="M2_REPO/org/freemarker/freemarker/2.3.20/freemarker-2.3.20.jar"/>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>

42
forge-gui/.project
View File

@@ -1,25 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>forge-gui</name>
<comment>Forge lets you play the card game Magic: The Gathering against a computer opponent
using all of the rules. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects>
<project>forge-core</project>
<project>forge-resources</project>
<project>forge-game</project>
<project>forge-ai</project>
<project>forge-net</project>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
<name>forge-gui</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>

0
forge-bundle/src/main/resources/CHANGES.txt → forge-gui/CHANGES.txt
View File

0
forge-bundle/src/main/resources/LICENSE.txt → forge-gui/LICENSE.txt
View File

0
forge-bundle/src/main/resources/README.txt → forge-gui/README.txt
View File

0
forge-bundle/src/main/resources/forge.profile.properties.example → forge-gui/forge.profile.properties.example
View File

450
forge-gui/pom.xml
View File

@@ -9,13 +9,134 @@
<artifactId>forge-gui</artifactId>
<packaging>jar</packaging>
<name>Forge GUI</name>
<name>Forge</name>
<build>
<plugins>
<plugin>
<groupId>com.google.code.maven-svn-revision-number-plugin</groupId>
<artifactId>svn-revision-number-maven-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
<configuration>
<failOnError>false</failOnError>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
<version>1.8.1</version>
</dependency>
<dependency>
<groupId>com.oracle.appbundler</groupId>
<artifactId>appbundler</artifactId>
<version>1.0</version>
<classifier>ea</classifier>
</dependency>
</dependencies>
<executions>
<execution>
<id>build-version-string</id>
<phase>process-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<exportAntProperties>true</exportAntProperties>
<target>
<condition property="fullversionstring" value="${project.version}-r${forge.revision}${forge.specialStatus}" else="${project.version}-r${forge.revision}${forge.specialStatus} (mixed revisions detected; please update from the root directory)">
<contains string="${forge.mixedRevisions}" substring="false" />
</condition>
</target>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
<manifestEntries>
<Implementation-Version>${fullversionstring}</Implementation-Version>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>com.google.code.maven-replacer-plugin</groupId>
<artifactId>replacer</artifactId>
<version>1.5.2</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>replace</goal>
</goals>
</execution>
</executions>
<configuration>
<basedir>${basedir}/${configSourceDirectory}</basedir>
<filesToInclude>forge.sh, forge.command</filesToInclude>
<outputBasedir>${project.build.directory}</outputBasedir>
<outputDir>.</outputDir>
<regex>false</regex>
<replacements>
<replacement>
<token>$project.build.finalName$</token>
<value>${project.build.finalName}-jar-with-dependencies.jar</value>
</replacement>
</replacements>
</configuration>
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<attach>false</attach>
<descriptorRefs>
<descriptorRef>jar-with-dependencies</descriptorRef>
</descriptorRefs>
<archive>
<manifest>
<mainClass>forge.view.Main</mainClass>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Implementation-Version>${fullversionstring}</Implementation-Version>
</manifestEntries>
</archive>
</configuration>
<executions>
<execution>
<id>make-assembly</id>
<!-- this is used for inheritance merges -->
<phase>package</phase>
<!-- bind to the packaging phase -->
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<id>released-version</id>
@@ -32,21 +153,7 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
<addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
</manifest>
<manifestEntries>
<Implementation-Version>${fullversionstring}</Implementation-Version>
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugins>
</build>
@@ -54,78 +161,379 @@
<dependency>
<groupId>forge</groupId>
<artifactId>forge-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>forge</groupId>
<artifactId>forge-game</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>forge</groupId>
<artifactId>forge-ai</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>forge</groupId>
<artifactId>forge-net</artifactId>
</dependency>
<dependency>
<groupId>forge</groupId>
<artifactId>forge-resources</artifactId>
<scope>runtime</scope>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.miglayout</groupId>
<artifactId>miglayout</artifactId>
<version>3.7.4</version>
</dependency>
<dependency>
<groupId>com.mortennobel</groupId>
<artifactId>java-image-scaling</artifactId>
<version>0.8.5</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>15.0</version>
</dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
<version>1.4.5</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8.7</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-testng</artifactId>
<version>1.5.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
<version>1.5.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-websocket</artifactId>
<version>${jettyVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>${jettyVersion}</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${jettyVersion}</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
</dependency>
<dependency>
<groupId>com.googlecode</groupId>
<artifactId>minlog</artifactId>
<version>1.2</version>
</dependency>
<!--dependency>
<groupId>com.oracle</groupId>
<artifactId>javafx</artifactId>
<version>2.2</version>
<systemPath>${java.home}/lib/jfxrt.jar</systemPath>
<scope>system</scope>
</dependency-->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.1</version>
</dependency>
<dependency>
<groupId>org.freemarker</groupId>
<artifactId>freemarker</artifactId>
<version>2.3.20</version>
</dependency>
</dependencies>
<profiles>
<profile>
<id>windows-linux</id>
<build>
<plugins>
<plugin>
<groupId>com.akathist.maven.plugins.launch4j</groupId>
<artifactId>launch4j-maven-plugin</artifactId>
<version>1.5.2</version>
<executions>
<execution>
<id>l4j-gui</id>
<phase>package</phase>
<goals>
<goal>launch4j</goal>
</goals>
<configuration>
<headerType>gui</headerType>
<outfile>${project.build.directory}/forge.exe</outfile>
<jar>${project.build.finalName}-jar-with-dependencies.jar</jar>
<dontWrapJar>true</dontWrapJar>
<errTitle>forge</errTitle>
<icon>src/main/config/forge.ico</icon>
<classPath>
<mainClass>forge.view.Main</mainClass>
<addDependencies>false</addDependencies>
<preCp>anything</preCp>
</classPath>
<jre>
<minVersion>1.7.0</minVersion>
<maxHeapSize>1024</maxHeapSize>
</jre>
<versionInfo>
<fileVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</fileVersion>
<txtFileVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</txtFileVersion>
<fileDescription>Forge</fileDescription>
<copyright>Forge</copyright>
<productVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</productVersion>
<txtProductVersion>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.0</txtProductVersion>
<productName>Forge</productName>
<internalName>forge</internalName>
<originalFilename>forge.exe</originalFilename>
</versionInfo>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
<version>1.8.1</version>
</dependency>
</dependencies>
<executions>
<execution>
<id>win-linux-app-bundle</id>
<phase>pre-integration-test</phase>
<configuration>
<target>
<!-- Windows/Linux archive -->
<mkdir dir="${project.build.directory}/${project.build.finalName}" />
<copy todir="${project.build.directory}/${project.build.finalName}">
<fileset dir="${project.build.directory}" includes="forge.sh" />
<fileset dir="${project.build.directory}" includes="forge.command" />
<fileset dir="${basedir}" includes="forge.profile.properties.example" />
<fileset dir="${basedir}" includes="LICENSE.txt" />
<fileset dir="${basedir}" includes="README.txt" />
<fileset dir="${basedir}" includes="CHANGES.txt" />
<fileset dir="${basedir}">
<include name="res/**" />
<exclude name="res/cardsfolder/**" />
</fileset>
<fileset dir="${project.build.directory}" includes="forge.exe" />
<fileset dir="${project.build.directory}" includes="${project.build.finalName}-jar-with-dependencies.jar" />
</copy>
<mkdir dir="${project.build.directory}/${project.build.finalName}/res/cardsfolder" />
<zip destfile="${project.build.directory}/${project.build.finalName}/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/res/cardsfolder" level="1" />
<chmod file="${project.build.directory}/${project.build.finalName}/forge.sh" perm="a+rx" />
<chmod file="${project.build.directory}/${project.build.finalName}/forge.command" perm="a+rx" />
<chmod file="${project.build.directory}/${project.build.finalName}/forge.exe" perm="a+rx" />
<tar destfile="${project.build.directory}/${project.build.finalName}.tar.bz2" compression="bzip2">
<tarfileset filemode="755" dir="${project.build.directory}/${project.build.finalName}">
<include name="forge.sh" />
<include name="forge.command" />
<include name="forge.exe" />
</tarfileset>
<tarfileset dir="${project.build.directory}/${project.build.finalName}">
<include name="**" />
<exclude name="forge.sh" />
<exclude name="forge.command" />
<exclude name="forge.exe" />
</tarfileset>
</tar>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<id>released-version</id>
<phase>validate</phase>
<goals>
<goal>released-version</goal>
</goals>
</execution>
<execution>
<id>parse-version</id>
<goals>
<goal>parse-version</goal>
</goals>
</execution>
<execution>
<id>attach-distribution</id>
<phase>post-integration-test</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>${project.build.directory}/${project.build.finalName}.tar.bz2</file>
<type>tar.bz2</type>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<properties>
<license.file.name>"LICENSE.txt"</license.file.name>
<changes.file.name>"CHANGES.txt"</changes.file.name>
<readme.file.name>"README.txt"</readme.file.name>
<forge.file.name>"Forge"</forge.file.name>
<applications.file.name>"Applications"</applications.file.name>
</properties>
<id>osx</id>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<version>1.7</version>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
<version>1.8.1</version>
</dependency>
<dependency>
<groupId>com.oracle.appbundler</groupId>
<artifactId>appbundler</artifactId>
<version>1.0</version>
<classifier>ea</classifier>
</dependency>
</dependencies>
<executions>
<execution>
<id>osx-appbundle</id>
<phase>pre-integration-test</phase>
<configuration>
<target>
<mkdir dir="${project.build.directory}/${project.build.finalName}-osx" />
<copy todir="${project.build.directory}/${project.build.finalName}-osx">
<fileset dir="${basedir}" includes="LICENSE.txt" />
<fileset dir="${basedir}" includes="README.txt" />
<fileset dir="${basedir}" includes="CHANGES.txt" />
</copy>
<mkdir dir="${project.build.directory}/res/cardsfolder" />
<zip destfile="${project.build.directory}/res/cardsfolder/cardsfolder.zip" basedir="${basedir}/res/cardsfolder" level="1" />
<taskdef name="bundleapp" classpathref="maven.runtime.classpath" classname="com.oracle.appbundler.AppBundlerTask" />
<bundleapp outputdirectory="${project.build.directory}/${project.build.finalName}-osx" name="${project.name}" displayname="${project.name}" shortversion="${project.version}" identifier="forge.view.Main" icon="${basedir}/${configSourceDirectory}/Forge.icns" applicationCategory="public.app-category.games" mainclassname="forge.view.Main">
<runtime dir="${env.JAVA_HOME}" />
<classpath file="${project.build.directory}/${project.build.finalName}-jar-with-dependencies.jar" />
<classpath file="${basedir}/res/cardsfolder" />
<classpath file="${project.build.directory}/res/cardsfolder/cardsfolder.zip" />
<classpath file="${basedir}/forge.profile.properties.example" />
<option value="-Dapple.laf.useScreenMenuBar=true" />
<option value="-Dcom.apple.macos.use-file-dialog-packages=true" />
<option value="-Dcom.apple.macos.useScreenMenuBar=true" />
<option value="-Dcom.apple.mrj.application.apple.menu.about.name=Forge" />
<option value="-Dcom.apple.smallTabs=true" />
<option value="-Xmx1024M" />
<option value="-Dapp.dir=$APP_ROOT/Contents/Resources/" />
</bundleapp>
<symlink link="${project.build.directory}/${project.build.finalName}-osx/Applications" resource="/Applications" />
<exec executable="${basedir}/${configSourceDirectory}/create-dmg" failonerror="false">
<arg line="--volname ${project.name}-${project.version} --background ${basedir}/${configSourceDirectory}/backgroundImage.jpg --window-size 700 419 --icon-size 64 --icon ${forge.file.name} 141 283 --icon ${applications.file.name} 452 283 --icon ${changes.file.name} 645 80 --icon ${license.file.name} 645 200 --icon ${readme.file.name} 645 320 ${project.build.directory}/${project.build.finalName}.dmg ${project.build.directory}/${project.build.finalName}-osx" />
</exec>
<tar basedir="${project.build.directory}" includes="${project.build.finalName}.dmg" destfile="${project.build.directory}/${project.build.finalName}-osx.tar.bz2" compression="bzip2" />
<!--<symlink link="${project.build.directory}/${project.build.finalName}-osx/Applications" action="delete" /> -->
<exec executable="rm" failonerror="false">
<arg line="-f ${project.build.directory}/${project.build.finalName}-osx/Applications" />
</exec>
</target>
</configuration>
<goals>
<goal>run</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.8</version>
<executions>
<execution>
<id>released-version</id>
<phase>validate</phase>
<goals>
<goal>released-version</goal>
</goals>
</execution>
<execution>
<id>parse-version</id>
<goals>
<goal>parse-version</goal>
</goals>
</execution>
<execution>
<id>attach-distribution-osx</id>
<phase>post-integration-test</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>${project.build.directory}/${project.build.finalName}-osx.tar.bz2
</file>
<type>tar.bz2</type>
<classifier>osx</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>test-deploy</id>
<distributionManagement>
<repository>
<id>cardforge-repo-local</id>
<url>ftp://localhost/Users/dhudson/releases</url>
</repository>
<snapshotRepository>
<id>cardforge-snapshot-repo-local</id>
<url>ftp://localhost/Users/dhudson/snapshots</url>
</snapshotRepository>
</distributionManagement>
</profile>
</profiles>
</project>

0
forge-resources/src/main/resources/ai/Default.ai → forge-gui/res/ai/Default.ai
View File

0
forge-resources/src/main/resources/ai/Reckless.ai → forge-gui/res/ai/Reckless.ai
View File

0
forge-resources/src/main/resources/blockdata/blocks.txt → forge-gui/res/blockdata/blocks.txt
View File

0
forge-resources/src/main/resources/blockdata/boosters-special.txt → forge-gui/res/blockdata/boosters-special.txt
View File

0
forge-resources/src/main/resources/blockdata/fantasyblocks.txt → forge-gui/res/blockdata/fantasyblocks.txt
View File

0
forge-resources/src/main/resources/blockdata/fatpacks.txt → forge-gui/res/blockdata/fatpacks.txt
View File

0
forge-resources/src/main/resources/blockdata/formats.txt → forge-gui/res/blockdata/formats.txt
View File

0
forge-resources/src/main/resources/blockdata/printsheets.txt → forge-gui/res/blockdata/printsheets.txt
View File

0
forge-resources/src/main/resources/blockdata/starters.txt → forge-gui/res/blockdata/starters.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/a_display_of_my_dark_power.txt → forge-gui/res/cardsfolder/a/a_display_of_my_dark_power.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abandon_hope.txt → forge-gui/res/cardsfolder/a/abandon_hope.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abandoned_outpost.txt → forge-gui/res/cardsfolder/a/abandoned_outpost.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abattoir_ghoul.txt → forge-gui/res/cardsfolder/a/abattoir_ghoul.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abbey_gargoyles.txt → forge-gui/res/cardsfolder/a/abbey_gargoyles.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abbey_griffin.txt → forge-gui/res/cardsfolder/a/abbey_griffin.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abbey_matron.txt → forge-gui/res/cardsfolder/a/abbey_matron.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abduction.txt → forge-gui/res/cardsfolder/a/abduction.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abeyance.txt → forge-gui/res/cardsfolder/a/abeyance.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abhorrent_overlord.txt → forge-gui/res/cardsfolder/a/abhorrent_overlord.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abjure.txt → forge-gui/res/cardsfolder/a/abjure.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abolish.txt → forge-gui/res/cardsfolder/a/abolish.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abomination.txt → forge-gui/res/cardsfolder/a/abomination.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/aboroth.txt → forge-gui/res/cardsfolder/a/aboroth.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/aboshan_cephalid_emperor.txt → forge-gui/res/cardsfolder/a/aboshan_cephalid_emperor.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/aboshans_desire.txt → forge-gui/res/cardsfolder/a/aboshans_desire.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/about_face.txt → forge-gui/res/cardsfolder/a/about_face.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abrupt_decay.txt → forge-gui/res/cardsfolder/a/abrupt_decay.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/absolute_grace.txt → forge-gui/res/cardsfolder/a/absolute_grace.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/absolute_law.txt → forge-gui/res/cardsfolder/a/absolute_law.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/absolver_thrull.txt → forge-gui/res/cardsfolder/a/absolver_thrull.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/absorb.txt → forge-gui/res/cardsfolder/a/absorb.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/absorb_vis.txt → forge-gui/res/cardsfolder/a/absorb_vis.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abu_jafar.txt → forge-gui/res/cardsfolder/a/abu_jafar.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abuna_acolyte.txt → forge-gui/res/cardsfolder/a/abuna_acolyte.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abunas_chant.txt → forge-gui/res/cardsfolder/a/abunas_chant.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abundance.txt → forge-gui/res/cardsfolder/a/abundance.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abundant_growth.txt → forge-gui/res/cardsfolder/a/abundant_growth.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abyssal_gatekeeper.txt → forge-gui/res/cardsfolder/a/abyssal_gatekeeper.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abyssal_horror.txt → forge-gui/res/cardsfolder/a/abyssal_horror.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abyssal_hunter.txt → forge-gui/res/cardsfolder/a/abyssal_hunter.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abyssal_nightstalker.txt → forge-gui/res/cardsfolder/a/abyssal_nightstalker.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abyssal_nocturnus.txt → forge-gui/res/cardsfolder/a/abyssal_nocturnus.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abyssal_persecutor.txt → forge-gui/res/cardsfolder/a/abyssal_persecutor.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/abyssal_specter.txt → forge-gui/res/cardsfolder/a/abyssal_specter.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/academy_at_tolaria_west.txt → forge-gui/res/cardsfolder/a/academy_at_tolaria_west.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/academy_raider.txt → forge-gui/res/cardsfolder/a/academy_raider.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/academy_rector.txt → forge-gui/res/cardsfolder/a/academy_rector.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/academy_researchers.txt → forge-gui/res/cardsfolder/a/academy_researchers.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/academy_ruins.txt → forge-gui/res/cardsfolder/a/academy_ruins.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/accelerate.txt → forge-gui/res/cardsfolder/a/accelerate.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/accelerated_mutation.txt → forge-gui/res/cardsfolder/a/accelerated_mutation.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/acceptable_losses.txt → forge-gui/res/cardsfolder/a/acceptable_losses.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/accorder_paladin.txt → forge-gui/res/cardsfolder/a/accorder_paladin.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/accorders_shield.txt → forge-gui/res/cardsfolder/a/accorders_shield.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/accumulated_knowledge.txt → forge-gui/res/cardsfolder/a/accumulated_knowledge.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/accursed_centaur.txt → forge-gui/res/cardsfolder/a/accursed_centaur.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/accursed_spirit.txt → forge-gui/res/cardsfolder/a/accursed_spirit.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/acid_rain.txt → forge-gui/res/cardsfolder/a/acid_rain.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/acid_web_spider.txt → forge-gui/res/cardsfolder/a/acid_web_spider.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/acidic_dagger.txt → forge-gui/res/cardsfolder/a/acidic_dagger.txt
View File

0
forge-gui/src/test/resources/cardsfolder/acidic_slime.txt → forge-gui/res/cardsfolder/a/acidic_slime.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/acidic_sliver.txt → forge-gui/res/cardsfolder/a/acidic_sliver.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/acidic_soil.txt → forge-gui/res/cardsfolder/a/acidic_soil.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/acolyte_of_xathrid.txt → forge-gui/res/cardsfolder/a/acolyte_of_xathrid.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/acolytes_reward.txt → forge-gui/res/cardsfolder/a/acolytes_reward.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/acorn_catapult.txt → forge-gui/res/cardsfolder/a/acorn_catapult.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/acorn_harvest.txt → forge-gui/res/cardsfolder/a/acorn_harvest.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/acquire.txt → forge-gui/res/cardsfolder/a/acquire.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/acridian.txt → forge-gui/res/cardsfolder/a/acridian.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/act_of_aggression.txt → forge-gui/res/cardsfolder/a/act_of_aggression.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/act_of_authority.txt → forge-gui/res/cardsfolder/a/act_of_authority.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/act_of_treason.txt → forge-gui/res/cardsfolder/a/act_of_treason.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/active_volcano.txt → forge-gui/res/cardsfolder/a/active_volcano.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/ad_nauseam.txt → forge-gui/res/cardsfolder/a/ad_nauseam.txt
View File

0
forge-resources/src/main/resources/cardsfolder/a/adamaro_first_to_desire.txt → forge-gui/res/cardsfolder/a/adamaro_first_to_desire.txt
View File

Some files were not shown because too many files have changed in this diff Show More