diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml index efe5d5fbb7..30f5d21fd4 100644 --- a/Mage.Client/pom.xml +++ b/Mage.Client/pom.xml @@ -1,179 +1,179 @@ - - - 4.0.0 - - - org.mage - mage-root - 1.0.2 - - - org.mage - mage-client - jar - Mage Client - - - - org.mage - mage - ${project.version} - - - org.mage - mage-common - ${project.version} - - - org.mage - mage-sets - ${project.version} - - - - ${project.groupId} - mage-server - ${mage-version} - - - com.googlecode.jspf - jspf-core - 0.9.1 - - - log4j - log4j - 1.2.14 - - - com.mortennobel - java-image-scaling - 0.8.5 - - - com.google.collections - google-collections - 1.0 - - - org.swinglabs - swingx - 1.6.1 - - - org.jetlang - jetlang - 0.2.9 - - - com.jgoodies - forms - 1.2.1 - - - com.intellij - forms_rt - 7.0.3 - - - - ${project.groupId} - mage-theme-plugin - 0.5 - runtime - - - ${project.groupId} - mage-counter-plugin - 0.1 - runtime - - - org.jdesktop - beansbinding - 1.2.1 - - - org.swinglabs - swing-layout - 1.0.3 - - - org.jsoup - jsoup - 1.5.2 - - - de.schlichtherle.truezip - truezip-file - 7.6.3 - - - de.schlichtherle.truezip - truezip-driver-zip - 7.6.3 - - - - - - - - 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 - - - ${manifest.file} - - true - mage.client.MageFrame - - - - - - maven-assembly-plugin - - false - - src/main/assembly/distribution.xml - - - - - - mage-client - - - - src/main/resources/META-INF/MANIFEST.MF - - - + + + 4.0.0 + + + org.mage + mage-root + 1.0.2 + + + org.mage + mage-client + jar + Mage Client + + + + org.mage + mage + ${project.version} + + + org.mage + mage-common + ${project.version} + + + org.mage + mage-sets + ${project.version} + + + + ${project.groupId} + mage-server + ${mage-version} + + + com.googlecode.jspf + jspf-core + 0.9.1 + + + log4j + log4j + 1.2.14 + + + com.mortennobel + java-image-scaling + 0.8.5 + + + com.google.collections + google-collections + 1.0 + + + org.swinglabs + swingx + 1.6.1 + + + org.jetlang + jetlang + 0.2.9 + + + com.jgoodies + forms + 1.2.1 + + + com.intellij + forms_rt + 7.0.3 + + + + ${project.groupId} + mage-theme-plugin + 0.5 + runtime + + + ${project.groupId} + mage-counter-plugin + 0.1 + runtime + + + org.jdesktop + beansbinding + 1.2.1 + + + org.swinglabs + swing-layout + 1.0.3 + + + org.jsoup + jsoup + 1.5.2 + + + de.schlichtherle.truezip + truezip-file + 7.6.3 + + + de.schlichtherle.truezip + truezip-driver-zip + 7.6.3 + + + + + + + + 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 + + + ${manifest.file} + + true + mage.client.MageFrame + + + + + + maven-assembly-plugin + + false + + src/main/assembly/distribution.xml + + + + + + mage-client + + + + src/main/resources/META-INF/MANIFEST.MF + + + diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java index c14ab9682a..1c799661b3 100644 --- a/Mage.Client/src/main/java/mage/client/MageFrame.java +++ b/Mage.Client/src/main/java/mage/client/MageFrame.java @@ -119,7 +119,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { private static Preferences prefs = Preferences.userNodeForPackage(MageFrame.class); private JLabel title; private Rectangle titleRectangle; - private static final MageVersion version = new MageVersion(1, 0, 2, "dev"); + private static final MageVersion version = new MageVersion(1, 0, 2, ""); private UUID clientId; private static MagePane activeFrame; private static boolean liteMode = false; diff --git a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java index 8b193d4830..dfc88f4000 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java @@ -372,7 +372,8 @@ public class ConnectDialog extends MageDialog { private void findPublicServerActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jButton1ActionPerformed BufferedReader in = null; try { - URL serverListURL = new URL("http://download.magefree.com/files/server-list.txt"); + // URL serverListURL = new URL("http://download.magefree.com/files/server-list.txt"); + URL serverListURL = new URL("http://176.31.186.181/files/server-list.txt"); Connection.ProxyType configProxyType = Connection.ProxyType.valueByText(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_PROXY_TYPE, "None")); diff --git a/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java b/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java index 9986ffa591..8a4e3f7f5e 100644 --- a/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java +++ b/Mage.Client/src/test/java/mage/client/game/MultiConnectTest.java @@ -30,7 +30,7 @@ public class MultiConnectTest { private static final CountDownLatch latch = new CountDownLatch(USER_CONNECT_COUNT); - private static final MageVersion version = new MageVersion(1, 0, 1, ""); + private static final MageVersion version = new MageVersion(1, 0, 2, ""); private static volatile int connected; diff --git a/Mage.Common/pom.xml b/Mage.Common/pom.xml index 04f24ed883..a92a5a10b0 100644 --- a/Mage.Common/pom.xml +++ b/Mage.Common/pom.xml @@ -1,84 +1,84 @@ - - - - 4.0.0 - - - org.mage - mage-root - 1.0.2 - - - mage-common - jar - Mage Common Classes - - - - ${project.groupId} - mage - ${project.version} - - - com.googlecode.jspf - jspf-core - 0.9.1 - - - org.jboss.remoting - jboss-remoting - 2.5.4.SP3 - - - org.jboss - jboss-common-core - 2.2.19.GA - - - jboss - jboss-serialization - 1.0.3.GA - - - concurrent - concurrent - 1.3.4 - - - trove - trove - 1.0.2 - - - - org.xerial - sqlite-jdbc - 3.7.2 - - - - - - src - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-resources-plugin - - UTF-8 - - - - - - mage-common - - + + + + 4.0.0 + + + org.mage + mage-root + 1.0.2 + + + mage-common + jar + Mage Common Classes + + + + ${project.groupId} + mage + ${project.version} + + + com.googlecode.jspf + jspf-core + 0.9.1 + + + org.jboss.remoting + jboss-remoting + 2.5.4.SP3 + + + org.jboss + jboss-common-core + 2.2.19.GA + + + jboss + jboss-serialization + 1.0.3.GA + + + concurrent + concurrent + 1.3.4 + + + trove + trove + 1.0.2 + + + + org.xerial + sqlite-jdbc + 3.7.2 + + + + + + src + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + maven-resources-plugin + + UTF-8 + + + + + + mage-common + + diff --git a/Mage.Plugins/Mage.Counter.Plugin/pom.xml b/Mage.Plugins/Mage.Counter.Plugin/pom.xml index d0368bf919..298e2b4d23 100644 --- a/Mage.Plugins/Mage.Counter.Plugin/pom.xml +++ b/Mage.Plugins/Mage.Counter.Plugin/pom.xml @@ -1,52 +1,52 @@ - - - - 4.0.0 - - - org.mage - mage-plugins - 1.0.2 - - - mage-counter-plugin - jar - Mage Counter Plugin - Implements game counter to display amount of games played - 0.1 - - - - ${project.groupId} - mage-common - ${mage-version} - - - com.googlecode.jspf - jspf-core - 0.9.1 - - - log4j - log4j - 1.2.9 - provided - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - - mage-counter-plugin - - + + + + 4.0.0 + + + org.mage + mage-plugins + 1.0.2 + + + mage-counter-plugin + jar + Mage Counter Plugin + Implements game counter to display amount of games played + 0.1 + + + + ${project.groupId} + mage-common + ${mage-version} + + + com.googlecode.jspf + jspf-core + 0.9.1 + + + log4j + log4j + 1.2.9 + provided + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + + mage-counter-plugin + + diff --git a/Mage.Plugins/Mage.Theme.Plugin/pom.xml b/Mage.Plugins/Mage.Theme.Plugin/pom.xml index 33355ebe82..7153ad46da 100644 --- a/Mage.Plugins/Mage.Theme.Plugin/pom.xml +++ b/Mage.Plugins/Mage.Theme.Plugin/pom.xml @@ -1,51 +1,51 @@ - - - 4.0.0 - - - org.mage - mage-plugins - 1.0.2 - - - mage-theme-plugin - jar - 0.5 - Mage Theme Plugin - Contains resources for drawing background - - - - ${project.groupId} - mage-common - ${mage-version} - - - com.googlecode.jspf - jspf-core - 0.9.1 - - - log4j - log4j - 1.2.9 - provided - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - - mage-theme-plugin - - + + + 4.0.0 + + + org.mage + mage-plugins + 1.0.2 + + + mage-theme-plugin + jar + 0.5 + Mage Theme Plugin + Contains resources for drawing background + + + + ${project.groupId} + mage-common + ${mage-version} + + + com.googlecode.jspf + jspf-core + 0.9.1 + + + log4j + log4j + 1.2.9 + provided + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + + mage-theme-plugin + + diff --git a/Mage.Plugins/pom.xml b/Mage.Plugins/pom.xml index 816fc4edd7..95be9d016e 100644 --- a/Mage.Plugins/pom.xml +++ b/Mage.Plugins/pom.xml @@ -1,23 +1,23 @@ - - - - 4.0.0 - - - org.mage - mage-root - 1.0.2 - - - mage-plugins - pom - Mage Plugins - Mage Plugins POM - - - Mage.Theme.Plugin - Mage.Counter.Plugin - - - + + + + 4.0.0 + + + org.mage + mage-root + 1.0.2 + + + mage-plugins + pom + Mage Plugins + Mage Plugins POM + + + Mage.Theme.Plugin + Mage.Counter.Plugin + + + diff --git a/Mage.Server.Console/pom.xml b/Mage.Server.Console/pom.xml index 950d0ddff6..0c662a5927 100644 --- a/Mage.Server.Console/pom.xml +++ b/Mage.Server.Console/pom.xml @@ -1,34 +1,34 @@ - - - 4.0.0 - - - org.mage - mage-root - 1.0.2 - - - org.mage - mage.server.console - jar - Mage Server Console - - - - org.mage - mage-common - ${project.version} - - - org.swinglabs - swingx - 1.6.1 - - - junit - junit - 4.8.2 - - - + + + 4.0.0 + + + org.mage + mage-root + 1.0.2 + + + org.mage + mage.server.console + jar + Mage Server Console + + + + org.mage + mage-common + ${project.version} + + + org.swinglabs + swingx + 1.6.1 + + + junit + junit + 4.8.2 + + + diff --git a/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java b/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java index 2e888a494d..f4200a4f73 100644 --- a/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java +++ b/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java @@ -57,7 +57,7 @@ public class ConsoleFrame extends javax.swing.JFrame implements MageClient { private static Session session; private ConnectDialog connectDialog; private static Preferences prefs = Preferences.userNodeForPackage(ConsoleFrame.class); - private static final MageVersion version = new MageVersion(1, 0, 2, "dev"); + private static final MageVersion version = new MageVersion(1, 0, 2, ""); /** * @return the session diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml b/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml index ab74d08a58..908a3a7690 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml @@ -1,54 +1,54 @@ - - - - 4.0.0 - - - org.mage - mage-server-plugins - 1.0.2 - - - mage-deck-constructed - jar - Mage Deck Constructed - - - - ${project.groupId} - mage - ${project.version} - - - ${project.groupId} - mage-sets - ${project.version} - - - - - src - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-resources-plugin - - UTF-8 - - - - - - mage-deck-constructed - - - - + + + + 4.0.0 + + + org.mage + mage-server-plugins + 1.0.2 + + + mage-deck-constructed + jar + Mage Deck Constructed + + + + ${project.groupId} + mage + ${project.version} + + + ${project.groupId} + mage-sets + ${project.version} + + + + + src + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + maven-resources-plugin + + UTF-8 + + + + + + mage-deck-constructed + + + + diff --git a/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml b/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml index 28f88fc6c4..11b3316dd5 100644 --- a/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml +++ b/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml @@ -1,49 +1,49 @@ - - - - 4.0.0 - - - org.mage - mage-server-plugins - 1.0.2 - - - mage-deck-limited - jar - Mage Deck Limited - - - - ${project.groupId} - mage - ${project.version} - - - - - src - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-resources-plugin - - UTF-8 - - - - - - mage-deck-limited - - - - + + + + 4.0.0 + + + org.mage + mage-server-plugins + 1.0.2 + + + mage-deck-limited + jar + Mage Deck Limited + + + + ${project.groupId} + mage + ${project.version} + + + + + src + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + maven-resources-plugin + + UTF-8 + + + + + + mage-deck-limited + + + + diff --git a/Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml index 9fe04dc1e3..e1fe725452 100644 --- a/Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml @@ -1,50 +1,50 @@ - - - - 4.0.0 - - - org.mage - mage-server-plugins - 1.0.2 - - - mage-game-commanderduel - jar - Mage Game Commander Two Player - - - - ${project.groupId} - mage - ${project.version} - - - - - src - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-resources-plugin - - UTF-8 - - - - - - mage-game-commanderduel - - - - - + + + + 4.0.0 + + + org.mage + mage-server-plugins + 1.0.2 + + + mage-game-commanderduel + jar + Mage Game Commander Two Player + + + + ${project.groupId} + mage + ${project.version} + + + + + src + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + maven-resources-plugin + + UTF-8 + + + + + + mage-game-commanderduel + + + + + diff --git a/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml index 2783a79703..358ad98969 100644 --- a/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml @@ -1,49 +1,49 @@ - - - - 4.0.0 - - - org.mage - mage-server-plugins - 1.0.2 - - - mage-game-freeforall - jar - Mage Game Free For All - - - - ${project.groupId} - mage - ${project.version} - - - - - src - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-resources-plugin - - UTF-8 - - - - - - mage-game-freeforall - - - - + + + + 4.0.0 + + + org.mage + mage-server-plugins + 1.0.2 + + + mage-game-freeforall + jar + Mage Game Free For All + + + + ${project.groupId} + mage + ${project.version} + + + + + src + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + maven-resources-plugin + + UTF-8 + + + + + + mage-game-freeforall + + + + diff --git a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml index c635f19855..2d70e0e7c0 100644 --- a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml @@ -1,50 +1,50 @@ - - - - 4.0.0 - - - org.mage - mage-server-plugins - 1.0.2 - - - mage-game-twoplayerduel - jar - Mage Game Two Player - - - - ${project.groupId} - mage - ${project.version} - - - - - src - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-resources-plugin - - UTF-8 - - - - - - mage-game-twoplayerduel - - - - - + + + + 4.0.0 + + + org.mage + mage-server-plugins + 1.0.2 + + + mage-game-twoplayerduel + jar + Mage Game Two Player + + + + ${project.groupId} + mage + ${project.version} + + + + + src + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + maven-resources-plugin + + UTF-8 + + + + + + mage-game-twoplayerduel + + + + + diff --git a/Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml b/Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml index a1e799fe70..9b00b450fc 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml @@ -1,55 +1,55 @@ - - - - 4.0.0 - - - org.mage - mage-server-plugins - 1.0.2 - - - mage-player-ai-draftbot - jar - Mage Player AI.DraftBot - - - - ${project.groupId} - mage - ${project.version} - - - ${project.groupId} - mage-player-ai - ${project.version} - - - - - src - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-resources-plugin - - UTF-8 - - - - - - mage-player-ai-draft-bot - - - - - + + + + 4.0.0 + + + org.mage + mage-server-plugins + 1.0.2 + + + mage-player-ai-draftbot + jar + Mage Player AI.DraftBot + + + + ${project.groupId} + mage + ${project.version} + + + ${project.groupId} + mage-player-ai + ${project.version} + + + + + src + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + maven-resources-plugin + + UTF-8 + + + + + + mage-player-ai-draft-bot + + + + + diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml b/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml index f3fa4115f8..716d8730f5 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml @@ -1,55 +1,55 @@ - - - - 4.0.0 - - - org.mage - mage-server-plugins - 1.0.2 - - - mage-player-ai-ma - jar - Mage Player AI.MA - - - - ${project.groupId} - mage - ${project.version} - - - ${project.groupId} - mage-player-ai - ${project.version} - - - - - src - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-resources-plugin - - UTF-8 - - - - - - mage-player-ai-ma - - - - - + + + + 4.0.0 + + + org.mage + mage-server-plugins + 1.0.2 + + + mage-player-ai-ma + jar + Mage Player AI.MA + + + + ${project.groupId} + mage + ${project.version} + + + ${project.groupId} + mage-player-ai + ${project.version} + + + + + src + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + maven-resources-plugin + + UTF-8 + + + + + + mage-player-ai-ma + + + + + diff --git a/Mage.Server.Plugins/Mage.Player.AI/pom.xml b/Mage.Server.Plugins/Mage.Player.AI/pom.xml index ea747a2196..2e854f28a4 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AI/pom.xml @@ -1,60 +1,60 @@ - - - - 4.0.0 - - - org.mage - mage-server-plugins - 1.0.2 - - - mage-player-ai - jar - Mage Player AI - - - - log4j - log4j - 1.2.14 - jar - - - ${project.groupId} - mage - ${project.version} - - - ${project.groupId} - mage-sets - ${project.version} - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-resources-plugin - - UTF-8 - - - - - - mage-player-ai - - - - - + + + + 4.0.0 + + + org.mage + mage-server-plugins + 1.0.2 + + + mage-player-ai + jar + Mage Player AI + + + + log4j + log4j + 1.2.14 + jar + + + ${project.groupId} + mage + ${project.version} + + + ${project.groupId} + mage-sets + ${project.version} + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + maven-resources-plugin + + UTF-8 + + + + + + mage-player-ai + + + + + diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml b/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml index bf56a52782..de921e2e50 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml @@ -1,61 +1,61 @@ - - - - 4.0.0 - - - org.mage - mage-server-plugins - 1.0.2 - - - mage-player-ai-mcts - jar - Mage Player AI MCTS - - - - log4j - log4j - 1.2.14 - jar - - - ${project.groupId} - mage - ${project.version} - - - ${project.groupId} - mage-player-ai - ${project.version} - - - - - src - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-resources-plugin - - UTF-8 - - - - - - mage-player-aimcts - - - - - + + + + 4.0.0 + + + org.mage + mage-server-plugins + 1.0.2 + + + mage-player-ai-mcts + jar + Mage Player AI MCTS + + + + log4j + log4j + 1.2.14 + jar + + + ${project.groupId} + mage + ${project.version} + + + ${project.groupId} + mage-player-ai + ${project.version} + + + + + src + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + maven-resources-plugin + + UTF-8 + + + + + + mage-player-aimcts + + + + + diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml b/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml index c53d3f4948..92d360fd48 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml @@ -1,61 +1,61 @@ - - - - 4.0.0 - - - org.mage - mage-server-plugins - 1.0.2 - - - mage-player-aiminimax - jar - Mage Player AI Minimax - - - - log4j - log4j - 1.2.14 - jar - - - ${project.groupId} - mage - ${project.version} - - - ${project.groupId} - mage-player-ai - ${project.version} - - - - - src - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-resources-plugin - - UTF-8 - - - - - - mage-player-aiminimax - - - - - + + + + 4.0.0 + + + org.mage + mage-server-plugins + 1.0.2 + + + mage-player-aiminimax + jar + Mage Player AI Minimax + + + + log4j + log4j + 1.2.14 + jar + + + ${project.groupId} + mage + ${project.version} + + + ${project.groupId} + mage-player-ai + ${project.version} + + + + + src + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + maven-resources-plugin + + UTF-8 + + + + + + mage-player-aiminimax + + + + + diff --git a/Mage.Server.Plugins/Mage.Player.Human/pom.xml b/Mage.Server.Plugins/Mage.Player.Human/pom.xml index 33a9f5e88b..fcf7f6ce3f 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.Human/pom.xml @@ -1,56 +1,56 @@ - - - - 4.0.0 - - - org.mage - mage-server-plugins - 1.0.2 - - - mage-player-human - jar - Mage Player Human - - - - org.mage - mage - ${project.version} - - - log4j - log4j - 1.2.14 - provided - - - - - src - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-resources-plugin - - UTF-8 - - - - - - mage-player-human - - - - - + + + + 4.0.0 + + + org.mage + mage-server-plugins + 1.0.2 + + + mage-player-human + jar + Mage Player Human + + + + org.mage + mage + ${project.version} + + + log4j + log4j + 1.2.14 + provided + + + + + src + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + maven-resources-plugin + + UTF-8 + + + + + + mage-player-human + + + + + diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml index 7a0427700d..5b0f113229 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml @@ -1,50 +1,50 @@ - - - - 4.0.0 - - - org.mage - mage-server-plugins - 1.0.2 - - - mage-tournament-boosterdraft - jar - Mage Tournament Booster Draft - - - - ${project.groupId} - mage - ${project.version} - - - - - src - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-resources-plugin - - UTF-8 - - - - - - mage-tournament-booster-draft - - - - - + + + + 4.0.0 + + + org.mage + mage-server-plugins + 1.0.2 + + + mage-tournament-boosterdraft + jar + Mage Tournament Booster Draft + + + + ${project.groupId} + mage + ${project.version} + + + + + src + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + maven-resources-plugin + + UTF-8 + + + + + + mage-tournament-booster-draft + + + + + diff --git a/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml b/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml index dbc21b95ff..102a0d949c 100644 --- a/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml +++ b/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml @@ -1,50 +1,50 @@ - - - - 4.0.0 - - - org.mage - mage-server-plugins - 1.0.2 - - - mage-tournament-sealed - jar - Mage Tournament Sealed - - - - ${project.groupId} - mage - ${project.version} - - - - - src - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-resources-plugin - - UTF-8 - - - - - - mage-tournament-sealed - - - - - + + + + 4.0.0 + + + org.mage + mage-server-plugins + 1.0.2 + + + mage-tournament-sealed + jar + Mage Tournament Sealed + + + + ${project.groupId} + mage + ${project.version} + + + + + src + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + maven-resources-plugin + + UTF-8 + + + + + + mage-tournament-sealed + + + + + diff --git a/Mage.Server.Plugins/pom.xml b/Mage.Server.Plugins/pom.xml index db930f4afb..722f3e9ff4 100644 --- a/Mage.Server.Plugins/pom.xml +++ b/Mage.Server.Plugins/pom.xml @@ -1,33 +1,33 @@ - - - - 4.0.0 - - - org.mage - mage-root - 1.0.2 - - - mage-server-plugins - pom - Mage Server Plugins - Mage Server Plugins POM - - - Mage.Deck.Constructed - Mage.Deck.Limited - Mage.Game.CommanderDuel - Mage.Game.FreeForAll - Mage.Game.TwoPlayerDuel - Mage.Player.AI - Mage.Player.AIMinimax - Mage.Player.AI.MA - Mage.Player.AIMCTS - Mage.Player.AI.DraftBot - Mage.Player.Human - Mage.Tournament.BoosterDraft - Mage.Tournament.Sealed - - + + + + 4.0.0 + + + org.mage + mage-root + 1.0.2 + + + mage-server-plugins + pom + Mage Server Plugins + Mage Server Plugins POM + + + Mage.Deck.Constructed + Mage.Deck.Limited + Mage.Game.CommanderDuel + Mage.Game.FreeForAll + Mage.Game.TwoPlayerDuel + Mage.Player.AI + Mage.Player.AIMinimax + Mage.Player.AI.MA + Mage.Player.AIMCTS + Mage.Player.AI.DraftBot + Mage.Player.Human + Mage.Tournament.BoosterDraft + Mage.Tournament.Sealed + + \ No newline at end of file diff --git a/Mage.Server/pom.xml b/Mage.Server/pom.xml index 0be9e24556..6fa0099635 100644 --- a/Mage.Server/pom.xml +++ b/Mage.Server/pom.xml @@ -1,212 +1,212 @@ - - - 4.0.0 - - - org.mage - mage-root - 1.0.2 - - - mage-server - jar - Mage Server - - - - ${project.groupId} - mage - ${mage-version} - - - ${project.groupId} - mage-common - ${mage-version} - - - ${project.groupId} - mage-sets - ${mage-version} - - - junit - junit - 4.8.2 - - - com.sun.xml.bind - jaxb-impl - 2.1.12 - - - log4j - log4j - 1.2.14 - jar - - - ${project.groupId} - mage-player-ai - ${project.version} - runtime - - - ${project.groupId} - mage-deck-constructed - ${project.version} - runtime - - - ${project.groupId} - mage-deck-limited - ${project.version} - runtime - - - ${project.groupId} - mage-game-commanderduel - ${project.version} - runtime - - - ${project.groupId} - mage-game-freeforall - ${project.version} - runtime - - - ${project.groupId} - mage-game-twoplayerduel - ${project.version} - runtime - - - ${project.groupId} - mage-player-human - ${project.version} - runtime - - - ${project.groupId} - mage-player-aiminimax - ${project.version} - runtime - - - ${project.groupId} - mage-player-ai-ma - ${project.version} - runtime - - - ${project.groupId} - mage-tournament-boosterdraft - ${project.version} - runtime - - - ${project.groupId} - mage-tournament-sealed - ${project.version} - runtime - - - - - - - org.jvnet.jaxb2.maven2 - maven-jaxb2-plugin - 0.7.4 - - mage.server.util.config - ./src/main/xml-resources/jaxb/Config/ - -Xcommons-lang - - - - - generate - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - - maven-assembly-plugin - - false - - src/main/assembly/distribution.xml - - - - - maven-jar-plugin - - - - true - mage.server.Main - - - - - - maven-resources-plugin - - UTF-8 - - - - - mage-server - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.1 - - - - - - - org.jvnet.jaxb2.maven2 - - - maven-jaxb2-plugin - - - [0.7.4,) - - - generate - - - - - - - - - - - - - - - - - + + + 4.0.0 + + + org.mage + mage-root + 1.0.2 + + + mage-server + jar + Mage Server + + + + ${project.groupId} + mage + ${mage-version} + + + ${project.groupId} + mage-common + ${mage-version} + + + ${project.groupId} + mage-sets + ${mage-version} + + + junit + junit + 4.8.2 + + + com.sun.xml.bind + jaxb-impl + 2.1.12 + + + log4j + log4j + 1.2.14 + jar + + + ${project.groupId} + mage-player-ai + ${project.version} + runtime + + + ${project.groupId} + mage-deck-constructed + ${project.version} + runtime + + + ${project.groupId} + mage-deck-limited + ${project.version} + runtime + + + ${project.groupId} + mage-game-commanderduel + ${project.version} + runtime + + + ${project.groupId} + mage-game-freeforall + ${project.version} + runtime + + + ${project.groupId} + mage-game-twoplayerduel + ${project.version} + runtime + + + ${project.groupId} + mage-player-human + ${project.version} + runtime + + + ${project.groupId} + mage-player-aiminimax + ${project.version} + runtime + + + ${project.groupId} + mage-player-ai-ma + ${project.version} + runtime + + + ${project.groupId} + mage-tournament-boosterdraft + ${project.version} + runtime + + + ${project.groupId} + mage-tournament-sealed + ${project.version} + runtime + + + + + + + org.jvnet.jaxb2.maven2 + maven-jaxb2-plugin + 0.7.4 + + mage.server.util.config + ./src/main/xml-resources/jaxb/Config/ + -Xcommons-lang + + + + + generate + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.6 + 1.6 + + + + maven-assembly-plugin + + false + + src/main/assembly/distribution.xml + + + + + maven-jar-plugin + + + + true + mage.server.Main + + + + + + maven-resources-plugin + + UTF-8 + + + + + mage-server + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.1 + + + + + + + org.jvnet.jaxb2.maven2 + + + maven-jaxb2-plugin + + + [0.7.4,) + + + generate + + + + + + + + + + + + + + + + + diff --git a/Mage.Server/release/readme.txt b/Mage.Server/release/readme.txt index c7446f67af..f571d04156 100644 --- a/Mage.Server/release/readme.txt +++ b/Mage.Server/release/readme.txt @@ -4,14 +4,17 @@ MAGE is a client/server implementation of a popular CCG without the collecting p The server hosts games and enforces the rules. The client creates or joins games, displays the current state of a game in progress and sends user events to the server. -You will need to have the Java Runtime Environment Version 6 Update 10 or greater. +You will need to have the Java Runtime Environment Version 6 Update 33 or greater. You can download this from: http://java.com/ ----------------------------------------------------------------------------------- Installing and running MAGE You will need to download both the client and the server applications. These can be -obtained from http://code.google.com/p/magic--another-game-engine/downloads/list. +obtained from +http://download.magefree.com +or +http://176.31.186.181/ Extact the client and the server to separate folders. To play a game you can either connect to a server or start your own server. To @@ -55,4 +58,5 @@ Notes MAGE is still very much in the testing phase so there can be lots of bugs and/or missing functionality. Please be patient. If you notice anything or want to -make suggestions please contact me at BetaSteward@googlemail.com +make suggestions goto https://github.com/magefree/mage/issues + diff --git a/Mage.Server/release/server.msg.txt b/Mage.Server/release/server.msg.txt index 8805e230e5..3ef103bae6 100644 --- a/Mage.Server/release/server.msg.txt +++ b/Mage.Server/release/server.msg.txt @@ -1,3 +1,3 @@ -Welcome! You are playing Mage version 1.0.1. +Welcome! You are playing Mage version 1.0.2. Find what was changed since previous versions on project Wiki. Contact us on www.slightlymagic.net. \ No newline at end of file diff --git a/Mage.Server/server.msg.txt b/Mage.Server/server.msg.txt index 45dcd8a4b5..2512cc266f 100644 --- a/Mage.Server/server.msg.txt +++ b/Mage.Server/server.msg.txt @@ -2,5 +2,5 @@ New HotKeys: Alt+E - Enlarge card image; Wheel zoom in/out - Enlarge card image; F4 - end current turn, response to stack; F9 - skip all opponents' turns, no response to stack; -Welcome! You are playing Mage version 1.0.1 dev +Welcome! You are playing Mage version 1.0.2 Contact us on www.slightlymagic.net. \ No newline at end of file diff --git a/Mage.Server/src/main/resources/log4j.properties b/Mage.Server/src/main/resources/log4j.properties index acee86f663..c4371dba19 100644 --- a/Mage.Server/src/main/resources/log4j.properties +++ b/Mage.Server/src/main/resources/log4j.properties @@ -1,6 +1,8 @@ #default levels log4j.rootLogger=info, console, logfile - +#log4j.logger.mage.player.ai=TRACE +#log4j.logger.mage.player.ai.ComputerPlayer6=debug +#log4j.logger.mage.player.ai.ComputerPlayer7=debug #log4j.logger.mage.player.human=DEBUG, console, logfile #log4j.additivity.mage.player.human=false diff --git a/Mage.Sets/pom.xml b/Mage.Sets/pom.xml index 53d6270723..664b12c360 100644 --- a/Mage.Sets/pom.xml +++ b/Mage.Sets/pom.xml @@ -1,64 +1,64 @@ - - - - 4.0.0 - - - org.mage - mage-root - 1.0.2 - - - org.mage - mage-sets - jar - Mage Sets - http://maven.apache.org - - - - ${project.groupId} - mage - ${mage-version} - - - log4j - log4j - 1.2.14 - jar - - - - junit - junit - 4.8.2 - - - - - src - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-resources-plugin - - UTF-8 - - - - - - mage-sets - - - - - + + + + 4.0.0 + + + org.mage + mage-root + 1.0.2 + + + org.mage + mage-sets + jar + Mage Sets + http://maven.apache.org + + + + ${project.groupId} + mage + ${mage-version} + + + log4j + log4j + 1.2.14 + jar + + + + junit + junit + 4.8.2 + + + + + src + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + maven-resources-plugin + + UTF-8 + + + + + + mage-sets + + + + + diff --git a/Mage.Tests/pom.xml b/Mage.Tests/pom.xml index 6f3fc53fe8..5118d0e8f9 100644 --- a/Mage.Tests/pom.xml +++ b/Mage.Tests/pom.xml @@ -1,86 +1,86 @@ - - - 4.0.0 - - - org.mage - mage-root - 1.0.2 - - - mage-tests - jar - Mage Tests - - - - ${project.groupId} - mage - ${mage-version} - - - ${project.groupId} - mage-common - ${mage-version} - - - ${project.groupId} - mage-sets - ${mage-version} - - - ${project.groupId} - mage-server - ${mage-version} - - - junit - junit - 4.8.2 - - - ${project.groupId} - mage-game-twoplayerduel - ${project.version} - compile - - - ${project.groupId} - mage-player-ai - ${project.version} - compile - - - - log4j - log4j - 1.2.14 - jar - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-resources-plugin - - UTF-8 - - - - - mage-tests - - - - - + + + 4.0.0 + + + org.mage + mage-root + 1.0.2 + + + mage-tests + jar + Mage Tests + + + + ${project.groupId} + mage + ${mage-version} + + + ${project.groupId} + mage-common + ${mage-version} + + + ${project.groupId} + mage-sets + ${mage-version} + + + ${project.groupId} + mage-server + ${mage-version} + + + junit + junit + 4.8.2 + + + ${project.groupId} + mage-game-twoplayerduel + ${project.version} + compile + + + ${project.groupId} + mage-player-ai + ${project.version} + compile + + + + log4j + log4j + 1.2.14 + jar + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + maven-resources-plugin + + UTF-8 + + + + + mage-tests + + + + + diff --git a/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java b/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java index 3e1c1298f5..81b3aeca54 100644 --- a/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java +++ b/Mage.Tests/src/test/java/org/mage/test/load/SimpleMageClient.java @@ -17,7 +17,7 @@ import java.util.UUID; public class SimpleMageClient implements MageClient { private UUID clientId; - private static final MageVersion version = new MageVersion(1, 0, 1, ""); + private static final MageVersion version = new MageVersion(1, 0, 2, ""); private static final transient Logger log = Logger.getLogger(SimpleMageClient.class); diff --git a/Mage.Updater/pom.xml b/Mage.Updater/pom.xml index 1a1b9fb163..4a6c0db15a 100644 --- a/Mage.Updater/pom.xml +++ b/Mage.Updater/pom.xml @@ -1,31 +1,31 @@ - - - - mage-root - org.mage - 1.0.2 - - 4.0.0 - - org.mage - mage-updater - Mage Updater - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - com.magefree.update.Updater - - - - - - + + + + mage-root + org.mage + 1.0.2 + + 4.0.0 + + org.mage + mage-updater + Mage Updater + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + com.magefree.update.Updater + + + + + + \ No newline at end of file diff --git a/Mage/pom.xml b/Mage/pom.xml index aa722834c2..c2a6cde31e 100644 --- a/Mage/pom.xml +++ b/Mage/pom.xml @@ -1,69 +1,69 @@ - - - - 4.0.0 - - - org.mage - mage-root - 1.0.2 - - - mage - jar - Mage Framework - - - - log4j - log4j - 1.2.14 - jar - - - - org.xerial - sqlite-jdbc - 3.7.2 - - - com.j256.ormlite - ormlite-core - 4.42 - - - com.j256.ormlite - ormlite-jdbc - 4.42 - - - - - - src - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.6 - 1.6 - - - - maven-resources-plugin - - UTF-8 - - - - - - mage - - - - - + + + + 4.0.0 + + + org.mage + mage-root + 1.0.2 + + + mage + jar + Mage Framework + + + + log4j + log4j + 1.2.14 + jar + + + + org.xerial + sqlite-jdbc + 3.7.2 + + + com.j256.ormlite + ormlite-core + 4.42 + + + com.j256.ormlite + ormlite-jdbc + 4.42 + + + + + + src + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.6 + 1.6 + + + + maven-resources-plugin + + UTF-8 + + + + + + mage + + + + + diff --git a/Utils/gen-card.pl b/Utils/gen-card.pl index ee60b4e705..4e0defa1f7 100644 --- a/Utils/gen-card.pl +++ b/Utils/gen-card.pl @@ -82,6 +82,7 @@ $raritiesConversion{'C'} = 'COMMON'; $raritiesConversion{'U'} = 'UNCOMMON'; $raritiesConversion{'R'} = 'RARE'; $raritiesConversion{'M'} = 'MYTHIC'; +$raritiesConversion{'Special'} = 'SPECIAL'; my %manaToColor; $manaToColor{'B'} = 'Black'; diff --git a/Utils/release/startMageWin7.bat b/Utils/release/startMageWin7.bat new file mode 100644 index 0000000000..c353ad6888 --- /dev/null +++ b/Utils/release/startMageWin7.bat @@ -0,0 +1,5 @@ +@ECHO OFF +cd ./mage-client +call startClientWin7 +cd ../mage-server +call startServerWin7 \ No newline at end of file diff --git a/pom.xml b/pom.xml index c6bf07b6c1..59da951e6b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,81 +1,81 @@ - - - - 4.0.0 - - org.mage - mage-root - 1.0.2 - pom - Mage Root - Mage Root POM - - - - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.6 - 1.6 - - - - maven-resources-plugin - 2.5 - - UTF-8 - - - - maven-jar-plugin - 2.4 - - - - MageTeam - - - - - - - - Mage - Mage.Common - Mage.Server - Mage.Sets - Mage.Client - Mage.Plugins - Mage.Server.Plugins - Mage.Server.Console - Mage.Tests - Mage.Updater - - - - - jboss-public-repository - JBoss Repository - https://repository.jboss.org/nexus/content/groups/public - - - never - - - daily - - - - local-project-repo - file:repository - - - - - 1.0.2 - UTF-8 - mage - - + + + + 4.0.0 + + org.mage + mage-root + 1.0.2 + pom + Mage Root + Mage Root POM + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.6 + 1.6 + + + + maven-resources-plugin + 2.5 + + UTF-8 + + + + maven-jar-plugin + 2.4 + + + + MageTeam + + + + + + + + Mage + Mage.Common + Mage.Server + Mage.Sets + Mage.Client + Mage.Plugins + Mage.Server.Plugins + Mage.Server.Console + Mage.Tests + Mage.Updater + + + + + jboss-public-repository + JBoss Repository + https://repository.jboss.org/nexus/content/groups/public + + + never + + + daily + + + + local-project-repo + file:repository + + + + + 1.0.2 + UTF-8 + mage + +