github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-03 01:08:59 -09:00
Code Issues Projects Releases Packages Wiki Activity

xmage 1.4.11v0

Browse source
This commit is contained in:
LevelX2 2016-04-26 00:59:03 +02:00
parent e81f5cbb32
commit 1fcd26fc60
36 changed files with 119 additions and 126 deletions
Mage.Client
pom.xml
src/main/java
mage/client
MageFrame.java
game
GamePanel.java
org/mage/plugins/theme
ThemePluginImpl.java
Mage.Common
pom.xml
src/mage/utils
MageVersion.java
Mage.Plugins
Mage.Counter.Plugin
pom.xml
pom.xml
Mage.Server.Console
pom.xml
Mage.Server.Plugins
Mage.Deck.Constructed
pom.xml
Mage.Deck.Limited
pom.xml
Mage.Game.CommanderDuel
pom.xml
Mage.Game.CommanderFreeForAll
pom.xml
Mage.Game.FreeForAll
pom.xml
Mage.Game.MomirDuel
pom.xml
Mage.Game.TinyLeadersDuel
pom.xml
Mage.Game.TwoPlayerDuel
pom.xml
Mage.Player.AI.DraftBot
pom.xml
Mage.Player.AI.MA
pom.xml
Mage.Player.AI
pom.xml
Mage.Player.AIMCTS
pom.xml
Mage.Player.AIMinimax
pom.xml
Mage.Player.Human
pom.xml
Mage.Tournament.BoosterDraft
pom.xml
Mage.Tournament.Constructed
pom.xml
Mage.Tournament.Sealed
pom.xml
pom.xml
Mage.Server
config
log4j.properties
pom.xml
Mage.Sets
pom.xml
Mage.Stats
pom.xml
Mage.Tests
pom.xml
Mage.Updater
pom.xml
Mage
pom.xml
src/main/java/mage/cards/repository
CardRepository.java
pom.xml

2
Mage.Client/pom.xml
View file

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

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

@ -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);
}
}
}

59
Mage.Client/src/main/java/mage/client/game/GamePanel.java
View file

@ -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;

23
Mage.Client/src/main/java/org/mage/plugins/theme/ThemePluginImpl.java
View file

@ -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<String, JComponent> 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"));

2
Mage.Common/pom.xml
View file

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-common</artifactId>

4
Mage.Common/src/mage/utils/MageVersion.java
View file

@ -40,8 +40,8 @@ public class MageVersion implements Serializable, Comparable<MageVersion> {
*/
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;

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-plugins</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-counter-plugin</artifactId>

2
Mage.Plugins/pom.xml
View file

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-plugins</artifactId>

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

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

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-deck-constructed</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-deck-limited</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-game-commanderduel</artifactId>

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

@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-game-commanderfreeforall</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-game-freeforall</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-game-momirduel</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-game-tinyleadersduel</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-game-twoplayerduel</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-player-ai-draftbot</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-player-ai-ma</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-player-ai</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-player-ai-mcts</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-player-aiminimax</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-player-human</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-tournament-boosterdraft</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-tournament-constructed</artifactId>

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

@ -7,7 +7,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-server-plugins</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-tournament-sealed</artifactId>

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

@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-server-plugins</artifactId>

88
Mage.Server/config/log4j.properties
View file

@ -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

2
Mage.Server/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-server</artifactId>

2
Mage.Sets/pom.xml
View file

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

2
Mage.Stats/pom.xml
View file

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

2
Mage.Tests/pom.xml
View file

@ -6,7 +6,7 @@
<parent>
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<artifactId>mage-tests</artifactId>

2
Mage.Updater/pom.xml
View file

@ -5,7 +5,7 @@
<parent>
<artifactId>mage-root</artifactId>
<groupId>org.mage</groupId>
<version>1.4.10</version>
<version>1.4.11</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
Mage/pom.xml
View file

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

2
Mage/src/main/java/mage/cards/repository/CardRepository.java
View file

@ -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<CardInfo, Object> cardDao;

4
pom.xml
View file

@ -6,7 +6,7 @@
<groupId>org.mage</groupId>
<artifactId>mage-root</artifactId>
<version>1.4.10</version>
<version>1.4.11</version>
<packaging>pom</packaging>
<name>Mage Root</name>
<description>Mage Root POM</description>
@ -83,7 +83,7 @@
</repositories>
<properties>
<mage-version>1.4.10</mage-version>
<mage-version>1.4.11</mage-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>