From cd0cba6ec7d8799bb85247b7b4f5d545e170b093 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 4 Jul 2015 01:28:19 +0200 Subject: [PATCH] XMage Release 1.4.2v0 --- Mage.Client/pom.xml | 2 +- Mage.Common/pom.xml | 2 +- Mage.Common/src/mage/utils/MageVersion.java | 59 +++++++++---------- Mage.Plugins/Mage.Counter.Plugin/pom.xml | 2 +- Mage.Plugins/Mage.Theme.Plugin/pom.xml | 4 +- Mage.Plugins/pom.xml | 2 +- Mage.Server.Console/pom.xml | 51 +++++++++++++++- .../Mage.Deck.Constructed/pom.xml | 2 +- Mage.Server.Plugins/Mage.Deck.Limited/pom.xml | 2 +- .../Mage.Game.CommanderDuel/pom.xml | 2 +- .../Mage.Game.CommanderFreeForAll/pom.xml | 2 +- .../Mage.Game.FreeForAll/pom.xml | 2 +- .../Mage.Game.TinyLeadersDuel/pom.xml | 2 +- .../Mage.Game.TwoPlayerDuel/pom.xml | 2 +- .../Mage.Player.AI.DraftBot/pom.xml | 2 +- Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml | 2 +- Mage.Server.Plugins/Mage.Player.AI/pom.xml | 2 +- .../Mage.Player.AIMCTS/pom.xml | 2 +- .../Mage.Player.AIMinimax/pom.xml | 2 +- Mage.Server.Plugins/Mage.Player.Human/pom.xml | 2 +- .../Mage.Tournament.BoosterDraft/pom.xml | 2 +- .../Mage.Tournament.Constructed/pom.xml | 2 +- .../Mage.Tournament.Sealed/pom.xml | 2 +- Mage.Server.Plugins/pom.xml | 2 +- Mage.Server/pom.xml | 2 +- Mage.Server/release/config/config.xml | 22 +++---- Mage.Server/release/server.msg.txt | 2 +- Mage.Sets/pom.xml | 2 +- Mage.Stats/pom.xml | 2 +- Mage.Tests/pom.xml | 2 +- Mage.Updater/pom.xml | 2 +- Mage/pom.xml | 4 +- .../mage/cards/repository/CardRepository.java | 17 +++--- .../cards/repository/ExpansionRepository.java | 28 ++++----- pom.xml | 4 +- 35 files changed, 145 insertions(+), 98 deletions(-) diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml index c28b20ae2b..2fd01058e6 100644 --- a/Mage.Client/pom.xml +++ b/Mage.Client/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 1.4.1 + 1.4.2 org.mage diff --git a/Mage.Common/pom.xml b/Mage.Common/pom.xml index e804b45754..29c08a1e81 100644 --- a/Mage.Common/pom.xml +++ b/Mage.Common/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 1.4.1 + 1.4.2 mage-common diff --git a/Mage.Common/src/mage/utils/MageVersion.java b/Mage.Common/src/mage/utils/MageVersion.java index 36583d77a3..8ea13bc3ca 100644 --- a/Mage.Common/src/mage/utils/MageVersion.java +++ b/Mage.Common/src/mage/utils/MageVersion.java @@ -1,31 +1,30 @@ /* -* Copyright 2011 BetaSteward_at_googlemail.com. All rights reserved. -* -* Redistribution and use in source and binary forms, with or without modification, are -* permitted provided that the following conditions are met: -* -* 1. Redistributions of source code must retain the above copyright notice, this list of -* conditions and the following disclaimer. -* -* 2. Redistributions in binary form must reproduce the above copyright notice, this list -* of conditions and the following disclaimer in the documentation and/or other materials -* provided with the distribution. -* -* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED -* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND -* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR -* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -* -* The views and conclusions contained in the software and documentation are those of the -* authors and should not be interpreted as representing official policies, either expressed -* or implied, of BetaSteward_at_googlemail.com. -*/ - + * Copyright 2011 BetaSteward_at_googlemail.com. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, are + * permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation are those of the + * authors and should not be interpreted as representing official policies, either expressed + * or implied, of BetaSteward_at_googlemail.com. + */ package mage.utils; import java.io.Serializable; @@ -41,10 +40,10 @@ public class MageVersion implements Serializable, Comparable { */ public final static int MAGE_VERSION_MAJOR = 1; public final static int MAGE_VERSION_MINOR = 4; - public final static int MAGE_VERSION_PATCH = 1; - public final static String MAGE_VERSION_MINOR_PATCH = "v3"; + public final static int MAGE_VERSION_PATCH = 2; + public final static String MAGE_VERSION_MINOR_PATCH = "v0"; public final static String MAGE_VERSION_INFO = ""; - + private final int major; private final int minor; private final int patch; diff --git a/Mage.Plugins/Mage.Counter.Plugin/pom.xml b/Mage.Plugins/Mage.Counter.Plugin/pom.xml index 569f1399be..e5ae116c80 100644 --- a/Mage.Plugins/Mage.Counter.Plugin/pom.xml +++ b/Mage.Plugins/Mage.Counter.Plugin/pom.xml @@ -7,7 +7,7 @@ org.mage mage-plugins - 1.4.1 + 1.4.2 mage-counter-plugin diff --git a/Mage.Plugins/Mage.Theme.Plugin/pom.xml b/Mage.Plugins/Mage.Theme.Plugin/pom.xml index 053171cd39..b85682e19c 100644 --- a/Mage.Plugins/Mage.Theme.Plugin/pom.xml +++ b/Mage.Plugins/Mage.Theme.Plugin/pom.xml @@ -6,7 +6,7 @@ org.mage mage-plugins - 1.4.1 + 1.4.2 mage-theme-plugin @@ -29,7 +29,7 @@ ${project.groupId} mage-client - 1.4.1 + 1.4.2 diff --git a/Mage.Plugins/pom.xml b/Mage.Plugins/pom.xml index cc48ed5c7b..ab4aa2c1d2 100644 --- a/Mage.Plugins/pom.xml +++ b/Mage.Plugins/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 1.4.1 + 1.4.2 mage-plugins diff --git a/Mage.Server.Console/pom.xml b/Mage.Server.Console/pom.xml index 2522cc1d11..01aa84df34 100644 --- a/Mage.Server.Console/pom.xml +++ b/Mage.Server.Console/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 1.4.1 + 1.4.2 org.mage @@ -28,7 +28,54 @@ junit junit - test + test + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-install-plugin + 2.5.2 + + + maven-resources-plugin + + UTF-8 + + + + maven-jar-plugin + + + ${manifest.file} + + true + mage.server.console.ConsoleFrame + + + + + + maven-assembly-plugin + + false + + src/main/assembly/distribution.xml + + + + + + mage-console + + + + src/main/resources/META-INF/MANIFEST.MF + diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml b/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml index eeb227fab7..b3599cd383 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 1.4.1 + 1.4.2 mage-deck-constructed diff --git a/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml b/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml index 5ba54ada61..fef00e5535 100644 --- a/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml +++ b/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 1.4.1 + 1.4.2 mage-deck-limited diff --git a/Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml index 21d3ecfae3..088bddb5c6 100644 --- a/Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 1.4.1 + 1.4.2 mage-game-commanderduel diff --git a/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml index f0fa53feb7..bd62a87af4 100644 --- a/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml @@ -6,7 +6,7 @@ org.mage mage-server-plugins - 1.4.1 + 1.4.2 mage-game-commanderfreeforall diff --git a/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml index 79201f719e..40846d6d87 100644 --- a/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 1.4.1 + 1.4.2 mage-game-freeforall diff --git a/Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/pom.xml index 995624a110..84a07a702c 100644 --- a/Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 1.4.1 + 1.4.2 mage-game-tinyleadersduel diff --git a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml index 822af7beef..b5d97c415d 100644 --- a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 1.4.1 + 1.4.2 mage-game-twoplayerduel diff --git a/Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml b/Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml index eb5254b926..893420512a 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AI.DraftBot/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 1.4.1 + 1.4.2 mage-player-ai-draftbot diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml b/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml index d905d12ec1..2f9afe8a97 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 1.4.1 + 1.4.2 mage-player-ai-ma diff --git a/Mage.Server.Plugins/Mage.Player.AI/pom.xml b/Mage.Server.Plugins/Mage.Player.AI/pom.xml index 6c90d7e1d5..2aa9ab4e65 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AI/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 1.4.1 + 1.4.2 mage-player-ai diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml b/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml index ef53791b09..d11572b64c 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 1.4.1 + 1.4.2 mage-player-ai-mcts diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml b/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml index 7f31cb0692..aa551c80b7 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 1.4.1 + 1.4.2 mage-player-aiminimax diff --git a/Mage.Server.Plugins/Mage.Player.Human/pom.xml b/Mage.Server.Plugins/Mage.Player.Human/pom.xml index d76184bfd6..9dfaa3988b 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.Human/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 1.4.1 + 1.4.2 mage-player-human diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml index 897b17155a..92cd690763 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 1.4.1 + 1.4.2 mage-tournament-boosterdraft diff --git a/Mage.Server.Plugins/Mage.Tournament.Constructed/pom.xml b/Mage.Server.Plugins/Mage.Tournament.Constructed/pom.xml index a4c096d507..091d2b0a97 100644 --- a/Mage.Server.Plugins/Mage.Tournament.Constructed/pom.xml +++ b/Mage.Server.Plugins/Mage.Tournament.Constructed/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 1.4.1 + 1.4.2 mage-tournament-constructed diff --git a/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml b/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml index 37b534066b..ac640da952 100644 --- a/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml +++ b/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 1.4.1 + 1.4.2 mage-tournament-sealed diff --git a/Mage.Server.Plugins/pom.xml b/Mage.Server.Plugins/pom.xml index 6aa5662ff1..bcc34b3f72 100644 --- a/Mage.Server.Plugins/pom.xml +++ b/Mage.Server.Plugins/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 1.4.1 + 1.4.2 mage-server-plugins diff --git a/Mage.Server/pom.xml b/Mage.Server/pom.xml index ecc375c12d..d0cec09ce3 100644 --- a/Mage.Server/pom.xml +++ b/Mage.Server/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 1.4.1 + 1.4.2 mage-server diff --git a/Mage.Server/release/config/config.xml b/Mage.Server/release/config/config.xml index ad1e56d316..37d72390fb 100644 --- a/Mage.Server/release/config/config.xml +++ b/Mage.Server/release/config/config.xml @@ -1,14 +1,14 @@ - - + + + @@ -64,7 +66,7 @@ - + diff --git a/Mage.Server/release/server.msg.txt b/Mage.Server/release/server.msg.txt index f9309549e1..b22aa2823b 100644 --- a/Mage.Server/release/server.msg.txt +++ b/Mage.Server/release/server.msg.txt @@ -1,4 +1,4 @@ -Welcome! You are playing XMage version 1.4.1 +Welcome! You are playing XMage version 1.4.2 Find what was changed since previous versions on project Wiki https://github.com/magefree/mage/wiki Contact us on the XMAGE board of http://www.slightlymagic.net/forum/viewforum.php?f=70 for bug reports or enhancement requests. Download newest version from http://XMage.de \ No newline at end of file diff --git a/Mage.Sets/pom.xml b/Mage.Sets/pom.xml index e5beb76c89..95e4a1caf0 100644 --- a/Mage.Sets/pom.xml +++ b/Mage.Sets/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 1.4.1 + 1.4.2 org.mage diff --git a/Mage.Stats/pom.xml b/Mage.Stats/pom.xml index c95eae1515..bad954e962 100644 --- a/Mage.Stats/pom.xml +++ b/Mage.Stats/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 1.4.1 + 1.4.2 org.mage diff --git a/Mage.Tests/pom.xml b/Mage.Tests/pom.xml index 5536e82d55..86e03d742f 100644 --- a/Mage.Tests/pom.xml +++ b/Mage.Tests/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 1.4.1 + 1.4.2 mage-tests diff --git a/Mage.Updater/pom.xml b/Mage.Updater/pom.xml index 296591999f..1cba689e49 100644 --- a/Mage.Updater/pom.xml +++ b/Mage.Updater/pom.xml @@ -5,7 +5,7 @@ mage-root org.mage - 1.4.1 + 1.4.2 4.0.0 diff --git a/Mage/pom.xml b/Mage/pom.xml index a7336af347..02ac85bd1f 100644 --- a/Mage/pom.xml +++ b/Mage/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 1.4.1 + 1.4.2 mage @@ -24,7 +24,7 @@ com.h2database h2 - 1.4.185 + 1.4.187 runtime diff --git a/Mage/src/mage/cards/repository/CardRepository.java b/Mage/src/mage/cards/repository/CardRepository.java index 587634b387..ebddaf05ab 100644 --- a/Mage/src/mage/cards/repository/CardRepository.java +++ b/Mage/src/mage/cards/repository/CardRepository.java @@ -60,7 +60,7 @@ public enum CardRepository { // raise this if db structure was changed private static final long CARD_DB_VERSION = 39; // raise this if new cards were added to the server - private static final long CARD_CONTENT_VERSION = 20; + private static final long CARD_CONTENT_VERSION = 21; private final Random random = new Random(); private Dao cardDao; @@ -135,7 +135,7 @@ public enum CardRepository { int result = card.getName().indexOf(" // "); if (result > 0) { names.add(card.getName().substring(0, result)); - names.add(card.getName().substring(result+4)); + names.add(card.getName().substring(result + 4)); } else { names.add(card.getName()); } @@ -156,7 +156,7 @@ public enum CardRepository { int result = card.getName().indexOf(" // "); if (result > 0) { names.add(card.getName().substring(0, result)); - names.add(card.getName().substring(result+4)); + names.add(card.getName().substring(result + 4)); } else { names.add(card.getName()); } @@ -165,7 +165,7 @@ public enum CardRepository { } return names; } - + public Set getCreatureNames() { Set names = new TreeSet<>(); try { @@ -177,7 +177,7 @@ public enum CardRepository { int result = card.getName().indexOf(" // "); if (result > 0) { names.add(card.getName().substring(0, result)); - names.add(card.getName().substring(result+4)); + names.add(card.getName().substring(result + 4)); } else { names.add(card.getName()); } @@ -193,7 +193,7 @@ public enum CardRepository { QueryBuilder qb = cardDao.queryBuilder(); qb.distinct().selectColumns("name"); Where where = qb.where(); - where.and(where.not().like("types", '%' + CardType.CREATURE.name() +'%'),where.not().like("types", '%' + CardType.LAND.name() + '%')); + where.and(where.not().like("types", '%' + CardType.CREATURE.name() + '%'), where.not().like("types", '%' + CardType.LAND.name() + '%')); List results = cardDao.query(qb.prepare()); for (CardInfo card : results) { int result = card.getName().indexOf(" // "); @@ -261,7 +261,6 @@ public enum CardRepository { return null; } - public List getClassNames() { List names = new ArrayList<>(); try { @@ -313,7 +312,7 @@ public enum CardRepository { try { QueryBuilder queryBuilder = cardDao.queryBuilder(); criteria.buildQuery(queryBuilder); - + return cardDao.query(queryBuilder.prepare()); } catch (SQLException ex) { } @@ -333,7 +332,7 @@ public enum CardRepository { public void setContentVersion(long version) { try { ConnectionSource connectionSource = new JdbcConnectionSource(JDBC_URL); - RepositoryUtil.updateVersion(connectionSource, VERSION_ENTITY_NAME + "Content", version); + RepositoryUtil.updateVersion(connectionSource, VERSION_ENTITY_NAME + "Content", version); } catch (SQLException ex) { ex.printStackTrace(); } diff --git a/Mage/src/mage/cards/repository/ExpansionRepository.java b/Mage/src/mage/cards/repository/ExpansionRepository.java index 6f2e118bec..a50a3d14fb 100644 --- a/Mage/src/mage/cards/repository/ExpansionRepository.java +++ b/Mage/src/mage/cards/repository/ExpansionRepository.java @@ -21,13 +21,13 @@ import org.apache.log4j.Logger; public enum ExpansionRepository { instance; - - private static final Logger logger = Logger.getLogger(ExpansionRepository.class); - + + private static final Logger logger = Logger.getLogger(ExpansionRepository.class); + private static final String JDBC_URL = "jdbc:h2:file:./db/cards.h2;AUTO_SERVER=TRUE"; private static final String VERSION_ENTITY_NAME = "expansion"; private static final long EXPANSION_DB_VERSION = 5; - private static final long EXPANSION_CONTENT_VERSION = 8; + private static final long EXPANSION_CONTENT_VERSION = 9; private Dao expansionDao; @@ -73,7 +73,7 @@ public enum ExpansionRepository { } public ExpansionInfo[] getWithBoostersSortedByReleaseDate() { - ExpansionInfo[] sets = new ExpansionInfo[0]; + ExpansionInfo[] sets = new ExpansionInfo[0]; try { QueryBuilder qb = expansionDao.queryBuilder(); qb.orderBy("releaseDate", false); @@ -96,9 +96,9 @@ public enum ExpansionRepository { } return sets; } - + public List getSetsFromBlock(String blockName) { - List sets = new LinkedList<>(); + List sets = new LinkedList<>(); try { QueryBuilder qb = expansionDao.queryBuilder(); qb.where().eq("blockName", new SelectArg(blockName)); @@ -119,9 +119,9 @@ public enum ExpansionRepository { } } catch (SQLException ex) { } - return set; + return set; } - + public ExpansionInfo getSetByName(String setName) { ExpansionInfo set = null; try { @@ -133,7 +133,7 @@ public enum ExpansionRepository { } } catch (SQLException ex) { } - return set; + return set; } public List getAll() { @@ -145,7 +145,7 @@ public enum ExpansionRepository { } return new ArrayList<>(); } - + public List getAllSetNames() { try { QueryBuilder qb = expansionDao.queryBuilder(); @@ -153,14 +153,14 @@ public enum ExpansionRepository { List expansions = expansionDao.query(qb.prepare()); List setNames = new LinkedList<>(); for (ExpansionInfo expansionInfo : expansions) { - setNames.add(expansionInfo.getName()); - } + setNames.add(expansionInfo.getName()); + } return setNames; } catch (SQLException ex) { } return new ArrayList<>(); } - + public long getContentVersionFromDB() { try { ConnectionSource connectionSource = new JdbcConnectionSource(JDBC_URL); diff --git a/pom.xml b/pom.xml index 3eb73e5820..176b229135 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 1.4.1 + 1.4.2 pom Mage Root Mage Root POM @@ -83,7 +83,7 @@ - 1.4.1 + 1.4.2 UTF-8