add initial Launch4j support and one card

This commit is contained in:
Loki 2011-04-29 23:54:16 +03:00
parent be2fdd6487
commit 1fdc50570f
6 changed files with 402 additions and 216 deletions

View file

@ -1,148 +1,186 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.7.2</version> <version>0.7.2</version>
</parent> </parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>Mage-Client</artifactId> <artifactId>Mage-Client</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Mage Client</name> <name>Mage Client</name>
<dependencies> <dependencies>
<dependency>
<groupId>org.mage</groupId>
<artifactId>Mage</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.mage</groupId>
<artifactId>Mage-Common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.mage</groupId>
<artifactId>Mage-Sets</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.googlecode.jspf</groupId>
<artifactId>jspf-core</artifactId>
<version>0.9.1</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.9</version>
</dependency>
<dependency>
<groupId>com.mortennobel</groupId>
<artifactId>java-image-scaling</artifactId>
<version>0.8.4</version>
</dependency>
<dependency>
<groupId>com.google.collections</groupId>
<artifactId>google-collections</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>org.swinglabs</groupId>
<artifactId>swingx</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.jetlang</groupId>
<artifactId>jetlang</artifactId>
<version>0.2.4</version>
</dependency>
<dependency> <dependency>
<groupId>com.jgoodies</groupId> <groupId>org.mage</groupId>
<artifactId>forms</artifactId> <artifactId>Mage</artifactId>
<version>1.2.1</version> <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.intellij</groupId>
<artifactId>forms_rt</artifactId>
<version>7.0.3</version>
</dependency> </dependency>
<!-- <dependency>
<dependency> <groupId>org.mage</groupId>
<groupId>junit</groupId> <artifactId>Mage-Common</artifactId>
<artifactId>junit</artifactId> <version>${project.version}</version>
<version>4.8.2</version> </dependency>
<type>jar</type> <dependency>
<scope>test</scope> <groupId>org.mage</groupId>
</dependency> <artifactId>Mage-Sets</artifactId>
--> <version>${project.version}</version>
<dependency> </dependency>
<groupId>${project.groupId}</groupId> <dependency>
<artifactId>Mage-Theme-Plugin</artifactId> <groupId>com.googlecode.jspf</groupId>
<version>0.4</version> <artifactId>jspf-core</artifactId>
<scope>runtime</scope> <version>0.9.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>log4j</groupId>
<artifactId>Mage-Card-Plugin</artifactId> <artifactId>log4j</artifactId>
<version>0.5</version> <version>1.2.9</version>
<scope>runtime</scope> </dependency>
</dependency> <dependency>
<dependency> <groupId>com.mortennobel</groupId>
<groupId>${project.groupId}</groupId> <artifactId>java-image-scaling</artifactId>
<artifactId>Mage-Counter-Plugin</artifactId> <version>0.8.4</version>
<version>0.1</version> </dependency>
<scope>runtime</scope> <dependency>
</dependency> <groupId>com.google.collections</groupId>
</dependencies> <artifactId>google-collections</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>org.swinglabs</groupId>
<artifactId>swingx</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>org.jetlang</groupId>
<artifactId>jetlang</artifactId>
<version>0.2.4</version>
</dependency>
<dependency>
<groupId>com.jgoodies</groupId>
<artifactId>forms</artifactId>
<version>1.2.1</version>
</dependency>
<dependency>
<groupId>com.intellij</groupId>
<artifactId>forms_rt</artifactId>
<version>7.0.3</version>
</dependency>
<!--
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<type>jar</type>
<scope>test</scope>
</dependency>
-->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>Mage-Theme-Plugin</artifactId>
<version>0.4</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>Mage-Card-Plugin</artifactId>
<version>0.5</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>Mage-Counter-Plugin</artifactId>
<version>0.1</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<configuration> <configuration>
<source>1.6</source> <source>1.6</source>
<target>1.6</target> <target>1.6</target>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId> <artifactId>maven-install-plugin</artifactId>
<version>2.3.1</version> <version>2.3.1</version>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<configuration> <configuration>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-jar-plugin</artifactId> <artifactId>maven-jar-plugin</artifactId>
<configuration> <configuration>
<archive> <archive>
<manifest> <manifest>
<addClasspath>true</addClasspath> <addClasspath>true</addClasspath>
<classpathPrefix>lib/</classpathPrefix> <classpathPrefix>lib/</classpathPrefix>
<mainClass>mage.client.MageFrame</mainClass> <mainClass>mage.client.MageFrame</mainClass>
</manifest> </manifest>
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<configuration> <configuration>
<appendAssemblyId>false</appendAssemblyId> <appendAssemblyId>false</appendAssemblyId>
<descriptors> <descriptors>
<descriptor>src/main/assembly/distribution.xml</descriptor> <descriptor>src/main/assembly/distribution.xml</descriptor>
</descriptors> </descriptors>
</configuration> </configuration>
</plugin> </plugin>
</plugins> <plugin>
<groupId>com.akathist.maven.plugins.launch4j</groupId>
<artifactId>launch4j-maven-plugin</artifactId>
<executions>
<execution>
<id>l4j-mage-client</id>
<phase>package</phase>
<goals>
<goal>launch4j</goal>
</goals>
<configuration>
<headerType>console</headerType>
<outfile>target/mage-client-${project.version}.exe</outfile>
<jar>target/mage-client.jar</jar>
<errTitle>Mage Client</errTitle>
<classPath>
<mainClass>mage.client.MageFrame</mainClass>
<addDependencies>true</addDependencies>
<preCp>anything</preCp>
</classPath>
<jre>
<minVersion>1.5.0</minVersion>
</jre>
<versionInfo>
<fileVersion>0.7.2.0</fileVersion>
<txtFileVersion>MAGE Client</txtFileVersion>
<fileDescription>Mage Client</fileDescription>
<copyright>(C) Mage Development Team</copyright>
<productVersion>0.7.2.0</productVersion>
<txtProductVersion>MAGE Client</txtProductVersion>
<productName>MAGE</productName>
<internalName>Mage-Client</internalName>
<originalFilename>original.exe</originalFilename>
</versionInfo>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<finalName>mage-client</finalName> <finalName>mage-client</finalName>
</build> </build>
</project> </project>

View file

@ -29,6 +29,7 @@
<include>org.mage:Mage-Theme-Plugin</include> <include>org.mage:Mage-Theme-Plugin</include>
<include>org.mage:Mage-Card-Plugin</include> <include>org.mage:Mage-Card-Plugin</include>
<include>org.mage:Mage-Counter-Plugin</include> <include>org.mage:Mage-Counter-Plugin</include>
<include>org.mage:Mage-Counter-Plugin</include>
</includes> </includes>
</dependencySet> </dependencySet>
</dependencySets> </dependencySets>
@ -38,5 +39,13 @@
<directory>release/</directory> <directory>release/</directory>
<outputDirectory>/</outputDirectory> <outputDirectory>/</outputDirectory>
</fileSet> </fileSet>
<fileSet>
<filtered>false</filtered>
<directory>target/</directory>
<includes>
<include>*.exe</include>
</includes>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets> </fileSets>
</assembly> </assembly>

View file

@ -1,5 +1,5 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
@ -94,18 +94,18 @@
<version>${project.version}</version> <version>${project.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>Mage-Tournament-BoosterDraft</artifactId> <artifactId>Mage-Tournament-BoosterDraft</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
<artifactId>Mage-Tournament-Sealed</artifactId> <artifactId>Mage-Tournament-Sealed</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
</dependencies> </dependencies>
<pluginRepositories> <pluginRepositories>
@ -171,6 +171,44 @@
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>com.akathist.maven.plugins.launch4j</groupId>
<artifactId>launch4j-maven-plugin</artifactId>
<executions>
<execution>
<id>l4j-mage-server</id>
<phase>package</phase>
<goals>
<goal>launch4j</goal>
</goals>
<configuration>
<headerType>console</headerType>
<outfile>target/mage-server-${project.version}.exe</outfile>
<jar>target/mage-server.jar</jar>
<errTitle>Mage Server</errTitle>
<classPath>
<mainClass>mage.server.Main</mainClass>
<addDependencies>true</addDependencies>
<preCp>anything</preCp>
</classPath>
<jre>
<minVersion>1.5.0</minVersion>
</jre>
<versionInfo>
<fileVersion>0.7.2.0</fileVersion>
<txtFileVersion>MAGE Server</txtFileVersion>
<fileDescription>Mage Server</fileDescription>
<copyright>(C) Mage Development Team</copyright>
<productVersion>0.7.2.0</productVersion>
<txtProductVersion>MAGE Server</txtProductVersion>
<productName>MAGE</productName>
<internalName>Mage-Server</internalName>
<originalFilename>original.exe</originalFilename>
</versionInfo>
</configuration>
</execution>
</executions>
</plugin>
</plugins> </plugins>
<finalName>mage-server</finalName> <finalName>mage-server</finalName>

View file

@ -1,56 +1,64 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1" <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1 xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.1
http://maven.apache.org/xsd/assembly-1.1.1.xsd"> http://maven.apache.org/xsd/assembly-1.1.1.xsd">
<includeBaseDirectory>false</includeBaseDirectory> <includeBaseDirectory>false</includeBaseDirectory>
<formats> <formats>
<format>zip</format> <format>zip</format>
</formats> </formats>
<dependencySets> <dependencySets>
<dependencySet> <dependencySet>
<outputDirectory>/</outputDirectory> <outputDirectory>/</outputDirectory>
<includes> <includes>
<include>org.mage:Mage-Server</include> <include>org.mage:Mage-Server</include>
</includes> </includes>
</dependencySet> </dependencySet>
<dependencySet> <dependencySet>
<outputDirectory>/plugins</outputDirectory> <outputDirectory>/plugins</outputDirectory>
<includes> <includes>
<include>org.mage:Mage-Deck-Constructed</include> <include>org.mage:Mage-Deck-Constructed</include>
<include>org.mage:Mage-Deck-Limited</include> <include>org.mage:Mage-Deck-Limited</include>
<include>org.mage:Mage-Game-FreeForAll</include> <include>org.mage:Mage-Game-FreeForAll</include>
<include>org.mage:Mage-Game-TwoPlayerDuel</include> <include>org.mage:Mage-Game-TwoPlayerDuel</include>
<include>org.mage:Mage-Player-AI</include> <include>org.mage:Mage-Player-AI</include>
<include>org.mage:Mage-Player-AIMinimax</include> <include>org.mage:Mage-Player-AIMinimax</include>
<include>org.mage:Mage-Player-AI-MA</include> <include>org.mage:Mage-Player-AI-MA</include>
<include>org.mage:Mage-Player-Human</include> <include>org.mage:Mage-Player-Human</include>
<include>org.mage:Mage-Tournament-BoosterDraft</include> <include>org.mage:Mage-Tournament-BoosterDraft</include>
<include>org.mage:Mage-Tournament-Sealed</include> <include>org.mage:Mage-Tournament-Sealed</include>
</includes> </includes>
</dependencySet> </dependencySet>
<dependencySet> <dependencySet>
<outputDirectory>/lib/</outputDirectory> <outputDirectory>/lib/</outputDirectory>
<excludes> <excludes>
<exclude>org.mage:Mage-Server</exclude> <exclude>org.mage:Mage-Server</exclude>
<exclude>org.mage:Mage-Deck-Constructed</exclude> <exclude>org.mage:Mage-Deck-Constructed</exclude>
<exclude>org.mage:Mage-Deck-Limited</exclude> <exclude>org.mage:Mage-Deck-Limited</exclude>
<exclude>org.mage:Mage-Game-FreeForAll</exclude> <exclude>org.mage:Mage-Game-FreeForAll</exclude>
<exclude>org.mage:Mage-Game-TwoPlayerDuel</exclude> <exclude>org.mage:Mage-Game-TwoPlayerDuel</exclude>
<exclude>org.mage:Mage-Player-AI</exclude> <exclude>org.mage:Mage-Player-AI</exclude>
<exclude>org.mage:Mage-Player-AIMinimax</exclude> <exclude>org.mage:Mage-Player-AIMinimax</exclude>
<exclude>org.mage:Mage-Player-AI-MA</exclude> <exclude>org.mage:Mage-Player-AI-MA</exclude>
<exclude>org.mage:Mage-Player-Human</exclude> <exclude>org.mage:Mage-Player-Human</exclude>
<exclude>org.mage:Mage-Tournament-BoosterDraft</exclude> <exclude>org.mage:Mage-Tournament-BoosterDraft</exclude>
<exclude>org.mage:Mage-Tournament-Sealed</exclude> <exclude>org.mage:Mage-Tournament-Sealed</exclude>
</excludes> </excludes>
</dependencySet> </dependencySet>
</dependencySets> </dependencySets>
<fileSets> <fileSets>
<fileSet> <fileSet>
<filtered>true</filtered> <filtered>true</filtered>
<directory>release/</directory> <directory>release/</directory>
<outputDirectory>/</outputDirectory> <outputDirectory>/</outputDirectory>
</fileSet> </fileSet>
</fileSets> <fileSet>
<filtered>false</filtered>
<directory>target/</directory>
<includes>
<include>*.exe</include>
</includes>
<outputDirectory>/</outputDirectory>
</fileSet>
</fileSets>
</assembly> </assembly>

View file

@ -0,0 +1,79 @@
/*
* Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without modification, are
* permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this list of
* conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice, this list
* of conditions and the following disclaimer in the documentation and/or other materials
* provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* The views and conclusions contained in the software and documentation are those of the
* authors and should not be interpreted as representing official policies, either expressed
* or implied, of BetaSteward_at_googlemail.com.
*/
package mage.sets.mirrodinbesieged;
import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Rarity;
import mage.MageInt;
import mage.abilities.common.EntersBattlefieldTriggeredAbility;
import mage.abilities.effects.SearchEffect;
import mage.abilities.effects.common.search.SearchLibraryRevealPutInHandEffect;
import mage.cards.CardImpl;
import mage.filter.Filter;
import mage.filter.FilterCard;
import mage.target.common.TargetCardInLibrary;
/**
*
* @author Loki
*/
public class TreasureMage extends CardImpl<TreasureMage> {
private static FilterCard filter = new FilterCard("an artifact card with converted mana cost 6 or more");
static {
filter.getCardType().add(CardType.ARTIFACT);
filter.setConvertedManaCost(5);
filter.setConvertedManaCostComparison(Filter.ComparisonType.GreaterThan);
}
public TreasureMage (UUID ownerId) {
super(ownerId, 34, "Treasure Mage", Rarity.UNCOMMON, new CardType[]{CardType.CREATURE}, "{2}{U}");
this.expansionSetCode = "MBS";
this.subtype.add("Human");
this.subtype.add("Wizard");
this.color.setBlue(true);
this.power = new MageInt(2);
this.toughness = new MageInt(2);
TargetCardInLibrary target = new TargetCardInLibrary(0, 1, filter);
SearchEffect effect = new SearchLibraryRevealPutInHandEffect(target);
this.addAbility(new EntersBattlefieldTriggeredAbility(effect, true));
}
public TreasureMage (final TreasureMage card) {
super(card);
}
@Override
public TreasureMage copy() {
return new TreasureMage(this);
}
}

14
pom.xml
View file

@ -31,6 +31,7 @@
<module>Mage.Client</module> <module>Mage.Client</module>
<module>Mage.Plugins</module> <module>Mage.Plugins</module>
<module>Mage.Server.Plugins</module> <module>Mage.Server.Plugins</module>
<module>Mage.Tests</module>
</modules> </modules>
<repositories> <repositories>
@ -43,8 +44,21 @@
<name>Jetlang Repository for Maven</name> <name>Jetlang Repository for Maven</name>
<url>http://jetlang.googlecode.com/svn/repo/</url> <url>http://jetlang.googlecode.com/svn/repo/</url>
</repository> </repository>
<repository>
<id>akathist-repository</id>
<name>Akathist Repository</name>
<url>http://www.9stmaryrd.com/maven</url>
</repository>
</repositories> </repositories>
<pluginRepositories>
<pluginRepository>
<id>akathist-repository</id>
<name>Akathist Repository</name>
<url>http://www.9stmaryrd.com/maven</url>
</pluginRepository>
</pluginRepositories>
<properties> <properties>
<mage-version>0.7.2</mage-version> <mage-version>0.7.2</mage-version>
</properties> </properties>