diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml index 5d34b27ea8..e5490580fc 100644 --- a/Mage.Client/pom.xml +++ b/Mage.Client/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 1.4.10 + 1.4.11 org.mage diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java index c77c08e8f3..1abf229af6 100644 --- a/Mage.Client/src/main/java/mage/client/MageFrame.java +++ b/Mage.Client/src/main/java/mage/client/MageFrame.java @@ -1069,11 +1069,9 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { if (setActive) { setActive(tablesPane); } else // if other panel was already shown, mamke sure it's topmost again - { - if (topPanebefore != null) { + if (topPanebefore != null) { setActive(topPanebefore); } - } } public void hideGames() { @@ -1358,13 +1356,12 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { disableButtons(); hideGames(); hideTables(); + session.disconnect(false); if (errorCall) { UserRequestMessage message = new UserRequestMessage("Connection lost", "The connection to server was lost. Reconnect?"); message.setButton1("No", null); message.setButton2("Yes", PlayerAction.CLIENT_RECONNECT); showUserRequestDialog(message); - } else { - session.disconnect(false); } } } diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java index 434be70044..5bd74b7940 100644 --- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java +++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java @@ -130,7 +130,6 @@ import static mage.constants.PlayerAction.TRIGGER_AUTO_ORDER_ABILITY_LAST; import static mage.constants.PlayerAction.TRIGGER_AUTO_ORDER_NAME_FIRST; import static mage.constants.PlayerAction.TRIGGER_AUTO_ORDER_NAME_LAST; import static mage.constants.PlayerAction.TRIGGER_AUTO_ORDER_RESET_ALL; -import mage.constants.UseFirstManaAbilityMode; import mage.constants.Zone; import mage.game.events.PlayerQueryEvent; import mage.remote.Session; @@ -287,7 +286,7 @@ public final class GamePanel extends javax.swing.JPanel { } }); - jPanel3.addComponentListener(componentAdapterPlayField); + pnlHelperHandButtonsStackArea.addComponentListener(componentAdapterPlayField); initComponents = false; } @@ -296,7 +295,7 @@ public final class GamePanel extends javax.swing.JPanel { components.put("jSplitPane1", jSplitPane1); components.put("pnlBattlefield", pnlBattlefield); - components.put("jPanel3", jPanel3); + components.put("pnlHelperHandButtonsStackArea", pnlHelperHandButtonsStackArea); components.put("hand", handContainer); components.put("gameChatPanel", gameChatPanel); components.put("userChatPanel", userChatPanel); @@ -397,11 +396,15 @@ public final class GamePanel extends javax.swing.JPanel { jSplitPane1.setDividerSize(GUISizeHelper.dividerBarSize); jSplitPane2.setDividerSize(GUISizeHelper.dividerBarSize); stackObjects.setCardDimension(GUISizeHelper.handCardDimension); - int newStackWidth = jPanel3.getWidth() * GUISizeHelper.stackWidth / 100; + + txtSpellsCast.setFont(new Font(GUISizeHelper.gameDialogAreaFont.getFontName(), Font.BOLD, GUISizeHelper.gameDialogAreaFont.getSize())); + GUISizeHelper.changePopupMenuFont(popupMenuTriggerOrder); + + int newStackWidth = pnlHelperHandButtonsStackArea.getWidth() * GUISizeHelper.stackWidth / 100; if (newStackWidth < 410) { newStackWidth = 410; } - Dimension newDimension = new Dimension(jPanel3.getWidth() - newStackWidth, GUISizeHelper.handCardDimension.height + GUISizeHelper.scrollBarSize); + Dimension newDimension = new Dimension(pnlHelperHandButtonsStackArea.getWidth() - newStackWidth, GUISizeHelper.handCardDimension.height + GUISizeHelper.scrollBarSize); handContainer.setPreferredSize(newDimension); handContainer.setMaximumSize(newDimension); @@ -414,10 +417,6 @@ public final class GamePanel extends javax.swing.JPanel { pnlShortCuts.setPreferredSize(newDimension); pnlShortCuts.setMinimumSize(newDimension); pnlShortCuts.setMaximumSize(newDimension); - - txtSpellsCast.setFont(new Font(GUISizeHelper.gameDialogAreaFont.getFontName(), Font.BOLD, GUISizeHelper.gameDialogAreaFont.getSize())); - - GUISizeHelper.changePopupMenuFont(popupMenuTriggerOrder); } private void saveDividerLocations() { @@ -1260,7 +1259,7 @@ public final class GamePanel extends javax.swing.JPanel { jSplitPane1 = new javax.swing.JSplitPane(); jSplitPane0 = new javax.swing.JSplitPane(); jPanel2 = new javax.swing.JPanel(); - jPanel3 = new javax.swing.JPanel(); + pnlHelperHandButtonsStackArea = new javax.swing.JPanel(); pnlShortCuts = new javax.swing.JPanel(); lblPhase = new javax.swing.JLabel(); txtPhase = new javax.swing.JLabel(); @@ -1599,7 +1598,7 @@ public final class GamePanel extends javax.swing.JPanel { this.getActionMap().put("USEFIRSTMANAABILITY", new AbstractAction() { @Override public void actionPerformed(ActionEvent actionEvent) { - session.sendPlayerAction(PlayerAction.USE_FIRST_MANA_ABILITY_ON, gameId, null); + session.sendPlayerAction(PlayerAction.USE_FIRST_MANA_ABILITY_ON, gameId, null); setMenuStates( PreferencesDialog.getCachedValue(KEY_GAME_MANA_AUTOPAYMENT, "true").equals("true"), PreferencesDialog.getCachedValue(KEY_GAME_MANA_AUTOPAYMENT_ONLY_ONE, "true").equals("true"), @@ -1853,53 +1852,53 @@ public final class GamePanel extends javax.swing.JPanel { phasesContainer.add(empty1, ratio); phasesContainer.add(jPhases); - javax.swing.GroupLayout gl_jPanel3 = new javax.swing.GroupLayout(jPanel3); - gl_jPanel3.setHorizontalGroup( - gl_jPanel3.createParallelGroup(Alignment.LEADING) - .addGroup(gl_jPanel3.createSequentialGroup() + javax.swing.GroupLayout gl_helperHandButtonsStackArea = new javax.swing.GroupLayout(pnlHelperHandButtonsStackArea); + gl_helperHandButtonsStackArea.setHorizontalGroup( + gl_helperHandButtonsStackArea.createParallelGroup(Alignment.LEADING) + .addGroup(gl_helperHandButtonsStackArea.createSequentialGroup() // .addGap(0) - .addGroup(gl_jPanel3.createParallelGroup(Alignment.LEADING) - .addGroup(gl_jPanel3.createSequentialGroup() - .addGroup(gl_jPanel3.createParallelGroup(Alignment.LEADING) + .addGroup(gl_helperHandButtonsStackArea.createParallelGroup(Alignment.LEADING) + .addGroup(gl_helperHandButtonsStackArea.createSequentialGroup() + .addGroup(gl_helperHandButtonsStackArea.createParallelGroup(Alignment.LEADING) .addComponent(helper, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) .addComponent(handContainer, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) ) - .addGroup(gl_jPanel3.createParallelGroup(Alignment.LEADING) + .addGroup(gl_helperHandButtonsStackArea.createParallelGroup(Alignment.LEADING) .addComponent(pnlShortCuts, 410, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE) .addComponent(stackObjects, 410, GroupLayout.PREFERRED_SIZE, Short.MAX_VALUE) ) ) .addGap(0) //.addComponent(jPhases, GroupLayout.DEFAULT_SIZE, GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addGroup(gl_jPanel3.createSequentialGroup() + .addGroup(gl_helperHandButtonsStackArea.createSequentialGroup() .addComponent(pnlBattlefield, GroupLayout.DEFAULT_SIZE, 200, Short.MAX_VALUE) .addComponent(phasesContainer, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) ))) ); - gl_jPanel3.setVerticalGroup( - gl_jPanel3.createParallelGroup(Alignment.TRAILING) - .addGroup(gl_jPanel3.createSequentialGroup() - .addGroup(gl_jPanel3.createParallelGroup(Alignment.LEADING) + gl_helperHandButtonsStackArea.setVerticalGroup( + gl_helperHandButtonsStackArea.createParallelGroup(Alignment.TRAILING) + .addGroup(gl_helperHandButtonsStackArea.createSequentialGroup() + .addGroup(gl_helperHandButtonsStackArea.createParallelGroup(Alignment.LEADING) .addComponent(pnlBattlefield, GroupLayout.DEFAULT_SIZE, 200, Short.MAX_VALUE) .addComponent(phasesContainer, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) ) //.addPreferredGap(ComponentPlacement.RELATED) - .addGroup(gl_jPanel3.createParallelGroup(Alignment.LEADING) - .addGroup(gl_jPanel3.createSequentialGroup() + .addGroup(gl_helperHandButtonsStackArea.createParallelGroup(Alignment.LEADING) + .addGroup(gl_helperHandButtonsStackArea.createSequentialGroup() .addGap(2) .addComponent(pnlShortCuts, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) .addComponent(stackObjects, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) ) - .addGroup(gl_jPanel3.createSequentialGroup() + .addGroup(gl_helperHandButtonsStackArea.createSequentialGroup() .addComponent(helper, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) .addComponent(handContainer, GroupLayout.PREFERRED_SIZE, GroupLayout.DEFAULT_SIZE, GroupLayout.PREFERRED_SIZE) ) ) ) ); - jPanel3.setLayout(gl_jPanel3); + pnlHelperHandButtonsStackArea.setLayout(gl_helperHandButtonsStackArea); - jSplitPane1.setLeftComponent(jPanel3); + jSplitPane1.setLeftComponent(pnlHelperHandButtonsStackArea); jSplitPane1.setRightComponent(jSplitPane2); // Set individual area sizes of big card pane @@ -2298,7 +2297,7 @@ public final class GamePanel extends javax.swing.JPanel { private HelperPanel helper; private mage.client.chat.ChatPanelBasic userChatPanel; private javax.swing.JPanel jPanel2; - private javax.swing.JPanel jPanel3; + private javax.swing.JPanel pnlHelperHandButtonsStackArea; private javax.swing.JSplitPane jSplitPane0; private javax.swing.JSplitPane jSplitPane1; private javax.swing.JLabel lblActivePlayer; diff --git a/Mage.Client/src/main/java/org/mage/plugins/theme/ThemePluginImpl.java b/Mage.Client/src/main/java/org/mage/plugins/theme/ThemePluginImpl.java index 3da3fbfa93..aec6180610 100644 --- a/Mage.Client/src/main/java/org/mage/plugins/theme/ThemePluginImpl.java +++ b/Mage.Client/src/main/java/org/mage/plugins/theme/ThemePluginImpl.java @@ -1,23 +1,20 @@ package org.mage.plugins.theme; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.io.*; +import java.util.Map; +import javax.imageio.ImageIO; +import javax.swing.*; +import mage.client.dialog.PreferencesDialog; import mage.components.ImagePanel; import mage.interfaces.plugin.ThemePlugin; -import mage.client.dialog.PreferencesDialog; import net.xeoh.plugins.base.annotations.PluginImplementation; import net.xeoh.plugins.base.annotations.events.Init; import net.xeoh.plugins.base.annotations.events.PluginLoaded; import net.xeoh.plugins.base.annotations.meta.Author; import org.apache.log4j.Logger; -import javax.imageio.ImageIO; -import javax.swing.*; -import java.awt.*; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.*; -import java.io.InputStream; -import java.util.Map; - @PluginImplementation @Author(name = "nantuko") /* udpated by Noahsark */ @@ -67,9 +64,9 @@ public class ThemePluginImpl implements ThemePlugin { public void applyInGame(Map ui) { BufferedImage backgroundImage; try { - if (PreferencesDialog.getCachedValue(PreferencesDialog.KEY_BATTLEFIELD_IMAGE_DEFAULT,"true").equals("true")) { + if (PreferencesDialog.getCachedValue(PreferencesDialog.KEY_BATTLEFIELD_IMAGE_DEFAULT, "true").equals("true")) { backgroundImage = loadbuffer_default(); - } else if (PreferencesDialog.getCachedValue(PreferencesDialog.KEY_BATTLEFIELD_IMAGE_RANDOM,"true").equals("true")) { + } else if (PreferencesDialog.getCachedValue(PreferencesDialog.KEY_BATTLEFIELD_IMAGE_RANDOM, "true").equals("true")) { backgroundImage = loadbuffer_random(); } else if (PreferencesDialog.getCachedValue(PreferencesDialog.KEY_BATTLEFIELD_IMAGE, "") != null) { backgroundImage = loadbuffer_selected(); @@ -89,7 +86,7 @@ public class ThemePluginImpl implements ThemePlugin { unsetOpaque(ui.get("jSplitPane1")); unsetOpaque(ui.get("pnlBattlefield")); - unsetOpaque(ui.get("jPanel3")); + unsetOpaque(ui.get("pnlHelperHandButtonsStackArea")); unsetOpaque(ui.get("hand")); unsetOpaque(ui.get("gameChatPanel")); unsetOpaque(ui.get("userChatPanel")); diff --git a/Mage.Common/pom.xml b/Mage.Common/pom.xml index 3c7f4e356c..7e02483d16 100644 --- a/Mage.Common/pom.xml +++ b/Mage.Common/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 1.4.10 + 1.4.11 mage-common diff --git a/Mage.Common/src/mage/utils/MageVersion.java b/Mage.Common/src/mage/utils/MageVersion.java index d10bcaedc7..868c777da1 100644 --- a/Mage.Common/src/mage/utils/MageVersion.java +++ b/Mage.Common/src/mage/utils/MageVersion.java @@ -40,8 +40,8 @@ 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 = 10; - public final static String MAGE_VERSION_MINOR_PATCH = "v1"; + public final static int MAGE_VERSION_PATCH = 11; + public final static String MAGE_VERSION_MINOR_PATCH = "v0"; public final static String MAGE_VERSION_INFO = ""; private final int major; diff --git a/Mage.Plugins/Mage.Counter.Plugin/pom.xml b/Mage.Plugins/Mage.Counter.Plugin/pom.xml index 167d1016c5..6cb905ec31 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.10 + 1.4.11 mage-counter-plugin diff --git a/Mage.Plugins/pom.xml b/Mage.Plugins/pom.xml index 6077771a2b..12ff7a2039 100644 --- a/Mage.Plugins/pom.xml +++ b/Mage.Plugins/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 1.4.10 + 1.4.11 mage-plugins diff --git a/Mage.Server.Console/pom.xml b/Mage.Server.Console/pom.xml index 2f5841b2f8..e923329dd1 100644 --- a/Mage.Server.Console/pom.xml +++ b/Mage.Server.Console/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 1.4.10 + 1.4.11 org.mage diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml b/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml index e45f3cdd0c..30f58687c5 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.10 + 1.4.11 mage-deck-constructed diff --git a/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml b/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml index 0c6c524410..b9b8924a80 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.10 + 1.4.11 mage-deck-limited diff --git a/Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.CommanderDuel/pom.xml index 4fa63113c0..a67dc36a1c 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.10 + 1.4.11 mage-game-commanderduel diff --git a/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.CommanderFreeForAll/pom.xml index ae15ecb0c0..86cf0fb7e0 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.10 + 1.4.11 mage-game-commanderfreeforall diff --git a/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml index a8d80029da..e458743b45 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.10 + 1.4.11 mage-game-freeforall diff --git a/Mage.Server.Plugins/Mage.Game.MomirDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.MomirDuel/pom.xml index ed3a0caf06..d349afcf19 100644 --- a/Mage.Server.Plugins/Mage.Game.MomirDuel/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.MomirDuel/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 1.4.10 + 1.4.11 mage-game-momirduel diff --git a/Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.TinyLeadersDuel/pom.xml index e5d55468bd..fe55a51b7d 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.10 + 1.4.11 mage-game-tinyleadersduel diff --git a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml index aa2801fc17..fcfa3ca0fa 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.10 + 1.4.11 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 b3305bbf4f..8d46281b43 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.10 + 1.4.11 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 da689da65a..df21f74d59 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.10 + 1.4.11 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 328cace737..c1a23e9392 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.10 + 1.4.11 mage-player-ai diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml b/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml index 374dc834a7..7063a6f441 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.10 + 1.4.11 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 0c41cc60cf..826b9b585c 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.10 + 1.4.11 mage-player-aiminimax diff --git a/Mage.Server.Plugins/Mage.Player.Human/pom.xml b/Mage.Server.Plugins/Mage.Player.Human/pom.xml index f9e286ff20..68e3a603be 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.10 + 1.4.11 mage-player-human diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml index de7c3ff91b..1bce10f9bb 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.10 + 1.4.11 mage-tournament-boosterdraft diff --git a/Mage.Server.Plugins/Mage.Tournament.Constructed/pom.xml b/Mage.Server.Plugins/Mage.Tournament.Constructed/pom.xml index c879f31413..af84d1c42e 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.10 + 1.4.11 mage-tournament-constructed diff --git a/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml b/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml index 1d17a77995..727698f0bb 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.10 + 1.4.11 mage-tournament-sealed diff --git a/Mage.Server.Plugins/pom.xml b/Mage.Server.Plugins/pom.xml index e697248925..37bcab5274 100644 --- a/Mage.Server.Plugins/pom.xml +++ b/Mage.Server.Plugins/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 1.4.10 + 1.4.11 mage-server-plugins diff --git a/Mage.Server/config/log4j.properties b/Mage.Server/config/log4j.properties index 2bfdbce343..71ccf92f03 100644 --- a/Mage.Server/config/log4j.properties +++ b/Mage.Server/config/log4j.properties @@ -1,45 +1,45 @@ -#default levels -#log4j.rootLogger=info, console, logfile -log4j.rootLogger=info, RollingAppender -log4j.logger.com.j256.ormlite=warn -log4j.logger.mage.game=debug -log4j.logger.mage.game.GameImpl=debug -log4j.logger.mage.players.PlayerImpl=debug -log4j.logger.mage.server=debug -#log4j.logger.mage.server.UserManager=debug -#log4j.logger.mage.server.User=debug -#log4j.logger.mage.server.ChatSession=debug -#log4j.logger.mage.server.ChatManager=debug -#log4j.logger.mage.server.TableController=debug -#log4j.logger.mage.server.TableManager=debug -#log4j.logger.mage.server.tournament.TournamentManager=debug -#log4j.logger.mage.server.game.GameSession=debug -log4j.logger.mage.abilities.AbilityImpl=debug -log4j.logger.mage.cards.decks=debug -log4j.logger.mage.abilities.effects.common.continious.CommanderManaReplacementEffect=debug - -#console log -#log4j.appender.console=org.apache.log4j.ConsoleAppender -#log4j.appender.console.layout=org.apache.log4j.PatternLayout -#log4j.appender.console.layout.ConversionPattern=%-5p [%d{yyyy-MM-dd HH:mm [ss:SSS]}] %C{1}[%t]: %m% -#log4j.appender.console.Threshold=info - -#file log -#log4j.appender.logfile=org.apache.log4j.FileAppender -#log4j.appender.logfile.File=mageserver.log -#log4j.appender.logfile.layout=org.apache.log4j.PatternLayout -#log4j.appender.logfile.layout.ConversionPattern=%-5p [%d{yyyy-MM-dd HH:mm [ss:SSS]}] %C{1}[%t]: %m%n - -log4j.appender.RollingAppender=org.apache.log4j.DailyRollingFileAppender -log4j.appender.RollingAppender.File=mageserver.log -log4j.appender.RollingAppender.DatePattern='.'yyyy-MM-dd -log4j.appender.RollingAppender.layout=org.apache.log4j.PatternLayout -log4j.appender.RollingAppender.layout.ConversionPattern=[%p] %d %c %M - %m%n -log4j.appender.RollingAppender.layout.ConversionPattern=%-5p %d{yyyy-MM-dd HH:mm:ss,SSS} %-90m =>[%t] %C{1}.%M%n -#diagnostic log for game core classes -#log4j.category.mage.server.game = INFO, diagfile -#log4j.additivity.mage.server.game = false -#log4j.appender.diagfile=org.apache.log4j.FileAppender -#log4j.appender.diagfile.File=magediag.log -#log4j.appender.diagfile.layout=org.apache.log4j.PatternLayout +#default levels +#log4j.rootLogger=info, console, logfile +log4j.rootLogger=info, RollingAppender +log4j.logger.com.j256.ormlite=warn +log4j.logger.mage.game=debug +log4j.logger.mage.game.GameImpl=debug +log4j.logger.mage.players.PlayerImpl=debug +log4j.logger.mage.server=debug +#log4j.logger.mage.server.UserManager=debug +log4j.logger.mage.server.User=trace +#log4j.logger.mage.server.ChatSession=debug +#log4j.logger.mage.server.ChatManager=debug +#log4j.logger.mage.server.TableController=debug +#log4j.logger.mage.server.TableManager=debug +#log4j.logger.mage.server.tournament.TournamentManager=debug +#log4j.logger.mage.server.game.GameSession=debug +log4j.logger.mage.abilities.AbilityImpl=debug +log4j.logger.mage.cards.decks=debug +log4j.logger.mage.abilities.effects.common.continious.CommanderManaReplacementEffect=debug + +#console log +#log4j.appender.console=org.apache.log4j.ConsoleAppender +#log4j.appender.console.layout=org.apache.log4j.PatternLayout +#log4j.appender.console.layout.ConversionPattern=%-5p [%d{yyyy-MM-dd HH:mm [ss:SSS]}] %C{1}[%t]: %m% +#log4j.appender.console.Threshold=info + +#file log +#log4j.appender.logfile=org.apache.log4j.FileAppender +#log4j.appender.logfile.File=mageserver.log +#log4j.appender.logfile.layout=org.apache.log4j.PatternLayout +#log4j.appender.logfile.layout.ConversionPattern=%-5p [%d{yyyy-MM-dd HH:mm [ss:SSS]}] %C{1}[%t]: %m%n + +log4j.appender.RollingAppender=org.apache.log4j.DailyRollingFileAppender +log4j.appender.RollingAppender.File=mageserver.log +log4j.appender.RollingAppender.DatePattern='.'yyyy-MM-dd +log4j.appender.RollingAppender.layout=org.apache.log4j.PatternLayout +log4j.appender.RollingAppender.layout.ConversionPattern=[%p] %d %c %M - %m%n +log4j.appender.RollingAppender.layout.ConversionPattern=%-5p %d{yyyy-MM-dd HH:mm:ss,SSS} %-90m =>[%t] %C{1}.%M%n +#diagnostic log for game core classes +#log4j.category.mage.server.game = INFO, diagfile +#log4j.additivity.mage.server.game = false +#log4j.appender.diagfile=org.apache.log4j.FileAppender +#log4j.appender.diagfile.File=magediag.log +#log4j.appender.diagfile.layout=org.apache.log4j.PatternLayout #log4j.appender.diagfile.layout.ConversionPattern=%-5p [%d{yyyy-MM-dd HH:mm [ss:SSS]}] %C{1}[%t]: %m%n \ No newline at end of file diff --git a/Mage.Server/pom.xml b/Mage.Server/pom.xml index 1aaa268d3e..383f031eb9 100644 --- a/Mage.Server/pom.xml +++ b/Mage.Server/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 1.4.10 + 1.4.11 mage-server diff --git a/Mage.Sets/pom.xml b/Mage.Sets/pom.xml index dbfbcb7b06..e4530df5b9 100644 --- a/Mage.Sets/pom.xml +++ b/Mage.Sets/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 1.4.10 + 1.4.11 org.mage diff --git a/Mage.Stats/pom.xml b/Mage.Stats/pom.xml index 7434d3b386..265c62653c 100644 --- a/Mage.Stats/pom.xml +++ b/Mage.Stats/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 1.4.10 + 1.4.11 org.mage diff --git a/Mage.Tests/pom.xml b/Mage.Tests/pom.xml index 6c7cddd077..04c51b8695 100644 --- a/Mage.Tests/pom.xml +++ b/Mage.Tests/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 1.4.10 + 1.4.11 mage-tests diff --git a/Mage.Updater/pom.xml b/Mage.Updater/pom.xml index 2de4b4ee8f..d918f7c708 100644 --- a/Mage.Updater/pom.xml +++ b/Mage.Updater/pom.xml @@ -5,7 +5,7 @@ mage-root org.mage - 1.4.10 + 1.4.11 4.0.0 diff --git a/Mage/pom.xml b/Mage/pom.xml index d049e9a657..4e0b3c938c 100644 --- a/Mage/pom.xml +++ b/Mage/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 1.4.10 + 1.4.11 mage diff --git a/Mage/src/main/java/mage/cards/repository/CardRepository.java b/Mage/src/main/java/mage/cards/repository/CardRepository.java index 0f5c32a6b1..18ce6b8d0e 100644 --- a/Mage/src/main/java/mage/cards/repository/CardRepository.java +++ b/Mage/src/main/java/mage/cards/repository/CardRepository.java @@ -63,7 +63,7 @@ public enum CardRepository { // raise this if db structure was changed private static final long CARD_DB_VERSION = 43; // raise this if new cards were added to the server - private static final long CARD_CONTENT_VERSION = 52; + private static final long CARD_CONTENT_VERSION = 53; private final Random random = new Random(); private Dao cardDao; diff --git a/pom.xml b/pom.xml index 5226138815..d58867a7d6 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 1.4.10 + 1.4.11 pom Mage Root Mage Root POM @@ -83,7 +83,7 @@ - 1.4.10 + 1.4.11 UTF-8