From 1465e505c0ef5471b87ca58222e771b791c9ade1 Mon Sep 17 00:00:00 2001
From: Oleg Agafonov <jaydi85@gmail.com>
Date: Mon, 27 May 2019 18:02:28 +0400
Subject: [PATCH] Added duel mode for oathbreaker

---
 .../Mage.Game.OathbreakerDuel/pom.xml         |  55 +++
 .../src/mage/game/OathbreakerDuel.java        |  36 ++
 .../src/mage/game/OathbreakerDuelMatch.java   |  29 ++
 .../src/mage/game/OathbreakerDuelType.java    |  29 ++
 .../src/mage/game/OathbreakerFreeForAll.java  |  28 --
 Mage.Server.Plugins/pom.xml                   |   1 +
 Mage.Server/config/config.xml                 | 298 +++++---------
 Mage.Server/pom.xml                           |   6 +
 Mage.Server/release/config/config.xml         | 364 ++++++------------
 9 files changed, 365 insertions(+), 481 deletions(-)
 create mode 100644 Mage.Server.Plugins/Mage.Game.OathbreakerDuel/pom.xml
 create mode 100644 Mage.Server.Plugins/Mage.Game.OathbreakerDuel/src/mage/game/OathbreakerDuel.java
 create mode 100644 Mage.Server.Plugins/Mage.Game.OathbreakerDuel/src/mage/game/OathbreakerDuelMatch.java
 create mode 100644 Mage.Server.Plugins/Mage.Game.OathbreakerDuel/src/mage/game/OathbreakerDuelType.java

diff --git a/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/pom.xml
new file mode 100644
index 0000000000..717a09c791
--- /dev/null
+++ b/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/pom.xml
@@ -0,0 +1,55 @@
+<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">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.mage</groupId>
+        <artifactId>mage-server-plugins</artifactId>
+        <version>1.4.35</version>
+    </parent>
+
+    <artifactId>mage-game-oathbreakerduel</artifactId>
+    <packaging>jar</packaging>
+    <name>Mage Game Oathbreaker Two Player</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mage</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mage</groupId>
+            <artifactId>mage-game-oathbreakerfreeforall</artifactId>
+            <version>1.4.35</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <sourceDirectory>src</sourceDirectory>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <configuration>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+
+        </plugins>
+
+        <finalName>mage-game-oathbreakerduel</finalName>
+    </build>
+
+    <properties/>
+
+</project>
diff --git a/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/src/mage/game/OathbreakerDuel.java b/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/src/mage/game/OathbreakerDuel.java
new file mode 100644
index 0000000000..6979861ee8
--- /dev/null
+++ b/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/src/mage/game/OathbreakerDuel.java
@@ -0,0 +1,36 @@
+package mage.game;
+
+import mage.constants.MultiplayerAttackOption;
+import mage.constants.RangeOfInfluence;
+import mage.game.match.MatchType;
+import mage.game.mulligan.Mulligan;
+
+/**
+ * @author JayDi85
+ */
+public class OathbreakerDuel extends OathbreakerFreeForAll {
+
+    public OathbreakerDuel(MultiplayerAttackOption attackOption, RangeOfInfluence range, Mulligan mulligan, int startLife) {
+        super(attackOption, range, mulligan, startLife);
+    }
+
+    public OathbreakerDuel(final OathbreakerDuel game) {
+        super(game);
+    }
+
+    @Override
+    public MatchType getGameType() {
+        return new OathbreakerDuelType();
+    }
+
+    @Override
+    public int getNumPlayers() {
+        return 2;
+    }
+
+    @Override
+    public OathbreakerDuel copy() {
+        return new OathbreakerDuel(this);
+    }
+
+}
diff --git a/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/src/mage/game/OathbreakerDuelMatch.java b/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/src/mage/game/OathbreakerDuelMatch.java
new file mode 100644
index 0000000000..2d2491e2a1
--- /dev/null
+++ b/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/src/mage/game/OathbreakerDuelMatch.java
@@ -0,0 +1,29 @@
+package mage.game;
+
+import mage.game.match.MatchImpl;
+import mage.game.match.MatchOptions;
+import mage.game.mulligan.Mulligan;
+
+/**
+ * @author JayDi85
+ */
+public class OathbreakerDuelMatch extends MatchImpl {
+
+    public OathbreakerDuelMatch(MatchOptions options) {
+        super(options);
+    }
+
+    @Override
+    public void startGame() throws GameException {
+        int startLife = 20;
+        boolean alsoHand = true;
+        Mulligan mulligan = options.getMulliganType().getMulligan(options.getFreeMulligans());
+        OathbreakerDuel game = new OathbreakerDuel(options.getAttackOption(), options.getRange(), mulligan, startLife);
+        game.setCheckCommanderDamage(false);
+        game.setStartMessage(this.createGameStartMessage());
+        game.setAlsoHand(alsoHand);
+        game.setAlsoLibrary(true);
+        initGame(game);
+        games.add(game);
+    }
+}
diff --git a/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/src/mage/game/OathbreakerDuelType.java b/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/src/mage/game/OathbreakerDuelType.java
new file mode 100644
index 0000000000..ad52c5cce7
--- /dev/null
+++ b/Mage.Server.Plugins/Mage.Game.OathbreakerDuel/src/mage/game/OathbreakerDuelType.java
@@ -0,0 +1,29 @@
+package mage.game;
+
+import mage.game.match.MatchType;
+
+/**
+ * @author JayDi85
+ */
+public class OathbreakerDuelType extends MatchType {
+
+    public OathbreakerDuelType() {
+        this.name = "Oathbreaker Two Player Duel";
+        this.maxPlayers = 2;
+        this.minPlayers = 2;
+        this.numTeams = 0;
+        this.useAttackOption = false;
+        this.useRange = false;
+        this.sideboardingAllowed = false;
+    }
+
+    protected OathbreakerDuelType(final OathbreakerDuelType matchType) {
+        super(matchType);
+    }
+
+    @Override
+    public OathbreakerDuelType copy() {
+        return new OathbreakerDuelType(this);
+    }
+
+}
diff --git a/Mage.Server.Plugins/Mage.Game.OathbreakerFreeForAll/src/mage/game/OathbreakerFreeForAll.java b/Mage.Server.Plugins/Mage.Game.OathbreakerFreeForAll/src/mage/game/OathbreakerFreeForAll.java
index 55066b6f6f..4add5af79e 100644
--- a/Mage.Server.Plugins/Mage.Game.OathbreakerFreeForAll/src/mage/game/OathbreakerFreeForAll.java
+++ b/Mage.Server.Plugins/Mage.Game.OathbreakerFreeForAll/src/mage/game/OathbreakerFreeForAll.java
@@ -40,34 +40,6 @@ public class OathbreakerFreeForAll extends GameCommanderImpl {
 
     @Override
     protected void init(UUID choosingPlayerId) {
-        /*
-        // prepare commanders and signature spells info
-        playerSignatureSpell.clear();
-        playerCommanders.clear();
-        for (UUID playerId : state.getPlayerList(startingPlayerId)) {
-            UUID signatureSpell = null;
-            List<UUID> commanders = new ArrayList<>();
-
-            Player player = getPlayer(playerId);
-            List<UUID> searchList = new ArrayList<>();
-            searchList.addAll(player.getCommandersIds());
-            searchList.addAll(new ArrayList<>(player.getSideboard()));
-            for (UUID id : searchList) {
-                Card commander = this.getCard(id);
-                if (commander != null) {
-                    if (commander.isInstantOrSorcery()) {
-                        signatureSpell = commander.getId();
-                    } else if (!commanders.contains(commander.getId())) {
-                        commanders.add(commander.getId());
-                    }
-                }
-            }
-
-            playerSignatureSpell.put(playerId, signatureSpell);
-            playerCommanders.put(playerId, commanders);
-        }
-         */
-
         // init base commander game
         startingPlayerSkipsDraw = false;
         super.init(choosingPlayerId);
diff --git a/Mage.Server.Plugins/pom.xml b/Mage.Server.Plugins/pom.xml
index 497e462c37..96c567750d 100644
--- a/Mage.Server.Plugins/pom.xml
+++ b/Mage.Server.Plugins/pom.xml
@@ -30,6 +30,7 @@
         <module>Mage.Game.FreeformCommanderFreeForAll</module>
         <module>Mage.Game.BrawlDuel</module>
         <module>Mage.Game.BrawlFreeForAll</module>
+        <module>Mage.Game.OathbreakerDuel</module>
         <module>Mage.Game.OathbreakerFreeForAll</module>
         <module>Mage.Game.TwoPlayerDuel</module>
         <module>Mage.Player.AI</module>
diff --git a/Mage.Server/config/config.xml b/Mage.Server/config/config.xml
index 500b4c29b2..baac728b02 100644
--- a/Mage.Server/config/config.xml
+++ b/Mage.Server/config/config.xml
@@ -69,234 +69,126 @@
         <!--<playerType name="Computer - minimax" jar="mage-player-aiminimax.jar" className="mage.player.ai.ComputerPlayer3"/>-->
         <playerType name="Computer - mad" jar="mage-player-ai-ma.jar" className="mage.player.ai.ComputerPlayer7"/>
         <!--<playerType name="Computer - monte carlo" jar="mage-player-aimcts.jar" className="mage.player.ai.ComputerPlayerMCTS"/>-->
-        <playerType name="Computer - draftbot" jar="mage-player-ai-draft-bot.jar"
-                    className="mage.player.ai.ComputerDraftPlayer"/>
+        <playerType name="Computer - draftbot" jar="mage-player-ai-draft-bot.jar" className="mage.player.ai.ComputerDraftPlayer"/>
     </playerTypes>
     <gameTypes>
-        <gameType name="Two Player Duel" jar="mage-game-twoplayerduel.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="Commander Two Player Duel" jar="mage-game-commanderduel.jar"
-                  className="mage.game.CommanderDuelMatch" typeName="mage.game.CommanderDuelType"/>
-        <gameType name="Commander Free For All" jar="mage-game-commanderfreeforall.jar"
-                  className="mage.game.CommanderFreeForAllMatch" typeName="mage.game.CommanderFreeForAllType"/>
-        <gameType name="Tiny Leaders Two Player Duel" jar="mage-game-tinyleadersduel.jar"
-                  className="mage.game.TinyLeadersDuelMatch" typeName="mage.game.TinyLeadersDuelType"/>
-        <gameType name="Canadian Highlander Two Player Duel" jar="mage-game-canadianhighlanderduel.jar"
-                  className="mage.game.CanadianHighlanderDuelMatch" typeName="mage.game.CanadianHighlanderDuelType"/>
-        <gameType name="Penny Dreadful Commander Free For All" jar="mage-game-pennydreadfulcommanderfreeforall.jar"
-                  className="mage.game.PennyDreadfulCommanderFreeForAllMatch"
-                  typeName="mage.game.PennyDreadfulCommanderFreeForAllType"/>
-        <gameType name="Freeform Commander Two Player Duel" jar="mage-game-freeformcommanderduel.jar"
-                  className="mage.game.FreeformCommanderDuelMatch" typeName="mage.game.FreeformCommanderDuelType"/>
-        <gameType name="Freeform Commander Free For All" jar="mage-game-freeformcommanderfreeforall.jar"
-                  className="mage.game.FreeformCommanderFreeForAllMatch"
-                  typeName="mage.game.FreeformCommanderFreeForAllType"/>
-        <gameType name="Oathbreaker Free For All" jar="mage-game-oathbreakerfreeforall.jar"
-                  className="mage.game.OathbreakerFreeForAllMatch" typeName="mage.game.OathbreakerFreeForAllType"/>
-        <gameType name="Brawl Two Player Duel" jar="mage-game-brawlduel.jar" className="mage.game.BrawlDuelMatch"
-                  typeName="mage.game.BrawlDuelType"/>
-        <gameType name="Brawl Free For All" jar="mage-game-brawlfreeforall.jar"
-                  className="mage.game.BrawlFreeForAllMatch" typeName="mage.game.BrawlFreeForAllType"/>
-        <gameType name="Momir Basic Two Player Duel" jar="mage-game-momirduel.jar" className="mage.game.MomirDuelMatch"
-                  typeName="mage.game.MomirDuelType"/>
-        <gameType name="Momir Basic Free For All" jar="mage-game-momir.jar" className="mage.game.MomirFreeForAllMatch"
-                  typeName="mage.game.MomirFreeForAllType"/>
+        <gameType name="Two Player Duel" jar="mage-game-twoplayerduel.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="Commander Two Player Duel" jar="mage-game-commanderduel.jar" className="mage.game.CommanderDuelMatch" typeName="mage.game.CommanderDuelType"/>
+        <gameType name="Commander Free For All" jar="mage-game-commanderfreeforall.jar" className="mage.game.CommanderFreeForAllMatch" typeName="mage.game.CommanderFreeForAllType"/>
+        <gameType name="Tiny Leaders Two Player Duel" jar="mage-game-tinyleadersduel.jar" className="mage.game.TinyLeadersDuelMatch" typeName="mage.game.TinyLeadersDuelType"/>
+        <gameType name="Canadian Highlander Two Player Duel" jar="mage-game-canadianhighlanderduel.jar" className="mage.game.CanadianHighlanderDuelMatch" typeName="mage.game.CanadianHighlanderDuelType"/>
+        <gameType name="Penny Dreadful Commander Free For All" jar="mage-game-pennydreadfulcommanderfreeforall.jar" className="mage.game.PennyDreadfulCommanderFreeForAllMatch" typeName="mage.game.PennyDreadfulCommanderFreeForAllType"/>
+        <gameType name="Freeform Commander Two Player Duel" jar="mage-game-freeformcommanderduel.jar" className="mage.game.FreeformCommanderDuelMatch" typeName="mage.game.FreeformCommanderDuelType"/>
+        <gameType name="Freeform Commander Free For All" jar="mage-game-freeformcommanderfreeforall.jar" className="mage.game.FreeformCommanderFreeForAllMatch" typeName="mage.game.FreeformCommanderFreeForAllType"/>
+        <gameType name="Oathbreaker Two Player Duel" jar="mage-game-oathbreakerduel.jar" className="mage.game.OathbreakerDuelMatch" typeName="mage.game.OathbreakerDuelType"/>
+        <gameType name="Oathbreaker Free For All" jar="mage-game-oathbreakerfreeforall.jar" className="mage.game.OathbreakerFreeForAllMatch" typeName="mage.game.OathbreakerFreeForAllType"/>
+        <gameType name="Brawl Two Player Duel" jar="mage-game-brawlduel.jar" className="mage.game.BrawlDuelMatch" typeName="mage.game.BrawlDuelType"/>
+        <gameType name="Brawl Free For All" jar="mage-game-brawlfreeforall.jar" className="mage.game.BrawlFreeForAllMatch" typeName="mage.game.BrawlFreeForAllType"/>
+        <gameType name="Momir Basic Two Player Duel" jar="mage-game-momirduel.jar" className="mage.game.MomirDuelMatch" typeName="mage.game.MomirDuelType"/>
+        <gameType name="Momir Basic Free For All" jar="mage-game-momir.jar" className="mage.game.MomirFreeForAllMatch" typeName="mage.game.MomirFreeForAllType"/>
     </gameTypes>
     <tournamentTypes>
-        <tournamentType name="Constructed Elimination" jar="mage-tournament-constructed.jar"
-                        className="mage.tournament.ConstructedEliminationTournament"
-                        typeName="mage.tournament.ConstructedEliminationTournamentType"/>
-        <tournamentType name="Constructed Swiss" jar="mage-tournament-constructed.jar"
-                        className="mage.tournament.ConstructedSwissTournament"
-                        typeName="mage.tournament.ConstructedSwissTournamentType"/>
-        <tournamentType name="Booster Draft Elimination" jar="mage-tournament-booster-draft.jar"
-                        className="mage.tournament.BoosterDraftEliminationTournament"
-                        typeName="mage.tournament.BoosterDraftEliminationTournamentType"/>
-        <tournamentType name="Booster Draft Elimination (Cube)" jar="mage-tournament-booster-draft.jar"
-                        className="mage.tournament.BoosterDraftEliminationTournament"
-                        typeName="mage.tournament.BoosterDraftEliminationCubeTournamentType"/>
-        <tournamentType name="Booster Draft Elimination (Random)" jar="mage-tournament-booster-draft.jar"
-                        className="mage.tournament.RandomBoosterDraftEliminationTournament"
-                        typeName="mage.tournament.RandomBoosterDraftEliminationTournamentType"/>
-        <tournamentType name="Booster Draft Elimination (Rich Man)" jar="mage-tournament-booster-draft.jar"
-                        className="mage.tournament.RichManDraftEliminationTournament"
-                        typeName="mage.tournament.RichManDraftEliminationTournamentType"/>
-        <tournamentType name="Booster Draft Elimination (Rich Man Cube)" jar="mage-tournament-booster-draft.jar"
-                        className="mage.tournament.RichManCubeDraftEliminationTournament"
-                        typeName="mage.tournament.RichManCubeDraftEliminationTournamentType"/>
-        <tournamentType name="Booster Draft Swiss" jar="mage-tournament-booster-draft.jar"
-                        className="mage.tournament.BoosterDraftSwissTournament"
-                        typeName="mage.tournament.BoosterDraftSwissTournamentType"/>
-        <tournamentType name="Booster Draft Swiss (Cube)" jar="mage-tournament-booster-draft.jar"
-                        className="mage.tournament.BoosterDraftSwissTournament"
-                        typeName="mage.tournament.BoosterDraftSwissCubeTournamentType"/>
-        <tournamentType name="Booster Draft Swiss (Random)" jar="mage-tournament-booster-draft.jar"
-                        className="mage.tournament.RandomBoosterDraftSwissTournament"
-                        typeName="mage.tournament.RandomBoosterDraftSwissTournamentType"/>
-        <tournamentType name="Sealed Elimination" jar="mage-tournament-sealed.jar"
-                        className="mage.tournament.SealedEliminationTournament"
-                        typeName="mage.tournament.SealedEliminationTournamentType"/>
-        <tournamentType name="Sealed Elimination (Cube)" jar="mage-tournament-sealed.jar"
-                        className="mage.tournament.SealedEliminationTournament"
-                        typeName="mage.tournament.SealedEliminationCubeTournamentType"/>
-        <tournamentType name="Sealed Swiss" jar="mage-tournament-sealed.jar"
-                        className="mage.tournament.SealedSwissTournament"
-                        typeName="mage.tournament.SealedSwissTournamentType"/>
-        <tournamentType name="Sealed Swiss (Cube)" jar="mage-tournament-sealed.jar"
-                        className="mage.tournament.SealedSwissTournament"
-                        typeName="mage.tournament.SealedSwissCubeTournamentType"/>
+        <tournamentType name="Constructed Elimination" jar="mage-tournament-constructed.jar" className="mage.tournament.ConstructedEliminationTournament" typeName="mage.tournament.ConstructedEliminationTournamentType"/>
+        <tournamentType name="Constructed Swiss" jar="mage-tournament-constructed.jar" className="mage.tournament.ConstructedSwissTournament" typeName="mage.tournament.ConstructedSwissTournamentType"/>
+        <tournamentType name="Booster Draft Elimination" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationTournamentType"/>
+        <tournamentType name="Booster Draft Elimination (Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationCubeTournamentType"/>
+        <tournamentType name="Booster Draft Elimination (Random)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RandomBoosterDraftEliminationTournament" typeName="mage.tournament.RandomBoosterDraftEliminationTournamentType"/>
+        <tournamentType name="Booster Draft Elimination (Rich Man)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManDraftEliminationTournament" typeName="mage.tournament.RichManDraftEliminationTournamentType"/>
+        <tournamentType name="Booster Draft Elimination (Rich Man Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManCubeDraftEliminationTournament" typeName="mage.tournament.RichManCubeDraftEliminationTournamentType"/>
+        <tournamentType name="Booster Draft Swiss" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftSwissTournament" typeName="mage.tournament.BoosterDraftSwissTournamentType"/>
+        <tournamentType name="Booster Draft Swiss (Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftSwissTournament" typeName="mage.tournament.BoosterDraftSwissCubeTournamentType"/>
+        <tournamentType name="Booster Draft Swiss (Random)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RandomBoosterDraftSwissTournament" typeName="mage.tournament.RandomBoosterDraftSwissTournamentType"/>
+        <tournamentType name="Sealed Elimination" jar="mage-tournament-sealed.jar" className="mage.tournament.SealedEliminationTournament" typeName="mage.tournament.SealedEliminationTournamentType"/>
+        <tournamentType name="Sealed Elimination (Cube)" jar="mage-tournament-sealed.jar" className="mage.tournament.SealedEliminationTournament" typeName="mage.tournament.SealedEliminationCubeTournamentType"/>
+        <tournamentType name="Sealed Swiss" jar="mage-tournament-sealed.jar" className="mage.tournament.SealedSwissTournament" typeName="mage.tournament.SealedSwissTournamentType"/>
+        <tournamentType name="Sealed Swiss (Cube)" jar="mage-tournament-sealed.jar" className="mage.tournament.SealedSwissTournament" typeName="mage.tournament.SealedSwissCubeTournamentType"/>
     </tournamentTypes>
     <draftCubes>
-        <draftCube name="Adam Styborski's Pauper Cube" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.AdamStyborskisPauperCube"/>
-        <draftCube name="Ben's Cube" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.BensCube"/>
-        <draftCube name="Cube Tutor 360 Pauper" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.CubeTutor360Pauper"/>
-        <draftCube name="Cube Tutor 720" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.CubeTutor720"/>
-        <draftCube name="Eric Klug's Pro Tour Cube" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.EricKlugsProTourCube"/>
-        <draftCube name="Guillaume Matignon's Jenny's/Johnny's Cube" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.GuillaumeMatignonsJennysJohnnysCube"/>
-        <draftCube name="Jim Davis's Cube" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.JimDavisCube"/>
-        <draftCube name="Joseph Vasoli's Peasant Cube" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.JosephVasolisPeasantCube"/>
-        <draftCube name="Mono Blue Cube" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.MonoBlueCube"/>
-        <draftCube name="Sam Black's No Search Cube" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.SamBlacksCube"/>
-        <draftCube name="Timothee Simonot's Twisted Color Pie Cube" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.TimotheeSimonotsTwistedColorPieCube"/>
-        <draftCube name="MTGO Cube March 2014" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.MTGOMarchCube2014"/>
-        <draftCube name="MTGO Legacy Cube" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.LegacyCube"/>
-        <draftCube name="MTGO Legacy Cube 2015 March" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.LegacyCubeMarch2015"/>
-        <draftCube name="MTGO Legacy Cube 2015 September" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.LegacyCubeSeptember2015"/>
-        <draftCube name="MTGO Legacy Cube 2016 January" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.LegacyCubeJanuary2016"/>
-        <draftCube name="MTGO Legacy Cube 2016 September" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.LegacyCubeSeptember2016"/>
-        <draftCube name="MTGO Legacy Cube 2017 January" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.LegacyCubeJanuary2017"/>
-        <draftCube name="MTGO Legacy Cube 2017 April" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.LegacyCubeApril2017"/>
-        <draftCube name="MTGO Legacy Cube 2018 February" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.LegacyCube2018February"/>
-        <draftCube name="MTGO Legendary Cube" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.LegendaryCube"/>
-        <draftCube name="MTGO Legendary Cube April 2016" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.LegendaryCubeApril2016"/>
-        <draftCube name="MTGO Modern Cube 2017" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.ModernCube2017"/>
-        <draftCube name="MTGO Vintage Cube 2013" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.VintageCube2013"/>
-        <draftCube name="MTGO Vintage Cube 2014" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.VintageCube2014"/>
-        <draftCube name="MTGO Vintage Cube 2015" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.VintageCube2015"/>
-        <draftCube name="MTGO Vintage Cube 2016" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.VintageCube2016"/>
-        <draftCube name="MTGO Vintage Cube June 2016" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.VintageCubeJune2016"/>
-        <draftCube name="MTGO Vintage Cube November 2016" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.VintageCubeNovember2016"/>
-        <draftCube name="MTGO Vintage Cube June 2017" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.VintageCubeJune2017"/>
-        <draftCube name="MTGO Vintage Cube December 2017" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.VintageCubeDecember2017"/>
-        <draftCube name="MTGO Vintage Cube June 2018" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.VintageCubeJune2018"/>
-        <draftCube name="MTGO Vintage Cube December 2018" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.VintageCubeDecember2018"/>
-        <draftCube name="SCG Con Cube 2018 December" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.ScgConCube2018December"/>
-        <draftCube name="The Peasant's Toolbox" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.PeasantsToolboxCube"/>
-        <draftCube name="www.MTGCube.com" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.MTGCube"/>
-        <draftCube name="Cube From Deck" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.CubeFromDeck"/>
+        <draftCube name="Adam Styborski's Pauper Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.AdamStyborskisPauperCube"/>
+        <draftCube name="Ben's Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.BensCube"/>
+        <draftCube name="Cube Tutor 360 Pauper" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.CubeTutor360Pauper"/>
+        <draftCube name="Cube Tutor 720" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.CubeTutor720"/>
+        <draftCube name="Eric Klug's Pro Tour Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.EricKlugsProTourCube"/>
+        <draftCube name="Guillaume Matignon's Jenny's/Johnny's Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.GuillaumeMatignonsJennysJohnnysCube"/>
+        <draftCube name="Jim Davis's Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.JimDavisCube"/>
+        <draftCube name="Joseph Vasoli's Peasant Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.JosephVasolisPeasantCube"/>
+        <draftCube name="Mono Blue Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.MonoBlueCube"/>
+        <draftCube name="Sam Black's No Search Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.SamBlacksCube"/>
+        <draftCube name="Timothee Simonot's Twisted Color Pie Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.TimotheeSimonotsTwistedColorPieCube"/>
+        <draftCube name="MTGO Cube March 2014" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.MTGOMarchCube2014"/>
+        <draftCube name="MTGO Legacy Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCube"/>
+        <draftCube name="MTGO Legacy Cube 2015 March" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCubeMarch2015"/>
+        <draftCube name="MTGO Legacy Cube 2015 September" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCubeSeptember2015"/>
+        <draftCube name="MTGO Legacy Cube 2016 January" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCubeJanuary2016"/>
+        <draftCube name="MTGO Legacy Cube 2016 September" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCubeSeptember2016"/>
+        <draftCube name="MTGO Legacy Cube 2017 January" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCubeJanuary2017"/>
+        <draftCube name="MTGO Legacy Cube 2017 April" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCubeApril2017"/>
+        <draftCube name="MTGO Legacy Cube 2018 February" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegacyCube2018February"/>
+        <draftCube name="MTGO Legendary Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegendaryCube"/>
+        <draftCube name="MTGO Legendary Cube April 2016" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.LegendaryCubeApril2016"/>
+        <draftCube name="MTGO Modern Cube 2017" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.ModernCube2017"/>
+        <draftCube name="MTGO Vintage Cube 2013" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCube2013"/>
+        <draftCube name="MTGO Vintage Cube 2014" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCube2014"/>
+        <draftCube name="MTGO Vintage Cube 2015" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCube2015"/>
+        <draftCube name="MTGO Vintage Cube 2016" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCube2016"/>
+        <draftCube name="MTGO Vintage Cube June 2016" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCubeJune2016"/>
+        <draftCube name="MTGO Vintage Cube November 2016" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCubeNovember2016"/>
+        <draftCube name="MTGO Vintage Cube June 2017" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCubeJune2017"/>
+        <draftCube name="MTGO Vintage Cube December 2017" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.VintageCubeDecember2017"/>
+        <draftCube name="MTGO Vintage Cube June 2018" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.VintageCubeJune2018"/>
+        <draftCube name="MTGO Vintage Cube December 2018" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.VintageCubeDecember2018"/>
+        <draftCube name="SCG Con Cube 2018 December" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.ScgConCube2018December"/>
+        <draftCube name="The Peasant's Toolbox" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.PeasantsToolboxCube"/>
+        <draftCube name="www.MTGCube.com" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.MTGCube"/>
+        <draftCube name="Cube From Deck" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.CubeFromDeck"/>
     </draftCubes>
     <deckTypes>
         <deckType name="Constructed - Standard" jar="mage-deck-constructed.jar" className="mage.deck.Standard"/>
         <deckType name="Constructed - Extended" jar="mage-deck-constructed.jar" className="mage.deck.Extended"/>
         <deckType name="Constructed - Frontier" jar="mage-deck-constructed.jar" className="mage.deck.Frontier"/>
         <deckType name="Constructed - Modern" jar="mage-deck-constructed.jar" className="mage.deck.Modern"/>
-        <deckType name="Constructed - Modern - No Banned List" jar="mage-deck-constructed.jar"
-                  className="mage.deck.ModernNoBannedList"/>
+        <deckType name="Constructed - Modern - No Banned List" jar="mage-deck-constructed.jar" className="mage.deck.ModernNoBannedList"/>
         <deckType name="Constructed - Eternal" jar="mage-deck-constructed.jar" className="mage.deck.Eternal"/>
         <deckType name="Constructed - Legacy" jar="mage-deck-constructed.jar" className="mage.deck.Legacy"/>
         <deckType name="Constructed - Vintage" jar="mage-deck-constructed.jar" className="mage.deck.Vintage"/>
         <deckType name="Constructed - Pauper" jar="mage-deck-constructed.jar" className="mage.deck.Pauper"/>
-        <deckType name="Constructed - Historical Type 2" jar="mage-deck-constructed.jar"
-                  className="mage.deck.HistoricalType2"/>
+        <deckType name="Constructed - Historical Type 2" jar="mage-deck-constructed.jar" className="mage.deck.HistoricalType2"/>
         <deckType name="Constructed - Super Type 2" jar="mage-deck-constructed.jar" className="mage.deck.SuperType2"/>
-        <deckType name="Constructed - Australian Highlander" jar="mage-deck-constructed.jar"
-                  className="mage.deck.AusHighlander"/>
-        <deckType name="Constructed - Canadian Highlander" jar="mage-deck-constructed.jar"
-                  className="mage.deck.CanadianHighlander"/>
-        <deckType name="Constructed - Old School 93/94" jar="mage-deck-constructed.jar"
-                  className="mage.deck.OldSchool9394"/>
-        <deckType name="Constructed - Old School 93/94 - Italian Rules" jar="mage-deck-constructed.jar"
-                  className="mage.deck.OldSchool9394Italian"/>
-        <deckType name="Constructed - Old School 93/94 - Channel Fireball Rules" jar="mage-deck-constructed.jar"
-                  className="mage.deck.OldSchool9394CFB"/>
-        <deckType name="Constructed - Old School 93/94 - EudoGames Rules" jar="mage-deck-constructed.jar"
-                  className="mage.deck.OldSchool9394EG"/>
-        <deckType name="Constructed - Old School 93/94 - EC Rules" jar="mage-deck-constructed.jar"
-                  className="mage.deck.OldSchool9394EC"/>
+        <deckType name="Constructed - Australian Highlander" jar="mage-deck-constructed.jar" className="mage.deck.AusHighlander"/>
+        <deckType name="Constructed - Canadian Highlander" jar="mage-deck-constructed.jar" className="mage.deck.CanadianHighlander"/>
+        <deckType name="Constructed - Old School 93/94" jar="mage-deck-constructed.jar" className="mage.deck.OldSchool9394"/>
+        <deckType name="Constructed - Old School 93/94 - Italian Rules" jar="mage-deck-constructed.jar" className="mage.deck.OldSchool9394Italian"/>
+        <deckType name="Constructed - Old School 93/94 - Channel Fireball Rules" jar="mage-deck-constructed.jar" className="mage.deck.OldSchool9394CFB"/>
+        <deckType name="Constructed - Old School 93/94 - EudoGames Rules" jar="mage-deck-constructed.jar" className="mage.deck.OldSchool9394EG"/>
+        <deckType name="Constructed - Old School 93/94 - EC Rules" jar="mage-deck-constructed.jar" className="mage.deck.OldSchool9394EC"/>
         <deckType name="Constructed - Premodern" jar="mage-deck-constructed.jar" className="mage.deck.Premodern"/>
         <deckType name="Constructed - Freeform" jar="mage-deck-constructed.jar" className="mage.deck.Freeform"/>
         <deckType name="Variant Magic - Commander" jar="mage-deck-constructed.jar" className="mage.deck.Commander"/>
-        <deckType name="Variant Magic - Duel Commander" jar="mage-deck-constructed.jar"
-                  className="mage.deck.DuelCommander"/>
-        <deckType name="Variant Magic - MTGO 1v1 Commander" jar="mage-deck-constructed.jar"
-                  className="mage.deck.MTGO1v1Commander"/>
-        <deckType name="Variant Magic - Tiny Leaders" jar="mage-deck-constructed.jar"
-                  className="mage.deck.TinyLeaders"/>
+        <deckType name="Variant Magic - Duel Commander" jar="mage-deck-constructed.jar" className="mage.deck.DuelCommander"/>
+        <deckType name="Variant Magic - MTGO 1v1 Commander" jar="mage-deck-constructed.jar" className="mage.deck.MTGO1v1Commander"/>
+        <deckType name="Variant Magic - Tiny Leaders" jar="mage-deck-constructed.jar" className="mage.deck.TinyLeaders"/>
         <deckType name="Variant Magic - Momir Basic" jar="mage-deck-constructed.jar" className="mage.deck.Momir"/>
-        <deckType name="Variant Magic - Penny Dreadful Commander" jar="mage-deck-constructed.jar"
-                  className="mage.deck.PennyDreadfulCommander"/>
-        <deckType name="Variant Magic - Freeform Commander" jar="mage-deck-constructed.jar"
-                  className="mage.deck.FreeformCommander"/>
+        <deckType name="Variant Magic - Penny Dreadful Commander" jar="mage-deck-constructed.jar" className="mage.deck.PennyDreadfulCommander"/>
+        <deckType name="Variant Magic - Freeform Commander" jar="mage-deck-constructed.jar" className="mage.deck.FreeformCommander"/>
         <deckType name="Variant Magic - Brawl" jar="mage-deck-constructed.jar" className="mage.deck.Brawl"/>
         <deckType name="Variant Magic - Oathbreaker" jar="mage-deck-constructed.jar" className="mage.deck.Oathbreaker"/>
-        <deckType name="Block Constructed - Amonkhet" jar="mage-deck-constructed.jar"
-                  className="mage.deck.AmonkhetBlock"/>
-        <deckType name="Block Constructed - Battle for Zendikar" jar="mage-deck-constructed.jar"
-                  className="mage.deck.BattleForZendikarBlock"/>
-        <deckType name="Block Constructed - Innistrad" jar="mage-deck-constructed.jar"
-                  className="mage.deck.InnistradBlock"/>
+        <deckType name="Block Constructed - Amonkhet" jar="mage-deck-constructed.jar" className="mage.deck.AmonkhetBlock"/>
+        <deckType name="Block Constructed - Battle for Zendikar" jar="mage-deck-constructed.jar" className="mage.deck.BattleForZendikarBlock"/>
+        <deckType name="Block Constructed - Innistrad" jar="mage-deck-constructed.jar" className="mage.deck.InnistradBlock"/>
         <deckType name="Block Constructed - Ixalan" jar="mage-deck-constructed.jar" className="mage.deck.IxalanBlock"/>
-        <deckType name="Block Constructed - Kaladesh" jar="mage-deck-constructed.jar"
-                  className="mage.deck.KaladeshBlock"/>
-        <deckType name="Block Constructed - Kamigawa" jar="mage-deck-constructed.jar"
-                  className="mage.deck.KamigawaBlock"/>
-        <deckType name="Block Constructed - Khans of Tarkir" jar="mage-deck-constructed.jar"
-                  className="mage.deck.KhansOfTarkirBlock"/>
+        <deckType name="Block Constructed - Kaladesh" jar="mage-deck-constructed.jar" className="mage.deck.KaladeshBlock"/>
+        <deckType name="Block Constructed - Kamigawa" jar="mage-deck-constructed.jar" className="mage.deck.KamigawaBlock"/>
+        <deckType name="Block Constructed - Khans of Tarkir" jar="mage-deck-constructed.jar" className="mage.deck.KhansOfTarkirBlock"/>
         <deckType name="Block Constructed - Lorwyn" jar="mage-deck-constructed.jar" className="mage.deck.LorwynBlock"/>
-        <deckType name="Block Constructed - Return to Ravnica" jar="mage-deck-constructed.jar"
-                  className="mage.deck.ReturnToRavnicaBlock"/>
-        <deckType name="Block Constructed - Scars of Mirrodin" jar="mage-deck-constructed.jar"
-                  className="mage.deck.ScarsOfMirrodinBlock"/>
-        <deckType name="Block Constructed - Shadowmoor" jar="mage-deck-constructed.jar"
-                  className="mage.deck.ShadowmoorBlock"/>
-        <deckType name="Block Constructed - Shadows over Innistrad" jar="mage-deck-constructed.jar"
-                  className="mage.deck.ShadowsOverInnistradBlock"/>
-        <deckType name="Block Constructed - Shards of Alara" jar="mage-deck-constructed.jar"
-                  className="mage.deck.ShardsOfAlaraBlock"/>
+        <deckType name="Block Constructed - Return to Ravnica" jar="mage-deck-constructed.jar" className="mage.deck.ReturnToRavnicaBlock"/>
+        <deckType name="Block Constructed - Scars of Mirrodin" jar="mage-deck-constructed.jar" className="mage.deck.ScarsOfMirrodinBlock"/>
+        <deckType name="Block Constructed - Shadowmoor" jar="mage-deck-constructed.jar" className="mage.deck.ShadowmoorBlock"/>
+        <deckType name="Block Constructed - Shadows over Innistrad" jar="mage-deck-constructed.jar" className="mage.deck.ShadowsOverInnistradBlock"/>
+        <deckType name="Block Constructed - Shards of Alara" jar="mage-deck-constructed.jar" className="mage.deck.ShardsOfAlaraBlock"/>
         <deckType name="Block Constructed - Theros" jar="mage-deck-constructed.jar" className="mage.deck.TherosBlock"/>
-        <deckType name="Block Constructed - Zendikar" jar="mage-deck-constructed.jar"
-                  className="mage.deck.ZendikarBlock"/>
-        <deckType name="Block Constructed Custom - Star Wars" jar="mage-deck-constructed.jar"
-                  className="mage.deck.StarWarsBlock"/>
+        <deckType name="Block Constructed - Zendikar" jar="mage-deck-constructed.jar" className="mage.deck.ZendikarBlock"/>
+        <deckType name="Block Constructed Custom - Star Wars" jar="mage-deck-constructed.jar" className="mage.deck.StarWarsBlock"/>
         <deckType name="Limited" jar="mage-deck-limited.jar" className="mage.deck.Limited"/>
     </deckTypes>
-</config>
+</config>
\ No newline at end of file
diff --git a/Mage.Server/pom.xml b/Mage.Server/pom.xml
index b835f3e7df..b66193422e 100644
--- a/Mage.Server/pom.xml
+++ b/Mage.Server/pom.xml
@@ -192,6 +192,12 @@
             <scope>runtime</scope>
         </dependency>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>mage-game-oathbreakerduel</artifactId>
+            <version>${project.version}</version>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>mage-game-oathbreakerfreeforall</artifactId>
diff --git a/Mage.Server/release/config/config.xml b/Mage.Server/release/config/config.xml
index 37cdb35f4c..fcaffeb49a 100644
--- a/Mage.Server/release/config/config.xml
+++ b/Mage.Server/release/config/config.xml
@@ -61,264 +61,128 @@
             mailFromAddress=""
     />
     <playerTypes>
-        <playerType name="Human" jar="mage-player-human-${project.version}.jar"
-                    className="mage.player.human.HumanPlayer"/>
-        <playerType name="Computer - mad" jar="mage-player-ai-ma-${project.version}.jar"
-                    className="mage.player.ai.ComputerPlayer7"/>
-        <playerType name="Computer - draftbot" jar="mage-player-ai-draftbot-${project.version}.jar"
-                    className="mage.player.ai.ComputerDraftPlayer"/>
+        <playerType name="Human" jar="mage-player-human-${project.version}.jar" className="mage.player.human.HumanPlayer"/>
+        <playerType name="Computer - mad" jar="mage-player-ai-ma-${project.version}.jar" className="mage.player.ai.ComputerPlayer7"/>
+        <playerType name="Computer - draftbot" jar="mage-player-ai-draftbot-${project.version}.jar" className="mage.player.ai.ComputerDraftPlayer"/>
     </playerTypes>
     <gameTypes>
-        <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-${project.version}.jar"
-                  className="mage.game.FreeForAllMatch" typeName="mage.game.FreeForAllType"/>
-        <gameType name="Commander Two Player Duel" jar="mage-game-commanderduel-${project.version}.jar"
-                  className="mage.game.CommanderDuelMatch" typeName="mage.game.CommanderDuelType"/>
-        <gameType name="Commander Free For All" jar="mage-game-commanderfreeforall-${project.version}.jar"
-                  className="mage.game.CommanderFreeForAllMatch" typeName="mage.game.CommanderFreeForAllType"/>
-        <gameType name="Tiny Leaders Two Player Duel" jar="mage-game-tinyleadersduel-${project.version}.jar"
-                  className="mage.game.TinyLeadersDuelMatch" typeName="mage.game.TinyLeadersDuelType"/>
-        <gameType name="Canadian Highlander Two Player Duel"
-                  jar="mage-game-canadianhighlanderduel-${project.version}.jar"
-                  className="mage.game.CanadianHighlanderDuelMatch" typeName="mage.game.CanadianHighlanderDuelType"/>
-        <gameType name="Penny Dreadful Commander Free For All"
-                  jar="mage-game-pennydreadfulcommanderfreeforall-${project.version}.jar"
-                  className="mage.game.PennyDreadfulCommanderFreeForAllMatch"
-                  typeName="mage.game.PennyDreadfulCommanderFreeForAllType"/>
-        <gameType name="Freeform Commander Two Player Duel" jar="mage-game-freeformcommanderduel-${project.version}.jar"
-                  className="mage.game.FreeformCommanderDuelMatch" typeName="mage.game.FreeformCommanderDuelType"/>
-        <gameType name="Freeform Commander Free For All"
-                  jar="mage-game-freeformcommanderfreeforall-${project.version}.jar"
-                  className="mage.game.FreeformCommanderFreeForAllMatch"
-                  typeName="mage.game.FreeformCommanderFreeForAllType"/>
-        <gameType name="Oathbreaker Free For All" jar="mage-game-oathbreakerfreeforall-${project.version}.jar"
-                  className="mage.game.OathbreakerFreeForAllMatch" typeName="mage.game.OathbreakerFreeForAllType"/>
-        <gameType name="Brawl Two Player Duel" jar="mage-game-brawlduel-${project.version}.jar"
-                  className="mage.game.BrawlDuelMatch" typeName="mage.game.BrawlDuelType"/>
-        <gameType name="Brawl Free For All" jar="mage-game-brawlfreeforall-${project.version}.jar"
-                  className="mage.game.BrawlFreeForAllMatch" typeName="mage.game.BrawlFreeForAllType"/>
-        <gameType name="Momir Basic Two Player Duel" jar="mage-game-momirduel-${project.version}.jar"
-                  className="mage.game.MomirDuelMatch" typeName="mage.game.MomirDuelType"/>
-        <gameType name="Momir Basic Free For All" jar="mage-game-momir-${project.version}.jar"
-                  className="mage.game.MomirFreeForAllMatch" typeName="mage.game.MomirFreeForAllType"/>
+        <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-${project.version}.jar" className="mage.game.FreeForAllMatch" typeName="mage.game.FreeForAllType"/>
+        <gameType name="Commander Two Player Duel" jar="mage-game-commanderduel-${project.version}.jar" className="mage.game.CommanderDuelMatch" typeName="mage.game.CommanderDuelType"/>
+        <gameType name="Commander Free For All" jar="mage-game-commanderfreeforall-${project.version}.jar" className="mage.game.CommanderFreeForAllMatch" typeName="mage.game.CommanderFreeForAllType"/>
+        <gameType name="Tiny Leaders Two Player Duel" jar="mage-game-tinyleadersduel-${project.version}.jar" className="mage.game.TinyLeadersDuelMatch" typeName="mage.game.TinyLeadersDuelType"/>
+        <gameType name="Canadian Highlander Two Player Duel" jar="mage-game-canadianhighlanderduel-${project.version}.jar" className="mage.game.CanadianHighlanderDuelMatch" typeName="mage.game.CanadianHighlanderDuelType"/>
+        <gameType name="Penny Dreadful Commander Free For All" jar="mage-game-pennydreadfulcommanderfreeforall-${project.version}.jar" className="mage.game.PennyDreadfulCommanderFreeForAllMatch" typeName="mage.game.PennyDreadfulCommanderFreeForAllType"/>
+        <gameType name="Freeform Commander Two Player Duel" jar="mage-game-freeformcommanderduel-${project.version}.jar" className="mage.game.FreeformCommanderDuelMatch" typeName="mage.game.FreeformCommanderDuelType"/>
+        <gameType name="Freeform Commander Free For All" jar="mage-game-freeformcommanderfreeforall-${project.version}.jar" className="mage.game.FreeformCommanderFreeForAllMatch" typeName="mage.game.FreeformCommanderFreeForAllType"/>
+        <gameType name="Oathbreaker Two Player Duel" jar="mage-game-oathbreakerduel-${project.version}.jar" className="mage.game.OathbreakerDuelMatch" typeName="mage.game.OathbreakerDuelType"/>
+        <gameType name="Oathbreaker Free For All" jar="mage-game-oathbreakerfreeforall-${project.version}.jar" className="mage.game.OathbreakerFreeForAllMatch" typeName="mage.game.OathbreakerFreeForAllType"/>
+        <gameType name="Brawl Two Player Duel" jar="mage-game-brawlduel-${project.version}.jar" className="mage.game.BrawlDuelMatch" typeName="mage.game.BrawlDuelType"/>
+        <gameType name="Brawl Free For All" jar="mage-game-brawlfreeforall-${project.version}.jar" className="mage.game.BrawlFreeForAllMatch" typeName="mage.game.BrawlFreeForAllType"/>
+        <gameType name="Momir Basic Two Player Duel" jar="mage-game-momirduel-${project.version}.jar" className="mage.game.MomirDuelMatch" typeName="mage.game.MomirDuelType"/>
+        <gameType name="Momir Basic Free For All" jar="mage-game-momir-${project.version}.jar" className="mage.game.MomirFreeForAllMatch" typeName="mage.game.MomirFreeForAllType"/>
     </gameTypes>
     <tournamentTypes>
-        <tournamentType name="Constructed Elimination" jar="mage-tournament-constructed-${project.version}.jar"
-                        className="mage.tournament.ConstructedEliminationTournament"
-                        typeName="mage.tournament.ConstructedEliminationTournamentType"/>
-        <tournamentType name="Constructed Swiss" jar="mage-tournament-constructed-${project.version}.jar"
-                        className="mage.tournament.ConstructedSwissTournament"
-                        typeName="mage.tournament.ConstructedSwissTournamentType"/>
-        <tournamentType name="Booster Draft Elimination" jar="mage-tournament-boosterdraft-${project.version}.jar"
-                        className="mage.tournament.BoosterDraftEliminationTournament"
-                        typeName="mage.tournament.BoosterDraftEliminationTournamentType"/>
-        <tournamentType name="Booster Draft Elimination (Cube)"
-                        jar="mage-tournament-boosterdraft-${project.version}.jar"
-                        className="mage.tournament.BoosterDraftEliminationTournament"
-                        typeName="mage.tournament.BoosterDraftEliminationCubeTournamentType"/>
-        <tournamentType name="Booster Draft Elimination (Random)"
-                        jar="mage-tournament-boosterdraft-${project.version}.jar"
-                        className="mage.tournament.RandomBoosterDraftEliminationTournament"
-                        typeName="mage.tournament.RandomBoosterDraftEliminationTournamentType"/>
-        <tournamentType name="Booster Draft Elimination (Rich Man)"
-                        jar="mage-tournament-boosterdraft-${project.version}.jar"
-                        className="mage.tournament.RichManDraftEliminationTournament"
-                        typeName="mage.tournament.RichManDraftEliminationTournamentType"/>
-        <tournamentType name="Booster Draft Elimination (Rich Man Cube)"
-                        jar="mage-tournament-boosterdraft-${project.version}.jar"
-                        className="mage.tournament.RichManCubeDraftEliminationTournament"
-                        typeName="mage.tournament.RichManCubeDraftEliminationTournamentType"/>
-        <tournamentType name="Booster Draft Swiss" jar="mage-tournament-boosterdraft-${project.version}.jar"
-                        className="mage.tournament.BoosterDraftSwissTournament"
-                        typeName="mage.tournament.BoosterDraftSwissTournamentType"/>
-        <tournamentType name="Booster Draft Swiss (Cube)" jar="mage-tournament-boosterdraft-${project.version}.jar"
-                        className="mage.tournament.BoosterDraftSwissTournament"
-                        typeName="mage.tournament.BoosterDraftSwissCubeTournamentType"/>
-        <tournamentType name="Booster Draft Swiss (Random)" jar="mage-tournament-boosterdraft-${project.version}.jar"
-                        className="mage.tournament.RandomBoosterDraftSwissTournament"
-                        typeName="mage.tournament.RandomBoosterDraftSwissTournamentType"/>
-        <tournamentType name="Sealed Elimination" jar="mage-tournament-sealed-${project.version}.jar"
-                        className="mage.tournament.SealedEliminationTournament"
-                        typeName="mage.tournament.SealedEliminationTournamentType"/>
-        <tournamentType name="Sealed Elimination (Cube)" jar="mage-tournament-sealed-${project.version}.jar"
-                        className="mage.tournament.SealedEliminationTournament"
-                        typeName="mage.tournament.SealedEliminationCubeTournamentType"/>
-        <tournamentType name="Sealed Swiss" jar="mage-tournament-sealed-${project.version}.jar"
-                        className="mage.tournament.SealedSwissTournament"
-                        typeName="mage.tournament.SealedSwissTournamentType"/>
-        <tournamentType name="Sealed Swiss (Cube)" jar="mage-tournament-sealed-${project.version}.jar"
-                        className="mage.tournament.SealedSwissTournament"
-                        typeName="mage.tournament.SealedSwissCubeTournamentType"/>
+        <tournamentType name="Constructed Elimination" jar="mage-tournament-constructed-${project.version}.jar" className="mage.tournament.ConstructedEliminationTournament" typeName="mage.tournament.ConstructedEliminationTournamentType"/>
+        <tournamentType name="Constructed Swiss" jar="mage-tournament-constructed-${project.version}.jar" className="mage.tournament.ConstructedSwissTournament" typeName="mage.tournament.ConstructedSwissTournamentType"/>
+        <tournamentType name="Booster Draft Elimination" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationTournamentType"/>
+        <tournamentType name="Booster Draft Elimination (Cube)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationCubeTournamentType"/>
+        <tournamentType name="Booster Draft Elimination (Random)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.RandomBoosterDraftEliminationTournament" typeName="mage.tournament.RandomBoosterDraftEliminationTournamentType"/>
+        <tournamentType name="Booster Draft Elimination (Rich Man)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.RichManDraftEliminationTournament" typeName="mage.tournament.RichManDraftEliminationTournamentType"/>
+        <tournamentType name="Booster Draft Elimination (Rich Man Cube)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.RichManCubeDraftEliminationTournament" typeName="mage.tournament.RichManCubeDraftEliminationTournamentType"/>
+        <tournamentType name="Booster Draft Swiss" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.BoosterDraftSwissTournament" typeName="mage.tournament.BoosterDraftSwissTournamentType"/>
+        <tournamentType name="Booster Draft Swiss (Cube)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.BoosterDraftSwissTournament" typeName="mage.tournament.BoosterDraftSwissCubeTournamentType"/>
+        <tournamentType name="Booster Draft Swiss (Random)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.RandomBoosterDraftSwissTournament" typeName="mage.tournament.RandomBoosterDraftSwissTournamentType"/>
+        <tournamentType name="Sealed Elimination" jar="mage-tournament-sealed-${project.version}.jar" className="mage.tournament.SealedEliminationTournament" typeName="mage.tournament.SealedEliminationTournamentType"/>
+        <tournamentType name="Sealed Elimination (Cube)" jar="mage-tournament-sealed-${project.version}.jar" className="mage.tournament.SealedEliminationTournament" typeName="mage.tournament.SealedEliminationCubeTournamentType"/>
+        <tournamentType name="Sealed Swiss" jar="mage-tournament-sealed-${project.version}.jar" className="mage.tournament.SealedSwissTournament" typeName="mage.tournament.SealedSwissTournamentType"/>
+        <tournamentType name="Sealed Swiss (Cube)" jar="mage-tournament-sealed-${project.version}.jar" className="mage.tournament.SealedSwissTournament" typeName="mage.tournament.SealedSwissCubeTournamentType"/>
     </tournamentTypes>
     <draftCubes>
-        <draftCube name="Adam Styborski's Pauper Cube" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.AdamStyborskisPauperCube"/>
-        <draftCube name="Ben's Cube" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.BensCube"/>
-        <draftCube name="Cube Tutor 360 Pauper" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.CubeTutor360Pauper"/>
-        <draftCube name="Cube Tutor 720" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.CubeTutor720"/>
-        <draftCube name="Eric Klug's Pro Tour Cube" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.EricKlugsProTourCube"/>
-        <draftCube name="Guillaume Matignon's Jenny's/Johnny's Cube" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.GuillaumeMatignonsJennysJohnnysCube"/>
-        <draftCube name="Jim Davis's Cube" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.JimDavisCube"/>
-        <draftCube name="Joseph Vasoli's Peasant Cube" jar="mage-tournament-booster-draft.jar"
-                   className="mage.tournament.cubes.JosephVasolisPeasantCube"/>
-        <draftCube name="Mono Blue Cube" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.MonoBlueCube"/>
-        <draftCube name="Sam Black's No Search Cube" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.SamBlacksCube"/>
-        <draftCube name="Timothee Simonot's Twisted Color Pie Cube"
-                   jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.TimotheeSimonotsTwistedColorPieCube"/>
-        <draftCube name="MTGO Cube March 2014" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.MTGOMarchCube2014"/>
-        <draftCube name="MTGO Legacy Cube" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.LegacyCube"/>
-        <draftCube name="MTGO Legacy Cube 2015 March" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.LegacyCubeMarch2015"/>
-        <draftCube name="MTGO Legacy Cube 2015 September" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.LegacyCubeSeptember2015"/>
-        <draftCube name="MTGO Legacy Cube 2016 January" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.LegacyCubeJanuary2016"/>
-        <draftCube name="MTGO Legacy Cube 2016 September" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.LegacyCubeSeptember2016"/>
-        <draftCube name="MTGO Legacy Cube 2017 January" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.LegacyCubeJanuary2017"/>
-        <draftCube name="MTGO Legacy Cube 2017 April" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.LegacyCubeApril2017"/>
-        <draftCube name="MTGO Legacy Cube 2018 February" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.LegacyCube2018February"/>
-        <draftCube name="MTGO Legendary Cube" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.LegendaryCube"/>
-        <draftCube name="MTGO Legendary Cube April 2016" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.LegendaryCubeApril2016"/>
-        <draftCube name="MTGO Modern Cube 2017" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.ModernCube2017"/>
-        <draftCube name="MTGO Vintage Cube 2013" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.VintageCube2013"/>
-        <draftCube name="MTGO Vintage Cube 2014" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.VintageCube2014"/>
-        <draftCube name="MTGO Vintage Cube 2015" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.VintageCube2015"/>
-        <draftCube name="MTGO Vintage Cube 2016" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.VintageCube2016"/>
-        <draftCube name="MTGO Vintage Cube June 2016" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.VintageCubeJune2016"/>
-        <draftCube name="MTGO Vintage Cube November 2016" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.VintageCubeNovember2016"/>
-        <draftCube name="MTGO Vintage Cube June 2017" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.VintageCubeJune2017"/>
-        <draftCube name="MTGO Vintage Cube December 2017" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.VintageCubeDecember2017"/>
-        <draftCube name="MTGO Vintage Cube June 2018" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.VintageCubeJune2018"/>
-        <draftCube name="MTGO Vintage Cube December 2018" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.VintageCubeDecember2018"/>
-        <draftCube name="SCG Con Cube 2018 December" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.ScgConCube2018December"/>
-        <draftCube name="The Peasant's Toolbox" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.PeasantsToolboxCube"/>
-        <draftCube name="www.MTGCube.com" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.MTGCube"/>
-        <draftCube name="Cube From Deck" jar="mage-tournament-booster-draft-${project.version}.jar"
-                   className="mage.tournament.cubes.CubeFromDeck"/>
+        <draftCube name="Adam Styborski's Pauper Cube" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.AdamStyborskisPauperCube"/>
+        <draftCube name="Ben's Cube" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.BensCube"/>
+        <draftCube name="Cube Tutor 360 Pauper" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.CubeTutor360Pauper"/>
+        <draftCube name="Cube Tutor 720" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.CubeTutor720"/>
+        <draftCube name="Eric Klug's Pro Tour Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.EricKlugsProTourCube"/>
+        <draftCube name="Guillaume Matignon's Jenny's/Johnny's Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.GuillaumeMatignonsJennysJohnnysCube"/>
+        <draftCube name="Jim Davis's Cube" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.JimDavisCube"/>
+        <draftCube name="Joseph Vasoli's Peasant Cube" jar="mage-tournament-booster-draft.jar" className="mage.tournament.cubes.JosephVasolisPeasantCube"/>
+        <draftCube name="Mono Blue Cube" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.MonoBlueCube"/>
+        <draftCube name="Sam Black's No Search Cube" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.SamBlacksCube"/>
+        <draftCube name="Timothee Simonot's Twisted Color Pie Cube" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.TimotheeSimonotsTwistedColorPieCube"/>
+        <draftCube name="MTGO Cube March 2014" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.MTGOMarchCube2014"/>
+        <draftCube name="MTGO Legacy Cube" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.LegacyCube"/>
+        <draftCube name="MTGO Legacy Cube 2015 March" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.LegacyCubeMarch2015"/>
+        <draftCube name="MTGO Legacy Cube 2015 September" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.LegacyCubeSeptember2015"/>
+        <draftCube name="MTGO Legacy Cube 2016 January" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.LegacyCubeJanuary2016"/>
+        <draftCube name="MTGO Legacy Cube 2016 September" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.LegacyCubeSeptember2016"/>
+        <draftCube name="MTGO Legacy Cube 2017 January" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.LegacyCubeJanuary2017"/>
+        <draftCube name="MTGO Legacy Cube 2017 April" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.LegacyCubeApril2017"/>
+        <draftCube name="MTGO Legacy Cube 2018 February" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.LegacyCube2018February"/>
+        <draftCube name="MTGO Legendary Cube" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.LegendaryCube"/>
+        <draftCube name="MTGO Legendary Cube April 2016" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.LegendaryCubeApril2016"/>
+        <draftCube name="MTGO Modern Cube 2017" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.ModernCube2017"/>
+        <draftCube name="MTGO Vintage Cube 2013" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.VintageCube2013"/>
+        <draftCube name="MTGO Vintage Cube 2014" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.VintageCube2014"/>
+        <draftCube name="MTGO Vintage Cube 2015" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.VintageCube2015"/>
+        <draftCube name="MTGO Vintage Cube 2016" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.VintageCube2016"/>
+        <draftCube name="MTGO Vintage Cube June 2016" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.VintageCubeJune2016"/>
+        <draftCube name="MTGO Vintage Cube November 2016" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.VintageCubeNovember2016"/>
+        <draftCube name="MTGO Vintage Cube June 2017" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.VintageCubeJune2017"/>
+        <draftCube name="MTGO Vintage Cube December 2017" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.VintageCubeDecember2017"/>
+        <draftCube name="MTGO Vintage Cube June 2018" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.VintageCubeJune2018"/>
+        <draftCube name="MTGO Vintage Cube December 2018" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.VintageCubeDecember2018"/>
+        <draftCube name="SCG Con Cube 2018 December" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.ScgConCube2018December"/>
+        <draftCube name="The Peasant's Toolbox" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.PeasantsToolboxCube"/>
+        <draftCube name="www.MTGCube.com" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.MTGCube"/>
+        <draftCube name="Cube From Deck" jar="mage-tournament-booster-draft-${project.version}.jar" className="mage.tournament.cubes.CubeFromDeck"/>
     </draftCubes>
     <deckTypes>
-        <deckType name="Constructed - Standard" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.Standard"/>
-        <deckType name="Constructed - Extended" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.Extended"/>
-        <deckType name="Constructed - Frontier" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.Frontier"/>
-        <deckType name="Constructed - Modern" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.Modern"/>
-        <deckType name="Constructed - Modern - No Banned List" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.ModernNoBannedList"/>
-        <deckType name="Constructed - Eternal" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.Eternal"/>
-        <deckType name="Constructed - Legacy" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.Legacy"/>
-        <deckType name="Constructed - Vintage" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.Vintage"/>
-        <deckType name="Constructed - Pauper" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.Pauper"/>
-        <deckType name="Constructed - Historical Type 2" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.HistoricalType2"/>
-        <deckType name="Constructed - Super Type 2" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.SuperType2"/>
-        <deckType name="Constructed - Australian Highlander" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.AusHighlander"/>
-        <deckType name="Constructed - Canadian Highlander" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.CanadianHighlander"/>
-        <deckType name="Constructed - Old School 93/94" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.OldSchool9394"/>
-        <deckType name="Constructed - Old School 93/94 - Italian Rules"
-                  jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.OldSchool9394Italian"/>
-        <deckType name="Constructed - Old School 93/94 - Channel Fireball Rules"
-                  jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.OldSchool9394CFB"/>
-        <deckType name="Constructed - Old School 93/94 - EudoGames Rules"
-                  jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.OldSchool9394EG"/>
-        <deckType name="Constructed - Old School 93/94 - EC Rules" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.OldSchool9394EC"/>
-        <deckType name="Constructed - Premodern" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.Premodern"/>
-        <deckType name="Constructed - Freeform" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.Freeform"/>
-        <deckType name="Variant Magic - Commander" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.Commander"/>
-        <deckType name="Variant Magic - Duel Commander" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.DuelCommander"/>
-        <deckType name="Variant Magic - MTGO 1v1 Commander" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.MTGO1v1Commander"/>
-        <deckType name="Variant Magic - Tiny Leaders" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.TinyLeaders"/>
-        <deckType name="Variant Magic - Momir Basic" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.Momir"/>
-        <deckType name="Variant Magic - Penny Dreadful Commander" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.PennyDreadfulCommander"/>
-        <deckType name="Variant Magic - Freeform Commander" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.FreeformCommander"/>
-        <deckType name="Variant Magic - Brawl" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.Brawl"/>
-        <deckType name="Variant Magic - Oathbreaker" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.Oathbreaker"/>
-        <deckType name="Block Constructed - Amonkhet" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.AmonkhetBlock"/>
-        <deckType name="Block Constructed - Battle for Zendikar" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.BattleForZendikarBlock"/>
-        <deckType name="Block Constructed - Innistrad" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.InnistradBlock"/>
-        <deckType name="Block Constructed - Ixalan" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.IxalanBlock"/>
-        <deckType name="Block Constructed - Kaladesh" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.KaladeshBlock"/>
-        <deckType name="Block Constructed - Kamigawa" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.KamigawaBlock"/>
-        <deckType name="Block Constructed - Khans of Tarkir" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.KhansOfTarkirBlock"/>
-        <deckType name="Block Constructed - Lorwyn" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.LorwynBlock"/>
-        <deckType name="Block Constructed - Return to Ravnica" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.ReturnToRavnicaBlock"/>
-        <deckType name="Block Constructed - Scars of Mirrodin" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.ScarsOfMirrodinBlock"/>
-        <deckType name="Block Constructed - Shadowmoor" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.ShadowmoorBlock"/>
-        <deckType name="Block Constructed - Shadows over Innistrad" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.ShadowsOverInnistradBlock"/>
-        <deckType name="Block Constructed - Shards of Alara" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.ShardsOfAlaraBlock"/>
-        <deckType name="Block Constructed - Theros" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.TherosBlock"/>
-        <deckType name="Block Constructed - Zendikar" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.ZendikarBlock"/>
-        <deckType name="Block Constructed Custom - Star Wars" jar="mage-deck-constructed-${project.version}.jar"
-                  className="mage.deck.StarWarsBlock"/>
+        <deckType name="Constructed - Standard" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Standard"/>
+        <deckType name="Constructed - Extended" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Extended"/>
+        <deckType name="Constructed - Frontier" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Frontier"/>
+        <deckType name="Constructed - Modern" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Modern"/>
+        <deckType name="Constructed - Modern - No Banned List" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.ModernNoBannedList"/>
+        <deckType name="Constructed - Eternal" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Eternal"/>
+        <deckType name="Constructed - Legacy" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Legacy"/>
+        <deckType name="Constructed - Vintage" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Vintage"/>
+        <deckType name="Constructed - Pauper" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Pauper"/>
+        <deckType name="Constructed - Historical Type 2" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.HistoricalType2"/>
+        <deckType name="Constructed - Super Type 2" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.SuperType2"/>
+        <deckType name="Constructed - Australian Highlander" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.AusHighlander"/>
+        <deckType name="Constructed - Canadian Highlander" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.CanadianHighlander"/>
+        <deckType name="Constructed - Old School 93/94" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.OldSchool9394"/>
+        <deckType name="Constructed - Old School 93/94 - Italian Rules" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.OldSchool9394Italian"/>
+        <deckType name="Constructed - Old School 93/94 - Channel Fireball Rules" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.OldSchool9394CFB"/>
+        <deckType name="Constructed - Old School 93/94 - EudoGames Rules" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.OldSchool9394EG"/>
+        <deckType name="Constructed - Old School 93/94 - EC Rules" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.OldSchool9394EC"/>
+        <deckType name="Constructed - Premodern" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Premodern"/>
+        <deckType name="Constructed - Freeform" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Freeform"/>
+        <deckType name="Variant Magic - Commander" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Commander"/>
+        <deckType name="Variant Magic - Duel Commander" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.DuelCommander"/>
+        <deckType name="Variant Magic - MTGO 1v1 Commander" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.MTGO1v1Commander"/>
+        <deckType name="Variant Magic - Tiny Leaders" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.TinyLeaders"/>
+        <deckType name="Variant Magic - Momir Basic" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Momir"/>
+        <deckType name="Variant Magic - Penny Dreadful Commander" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.PennyDreadfulCommander"/>
+        <deckType name="Variant Magic - Freeform Commander" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.FreeformCommander"/>
+        <deckType name="Variant Magic - Brawl" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Brawl"/>
+        <deckType name="Variant Magic - Oathbreaker" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.Oathbreaker"/>
+        <deckType name="Block Constructed - Amonkhet" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.AmonkhetBlock"/>
+        <deckType name="Block Constructed - Battle for Zendikar" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.BattleForZendikarBlock"/>
+        <deckType name="Block Constructed - Innistrad" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.InnistradBlock"/>
+        <deckType name="Block Constructed - Ixalan" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.IxalanBlock"/>
+        <deckType name="Block Constructed - Kaladesh" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.KaladeshBlock"/>
+        <deckType name="Block Constructed - Kamigawa" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.KamigawaBlock"/>
+        <deckType name="Block Constructed - Khans of Tarkir" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.KhansOfTarkirBlock"/>
+        <deckType name="Block Constructed - Lorwyn" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.LorwynBlock"/>
+        <deckType name="Block Constructed - Return to Ravnica" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.ReturnToRavnicaBlock"/>
+        <deckType name="Block Constructed - Scars of Mirrodin" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.ScarsOfMirrodinBlock"/>
+        <deckType name="Block Constructed - Shadowmoor" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.ShadowmoorBlock"/>
+        <deckType name="Block Constructed - Shadows over Innistrad" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.ShadowsOverInnistradBlock"/>
+        <deckType name="Block Constructed - Shards of Alara" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.ShardsOfAlaraBlock"/>
+        <deckType name="Block Constructed - Theros" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.TherosBlock"/>
+        <deckType name="Block Constructed - Zendikar" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.ZendikarBlock"/>
+        <deckType name="Block Constructed Custom - Star Wars" jar="mage-deck-constructed-${project.version}.jar" className="mage.deck.StarWarsBlock"/>
         <deckType name="Limited" jar="mage-deck-limited-${project.version}.jar" className="mage.deck.Limited"/>
     </deckTypes>
 </config>