External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 10:40:06 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

update to version 0.7

Browse source
This commit is contained in:
BetaSteward 2011-04-01 21:05:43 -04:00
parent 7587e65a3a
commit 84c6ab76e0
29 changed files with 58 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Client/pom.xml
View file

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>

1
Mage.Client/src/main/assembly/distribution.xml
View file

@ -17,6 +17,7 @@
<dependencySet> <dependencySet>
<outputDirectory>/lib/</outputDirectory> <outputDirectory>/lib/</outputDirectory>
<excludes> <excludes>
<exclude>org.mage:Mage-Client</exclude>
<exclude>org.mage:Mage-Theme-Plugin</exclude> <exclude>org.mage:Mage-Theme-Plugin</exclude>
<exclude>org.mage:Mage-Card-Plugin</exclude> <exclude>org.mage:Mage-Card-Plugin</exclude>
<exclude>org.mage:Mage-Counter-Plugin</exclude> <exclude>org.mage:Mage-Counter-Plugin</exclude>

2
Mage.Client/src/main/java/mage/client/MageFrame.java
View file

@ -111,7 +111,7 @@ public class MageFrame extends javax.swing.JFrame {
*/ */
public MageFrame() { public MageFrame() {
setTitle("Mage, version 0.6.1"); setTitle("Mage, version 0.7");
EDTExceptionHandler.registerExceptionHandler(); EDTExceptionHandler.registerExceptionHandler();
addWindowListener(new WindowAdapter() { addWindowListener(new WindowAdapter() {

2
Mage.Client/src/main/java/mage/client/dialog/AboutDialog.java
View file

@ -77,7 +77,7 @@ public class AboutDialog extends MageDialog {
} }
}); });
jLabel1.setText("MAGE client, version 0.6.1"); jLabel1.setText("MAGE client, version 0.7");
lblVersion.setText("version"); lblVersion.setText("version");

2
Mage.Common/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<artifactId>Mage-Common</artifactId> <artifactId>Mage-Common</artifactId>

2
Mage.Plugins/Mage.Card.Plugin/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>Mage-Plugins</artifactId> <artifactId>Mage-Plugins</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<artifactId>Mage-Card-Plugin</artifactId> <artifactId>Mage-Card-Plugin</artifactId>

2
Mage.Plugins/Mage.Counter.Plugin/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>Mage-Plugins</artifactId> <artifactId>Mage-Plugins</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<artifactId>Mage-Counter-Plugin</artifactId> <artifactId>Mage-Counter-Plugin</artifactId>

2
Mage.Plugins/Mage.Rating.Plugin/pom.xml
View file

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>Mage-Plugins</artifactId> <artifactId>Mage-Plugins</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>

2
Mage.Plugins/Mage.Theme.Plugin/pom.xml
View file

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>Mage-Plugins</artifactId> <artifactId>Mage-Plugins</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<artifactId>Mage-Theme-Plugin</artifactId> <artifactId>Mage-Theme-Plugin</artifactId>

2
Mage.Plugins/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<artifactId>Mage-Plugins</artifactId> <artifactId>Mage-Plugins</artifactId>

2
Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>Mage-Server-Plugins</artifactId> <artifactId>Mage-Server-Plugins</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<artifactId>Mage-Deck-Constructed</artifactId> <artifactId>Mage-Deck-Constructed</artifactId>

2
Mage.Server.Plugins/Mage.Deck.Limited/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>Mage-Server-Plugins</artifactId> <artifactId>Mage-Server-Plugins</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<artifactId>Mage-Deck-Limited</artifactId> <artifactId>Mage-Deck-Limited</artifactId>

2
Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>Mage-Server-Plugins</artifactId> <artifactId>Mage-Server-Plugins</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<artifactId>Mage-Game-FreeForAll</artifactId> <artifactId>Mage-Game-FreeForAll</artifactId>

2
Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>Mage-Server-Plugins</artifactId> <artifactId>Mage-Server-Plugins</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<artifactId>Mage-Game-TwoPlayerDuel</artifactId> <artifactId>Mage-Game-TwoPlayerDuel</artifactId>

2
Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>Mage-Server-Plugins</artifactId> <artifactId>Mage-Server-Plugins</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<artifactId>Mage-Player-AI-MA</artifactId> <artifactId>Mage-Player-AI-MA</artifactId>

2
Mage.Server.Plugins/Mage.Player.AI/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>Mage-Server-Plugins</artifactId> <artifactId>Mage-Server-Plugins</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<artifactId>Mage-Player-AI</artifactId> <artifactId>Mage-Player-AI</artifactId>

2
Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>Mage-Server-Plugins</artifactId> <artifactId>Mage-Server-Plugins</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<artifactId>Mage-Player-AIMinimax</artifactId> <artifactId>Mage-Player-AIMinimax</artifactId>

2
Mage.Server.Plugins/Mage.Player.Human/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>Mage-Server-Plugins</artifactId> <artifactId>Mage-Server-Plugins</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<artifactId>Mage-Player-Human</artifactId> <artifactId>Mage-Player-Human</artifactId>

2
Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>Mage-Server-Plugins</artifactId> <artifactId>Mage-Server-Plugins</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<artifactId>Mage-Tournament-BoosterDraft</artifactId> <artifactId>Mage-Tournament-BoosterDraft</artifactId>

2
Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>Mage-Server-Plugins</artifactId> <artifactId>Mage-Server-Plugins</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<artifactId>Mage-Tournament-Sealed</artifactId> <artifactId>Mage-Tournament-Sealed</artifactId>

2
Mage.Server.Plugins/pom.xml
View file

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<artifactId>Mage-Server-Plugins</artifactId> <artifactId>Mage-Server-Plugins</artifactId>

14
Mage.Server/pom.xml
View file

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<artifactId>Mage-Server</artifactId> <artifactId>Mage-Server</artifactId>
@ -87,6 +87,12 @@
<artifactId>Mage-Player-AIMinimax</artifactId> <artifactId>Mage-Player-AIMinimax</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>Mage-Player-AI-MA</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>${project.groupId}</groupId> <groupId>${project.groupId}</groupId>
@ -94,6 +100,12 @@
<version>${project.version}</version> <version>${project.version}</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>Mage-Tournament-Sealed</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies> </dependencies>
<pluginRepositories> <pluginRepositories>

20
Mage.Server/release/config/config.xml
View file

@ -3,20 +3,22 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Config.xsd"> <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../Config.xsd">
<server serverAddress="localhost" serverName="mage-server" port="17171" maxGameThreads="10" maxSecondsIdle="600"/> <server serverAddress="localhost" serverName="mage-server" port="17171" maxGameThreads="10" maxSecondsIdle="600"/>
<playerTypes> <playerTypes>
<playerType name="Human" jar="mage-player-human.jar" className="mage.player.human.HumanPlayer"/> <playerType name="Human" jar="Mage-Player-Human-${project.version}.jar" className="mage.player.human.HumanPlayer"/>
<playerType name="Computer - default" jar="mage-player-ai.jar" className="mage.player.ai.ComputerPlayer"/> <playerType name="Computer - default" jar="Mage-Player-AI-${project.version}.jar" className="mage.player.ai.ComputerPlayer"/>
<playerType name="Computer - minimax" jar="mage-player-aiminimax.jar" className="mage.player.ai.ComputerPlayer2"/> <playerType name="Computer - minimax" jar="Mage-Player-AIMinimax-${project.version}.jar" className="mage.player.ai.ComputerPlayer2"/>
<playerType name="Computer - minimax hybrid" jar="mage-player-aiminimax.jar" className="mage.player.ai.ComputerPlayer3"/> <playerType name="Computer - minimax hybrid" jar="Mage-Player-AIMinimax-${project.version}.jar" className="mage.player.ai.ComputerPlayer3"/>
<playerType name="Computer - mad" jar="Mage-Player-AI-MA-${project.version}.jar" className="mage.player.ai.ComputerPlayer6"/>
</playerTypes> </playerTypes>
<gameTypes> <gameTypes>
<gameType name="Two Player Duel" jar="mage-game-twoplayerduel.jar" className="mage.game.TwoPlayerMatch" typeName="mage.game.TwoPlayerDuelType"/> <gameType name="Two Player Duel" jar="Mage-Game-TwoPlayerDuel-${project.version}.jar" className="mage.game.TwoPlayerMatch" typeName="mage.game.TwoPlayerDuelType"/>
<gameType name="Free For All" jar="mage-game-freeforall.jar" className="mage.game.FreeForAllMatch" typeName="mage.game.FreeForAllType"/> <gameType name="Free For All" jar="Mage-Game-FreeForAll-${project.version}.jar" className="mage.game.FreeForAllMatch" typeName="mage.game.FreeForAllType"/>
</gameTypes> </gameTypes>
<tournamentTypes> <tournamentTypes>
<tournamentType name="Booster Draft" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationTournamentType"/> <tournamentType name="Elimination Booster Draft" jar="Mage-Tournament-BoosterDraft-${project.version}.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationTournamentType"/>
<tournamentType name="Sealed Elimination" jar="Mage-Tournament-Sealed-${project.version}.jar" className="mage.tournament.SealedEliminationTournament" typeName="mage.tournament.SealedEliminationTournamentType"/>
</tournamentTypes> </tournamentTypes>
<deckTypes> <deckTypes>
<deckType name="Constructed" jar="mage-deck-constructed.jar" className="mage.deck.Constructed"/> <deckType name="Constructed" jar="Mage-Deck-Constructed-${project.version}.jar" className="mage.deck.Constructed"/>
<deckType name="Limited" jar="mage-deck-limited.jar" className="mage.deck.Limited"/> <deckType name="Limited" jar="Mage-Deck-Limited-${project.version}.jar" className="mage.deck.Limited"/>
</deckTypes> </deckTypes>
</config> </config>

8
Mage.Server/src/main/assembly/distribution.xml
View file

@ -23,20 +23,26 @@
<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-Human</include> <include>org.mage:Mage-Player-Human</include>
<include>org.mage:Mage-Draft-8PlayerBooster</include> <include>org.mage:Mage-Tournament-BoosterDraft</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-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-Human</exclude> <exclude>org.mage:Mage-Player-Human</exclude>
<exclude>org.mage:Mage-Tournament-BoosterDraft</exclude>
<exclude>org.mage:Mage-Tournament-Sealed</exclude>
</excludes> </excludes>
</dependencySet> </dependencySet>
</dependencySets> </dependencySets>

2
Mage.Server/src/main/java/mage/server/Main.java
View file

@ -55,7 +55,7 @@ public class Main {
private final static String testModeArg = "-testMode="; private final static String testModeArg = "-testMode=";
private final static String pluginFolder = "plugins"; private final static String pluginFolder = "plugins";
private final static String version = "0.6.1"; private final static String version = "0.7";
public static PluginClassLoader classLoader = new PluginClassLoader(); public static PluginClassLoader classLoader = new PluginClassLoader();
public static ServerImpl server; public static ServerImpl server;

2
Mage.Sets/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>

2
Mage.Tests/pom.xml
View file

@ -6,7 +6,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<artifactId>Mage-Tests</artifactId> <artifactId>Mage-Tests</artifactId>

2
Mage/pom.xml
View file

@ -7,7 +7,7 @@
<parent> <parent>
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.6</version> <version>0.7</version>
</parent> </parent>
<artifactId>Mage</artifactId> <artifactId>Mage</artifactId>

5
pom.xml
View file

@ -6,7 +6,7 @@
<groupId>org.mage</groupId> <groupId>org.mage</groupId>
<artifactId>mage-root</artifactId> <artifactId>mage-root</artifactId>
<version>0.6</version> <version>0.7</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Mage Root</name> <name>Mage Root</name>
<description>Mage Root POM</description> <description>Mage Root POM</description>
@ -19,7 +19,6 @@
<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>
@ -35,6 +34,6 @@
</repositories> </repositories>
<properties> <properties>
<mage-version>0.6</mage-version> <mage-version>0.7</mage-version>
</properties> </properties>
</project> </project>