From 1fdc50570fb8187c59d590eb7d4309e0887937d8 Mon Sep 17 00:00:00 2001 From: Loki Date: Fri, 29 Apr 2011 23:54:16 +0300 Subject: [PATCH] add initial Launch4j support and one card --- Mage.Client/pom.xml | 314 ++++++++++-------- .../src/main/assembly/distribution.xml | 13 +- Mage.Server/pom.xml | 86 +++-- .../src/main/assembly/distribution.xml | 112 ++++--- .../sets/mirrodinbesieged/TreasureMage.java | 79 +++++ pom.xml | 14 + 6 files changed, 402 insertions(+), 216 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/mirrodinbesieged/TreasureMage.java diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml index 6cee9993c4..1cc114c904 100644 --- a/Mage.Client/pom.xml +++ b/Mage.Client/pom.xml @@ -1,148 +1,186 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - 4.0.0 + 4.0.0 - - org.mage - mage-root - 0.7.2 - + + org.mage + mage-root + 0.7.2 + - org.mage - Mage-Client - jar - Mage Client + org.mage + Mage-Client + jar + Mage Client - - - org.mage - Mage - ${project.version} - - - org.mage - Mage-Common - ${project.version} - - - org.mage - Mage-Sets - ${project.version} - - - com.googlecode.jspf - jspf-core - 0.9.1 - - - log4j - log4j - 1.2.9 - - - com.mortennobel - java-image-scaling - 0.8.4 - - - com.google.collections - google-collections - 1.0 - - - org.swinglabs - swingx - 1.6.1 - - - org.jetlang - jetlang - 0.2.4 - + - com.jgoodies - forms - 1.2.1 - - - com.intellij - forms_rt - 7.0.3 + org.mage + Mage + ${project.version} - - - ${project.groupId} - Mage-Theme-Plugin - 0.4 - runtime - - - ${project.groupId} - Mage-Card-Plugin - 0.5 - runtime - - - ${project.groupId} - Mage-Counter-Plugin - 0.1 - runtime - - + + org.mage + Mage-Common + ${project.version} + + + org.mage + Mage-Sets + ${project.version} + + + com.googlecode.jspf + jspf-core + 0.9.1 + + + log4j + log4j + 1.2.9 + + + com.mortennobel + java-image-scaling + 0.8.4 + + + com.google.collections + google-collections + 1.0 + + + org.swinglabs + swingx + 1.6.1 + + + org.jetlang + jetlang + 0.2.4 + + + com.jgoodies + forms + 1.2.1 + + + com.intellij + forms_rt + 7.0.3 + + + + ${project.groupId} + Mage-Theme-Plugin + 0.4 + runtime + + + ${project.groupId} + Mage-Card-Plugin + 0.5 + runtime + + + ${project.groupId} + Mage-Counter-Plugin + 0.1 + runtime + + - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-install-plugin - 2.3.1 - - - maven-resources-plugin - - UTF-8 - - - - maven-jar-plugin - - - - true - lib/ - mage.client.MageFrame - - - - - - maven-assembly-plugin - - false - - src/main/assembly/distribution.xml - - - - + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + org.apache.maven.plugins + maven-install-plugin + 2.3.1 + + + maven-resources-plugin + + UTF-8 + + + + maven-jar-plugin + + + + true + lib/ + mage.client.MageFrame + + + + + + maven-assembly-plugin + + false + + src/main/assembly/distribution.xml + + + + + com.akathist.maven.plugins.launch4j + launch4j-maven-plugin + + + l4j-mage-client + package + + launch4j + + + console + target/mage-client-${project.version}.exe + target/mage-client.jar + Mage Client + + mage.client.MageFrame + true + anything + + + 1.5.0 + + + 0.7.2.0 + MAGE Client + Mage Client + (C) Mage Development Team + 0.7.2.0 + MAGE Client + MAGE + Mage-Client + original.exe + + + + + + - mage-client - + mage-client + diff --git a/Mage.Client/src/main/assembly/distribution.xml b/Mage.Client/src/main/assembly/distribution.xml index e778a46511..46c033403b 100644 --- a/Mage.Client/src/main/assembly/distribution.xml +++ b/Mage.Client/src/main/assembly/distribution.xml @@ -28,7 +28,8 @@ org.mage:Mage-Theme-Plugin org.mage:Mage-Card-Plugin - org.mage:Mage-Counter-Plugin + org.mage:Mage-Counter-Plugin + org.mage:Mage-Counter-Plugin @@ -37,6 +38,14 @@ true release/ / - + + + false + target/ + + *.exe + + / + diff --git a/Mage.Server/pom.xml b/Mage.Server/pom.xml index db26a5a387..058b987b9f 100644 --- a/Mage.Server/pom.xml +++ b/Mage.Server/pom.xml @@ -1,18 +1,18 @@ - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 - + org.mage mage-root 0.7.2 - + Mage-Server jar - Mage Server - + Mage Server + ${project.groupId} @@ -39,7 +39,7 @@ jaxb-impl 2.1.12 - + log4j log4j @@ -94,20 +94,20 @@ ${project.version} runtime - - ${project.groupId} - Mage-Tournament-BoosterDraft - ${project.version} - runtime - - - ${project.groupId} - Mage-Tournament-Sealed - ${project.version} - runtime - + + ${project.groupId} + Mage-Tournament-BoosterDraft + ${project.version} + runtime + + + ${project.groupId} + Mage-Tournament-Sealed + ${project.version} + runtime + - + maven2-repository.dev.java.net @@ -115,7 +115,7 @@ http://download.java.net/maven/2 - + @@ -171,11 +171,49 @@ UTF-8 + + com.akathist.maven.plugins.launch4j + launch4j-maven-plugin + + + l4j-mage-server + package + + launch4j + + + console + target/mage-server-${project.version}.exe + target/mage-server.jar + Mage Server + + mage.server.Main + true + anything + + + 1.5.0 + + + 0.7.2.0 + MAGE Server + Mage Server + (C) Mage Development Team + 0.7.2.0 + MAGE Server + MAGE + Mage-Server + original.exe + + + + + - + mage-server - + - + diff --git a/Mage.Server/src/main/assembly/distribution.xml b/Mage.Server/src/main/assembly/distribution.xml index a02c64f44d..4bb52a2513 100644 --- a/Mage.Server/src/main/assembly/distribution.xml +++ b/Mage.Server/src/main/assembly/distribution.xml @@ -1,56 +1,64 @@ - false - - zip - - - - / - - org.mage:Mage-Server - - - - /plugins - - org.mage:Mage-Deck-Constructed - org.mage:Mage-Deck-Limited - org.mage:Mage-Game-FreeForAll - org.mage:Mage-Game-TwoPlayerDuel - org.mage:Mage-Player-AI - org.mage:Mage-Player-AIMinimax - org.mage:Mage-Player-AI-MA - org.mage:Mage-Player-Human - org.mage:Mage-Tournament-BoosterDraft - org.mage:Mage-Tournament-Sealed - - - - /lib/ - - org.mage:Mage-Server - org.mage:Mage-Deck-Constructed - org.mage:Mage-Deck-Limited - org.mage:Mage-Game-FreeForAll - org.mage:Mage-Game-TwoPlayerDuel - org.mage:Mage-Player-AI - org.mage:Mage-Player-AIMinimax - org.mage:Mage-Player-AI-MA - org.mage:Mage-Player-Human - org.mage:Mage-Tournament-BoosterDraft - org.mage:Mage-Tournament-Sealed - - - - - - true - release/ - / - - + false + + zip + + + + / + + org.mage:Mage-Server + + + + /plugins + + org.mage:Mage-Deck-Constructed + org.mage:Mage-Deck-Limited + org.mage:Mage-Game-FreeForAll + org.mage:Mage-Game-TwoPlayerDuel + org.mage:Mage-Player-AI + org.mage:Mage-Player-AIMinimax + org.mage:Mage-Player-AI-MA + org.mage:Mage-Player-Human + org.mage:Mage-Tournament-BoosterDraft + org.mage:Mage-Tournament-Sealed + + + + /lib/ + + org.mage:Mage-Server + org.mage:Mage-Deck-Constructed + org.mage:Mage-Deck-Limited + org.mage:Mage-Game-FreeForAll + org.mage:Mage-Game-TwoPlayerDuel + org.mage:Mage-Player-AI + org.mage:Mage-Player-AIMinimax + org.mage:Mage-Player-AI-MA + org.mage:Mage-Player-Human + org.mage:Mage-Tournament-BoosterDraft + org.mage:Mage-Tournament-Sealed + + + + + + true + release/ + / + + + false + target/ + + *.exe + + / + + diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/TreasureMage.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/TreasureMage.java new file mode 100644 index 0000000000..8078cfe9da --- /dev/null +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/TreasureMage.java @@ -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 { + + 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); + } + +} diff --git a/pom.xml b/pom.xml index 3bd0580380..a070a2754b 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,7 @@ Mage.Client Mage.Plugins Mage.Server.Plugins + Mage.Tests @@ -43,8 +44,21 @@ Jetlang Repository for Maven http://jetlang.googlecode.com/svn/repo/ + + akathist-repository + Akathist Repository + http://www.9stmaryrd.com/maven + + + + akathist-repository + Akathist Repository + http://www.9stmaryrd.com/maven + + + 0.7.2