diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java index 785715924c4..8a9e3a95f50 100644 --- a/Mage.Client/src/main/java/mage/client/MageFrame.java +++ b/Mage.Client/src/main/java/mage/client/MageFrame.java @@ -92,6 +92,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; import java.util.prefs.Preferences; +import static mage.client.dialog.PreferencesDialog.KEY_CONNECT_FLAG; import mage.view.UserRequestMessage; import net.java.truevfs.access.TArchiveDetector; import net.java.truevfs.access.TConfig; @@ -710,10 +711,6 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { ProxyType proxyType = ProxyType.valueByText(prefs.get("proxyType", "None")); String proxyUsername = prefs.get("proxyUsername", ""); String proxyPassword = prefs.get("proxyPassword", ""); - int avatarId = PreferencesDialog.getSelectedAvatar(); - boolean showAbilityPickerForced = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_SHOW_ABILITY_PICKER_FORCED, "true").equals("true"); - - try { setCursor(new Cursor(Cursor.WAIT_CURSOR)); Connection connection = new Connection(); @@ -725,10 +722,9 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { connection.setProxyPort(proxyPort); connection.setProxyUsername(proxyUsername); connection.setProxyPassword(proxyPassword); - connection.setAvatarId(avatarId); - connection.setShowAbilityPickerForced(showAbilityPickerForced); - connection.setAllowRequestShowHandCards(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GAME_ALLOW_REQUEST_SHOW_HAND_CARDS, "true").equals("true")); - connection.setUserSkipPrioritySteps(PreferencesDialog.getUserSkipPrioritySteps()); + + setUserPrefsToConnection(connection); + logger.debug("connecting (auto): " + proxyType + " " + proxyServer + " " + proxyPort + " " + proxyUsername); if (MageFrame.connect(connection)) { showGames(false); @@ -742,6 +738,17 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { return false; } + public void setUserPrefsToConnection(Connection connection) { + int avatarId = PreferencesDialog.getSelectedAvatar(); + connection.setAvatarId(avatarId); + boolean showAbilityPickerForced = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_SHOW_ABILITY_PICKER_FORCED, "true").equals("true"); + connection.setShowAbilityPickerForced(showAbilityPickerForced); + connection.setAllowRequestShowHandCards(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GAME_ALLOW_REQUEST_SHOW_HAND_CARDS, "true").equals("true")); + connection.setConfirmEmptyManaPool(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GAME_CONFIRM_EMPTY_MANA_POOL, "true").equals("true")); + connection.setUserSkipPrioritySteps(PreferencesDialog.getUserSkipPrioritySteps()); + connection.setFlagName(MageFrame.getPreferences().get(KEY_CONNECT_FLAG, "world.png")); + } + /** * This method is called from within the constructor to * initialize the form. diff --git a/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java b/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java index c078527ebd1..ff2955e0fec 100644 --- a/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java +++ b/Mage.Client/src/main/java/mage/client/chat/ChatPanel.java @@ -311,7 +311,7 @@ public class ChatPanel extends javax.swing.JPanel { class TableModel extends AbstractTableModel { - private final String[] columnNames = new String[]{"Players", "Info", "Games", "Connection"}; + private final String[] columnNames = new String[]{" ","Players", "Info", "Games", "Connection"}; private UsersView[] players = new UsersView[0]; public void loadData(Collection roomUserInfoList) throws MageRemoteException { @@ -319,8 +319,9 @@ public class ChatPanel extends javax.swing.JPanel { this.players = roomUserInfo.getUsersView().toArray(new UsersView[0]); JTableHeader th = jTablePlayers.getTableHeader(); TableColumnModel tcm = th.getColumnModel(); - tcm.getColumn(0).setHeaderValue("Players (" + this.players.length + ")"); - tcm.getColumn(2).setHeaderValue( + + tcm.getColumn(1).setHeaderValue("Players (" + this.players.length + ")"); + tcm.getColumn(3).setHeaderValue( "Games " + roomUserInfo.getNumberActiveGames() + (roomUserInfo.getNumberActiveGames() != roomUserInfo.getNumberGameThreads() ? " (T:" + roomUserInfo.getNumberGameThreads():" (") + " limit: " + roomUserInfo.getNumberMaxGames() + ")"); @@ -342,12 +343,14 @@ public class ChatPanel extends javax.swing.JPanel { public Object getValueAt(int arg0, int arg1) { switch (arg1) { case 0: - return players[arg0].getUserName(); + return players[arg0].getFlagName(); case 1: - return players[arg0].getInfoState(); + return players[arg0].getUserName(); case 2: - return players[arg0].getInfoGames(); + return players[arg0].getInfoState(); case 3: + return players[arg0].getInfoGames(); + case 4: return players[arg0].getInfoPing(); } return ""; diff --git a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.form b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.form index 3389484c5d8..e84af7c5e33 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.form +++ b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.form @@ -35,20 +35,19 @@ - - - - + + + + + + + - - - - - - + + @@ -57,8 +56,9 @@ - + + @@ -86,12 +86,17 @@ + + + + + - + @@ -142,11 +147,24 @@ - + + + + + + + + + + + + + + diff --git a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java index a92c7a937fb..d26d235edd8 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java @@ -37,7 +37,6 @@ package mage.client.dialog; import mage.client.MageFrame; import mage.client.util.Config; import mage.remote.Connection; -import mage.remote.Connection.ProxyType; import org.apache.log4j.Logger; import javax.swing.*; @@ -64,6 +63,9 @@ import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; +import static mage.client.dialog.PreferencesDialog.KEY_CONNECT_AUTO_CONNECT; +import static mage.client.dialog.PreferencesDialog.KEY_CONNECT_FLAG; +import mage.remote.Connection.ProxyType; /** * @author BetaSteward_at_googlemail.com @@ -96,8 +98,18 @@ public class ConnectDialog extends MageDialog { this.txtServer.setText(MageFrame.getPreferences().get("serverAddress", Config.serverName)); this.txtPort.setText(MageFrame.getPreferences().get("serverPort", Integer.toString(Config.port))); this.txtUserName.setText(MageFrame.getPreferences().get("userName", "")); - this.chkAutoConnect.setSelected(Boolean.parseBoolean(MageFrame.getPreferences().get("autoConnect", "false"))); + this.chkAutoConnect.setSelected(Boolean.parseBoolean(MageFrame.getPreferences().get(KEY_CONNECT_AUTO_CONNECT, "false"))); this.chkForceUpdateDB.setSelected(false); // has always to be set manually to force comparison + + String selectedFlag = MageFrame.getPreferences().get(KEY_CONNECT_FLAG, "world.png"); + // set the selected country/flag + for (int i = 0; i < cbFlag.getItemCount(); i++) { + String[] name = (String[])cbFlag.getItemAt(i); + if (name[1].equals(selectedFlag)) { + cbFlag.setSelectedIndex(i); + break; + } + } this.setModal(true); this.setLocation(50, 50); this.setVisible(true); @@ -107,7 +119,7 @@ public class ConnectDialog extends MageDialog { MageFrame.getPreferences().put("serverAddress", txtServer.getText().trim()); MageFrame.getPreferences().put("serverPort", txtPort.getText().trim()); MageFrame.getPreferences().put("userName", txtUserName.getText().trim()); - MageFrame.getPreferences().put("autoConnect", Boolean.toString(chkAutoConnect.isSelected())); + MageFrame.getPreferences().put(KEY_CONNECT_AUTO_CONNECT, Boolean.toString(chkAutoConnect.isSelected())); } /** @@ -127,6 +139,8 @@ public class ConnectDialog extends MageDialog { txtPort = new javax.swing.JTextField(); lblUserName = new javax.swing.JLabel(); txtUserName = new javax.swing.JTextField(); + lblFlag = new javax.swing.JLabel(); + cbFlag = new mage.client.util.gui.countryBox.CountryComboBox(); chkAutoConnect = new javax.swing.JCheckBox(); chkForceUpdateDB = new javax.swing.JCheckBox(); jProxySettingsButton = new javax.swing.JButton(); @@ -159,7 +173,12 @@ public class ConnectDialog extends MageDialog { }); lblUserName.setLabelFor(txtUserName); - lblUserName.setText("User Name:"); + lblUserName.setText("User name:"); + + lblFlag.setLabelFor(txtUserName); + lblFlag.setText("User flag:"); + + cbFlag.setEditable(true); chkAutoConnect.setText("Automatically connect to this server next time"); chkAutoConnect.setToolTipText("If active this connect dialog will not be shown if you choose to connect.
\nInstead XMage tries to connect to the last server you were connected to."); @@ -211,26 +230,26 @@ public class ConnectDialog extends MageDialog { .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(btnCancel)) .addGroup(layout.createSequentialGroup() - .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) - .addComponent(lblPort) - .addComponent(lblServer) - .addComponent(lblUserName)) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING) + .addComponent(lblPort) + .addComponent(lblServer) + .addComponent(lblUserName)) + .addComponent(lblFlag, javax.swing.GroupLayout.Alignment.TRAILING)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(lblStatus, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(chkForceUpdateDB, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(chkAutoConnect, javax.swing.GroupLayout.DEFAULT_SIZE, 362, Short.MAX_VALUE) - .addGroup(layout.createSequentialGroup() - .addComponent(jProxySettingsButton) - .addGap(164, 237, Short.MAX_VALUE)) + .addComponent(jProxySettingsButton) + .addComponent(cbFlag, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addGroup(layout.createSequentialGroup() .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false) .addComponent(txtServer, javax.swing.GroupLayout.DEFAULT_SIZE, 286, Short.MAX_VALUE) .addComponent(txtPort, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, 71, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(txtUserName)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(btnFind) - .addGap(0, 0, Short.MAX_VALUE))))) + .addComponent(btnFind)) + .addComponent(chkForceUpdateDB, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(chkAutoConnect, javax.swing.GroupLayout.DEFAULT_SIZE, 358, Short.MAX_VALUE)))) .addContainerGap()) ); layout.setVerticalGroup( @@ -250,12 +269,16 @@ public class ConnectDialog extends MageDialog { .addComponent(txtUserName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE) .addComponent(lblUserName)) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false) + .addComponent(lblFlag, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(cbFlag, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)) + .addGap(5, 5, 5) .addComponent(chkAutoConnect) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(chkForceUpdateDB) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addComponent(jProxySettingsButton) - .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 20, Short.MAX_VALUE) + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 50, Short.MAX_VALUE) .addComponent(lblStatus, javax.swing.GroupLayout.PREFERRED_SIZE, 24, javax.swing.GroupLayout.PREFERRED_SIZE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE) @@ -269,6 +292,7 @@ public class ConnectDialog extends MageDialog { private void btnCancelActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_btnCancelActionPerformed MageFrame.getPreferences().put("autoConnect", Boolean.toString(chkAutoConnect.isSelected())); + MageFrame.getPreferences().put(KEY_CONNECT_FLAG, (String)cbFlag.getSelectedItem()); if (task != null && !task.isDone()) { task.cancel(true); } else { @@ -304,7 +328,7 @@ public class ConnectDialog extends MageDialog { connection.setPort(Integer.valueOf(this.txtPort.getText().trim())); connection.setUsername(this.txtUserName.getText().trim()); connection.setForceDBComparison(this.chkForceUpdateDB.isSelected()); - + MageFrame.getPreferences().put(KEY_CONNECT_FLAG, (String)cbFlag.getSelectedItem()); ProxyType configProxyType = Connection.ProxyType.valueByText(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_PROXY_TYPE, "None")); @@ -329,13 +353,8 @@ public class ConnectDialog extends MageDialog { } // pref settings - int avatarId = PreferencesDialog.getSelectedAvatar(); - connection.setAvatarId(avatarId); - boolean showAbilityPickerForced = PreferencesDialog.getCachedValue(PreferencesDialog.KEY_SHOW_ABILITY_PICKER_FORCED, "true").equals("true"); - connection.setAllowRequestShowHandCards(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GAME_ALLOW_REQUEST_SHOW_HAND_CARDS, "true").equals("true")); - connection.setShowAbilityPickerForced(showAbilityPickerForced); - connection.setUserSkipPrioritySteps(PreferencesDialog.getUserSkipPrioritySteps()); - connection.setConfirmEmptyManaPool(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GAME_CONFIRM_EMPTY_MANA_POOL, "true").equals("true")); + MageFrame.getInstance().setUserPrefsToConnection(connection); + logger.debug("connecting: " + connection.getProxyType() + " " + connection.getProxyHost() + " " + connection.getProxyPort()); task = new ConnectTask(); task.execute(); @@ -524,9 +543,11 @@ public class ConnectDialog extends MageDialog { private javax.swing.JButton btnCancel; private javax.swing.JButton btnConnect; private javax.swing.JButton btnFind; + private mage.client.util.gui.countryBox.CountryComboBox cbFlag; private javax.swing.JCheckBox chkAutoConnect; private javax.swing.JCheckBox chkForceUpdateDB; private javax.swing.JButton jProxySettingsButton; + private javax.swing.JLabel lblFlag; private javax.swing.JLabel lblPort; private javax.swing.JLabel lblServer; private javax.swing.JLabel lblStatus; diff --git a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form index 3a64ad1f596..06253718466 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form +++ b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.form @@ -31,7 +31,7 @@ - + diff --git a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java index c1775a462ac..e33b9c0b92d 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java @@ -226,6 +226,10 @@ public class PreferencesDialog extends javax.swing.JDialog { public static final String KEY_CONNECTION_URL_SERVER_LIST = "connectionURLServerList"; public static final String KEY_AVATAR = "selectedId"; + + public static final String KEY_CONNECT_AUTO_CONNECT = "autoConnect"; + public static final String KEY_CONNECT_FLAG = "connectFlag"; + private static final Map cache = new HashMap<>(); @@ -1713,7 +1717,8 @@ public class PreferencesDialog extends javax.swing.JDialog { dialog.showAbilityPickerForced.isSelected(), dialog.cbAllowRequestToShowHandCards.isSelected(), dialog.cbConfirmEmptyManaPool.isSelected(), - getUserSkipPrioritySteps()); + getUserSkipPrioritySteps(), + MageFrame.getPreferences().get(KEY_CONNECT_FLAG, "world.png")); prefs.flush(); } catch (BackingStoreException ex) { @@ -2390,7 +2395,9 @@ public class PreferencesDialog extends javax.swing.JDialog { PreferencesDialog.getCachedValue(PreferencesDialog.KEY_SHOW_TOOLTIPS_ANY_ZONE, "true").equals("true"), PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GAME_ALLOW_REQUEST_SHOW_HAND_CARDS, "true").equals("true"), PreferencesDialog.getCachedValue(PreferencesDialog.KEY_GAME_CONFIRM_EMPTY_MANA_POOL, "true").equals("true"), - getUserSkipPrioritySteps()); + getUserSkipPrioritySteps(), + MageFrame.getPreferences().get(KEY_CONNECT_FLAG, "world.png") + ); } } }); diff --git a/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryComboBox.java b/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryComboBox.java new file mode 100644 index 00000000000..2c365d95e3c --- /dev/null +++ b/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryComboBox.java @@ -0,0 +1,315 @@ +/* + * Copyright 2010 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.client.util.gui.countryBox; + +import javax.swing.DefaultComboBoxModel; +import javax.swing.JComboBox; + +/** + * A custom combo box with its own renderer and editor. + * @author wwww.codejava.net + * + */ +public class CountryComboBox extends JComboBox { + + private final DefaultComboBoxModel model; + + public static String[][] countryList = { + {"Afghanistan", "af.png"}, + {"Åland Islands", "ax.png"}, + {"Albania", "al.png"}, + {"Algeria", "dz.png"}, + {"American Samoa", "as.png"}, + {"Andorra", "ad.png"}, + {"Angola", "an.png"}, + {"Anguilla", "ai.png"}, + {"Antarctica", "ao.png"}, + {"Antigua and Barbuda", "ag.png"}, + {"Argentina", "ar.png"}, + {"Armenia", "am.png"}, + {"Aruba", "aw.png"}, + {"Australia", "au.png"}, + {"Austria", "at.png"}, + {"Azerbaijan", "az.png"}, + {"Bahamas", "bs.png"}, + {"Bahrain", "bh.png"}, + {"Bangladesh", "bd.png"}, + {"Barbados", "bb.png"}, + {"Belarus", "by.png"}, + {"Belgium", "be.png"}, + {"Belize", "bz.png"}, + {"Benin", "bj.png"}, + {"Bermuda", "bm.png"}, + {"Bhutan", "bt.png"}, + {"Bolivia, Plurinational State of", "bo.png"}, + {"Bosnia and Herzegovina", "ba.png"}, + {"Botswana", "bw.png"}, + {"Bouvet Island", "bv.png"}, + {"Brazil", "br.png"}, + {"British Indian Ocean Territory", "io.png"}, + {"Brunei Darussalam", "bn.png"}, + {"Bulgaria", "bg.png"}, + {"Burkina Faso", "bf.png"}, + {"Burundi", "bi.png"}, + {"Cabo Verde", "cv.png"}, + {"Cambodia", "kh.png"}, + {"Cameroon", "cm.png"}, + {"Canada", "ca.png"}, + {"Catalonia", "catalonia.png"}, + {"Cayman Islands", "ky.png"}, + {"Central African Republic", "cf.png"}, + {"Chad", "td.png"}, + {"Chile", "cl.png"}, + {"China", "cn.png"}, + {"Christmas Island", "cx.png"}, + {"Cocos (Keeling) Islands", "cc.png"}, + {"Colombia", "co.png"}, + {"Comoros", "km.png"}, + {"Congo", "cg.png"}, + {"Congo, the Democratic Republic of the", "cd.png"}, + {"Cook Islands", "ck.png"}, + {"Costa Rica", "cr.png"}, + {"Côte d'Ivoire", "ci.png"}, + {"Croatia", "hr.png"}, + {"Cuba", "cu.png"}, + {"Cyprus", "cy.png"}, + {"Czech Republic", "cz.png"}, + {"Denmark", "dk.png"}, + {"Djibouti", "dj.png"}, + {"Dominica", "dm.png"}, + {"Dominican Republic", "do.png"}, + {"Ecuador", "ec.png"}, + {"Egypt", "eg.png"}, + {"El Salvador", "sv.png"}, + {"England", "england.png"}, + {"Equatorial Guinea", "gq.png"}, + {"Eritrea", "er.png"}, + {"Estonia", "ee.png"}, + {"Ethiopia", "et.png"}, + {"European Union", "europeanunion.png"}, + {"Falkland Islands (Malvinas)", "fk.png"}, + {"Faroe Islands", "fo.png"}, + {"Fiji", "fj.png"}, + {"Finland", "fi.png"}, + {"France", "fr.png"}, + {"French Guiana", "gf.png"}, + {"French Polynesia", "pf.png"}, + {"French Southern Territories", "tf.png"}, + {"Gabon", "ga.png"}, + {"Gambia", "gm.png"}, + {"Georgia", "ge.png"}, + {"Germany", "de.png"}, + {"Ghana", "gh.png"}, + {"Gibraltar", "gi.png"}, + {"Greece", "gr.png"}, + {"Greenland", "gl.png"}, + {"Grenada", "gd.png"}, + {"Guadeloupe", "gp.png"}, + {"Guam", "gu.png"}, + {"Guatemala", "gt.png"}, + {"Guinea", "gn.png"}, + {"Guinea-Bissau", "gw.png"}, + {"Guyana", "gy.png"}, + {"Haiti", "ht.png"}, + {"Heard Island and McDonald Islands", "hm.png"}, + {"Holy See", "va.png"}, + {"Honduras", "hn.png"}, + {"Hong Kong", "hk.png"}, + {"Hungary", "hu.png"}, + {"Iceland", "is.png"}, + {"India", "in.png"}, + {"Indonesia", "id.png"}, + {"Iran, Islamic Republic of", "ir.png"}, + {"Iraq", "iq.png"}, + {"Ireland", "ie.png"}, + {"Israel", "il.png"}, + {"Italy", "it.png"}, + {"Jamaica", "jm.png"}, + {"Japan", "jp.png"}, + {"Jordan", "jo.png"}, + {"Kazakhstan", "kz.png"}, + {"Kenya", "ke.png"}, + {"Kiribati", "ki.png"}, + {"Korea, Democratic People's Republic of", "kp.png"}, + {"Korea, Republic of", "kr.png"}, + {"Kuwait", "kw.png"}, + {"Kyrgyzstan", "kg.png"}, + {"Lao People's Democratic Republic", "la.png"}, + {"Latvia", "lv.png"}, + {"Lebanon", "lb.png"}, + {"Lesotho", "ls.png"}, + {"Liberia", "lr.png"}, + {"Libya", "ly.png"}, + {"Liechtenstein", "li.png"}, + {"Lithuania", "lt.png"}, + {"Luxembourg", "lu.png"}, + {"Macao", "mo.png"}, + {"Macedonia, the former Yugoslav Republic of", "mk.png"}, + {"Madagascar", "mg.png"}, + {"Malawi", "mw.png"}, + {"Malaysia", "my.png"}, + {"Maldives", "mv.png"}, + {"Mali", "ml.png"}, + {"Malta", "mt.png"}, + {"Marshall Islands", "mh.png"}, + {"Martinique", "mq.png"}, + {"Mauritania", "mr.png"}, + {"Mauritius", "mu.png"}, + {"Mayotte", "yt.png"}, + {"Mexico", "mx.png"}, + {"Micronesia, Federated States of", "fm.png"}, + {"Moldova, Republic of", "md.png"}, + {"Monaco", "mc.png"}, + {"Mongolia", "mn.png"}, + {"Montenegro", "me.png"}, + {"Montserrat", "ms.png"}, + {"Morocco", "ma.png"}, + {"Mozambique", "mz.png"}, + {"Myanmar", "mm.png"}, + {"Namibia", "na.png"}, + {"Nauru", "nr.png"}, + {"Nepal", "np.png"}, + {"Netherlands", "nl.png"}, + {"New Caledonia", "nc.png"}, + {"New Zealand", "nz.png"}, + {"Nicaragua", "ni.png"}, + {"Niger", "ne.png"}, + {"Nigeria", "ng.png"}, + {"Niue", "nu.png"}, + {"Norfolk Island", "nf.png"}, + {"Northern Mariana Islands", "mp.png"}, + {"Norway", "no.png"}, + {"Oman", "om.png"}, + {"Pakistan", "pk.png"}, + {"Palau", "pw.png"}, + {"Palestine, State of", "ps.png"}, + {"Panama", "pa.png"}, + {"Papua New Guinea", "pg.png"}, + {"Paraguay", "py.png"}, + {"Peru", "pe.png"}, + {"Philippines", "ph.png"}, + {"Pitcairn", "pn.png"}, + {"Poland", "pl.png"}, + {"Portugal", "pt.png"}, + {"Puerto Rico", "pr.png"}, + {"Qatar", "qa.png"}, + {"Réunion", "re.png"}, + {"Romania", "ro.png"}, + {"Russian Federation", "ru.png"}, + {"Rwanda", "rw.png"}, + {"Saint Helena, Ascension and Tristan da Cunha", "sh.png"}, + {"Saint Kitts and Nevis", "kn.png"}, + {"Saint Lucia", "lc.png"}, + {"Saint Pierre and Miquelon", "pm.png"}, + {"Saint Vincent and the Grenadines", "vc.png"}, + {"Samoa", "ws.png"}, + {"San Marino", "sm.png"}, + {"Sao Tome and Principe", "st.png"}, + {"Saudi Arabia", "sa.png"}, + {"Scotland", "scotland.png"}, + {"Senegal", "sn.png"}, + {"Serbia", "rs.png"}, + {"Seychelles", "sc.png"}, + {"Sierra Leone", "sl.png"}, + {"Singapore", "sg.png"}, + {"Slovakia", "sk.png"}, + {"Slovenia", "si.png"}, + {"Solomon Islands", "sb.png"}, + {"Somalia", "so.png"}, + {"South Africa", "za.png"}, + {"South Georgia and the South Sandwich Islands", "gs.png"}, + {"Spain", "es.png"}, + {"Sri Lanka", "lk.png"}, + {"Sudan", "sd.png"}, + {"Suriname", "sr.png"}, + {"Svalbard and Jan Mayen", "sj.png"}, + {"Swaziland", "sz.png"}, + {"Sweden", "se.png"}, + {"Switzerland", "ch.png"}, + {"Syrian Arab Republic", "sy.png"}, + {"Taiwan, Province of China", "tw.png"}, + {"Tajikistan", "tj.png"}, + {"Tanzania, United Republic of", "tz.png"}, + {"Thailand", "th.png"}, + {"Timor-Leste", "tl.png"}, + {"Togo", "tg.png"}, + {"Tokelau", "tk.png"}, + {"Tonga", "to.png"}, + {"Trinidad and Tobago", "tt.png"}, + {"Tunisia", "tn.png"}, + {"Turkey", "tr.png"}, + {"Turkmenistan", "tm.png"}, + {"Turks and Caicos Islands", "tc.png"}, + {"Tuvalu", "tv.png"}, + {"Uganda", "ug.png"}, + {"Ukraine", "ua.png"}, + {"United Arab Emirates", "ae.png"}, + {"United Kingdom of Great Britain and Northern Ireland", "gb.png"}, + {"United States Minor Outlying Islands", "um.png"}, + {"United States of America", "us.png"}, + {"Uruguay", "uy.png"}, + {"Uzbekistan", "uz.png"}, + {"Vanuatu", "vu.png"}, + {"Venezuela, Bolivarian Republic of", "ve.png"}, + {"Viet Nam", "vn.png"}, + {"Virgin Islands, British", "vg.png"}, + {"Virgin Islands, U.S.", "vi.png"}, + {"Wales", "wales.png"}, + {"Wallis and Futuna", "wf.png"}, + {"World", "world.png"}, + {"Western Sahara", "eh.png"}, + {"Yemen", "ye.png"}, + {"Zambia", "zm.png"}, + {"Zimbabwe", "zw.png"}, + }; + + @SuppressWarnings("unchecked") + public CountryComboBox() { + model = new DefaultComboBoxModel(); + setModel(model); + setRenderer(new CountryItemRenderer()); + setEditor(new CountryItemEditor()); + addItems(countryList); + } + + /** + * Add an array items to this combo box. + * Each item is an array of two String elements: + * - first element is country name. + * - second element is path of an image file for country flag. + * @param items + */ + @SuppressWarnings("unchecked") + public void addItems(String[][] items) { + for (String[] anItem : items) { + model.addElement(anItem); + } + } + + +} diff --git a/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryItemEditor.java b/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryItemEditor.java new file mode 100644 index 00000000000..11d6e66cc91 --- /dev/null +++ b/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryItemEditor.java @@ -0,0 +1,87 @@ +/* + * Copyright 2010 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.client.util.gui.countryBox; + +import java.awt.Color; +import java.awt.Component; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import javax.swing.ImageIcon; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.plaf.basic.BasicComboBoxEditor; + + +/** + * Editor for JComboBox + * @author wwww.codejava.net + * + */ +public class CountryItemEditor extends BasicComboBoxEditor { + private final JPanel panel = new JPanel(); + private final JLabel labelItem = new JLabel(); + private String selectedValue; + + public CountryItemEditor() { + panel.setLayout(new GridBagLayout()); + GridBagConstraints constraints = new GridBagConstraints(); + constraints.fill = GridBagConstraints.HORIZONTAL; + constraints.weightx = 1.0; + constraints.insets = new Insets(2, 5, 2, 2); + + labelItem.setOpaque(false); + labelItem.setHorizontalAlignment(JLabel.LEFT); + labelItem.setForeground(Color.WHITE); + + panel.add(labelItem, constraints); + panel.setBackground(new Color(0,104,139, 0)); + selectedValue = null; + } + + @Override + public Component getEditorComponent() { + return this.panel; + } + + @Override + public Object getItem() { + return this.selectedValue; + } + + @Override + public void setItem(Object item) { + if (item == null || !(item instanceof String[])) { + return; + } + String[] countryItem = (String[]) item; + selectedValue = countryItem[0]; + labelItem.setText(selectedValue); + labelItem.setIcon(new ImageIcon(getClass().getResource("/flags/"+ countryItem[1]))); + } +} diff --git a/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryItemRenderer.java b/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryItemRenderer.java new file mode 100644 index 00000000000..38bfaa4867c --- /dev/null +++ b/Mage.Client/src/main/java/mage/client/util/gui/countryBox/CountryItemRenderer.java @@ -0,0 +1,87 @@ +/* + * Copyright 2010 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.client.util.gui.countryBox; + +import java.awt.Color; +import java.awt.Component; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.Insets; +import javax.swing.ImageIcon; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.JPanel; +import javax.swing.ListCellRenderer; + + +/** + * Customer renderer for JComboBox + * @author www.codejava.net + * + */ + +public class CountryItemRenderer extends JPanel implements ListCellRenderer { + private final JLabel labelItem = new JLabel(); + + public CountryItemRenderer() { + setLayout(new GridBagLayout()); + GridBagConstraints constraints = new GridBagConstraints(); + constraints.fill = GridBagConstraints.HORIZONTAL; + constraints.weightx = 1.0; + constraints.insets = new Insets(0, 0, 0, 0); + + labelItem.setOpaque(true); + labelItem.setHorizontalAlignment(JLabel.LEFT); + + add(labelItem, constraints); + setBackground(Color.LIGHT_GRAY); + } + + @Override + public Component getListCellRendererComponent(JList list, Object value, + int index, boolean isSelected, boolean cellHasFocus) { + String[] countryItem = (String[]) value; + + // set country name + labelItem.setText(countryItem[0]); + + // set country flag + labelItem.setIcon(new ImageIcon(countryItem[1])); + + if (isSelected) { + labelItem.setBackground(Color.BLUE); + labelItem.setForeground(Color.YELLOW); + } else { + labelItem.setForeground(Color.BLACK); + labelItem.setBackground(Color.LIGHT_GRAY); + } + + return this; + } + +} \ No newline at end of file diff --git a/Mage.Client/src/main/java/mage/client/util/gui/countryBox/MyComboBoxEditor.java b/Mage.Client/src/main/java/mage/client/util/gui/countryBox/MyComboBoxEditor.java new file mode 100644 index 00000000000..6c8db0b4723 --- /dev/null +++ b/Mage.Client/src/main/java/mage/client/util/gui/countryBox/MyComboBoxEditor.java @@ -0,0 +1,77 @@ +/* + * Copyright 2010 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.client.util.gui.countryBox; + +import java.awt.Color; +import java.awt.Component; +import java.awt.FlowLayout; +import java.awt.Font; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.plaf.basic.BasicComboBoxEditor; + +/** + * + * @author LevelX2 + */ + +public class MyComboBoxEditor extends BasicComboBoxEditor { + private final JLabel label; + private final JPanel panel; + private Object selectedItem; + + public MyComboBoxEditor() { + label = new JLabel(); + panel = new JPanel(); + + label.setOpaque(false); + label.setFont(new Font("Arial", Font.BOLD, 14)); + label.setForeground(Color.BLACK); + + panel.setLayout(new FlowLayout(FlowLayout.LEFT, 5, 2)); + panel.add(label); + panel.setBackground(Color.BLUE); + } + + @Override + public Component getEditorComponent() { + return this.panel; + } + + @Override + public Object getItem() { + return "[" + this.selectedItem.toString() + "]"; + } + + @Override + public void setItem(Object item) { + this.selectedItem = item; + label.setText(item.toString()); + } + +} \ No newline at end of file diff --git a/Mage.Client/src/main/java/mage/client/util/gui/countryBox/MyComboBoxRenderer.java b/Mage.Client/src/main/java/mage/client/util/gui/countryBox/MyComboBoxRenderer.java new file mode 100644 index 00000000000..d4c755dfca7 --- /dev/null +++ b/Mage.Client/src/main/java/mage/client/util/gui/countryBox/MyComboBoxRenderer.java @@ -0,0 +1,57 @@ +/* + * Copyright 2010 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.client.util.gui.countryBox; + +import java.awt.Color; +import java.awt.Component; +import java.awt.Font; +import javax.swing.JLabel; +import javax.swing.JList; +import javax.swing.ListCellRenderer; + +/** + * + * @author LevelX2 + */ +public class MyComboBoxRenderer extends JLabel implements ListCellRenderer { + + public MyComboBoxRenderer() { + setOpaque(true); + setFont(new Font("Arial", Font.BOLD /*| Font.ITALIC*/, 14)); + setBackground(Color.BLUE); + setForeground(Color.YELLOW); + } + + @Override + public Component getListCellRendererComponent(JList list, Object value, + int index, boolean isSelected, boolean cellHasFocus) { + setText(value.toString()); + return this; + } + +} diff --git a/Mage.Client/src/main/resources/flags/ad.png b/Mage.Client/src/main/resources/flags/ad.png new file mode 100644 index 00000000000..625ca84f9ec Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ad.png differ diff --git a/Mage.Client/src/main/resources/flags/ae.png b/Mage.Client/src/main/resources/flags/ae.png new file mode 100644 index 00000000000..ef3a1ecfccd Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ae.png differ diff --git a/Mage.Client/src/main/resources/flags/af.png b/Mage.Client/src/main/resources/flags/af.png new file mode 100644 index 00000000000..a4742e299f5 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/af.png differ diff --git a/Mage.Client/src/main/resources/flags/ag.png b/Mage.Client/src/main/resources/flags/ag.png new file mode 100644 index 00000000000..556d5504dc2 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ag.png differ diff --git a/Mage.Client/src/main/resources/flags/ai.png b/Mage.Client/src/main/resources/flags/ai.png new file mode 100644 index 00000000000..74ed29d9261 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ai.png differ diff --git a/Mage.Client/src/main/resources/flags/al.png b/Mage.Client/src/main/resources/flags/al.png new file mode 100644 index 00000000000..92354cb6e25 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/al.png differ diff --git a/Mage.Client/src/main/resources/flags/am.png b/Mage.Client/src/main/resources/flags/am.png new file mode 100644 index 00000000000..344a2a86c43 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/am.png differ diff --git a/Mage.Client/src/main/resources/flags/an.png b/Mage.Client/src/main/resources/flags/an.png new file mode 100644 index 00000000000..633e4b89fde Binary files /dev/null and b/Mage.Client/src/main/resources/flags/an.png differ diff --git a/Mage.Client/src/main/resources/flags/ao.png b/Mage.Client/src/main/resources/flags/ao.png new file mode 100644 index 00000000000..bcbd1d6d40d Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ao.png differ diff --git a/Mage.Client/src/main/resources/flags/ar.png b/Mage.Client/src/main/resources/flags/ar.png new file mode 100644 index 00000000000..e5ef8f1fcdd Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ar.png differ diff --git a/Mage.Client/src/main/resources/flags/as.png b/Mage.Client/src/main/resources/flags/as.png new file mode 100644 index 00000000000..32f30e4ce4e Binary files /dev/null and b/Mage.Client/src/main/resources/flags/as.png differ diff --git a/Mage.Client/src/main/resources/flags/at.png b/Mage.Client/src/main/resources/flags/at.png new file mode 100644 index 00000000000..0f15f34f288 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/at.png differ diff --git a/Mage.Client/src/main/resources/flags/au.png b/Mage.Client/src/main/resources/flags/au.png new file mode 100644 index 00000000000..a01389a745d Binary files /dev/null and b/Mage.Client/src/main/resources/flags/au.png differ diff --git a/Mage.Client/src/main/resources/flags/aw.png b/Mage.Client/src/main/resources/flags/aw.png new file mode 100644 index 00000000000..a3579c2d621 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/aw.png differ diff --git a/Mage.Client/src/main/resources/flags/ax.png b/Mage.Client/src/main/resources/flags/ax.png new file mode 100644 index 00000000000..1eea80a7b73 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ax.png differ diff --git a/Mage.Client/src/main/resources/flags/az.png b/Mage.Client/src/main/resources/flags/az.png new file mode 100644 index 00000000000..4ee9fe5ced2 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/az.png differ diff --git a/Mage.Client/src/main/resources/flags/ba.png b/Mage.Client/src/main/resources/flags/ba.png new file mode 100644 index 00000000000..c77499249c9 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ba.png differ diff --git a/Mage.Client/src/main/resources/flags/bb.png b/Mage.Client/src/main/resources/flags/bb.png new file mode 100644 index 00000000000..0df19c71d20 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/bb.png differ diff --git a/Mage.Client/src/main/resources/flags/bd.png b/Mage.Client/src/main/resources/flags/bd.png new file mode 100644 index 00000000000..076a8bf87c0 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/bd.png differ diff --git a/Mage.Client/src/main/resources/flags/be.png b/Mage.Client/src/main/resources/flags/be.png new file mode 100644 index 00000000000..d86ebc800a6 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/be.png differ diff --git a/Mage.Client/src/main/resources/flags/bf.png b/Mage.Client/src/main/resources/flags/bf.png new file mode 100644 index 00000000000..ab5ce8fe123 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/bf.png differ diff --git a/Mage.Client/src/main/resources/flags/bg.png b/Mage.Client/src/main/resources/flags/bg.png new file mode 100644 index 00000000000..0469f0607dc Binary files /dev/null and b/Mage.Client/src/main/resources/flags/bg.png differ diff --git a/Mage.Client/src/main/resources/flags/bh.png b/Mage.Client/src/main/resources/flags/bh.png new file mode 100644 index 00000000000..ea8ce68761b Binary files /dev/null and b/Mage.Client/src/main/resources/flags/bh.png differ diff --git a/Mage.Client/src/main/resources/flags/bi.png b/Mage.Client/src/main/resources/flags/bi.png new file mode 100644 index 00000000000..5cc2e30cfc4 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/bi.png differ diff --git a/Mage.Client/src/main/resources/flags/bj.png b/Mage.Client/src/main/resources/flags/bj.png new file mode 100644 index 00000000000..1cc8b458a4c Binary files /dev/null and b/Mage.Client/src/main/resources/flags/bj.png differ diff --git a/Mage.Client/src/main/resources/flags/bm.png b/Mage.Client/src/main/resources/flags/bm.png new file mode 100644 index 00000000000..c0c7aead8df Binary files /dev/null and b/Mage.Client/src/main/resources/flags/bm.png differ diff --git a/Mage.Client/src/main/resources/flags/bn.png b/Mage.Client/src/main/resources/flags/bn.png new file mode 100644 index 00000000000..8fb09849e9b Binary files /dev/null and b/Mage.Client/src/main/resources/flags/bn.png differ diff --git a/Mage.Client/src/main/resources/flags/bo.png b/Mage.Client/src/main/resources/flags/bo.png new file mode 100644 index 00000000000..ce7ba522aa7 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/bo.png differ diff --git a/Mage.Client/src/main/resources/flags/br.png b/Mage.Client/src/main/resources/flags/br.png new file mode 100644 index 00000000000..9b1a5538b26 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/br.png differ diff --git a/Mage.Client/src/main/resources/flags/bs.png b/Mage.Client/src/main/resources/flags/bs.png new file mode 100644 index 00000000000..639fa6cfa9c Binary files /dev/null and b/Mage.Client/src/main/resources/flags/bs.png differ diff --git a/Mage.Client/src/main/resources/flags/bt.png b/Mage.Client/src/main/resources/flags/bt.png new file mode 100644 index 00000000000..1d512dfff42 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/bt.png differ diff --git a/Mage.Client/src/main/resources/flags/bv.png b/Mage.Client/src/main/resources/flags/bv.png new file mode 100644 index 00000000000..160b6b5b79d Binary files /dev/null and b/Mage.Client/src/main/resources/flags/bv.png differ diff --git a/Mage.Client/src/main/resources/flags/bw.png b/Mage.Client/src/main/resources/flags/bw.png new file mode 100644 index 00000000000..fcb10394152 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/bw.png differ diff --git a/Mage.Client/src/main/resources/flags/by.png b/Mage.Client/src/main/resources/flags/by.png new file mode 100644 index 00000000000..504774ec10e Binary files /dev/null and b/Mage.Client/src/main/resources/flags/by.png differ diff --git a/Mage.Client/src/main/resources/flags/bz.png b/Mage.Client/src/main/resources/flags/bz.png new file mode 100644 index 00000000000..be63ee1c623 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/bz.png differ diff --git a/Mage.Client/src/main/resources/flags/ca.png b/Mage.Client/src/main/resources/flags/ca.png new file mode 100644 index 00000000000..1f204193ae5 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ca.png differ diff --git a/Mage.Client/src/main/resources/flags/catalonia.png b/Mage.Client/src/main/resources/flags/catalonia.png new file mode 100644 index 00000000000..5041e308e3a Binary files /dev/null and b/Mage.Client/src/main/resources/flags/catalonia.png differ diff --git a/Mage.Client/src/main/resources/flags/cc.png b/Mage.Client/src/main/resources/flags/cc.png new file mode 100644 index 00000000000..aed3d3b4e44 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/cc.png differ diff --git a/Mage.Client/src/main/resources/flags/cd.png b/Mage.Client/src/main/resources/flags/cd.png new file mode 100644 index 00000000000..5e489424884 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/cd.png differ diff --git a/Mage.Client/src/main/resources/flags/cf.png b/Mage.Client/src/main/resources/flags/cf.png new file mode 100644 index 00000000000..da687bdce92 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/cf.png differ diff --git a/Mage.Client/src/main/resources/flags/cg.png b/Mage.Client/src/main/resources/flags/cg.png new file mode 100644 index 00000000000..a859792ef32 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/cg.png differ diff --git a/Mage.Client/src/main/resources/flags/ch.png b/Mage.Client/src/main/resources/flags/ch.png new file mode 100644 index 00000000000..242ec01aaf5 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ch.png differ diff --git a/Mage.Client/src/main/resources/flags/ci.png b/Mage.Client/src/main/resources/flags/ci.png new file mode 100644 index 00000000000..3f2c62eb4d7 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ci.png differ diff --git a/Mage.Client/src/main/resources/flags/ck.png b/Mage.Client/src/main/resources/flags/ck.png new file mode 100644 index 00000000000..746d3d6f758 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ck.png differ diff --git a/Mage.Client/src/main/resources/flags/cl.png b/Mage.Client/src/main/resources/flags/cl.png new file mode 100644 index 00000000000..29c6d61bd4f Binary files /dev/null and b/Mage.Client/src/main/resources/flags/cl.png differ diff --git a/Mage.Client/src/main/resources/flags/cm.png b/Mage.Client/src/main/resources/flags/cm.png new file mode 100644 index 00000000000..f65c5bd5a79 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/cm.png differ diff --git a/Mage.Client/src/main/resources/flags/cn.png b/Mage.Client/src/main/resources/flags/cn.png new file mode 100644 index 00000000000..89144146219 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/cn.png differ diff --git a/Mage.Client/src/main/resources/flags/co.png b/Mage.Client/src/main/resources/flags/co.png new file mode 100644 index 00000000000..a118ff4a146 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/co.png differ diff --git a/Mage.Client/src/main/resources/flags/cr.png b/Mage.Client/src/main/resources/flags/cr.png new file mode 100644 index 00000000000..c7a37317940 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/cr.png differ diff --git a/Mage.Client/src/main/resources/flags/cs.png b/Mage.Client/src/main/resources/flags/cs.png new file mode 100644 index 00000000000..8254790ca72 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/cs.png differ diff --git a/Mage.Client/src/main/resources/flags/cu.png b/Mage.Client/src/main/resources/flags/cu.png new file mode 100644 index 00000000000..083f1d611c9 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/cu.png differ diff --git a/Mage.Client/src/main/resources/flags/cv.png b/Mage.Client/src/main/resources/flags/cv.png new file mode 100644 index 00000000000..a63f7eaf63c Binary files /dev/null and b/Mage.Client/src/main/resources/flags/cv.png differ diff --git a/Mage.Client/src/main/resources/flags/cx.png b/Mage.Client/src/main/resources/flags/cx.png new file mode 100644 index 00000000000..48e31adbf4c Binary files /dev/null and b/Mage.Client/src/main/resources/flags/cx.png differ diff --git a/Mage.Client/src/main/resources/flags/cy.png b/Mage.Client/src/main/resources/flags/cy.png new file mode 100644 index 00000000000..5b1ad6c0788 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/cy.png differ diff --git a/Mage.Client/src/main/resources/flags/cz.png b/Mage.Client/src/main/resources/flags/cz.png new file mode 100644 index 00000000000..c8403dd21fd Binary files /dev/null and b/Mage.Client/src/main/resources/flags/cz.png differ diff --git a/Mage.Client/src/main/resources/flags/de.png b/Mage.Client/src/main/resources/flags/de.png new file mode 100644 index 00000000000..ac4a9773627 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/de.png differ diff --git a/Mage.Client/src/main/resources/flags/dj.png b/Mage.Client/src/main/resources/flags/dj.png new file mode 100644 index 00000000000..582af364f8a Binary files /dev/null and b/Mage.Client/src/main/resources/flags/dj.png differ diff --git a/Mage.Client/src/main/resources/flags/dk.png b/Mage.Client/src/main/resources/flags/dk.png new file mode 100644 index 00000000000..e2993d3c59a Binary files /dev/null and b/Mage.Client/src/main/resources/flags/dk.png differ diff --git a/Mage.Client/src/main/resources/flags/dm.png b/Mage.Client/src/main/resources/flags/dm.png new file mode 100644 index 00000000000..5fbffcba3cb Binary files /dev/null and b/Mage.Client/src/main/resources/flags/dm.png differ diff --git a/Mage.Client/src/main/resources/flags/do.png b/Mage.Client/src/main/resources/flags/do.png new file mode 100644 index 00000000000..5a04932d879 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/do.png differ diff --git a/Mage.Client/src/main/resources/flags/dz.png b/Mage.Client/src/main/resources/flags/dz.png new file mode 100644 index 00000000000..335c2391d39 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/dz.png differ diff --git a/Mage.Client/src/main/resources/flags/ec.png b/Mage.Client/src/main/resources/flags/ec.png new file mode 100644 index 00000000000..0caa0b1e785 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ec.png differ diff --git a/Mage.Client/src/main/resources/flags/ee.png b/Mage.Client/src/main/resources/flags/ee.png new file mode 100644 index 00000000000..0c82efb7dde Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ee.png differ diff --git a/Mage.Client/src/main/resources/flags/eg.png b/Mage.Client/src/main/resources/flags/eg.png new file mode 100644 index 00000000000..8a3f7a10b57 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/eg.png differ diff --git a/Mage.Client/src/main/resources/flags/eh.png b/Mage.Client/src/main/resources/flags/eh.png new file mode 100644 index 00000000000..90a1195b47a Binary files /dev/null and b/Mage.Client/src/main/resources/flags/eh.png differ diff --git a/Mage.Client/src/main/resources/flags/england.png b/Mage.Client/src/main/resources/flags/england.png new file mode 100644 index 00000000000..3a7311d5617 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/england.png differ diff --git a/Mage.Client/src/main/resources/flags/er.png b/Mage.Client/src/main/resources/flags/er.png new file mode 100644 index 00000000000..13065ae99cc Binary files /dev/null and b/Mage.Client/src/main/resources/flags/er.png differ diff --git a/Mage.Client/src/main/resources/flags/es.png b/Mage.Client/src/main/resources/flags/es.png new file mode 100644 index 00000000000..c2de2d7111e Binary files /dev/null and b/Mage.Client/src/main/resources/flags/es.png differ diff --git a/Mage.Client/src/main/resources/flags/et.png b/Mage.Client/src/main/resources/flags/et.png new file mode 100644 index 00000000000..2e893fa056c Binary files /dev/null and b/Mage.Client/src/main/resources/flags/et.png differ diff --git a/Mage.Client/src/main/resources/flags/europeanunion.png b/Mage.Client/src/main/resources/flags/europeanunion.png new file mode 100644 index 00000000000..d6d87115808 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/europeanunion.png differ diff --git a/Mage.Client/src/main/resources/flags/fi.png b/Mage.Client/src/main/resources/flags/fi.png new file mode 100644 index 00000000000..14ec091b802 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/fi.png differ diff --git a/Mage.Client/src/main/resources/flags/fj.png b/Mage.Client/src/main/resources/flags/fj.png new file mode 100644 index 00000000000..cee998892eb Binary files /dev/null and b/Mage.Client/src/main/resources/flags/fj.png differ diff --git a/Mage.Client/src/main/resources/flags/fk.png b/Mage.Client/src/main/resources/flags/fk.png new file mode 100644 index 00000000000..ceaeb27decb Binary files /dev/null and b/Mage.Client/src/main/resources/flags/fk.png differ diff --git a/Mage.Client/src/main/resources/flags/fm.png b/Mage.Client/src/main/resources/flags/fm.png new file mode 100644 index 00000000000..066bb247389 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/fm.png differ diff --git a/Mage.Client/src/main/resources/flags/fo.png b/Mage.Client/src/main/resources/flags/fo.png new file mode 100644 index 00000000000..cbceb809eb9 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/fo.png differ diff --git a/Mage.Client/src/main/resources/flags/fr.png b/Mage.Client/src/main/resources/flags/fr.png new file mode 100644 index 00000000000..8332c4ec23c Binary files /dev/null and b/Mage.Client/src/main/resources/flags/fr.png differ diff --git a/Mage.Client/src/main/resources/flags/ga.png b/Mage.Client/src/main/resources/flags/ga.png new file mode 100644 index 00000000000..0e0d434363a Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ga.png differ diff --git a/Mage.Client/src/main/resources/flags/gb.png b/Mage.Client/src/main/resources/flags/gb.png new file mode 100644 index 00000000000..ff701e19f6d Binary files /dev/null and b/Mage.Client/src/main/resources/flags/gb.png differ diff --git a/Mage.Client/src/main/resources/flags/gd.png b/Mage.Client/src/main/resources/flags/gd.png new file mode 100644 index 00000000000..9ab57f5489b Binary files /dev/null and b/Mage.Client/src/main/resources/flags/gd.png differ diff --git a/Mage.Client/src/main/resources/flags/ge.png b/Mage.Client/src/main/resources/flags/ge.png new file mode 100644 index 00000000000..728d97078df Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ge.png differ diff --git a/Mage.Client/src/main/resources/flags/gf.png b/Mage.Client/src/main/resources/flags/gf.png new file mode 100644 index 00000000000..8332c4ec23c Binary files /dev/null and b/Mage.Client/src/main/resources/flags/gf.png differ diff --git a/Mage.Client/src/main/resources/flags/gh.png b/Mage.Client/src/main/resources/flags/gh.png new file mode 100644 index 00000000000..4e2f8965914 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/gh.png differ diff --git a/Mage.Client/src/main/resources/flags/gi.png b/Mage.Client/src/main/resources/flags/gi.png new file mode 100644 index 00000000000..e76797f62fe Binary files /dev/null and b/Mage.Client/src/main/resources/flags/gi.png differ diff --git a/Mage.Client/src/main/resources/flags/gl.png b/Mage.Client/src/main/resources/flags/gl.png new file mode 100644 index 00000000000..ef12a73bf96 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/gl.png differ diff --git a/Mage.Client/src/main/resources/flags/gm.png b/Mage.Client/src/main/resources/flags/gm.png new file mode 100644 index 00000000000..0720b667aff Binary files /dev/null and b/Mage.Client/src/main/resources/flags/gm.png differ diff --git a/Mage.Client/src/main/resources/flags/gn.png b/Mage.Client/src/main/resources/flags/gn.png new file mode 100644 index 00000000000..ea660b01fae Binary files /dev/null and b/Mage.Client/src/main/resources/flags/gn.png differ diff --git a/Mage.Client/src/main/resources/flags/gp.png b/Mage.Client/src/main/resources/flags/gp.png new file mode 100644 index 00000000000..dbb086d0012 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/gp.png differ diff --git a/Mage.Client/src/main/resources/flags/gq.png b/Mage.Client/src/main/resources/flags/gq.png new file mode 100644 index 00000000000..ebe20a28de0 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/gq.png differ diff --git a/Mage.Client/src/main/resources/flags/gr.png b/Mage.Client/src/main/resources/flags/gr.png new file mode 100644 index 00000000000..8651ade7cbe Binary files /dev/null and b/Mage.Client/src/main/resources/flags/gr.png differ diff --git a/Mage.Client/src/main/resources/flags/gs.png b/Mage.Client/src/main/resources/flags/gs.png new file mode 100644 index 00000000000..7ef0bf598d9 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/gs.png differ diff --git a/Mage.Client/src/main/resources/flags/gt.png b/Mage.Client/src/main/resources/flags/gt.png new file mode 100644 index 00000000000..c43a70d3642 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/gt.png differ diff --git a/Mage.Client/src/main/resources/flags/gu.png b/Mage.Client/src/main/resources/flags/gu.png new file mode 100644 index 00000000000..92f37c05330 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/gu.png differ diff --git a/Mage.Client/src/main/resources/flags/gw.png b/Mage.Client/src/main/resources/flags/gw.png new file mode 100644 index 00000000000..b37bcf06bf2 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/gw.png differ diff --git a/Mage.Client/src/main/resources/flags/gy.png b/Mage.Client/src/main/resources/flags/gy.png new file mode 100644 index 00000000000..22cbe2f5914 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/gy.png differ diff --git a/Mage.Client/src/main/resources/flags/hk.png b/Mage.Client/src/main/resources/flags/hk.png new file mode 100644 index 00000000000..d5c380ca9d8 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/hk.png differ diff --git a/Mage.Client/src/main/resources/flags/hm.png b/Mage.Client/src/main/resources/flags/hm.png new file mode 100644 index 00000000000..a01389a745d Binary files /dev/null and b/Mage.Client/src/main/resources/flags/hm.png differ diff --git a/Mage.Client/src/main/resources/flags/hn.png b/Mage.Client/src/main/resources/flags/hn.png new file mode 100644 index 00000000000..96f838859fd Binary files /dev/null and b/Mage.Client/src/main/resources/flags/hn.png differ diff --git a/Mage.Client/src/main/resources/flags/hr.png b/Mage.Client/src/main/resources/flags/hr.png new file mode 100644 index 00000000000..696b515460d Binary files /dev/null and b/Mage.Client/src/main/resources/flags/hr.png differ diff --git a/Mage.Client/src/main/resources/flags/ht.png b/Mage.Client/src/main/resources/flags/ht.png new file mode 100644 index 00000000000..416052af772 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ht.png differ diff --git a/Mage.Client/src/main/resources/flags/hu.png b/Mage.Client/src/main/resources/flags/hu.png new file mode 100644 index 00000000000..7baafe44ddc Binary files /dev/null and b/Mage.Client/src/main/resources/flags/hu.png differ diff --git a/Mage.Client/src/main/resources/flags/id.png b/Mage.Client/src/main/resources/flags/id.png new file mode 100644 index 00000000000..c6bc0fafac7 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/id.png differ diff --git a/Mage.Client/src/main/resources/flags/ie.png b/Mage.Client/src/main/resources/flags/ie.png new file mode 100644 index 00000000000..26baa31e182 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ie.png differ diff --git a/Mage.Client/src/main/resources/flags/il.png b/Mage.Client/src/main/resources/flags/il.png new file mode 100644 index 00000000000..2ca772d0b79 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/il.png differ diff --git a/Mage.Client/src/main/resources/flags/in.png b/Mage.Client/src/main/resources/flags/in.png new file mode 100644 index 00000000000..e4d7e81a98d Binary files /dev/null and b/Mage.Client/src/main/resources/flags/in.png differ diff --git a/Mage.Client/src/main/resources/flags/io.png b/Mage.Client/src/main/resources/flags/io.png new file mode 100644 index 00000000000..3e74b6a3164 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/io.png differ diff --git a/Mage.Client/src/main/resources/flags/iq.png b/Mage.Client/src/main/resources/flags/iq.png new file mode 100644 index 00000000000..878a351403a Binary files /dev/null and b/Mage.Client/src/main/resources/flags/iq.png differ diff --git a/Mage.Client/src/main/resources/flags/ir.png b/Mage.Client/src/main/resources/flags/ir.png new file mode 100644 index 00000000000..c5fd136aee5 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ir.png differ diff --git a/Mage.Client/src/main/resources/flags/is.png b/Mage.Client/src/main/resources/flags/is.png new file mode 100644 index 00000000000..b8f6d0f0667 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/is.png differ diff --git a/Mage.Client/src/main/resources/flags/it.png b/Mage.Client/src/main/resources/flags/it.png new file mode 100644 index 00000000000..89692f74f05 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/it.png differ diff --git a/Mage.Client/src/main/resources/flags/jm.png b/Mage.Client/src/main/resources/flags/jm.png new file mode 100644 index 00000000000..7be119e03d2 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/jm.png differ diff --git a/Mage.Client/src/main/resources/flags/jo.png b/Mage.Client/src/main/resources/flags/jo.png new file mode 100644 index 00000000000..11bd4972b6d Binary files /dev/null and b/Mage.Client/src/main/resources/flags/jo.png differ diff --git a/Mage.Client/src/main/resources/flags/jp.png b/Mage.Client/src/main/resources/flags/jp.png new file mode 100644 index 00000000000..325fbad3ffd Binary files /dev/null and b/Mage.Client/src/main/resources/flags/jp.png differ diff --git a/Mage.Client/src/main/resources/flags/ke.png b/Mage.Client/src/main/resources/flags/ke.png new file mode 100644 index 00000000000..51879adf17c Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ke.png differ diff --git a/Mage.Client/src/main/resources/flags/kg.png b/Mage.Client/src/main/resources/flags/kg.png new file mode 100644 index 00000000000..0a818f67ea3 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/kg.png differ diff --git a/Mage.Client/src/main/resources/flags/kh.png b/Mage.Client/src/main/resources/flags/kh.png new file mode 100644 index 00000000000..30f6bb1b9b6 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/kh.png differ diff --git a/Mage.Client/src/main/resources/flags/ki.png b/Mage.Client/src/main/resources/flags/ki.png new file mode 100644 index 00000000000..2dcce4b33ff Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ki.png differ diff --git a/Mage.Client/src/main/resources/flags/km.png b/Mage.Client/src/main/resources/flags/km.png new file mode 100644 index 00000000000..812b2f56c5a Binary files /dev/null and b/Mage.Client/src/main/resources/flags/km.png differ diff --git a/Mage.Client/src/main/resources/flags/kn.png b/Mage.Client/src/main/resources/flags/kn.png new file mode 100644 index 00000000000..febd5b486f3 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/kn.png differ diff --git a/Mage.Client/src/main/resources/flags/kp.png b/Mage.Client/src/main/resources/flags/kp.png new file mode 100644 index 00000000000..d3d509aa874 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/kp.png differ diff --git a/Mage.Client/src/main/resources/flags/kr.png b/Mage.Client/src/main/resources/flags/kr.png new file mode 100644 index 00000000000..9c0a78eb942 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/kr.png differ diff --git a/Mage.Client/src/main/resources/flags/kw.png b/Mage.Client/src/main/resources/flags/kw.png new file mode 100644 index 00000000000..96546da328a Binary files /dev/null and b/Mage.Client/src/main/resources/flags/kw.png differ diff --git a/Mage.Client/src/main/resources/flags/ky.png b/Mage.Client/src/main/resources/flags/ky.png new file mode 100644 index 00000000000..15c5f8e4775 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ky.png differ diff --git a/Mage.Client/src/main/resources/flags/kz.png b/Mage.Client/src/main/resources/flags/kz.png new file mode 100644 index 00000000000..45a8c887424 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/kz.png differ diff --git a/Mage.Client/src/main/resources/flags/la.png b/Mage.Client/src/main/resources/flags/la.png new file mode 100644 index 00000000000..e28acd018a2 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/la.png differ diff --git a/Mage.Client/src/main/resources/flags/lb.png b/Mage.Client/src/main/resources/flags/lb.png new file mode 100644 index 00000000000..d0d452bf868 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/lb.png differ diff --git a/Mage.Client/src/main/resources/flags/lc.png b/Mage.Client/src/main/resources/flags/lc.png new file mode 100644 index 00000000000..a47d065541b Binary files /dev/null and b/Mage.Client/src/main/resources/flags/lc.png differ diff --git a/Mage.Client/src/main/resources/flags/li.png b/Mage.Client/src/main/resources/flags/li.png new file mode 100644 index 00000000000..6469909c013 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/li.png differ diff --git a/Mage.Client/src/main/resources/flags/lk.png b/Mage.Client/src/main/resources/flags/lk.png new file mode 100644 index 00000000000..088aad6db95 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/lk.png differ diff --git a/Mage.Client/src/main/resources/flags/lr.png b/Mage.Client/src/main/resources/flags/lr.png new file mode 100644 index 00000000000..89a5bc7e707 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/lr.png differ diff --git a/Mage.Client/src/main/resources/flags/ls.png b/Mage.Client/src/main/resources/flags/ls.png new file mode 100644 index 00000000000..33fdef101f7 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ls.png differ diff --git a/Mage.Client/src/main/resources/flags/lt.png b/Mage.Client/src/main/resources/flags/lt.png new file mode 100644 index 00000000000..c8ef0da0919 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/lt.png differ diff --git a/Mage.Client/src/main/resources/flags/lu.png b/Mage.Client/src/main/resources/flags/lu.png new file mode 100644 index 00000000000..4cabba98ae7 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/lu.png differ diff --git a/Mage.Client/src/main/resources/flags/lv.png b/Mage.Client/src/main/resources/flags/lv.png new file mode 100644 index 00000000000..49b69981085 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/lv.png differ diff --git a/Mage.Client/src/main/resources/flags/ly.png b/Mage.Client/src/main/resources/flags/ly.png new file mode 100644 index 00000000000..b163a9f8a06 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ly.png differ diff --git a/Mage.Client/src/main/resources/flags/ma.png b/Mage.Client/src/main/resources/flags/ma.png new file mode 100644 index 00000000000..f386770280b Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ma.png differ diff --git a/Mage.Client/src/main/resources/flags/mc.png b/Mage.Client/src/main/resources/flags/mc.png new file mode 100644 index 00000000000..1aa830f121a Binary files /dev/null and b/Mage.Client/src/main/resources/flags/mc.png differ diff --git a/Mage.Client/src/main/resources/flags/md.png b/Mage.Client/src/main/resources/flags/md.png new file mode 100644 index 00000000000..4e92c189044 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/md.png differ diff --git a/Mage.Client/src/main/resources/flags/me.png b/Mage.Client/src/main/resources/flags/me.png new file mode 100644 index 00000000000..ac7253558ab Binary files /dev/null and b/Mage.Client/src/main/resources/flags/me.png differ diff --git a/Mage.Client/src/main/resources/flags/mg.png b/Mage.Client/src/main/resources/flags/mg.png new file mode 100644 index 00000000000..d2715b3d0e1 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/mg.png differ diff --git a/Mage.Client/src/main/resources/flags/mh.png b/Mage.Client/src/main/resources/flags/mh.png new file mode 100644 index 00000000000..fb523a8c39d Binary files /dev/null and b/Mage.Client/src/main/resources/flags/mh.png differ diff --git a/Mage.Client/src/main/resources/flags/mk.png b/Mage.Client/src/main/resources/flags/mk.png new file mode 100644 index 00000000000..db173aaff21 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/mk.png differ diff --git a/Mage.Client/src/main/resources/flags/ml.png b/Mage.Client/src/main/resources/flags/ml.png new file mode 100644 index 00000000000..2cec8ba440b Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ml.png differ diff --git a/Mage.Client/src/main/resources/flags/mm.png b/Mage.Client/src/main/resources/flags/mm.png new file mode 100644 index 00000000000..f464f67ffb4 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/mm.png differ diff --git a/Mage.Client/src/main/resources/flags/mn.png b/Mage.Client/src/main/resources/flags/mn.png new file mode 100644 index 00000000000..9396355db45 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/mn.png differ diff --git a/Mage.Client/src/main/resources/flags/mo.png b/Mage.Client/src/main/resources/flags/mo.png new file mode 100644 index 00000000000..deb801dda24 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/mo.png differ diff --git a/Mage.Client/src/main/resources/flags/mp.png b/Mage.Client/src/main/resources/flags/mp.png new file mode 100644 index 00000000000..298d588b14b Binary files /dev/null and b/Mage.Client/src/main/resources/flags/mp.png differ diff --git a/Mage.Client/src/main/resources/flags/mq.png b/Mage.Client/src/main/resources/flags/mq.png new file mode 100644 index 00000000000..010143b3867 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/mq.png differ diff --git a/Mage.Client/src/main/resources/flags/mr.png b/Mage.Client/src/main/resources/flags/mr.png new file mode 100644 index 00000000000..319546b1008 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/mr.png differ diff --git a/Mage.Client/src/main/resources/flags/ms.png b/Mage.Client/src/main/resources/flags/ms.png new file mode 100644 index 00000000000..d4cbb433d8f Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ms.png differ diff --git a/Mage.Client/src/main/resources/flags/mt.png b/Mage.Client/src/main/resources/flags/mt.png new file mode 100644 index 00000000000..00af94871de Binary files /dev/null and b/Mage.Client/src/main/resources/flags/mt.png differ diff --git a/Mage.Client/src/main/resources/flags/mu.png b/Mage.Client/src/main/resources/flags/mu.png new file mode 100644 index 00000000000..b7fdce1bdd7 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/mu.png differ diff --git a/Mage.Client/src/main/resources/flags/mv.png b/Mage.Client/src/main/resources/flags/mv.png new file mode 100644 index 00000000000..5073d9ec47c Binary files /dev/null and b/Mage.Client/src/main/resources/flags/mv.png differ diff --git a/Mage.Client/src/main/resources/flags/mw.png b/Mage.Client/src/main/resources/flags/mw.png new file mode 100644 index 00000000000..13886e9f8bf Binary files /dev/null and b/Mage.Client/src/main/resources/flags/mw.png differ diff --git a/Mage.Client/src/main/resources/flags/mx.png b/Mage.Client/src/main/resources/flags/mx.png new file mode 100644 index 00000000000..5bc58ab3e35 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/mx.png differ diff --git a/Mage.Client/src/main/resources/flags/my.png b/Mage.Client/src/main/resources/flags/my.png new file mode 100644 index 00000000000..9034cbab2c0 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/my.png differ diff --git a/Mage.Client/src/main/resources/flags/mz.png b/Mage.Client/src/main/resources/flags/mz.png new file mode 100644 index 00000000000..76405e063d4 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/mz.png differ diff --git a/Mage.Client/src/main/resources/flags/na.png b/Mage.Client/src/main/resources/flags/na.png new file mode 100644 index 00000000000..63358c67df9 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/na.png differ diff --git a/Mage.Client/src/main/resources/flags/nc.png b/Mage.Client/src/main/resources/flags/nc.png new file mode 100644 index 00000000000..2cad2837823 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/nc.png differ diff --git a/Mage.Client/src/main/resources/flags/ne.png b/Mage.Client/src/main/resources/flags/ne.png new file mode 100644 index 00000000000..d85f424f38d Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ne.png differ diff --git a/Mage.Client/src/main/resources/flags/nf.png b/Mage.Client/src/main/resources/flags/nf.png new file mode 100644 index 00000000000..f9bcdda12ca Binary files /dev/null and b/Mage.Client/src/main/resources/flags/nf.png differ diff --git a/Mage.Client/src/main/resources/flags/ng.png b/Mage.Client/src/main/resources/flags/ng.png new file mode 100644 index 00000000000..3eea2e02075 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ng.png differ diff --git a/Mage.Client/src/main/resources/flags/ni.png b/Mage.Client/src/main/resources/flags/ni.png new file mode 100644 index 00000000000..3969aaaaee4 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ni.png differ diff --git a/Mage.Client/src/main/resources/flags/nl.png b/Mage.Client/src/main/resources/flags/nl.png new file mode 100644 index 00000000000..fe44791e32b Binary files /dev/null and b/Mage.Client/src/main/resources/flags/nl.png differ diff --git a/Mage.Client/src/main/resources/flags/no.png b/Mage.Client/src/main/resources/flags/no.png new file mode 100644 index 00000000000..160b6b5b79d Binary files /dev/null and b/Mage.Client/src/main/resources/flags/no.png differ diff --git a/Mage.Client/src/main/resources/flags/np.png b/Mage.Client/src/main/resources/flags/np.png new file mode 100644 index 00000000000..aeb058b7ea8 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/np.png differ diff --git a/Mage.Client/src/main/resources/flags/nr.png b/Mage.Client/src/main/resources/flags/nr.png new file mode 100644 index 00000000000..705fc337ccd Binary files /dev/null and b/Mage.Client/src/main/resources/flags/nr.png differ diff --git a/Mage.Client/src/main/resources/flags/nu.png b/Mage.Client/src/main/resources/flags/nu.png new file mode 100644 index 00000000000..c3ce4aedda9 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/nu.png differ diff --git a/Mage.Client/src/main/resources/flags/nz.png b/Mage.Client/src/main/resources/flags/nz.png new file mode 100644 index 00000000000..10d6306d174 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/nz.png differ diff --git a/Mage.Client/src/main/resources/flags/om.png b/Mage.Client/src/main/resources/flags/om.png new file mode 100644 index 00000000000..2ffba7e8c43 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/om.png differ diff --git a/Mage.Client/src/main/resources/flags/pa.png b/Mage.Client/src/main/resources/flags/pa.png new file mode 100644 index 00000000000..9b2ee9a7809 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/pa.png differ diff --git a/Mage.Client/src/main/resources/flags/pe.png b/Mage.Client/src/main/resources/flags/pe.png new file mode 100644 index 00000000000..62a04977fb2 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/pe.png differ diff --git a/Mage.Client/src/main/resources/flags/pf.png b/Mage.Client/src/main/resources/flags/pf.png new file mode 100644 index 00000000000..771a0f65225 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/pf.png differ diff --git a/Mage.Client/src/main/resources/flags/pg.png b/Mage.Client/src/main/resources/flags/pg.png new file mode 100644 index 00000000000..10d6233496c Binary files /dev/null and b/Mage.Client/src/main/resources/flags/pg.png differ diff --git a/Mage.Client/src/main/resources/flags/ph.png b/Mage.Client/src/main/resources/flags/ph.png new file mode 100644 index 00000000000..b89e15935d9 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ph.png differ diff --git a/Mage.Client/src/main/resources/flags/pk.png b/Mage.Client/src/main/resources/flags/pk.png new file mode 100644 index 00000000000..e9df70ca4d6 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/pk.png differ diff --git a/Mage.Client/src/main/resources/flags/pl.png b/Mage.Client/src/main/resources/flags/pl.png new file mode 100644 index 00000000000..d413d010b5b Binary files /dev/null and b/Mage.Client/src/main/resources/flags/pl.png differ diff --git a/Mage.Client/src/main/resources/flags/pm.png b/Mage.Client/src/main/resources/flags/pm.png new file mode 100644 index 00000000000..ba91d2c7a0d Binary files /dev/null and b/Mage.Client/src/main/resources/flags/pm.png differ diff --git a/Mage.Client/src/main/resources/flags/pn.png b/Mage.Client/src/main/resources/flags/pn.png new file mode 100644 index 00000000000..aa9344f575b Binary files /dev/null and b/Mage.Client/src/main/resources/flags/pn.png differ diff --git a/Mage.Client/src/main/resources/flags/pr.png b/Mage.Client/src/main/resources/flags/pr.png new file mode 100644 index 00000000000..82d9130da45 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/pr.png differ diff --git a/Mage.Client/src/main/resources/flags/ps.png b/Mage.Client/src/main/resources/flags/ps.png new file mode 100644 index 00000000000..f5f547762ed Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ps.png differ diff --git a/Mage.Client/src/main/resources/flags/pt.png b/Mage.Client/src/main/resources/flags/pt.png new file mode 100644 index 00000000000..ece79801506 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/pt.png differ diff --git a/Mage.Client/src/main/resources/flags/pw.png b/Mage.Client/src/main/resources/flags/pw.png new file mode 100644 index 00000000000..6178b254a5d Binary files /dev/null and b/Mage.Client/src/main/resources/flags/pw.png differ diff --git a/Mage.Client/src/main/resources/flags/py.png b/Mage.Client/src/main/resources/flags/py.png new file mode 100644 index 00000000000..cb8723c0640 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/py.png differ diff --git a/Mage.Client/src/main/resources/flags/qa.png b/Mage.Client/src/main/resources/flags/qa.png new file mode 100644 index 00000000000..ed4c621fa71 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/qa.png differ diff --git a/Mage.Client/src/main/resources/flags/re.png b/Mage.Client/src/main/resources/flags/re.png new file mode 100644 index 00000000000..8332c4ec23c Binary files /dev/null and b/Mage.Client/src/main/resources/flags/re.png differ diff --git a/Mage.Client/src/main/resources/flags/ro.png b/Mage.Client/src/main/resources/flags/ro.png new file mode 100644 index 00000000000..57e74a6510d Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ro.png differ diff --git a/Mage.Client/src/main/resources/flags/rs.png b/Mage.Client/src/main/resources/flags/rs.png new file mode 100644 index 00000000000..9439a5b605d Binary files /dev/null and b/Mage.Client/src/main/resources/flags/rs.png differ diff --git a/Mage.Client/src/main/resources/flags/ru.png b/Mage.Client/src/main/resources/flags/ru.png new file mode 100644 index 00000000000..47da4214fd9 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ru.png differ diff --git a/Mage.Client/src/main/resources/flags/rw.png b/Mage.Client/src/main/resources/flags/rw.png new file mode 100644 index 00000000000..535649178a8 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/rw.png differ diff --git a/Mage.Client/src/main/resources/flags/sa.png b/Mage.Client/src/main/resources/flags/sa.png new file mode 100644 index 00000000000..b4641c7e8b0 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/sa.png differ diff --git a/Mage.Client/src/main/resources/flags/sb.png b/Mage.Client/src/main/resources/flags/sb.png new file mode 100644 index 00000000000..a9937ccf091 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/sb.png differ diff --git a/Mage.Client/src/main/resources/flags/sc.png b/Mage.Client/src/main/resources/flags/sc.png new file mode 100644 index 00000000000..39ee37184e0 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/sc.png differ diff --git a/Mage.Client/src/main/resources/flags/scotland.png b/Mage.Client/src/main/resources/flags/scotland.png new file mode 100644 index 00000000000..a0e57b4122a Binary files /dev/null and b/Mage.Client/src/main/resources/flags/scotland.png differ diff --git a/Mage.Client/src/main/resources/flags/sd.png b/Mage.Client/src/main/resources/flags/sd.png new file mode 100644 index 00000000000..eaab69eb787 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/sd.png differ diff --git a/Mage.Client/src/main/resources/flags/se.png b/Mage.Client/src/main/resources/flags/se.png new file mode 100644 index 00000000000..1994653dac1 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/se.png differ diff --git a/Mage.Client/src/main/resources/flags/sg.png b/Mage.Client/src/main/resources/flags/sg.png new file mode 100644 index 00000000000..dd34d612107 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/sg.png differ diff --git a/Mage.Client/src/main/resources/flags/sh.png b/Mage.Client/src/main/resources/flags/sh.png new file mode 100644 index 00000000000..4b1d2a29107 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/sh.png differ diff --git a/Mage.Client/src/main/resources/flags/si.png b/Mage.Client/src/main/resources/flags/si.png new file mode 100644 index 00000000000..bb1476ff5fe Binary files /dev/null and b/Mage.Client/src/main/resources/flags/si.png differ diff --git a/Mage.Client/src/main/resources/flags/sj.png b/Mage.Client/src/main/resources/flags/sj.png new file mode 100644 index 00000000000..160b6b5b79d Binary files /dev/null and b/Mage.Client/src/main/resources/flags/sj.png differ diff --git a/Mage.Client/src/main/resources/flags/sk.png b/Mage.Client/src/main/resources/flags/sk.png new file mode 100644 index 00000000000..7ccbc8274ad Binary files /dev/null and b/Mage.Client/src/main/resources/flags/sk.png differ diff --git a/Mage.Client/src/main/resources/flags/sl.png b/Mage.Client/src/main/resources/flags/sl.png new file mode 100644 index 00000000000..12d812d29fa Binary files /dev/null and b/Mage.Client/src/main/resources/flags/sl.png differ diff --git a/Mage.Client/src/main/resources/flags/sm.png b/Mage.Client/src/main/resources/flags/sm.png new file mode 100644 index 00000000000..3df2fdcf8c0 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/sm.png differ diff --git a/Mage.Client/src/main/resources/flags/sn.png b/Mage.Client/src/main/resources/flags/sn.png new file mode 100644 index 00000000000..eabb71db4e8 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/sn.png differ diff --git a/Mage.Client/src/main/resources/flags/so.png b/Mage.Client/src/main/resources/flags/so.png new file mode 100644 index 00000000000..4a1ea4b29b3 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/so.png differ diff --git a/Mage.Client/src/main/resources/flags/sr.png b/Mage.Client/src/main/resources/flags/sr.png new file mode 100644 index 00000000000..5eff9271d28 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/sr.png differ diff --git a/Mage.Client/src/main/resources/flags/st.png b/Mage.Client/src/main/resources/flags/st.png new file mode 100644 index 00000000000..2978557b19d Binary files /dev/null and b/Mage.Client/src/main/resources/flags/st.png differ diff --git a/Mage.Client/src/main/resources/flags/sv.png b/Mage.Client/src/main/resources/flags/sv.png new file mode 100644 index 00000000000..24987990b73 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/sv.png differ diff --git a/Mage.Client/src/main/resources/flags/sy.png b/Mage.Client/src/main/resources/flags/sy.png new file mode 100644 index 00000000000..f5ce30dcb79 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/sy.png differ diff --git a/Mage.Client/src/main/resources/flags/sz.png b/Mage.Client/src/main/resources/flags/sz.png new file mode 100644 index 00000000000..914ee861d41 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/sz.png differ diff --git a/Mage.Client/src/main/resources/flags/tc.png b/Mage.Client/src/main/resources/flags/tc.png new file mode 100644 index 00000000000..8fc1156bec3 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/tc.png differ diff --git a/Mage.Client/src/main/resources/flags/td.png b/Mage.Client/src/main/resources/flags/td.png new file mode 100644 index 00000000000..667f21fd9d5 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/td.png differ diff --git a/Mage.Client/src/main/resources/flags/tf.png b/Mage.Client/src/main/resources/flags/tf.png new file mode 100644 index 00000000000..80529a43619 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/tf.png differ diff --git a/Mage.Client/src/main/resources/flags/tg.png b/Mage.Client/src/main/resources/flags/tg.png new file mode 100644 index 00000000000..3aa00ad4dfa Binary files /dev/null and b/Mage.Client/src/main/resources/flags/tg.png differ diff --git a/Mage.Client/src/main/resources/flags/th.png b/Mage.Client/src/main/resources/flags/th.png new file mode 100644 index 00000000000..dd8ba91719b Binary files /dev/null and b/Mage.Client/src/main/resources/flags/th.png differ diff --git a/Mage.Client/src/main/resources/flags/tj.png b/Mage.Client/src/main/resources/flags/tj.png new file mode 100644 index 00000000000..617bf6455f6 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/tj.png differ diff --git a/Mage.Client/src/main/resources/flags/tk.png b/Mage.Client/src/main/resources/flags/tk.png new file mode 100644 index 00000000000..67b8c8cb519 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/tk.png differ diff --git a/Mage.Client/src/main/resources/flags/tl.png b/Mage.Client/src/main/resources/flags/tl.png new file mode 100644 index 00000000000..77da181e9c5 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/tl.png differ diff --git a/Mage.Client/src/main/resources/flags/tm.png b/Mage.Client/src/main/resources/flags/tm.png new file mode 100644 index 00000000000..828020ecd0f Binary files /dev/null and b/Mage.Client/src/main/resources/flags/tm.png differ diff --git a/Mage.Client/src/main/resources/flags/tn.png b/Mage.Client/src/main/resources/flags/tn.png new file mode 100644 index 00000000000..183cdd3dc98 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/tn.png differ diff --git a/Mage.Client/src/main/resources/flags/to.png b/Mage.Client/src/main/resources/flags/to.png new file mode 100644 index 00000000000..f89b8ba755f Binary files /dev/null and b/Mage.Client/src/main/resources/flags/to.png differ diff --git a/Mage.Client/src/main/resources/flags/tr.png b/Mage.Client/src/main/resources/flags/tr.png new file mode 100644 index 00000000000..be32f77e991 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/tr.png differ diff --git a/Mage.Client/src/main/resources/flags/tt.png b/Mage.Client/src/main/resources/flags/tt.png new file mode 100644 index 00000000000..2a11c1e20ac Binary files /dev/null and b/Mage.Client/src/main/resources/flags/tt.png differ diff --git a/Mage.Client/src/main/resources/flags/tv.png b/Mage.Client/src/main/resources/flags/tv.png new file mode 100644 index 00000000000..28274c5fb40 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/tv.png differ diff --git a/Mage.Client/src/main/resources/flags/tw.png b/Mage.Client/src/main/resources/flags/tw.png new file mode 100644 index 00000000000..f31c654c99c Binary files /dev/null and b/Mage.Client/src/main/resources/flags/tw.png differ diff --git a/Mage.Client/src/main/resources/flags/tz.png b/Mage.Client/src/main/resources/flags/tz.png new file mode 100644 index 00000000000..c00ff796142 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/tz.png differ diff --git a/Mage.Client/src/main/resources/flags/ua.png b/Mage.Client/src/main/resources/flags/ua.png new file mode 100644 index 00000000000..09563a21941 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ua.png differ diff --git a/Mage.Client/src/main/resources/flags/ug.png b/Mage.Client/src/main/resources/flags/ug.png new file mode 100644 index 00000000000..33f4affadee Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ug.png differ diff --git a/Mage.Client/src/main/resources/flags/um.png b/Mage.Client/src/main/resources/flags/um.png new file mode 100644 index 00000000000..c1dd9654b07 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/um.png differ diff --git a/Mage.Client/src/main/resources/flags/us.png b/Mage.Client/src/main/resources/flags/us.png new file mode 100644 index 00000000000..10f451fe85c Binary files /dev/null and b/Mage.Client/src/main/resources/flags/us.png differ diff --git a/Mage.Client/src/main/resources/flags/uy.png b/Mage.Client/src/main/resources/flags/uy.png new file mode 100644 index 00000000000..31d948a067f Binary files /dev/null and b/Mage.Client/src/main/resources/flags/uy.png differ diff --git a/Mage.Client/src/main/resources/flags/uz.png b/Mage.Client/src/main/resources/flags/uz.png new file mode 100644 index 00000000000..fef5dc1709d Binary files /dev/null and b/Mage.Client/src/main/resources/flags/uz.png differ diff --git a/Mage.Client/src/main/resources/flags/va.png b/Mage.Client/src/main/resources/flags/va.png new file mode 100644 index 00000000000..b31eaf225d6 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/va.png differ diff --git a/Mage.Client/src/main/resources/flags/vc.png b/Mage.Client/src/main/resources/flags/vc.png new file mode 100644 index 00000000000..8fa17b0612b Binary files /dev/null and b/Mage.Client/src/main/resources/flags/vc.png differ diff --git a/Mage.Client/src/main/resources/flags/ve.png b/Mage.Client/src/main/resources/flags/ve.png new file mode 100644 index 00000000000..00c90f9aff0 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ve.png differ diff --git a/Mage.Client/src/main/resources/flags/vg.png b/Mage.Client/src/main/resources/flags/vg.png new file mode 100644 index 00000000000..41569079865 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/vg.png differ diff --git a/Mage.Client/src/main/resources/flags/vi.png b/Mage.Client/src/main/resources/flags/vi.png new file mode 100644 index 00000000000..ed26915a323 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/vi.png differ diff --git a/Mage.Client/src/main/resources/flags/vn.png b/Mage.Client/src/main/resources/flags/vn.png new file mode 100644 index 00000000000..ec7cd48a346 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/vn.png differ diff --git a/Mage.Client/src/main/resources/flags/vu.png b/Mage.Client/src/main/resources/flags/vu.png new file mode 100644 index 00000000000..b3397bc63d7 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/vu.png differ diff --git a/Mage.Client/src/main/resources/flags/wales.png b/Mage.Client/src/main/resources/flags/wales.png new file mode 100644 index 00000000000..e0d7cee1107 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/wales.png differ diff --git a/Mage.Client/src/main/resources/flags/wf.png b/Mage.Client/src/main/resources/flags/wf.png new file mode 100644 index 00000000000..9f9558734f0 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/wf.png differ diff --git a/Mage.Client/src/main/resources/flags/world.png b/Mage.Client/src/main/resources/flags/world.png new file mode 100644 index 00000000000..bb27b2c1cc7 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/world.png differ diff --git a/Mage.Client/src/main/resources/flags/ws.png b/Mage.Client/src/main/resources/flags/ws.png new file mode 100644 index 00000000000..c16950802ea Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ws.png differ diff --git a/Mage.Client/src/main/resources/flags/ye.png b/Mage.Client/src/main/resources/flags/ye.png new file mode 100644 index 00000000000..468dfad0386 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/ye.png differ diff --git a/Mage.Client/src/main/resources/flags/yt.png b/Mage.Client/src/main/resources/flags/yt.png new file mode 100644 index 00000000000..c298f378bee Binary files /dev/null and b/Mage.Client/src/main/resources/flags/yt.png differ diff --git a/Mage.Client/src/main/resources/flags/za.png b/Mage.Client/src/main/resources/flags/za.png new file mode 100644 index 00000000000..57c58e2119f Binary files /dev/null and b/Mage.Client/src/main/resources/flags/za.png differ diff --git a/Mage.Client/src/main/resources/flags/zm.png b/Mage.Client/src/main/resources/flags/zm.png new file mode 100644 index 00000000000..c25b07beef8 Binary files /dev/null and b/Mage.Client/src/main/resources/flags/zm.png differ diff --git a/Mage.Client/src/main/resources/flags/zw.png b/Mage.Client/src/main/resources/flags/zw.png new file mode 100644 index 00000000000..53c97259b9b Binary files /dev/null and b/Mage.Client/src/main/resources/flags/zw.png differ diff --git a/Mage.Common/src/mage/remote/Connection.java b/Mage.Common/src/mage/remote/Connection.java index 1ce44b0ef77..21e51faf794 100644 --- a/Mage.Common/src/mage/remote/Connection.java +++ b/Mage.Common/src/mage/remote/Connection.java @@ -58,6 +58,7 @@ public class Connection { private boolean showAbilityPickerForced; private boolean allowRequestShowHandCards; private boolean confirmEmptyManaPool; + private String flagName; private UserSkipPrioritySteps userSkipPrioritySteps; private static final String serialization = "?serializationtype=jboss"; @@ -269,4 +270,12 @@ public class Connection { this.forceDBComparison = forceDBComparison; } + public String getFlagName() { + return flagName; + } + + public void setFlagName(String flagName) { + this.flagName = flagName; + } + } diff --git a/Mage.Common/src/mage/remote/SessionImpl.java b/Mage.Common/src/mage/remote/SessionImpl.java index 702857db496..2bcc00dfb39 100644 --- a/Mage.Common/src/mage/remote/SessionImpl.java +++ b/Mage.Common/src/mage/remote/SessionImpl.java @@ -279,7 +279,8 @@ public class SessionImpl implements Session { connection.isShowAbilityPickerForced(), connection.allowRequestShowHandCards(), connection.confirmEmptyManaPool(), - connection.getUserSkipPrioritySteps()); + connection.getUserSkipPrioritySteps(), + connection.getFlagName()); // for backward compatibility. don't remove twice call - first one does nothing but for version checking registerResult = server.registerClient(connection.getUsername(), sessionId, client.getVersion()); if (registerResult) { @@ -1396,10 +1397,10 @@ public class SessionImpl implements Session { } @Override - public boolean updatePreferencesForServer(int avatarId, boolean showAbilityPickerForced, boolean allowRequestShowHandCards, boolean confirmEmptyManaPool, UserSkipPrioritySteps userSkipPrioritySteps) { + public boolean updatePreferencesForServer(int avatarId, boolean showAbilityPickerForced, boolean allowRequestShowHandCards, boolean confirmEmptyManaPool, UserSkipPrioritySteps userSkipPrioritySteps, String flagName) { try { if (isConnected()) { - UserDataView userDataView = new UserDataView(avatarId, showAbilityPickerForced, allowRequestShowHandCards, confirmEmptyManaPool, userSkipPrioritySteps); + UserDataView userDataView = new UserDataView(avatarId, showAbilityPickerForced, allowRequestShowHandCards, confirmEmptyManaPool, userSkipPrioritySteps, flagName); server.setUserData(connection.getUsername(), sessionId, userDataView); } return true; diff --git a/Mage.Common/src/mage/remote/interfaces/ClientData.java b/Mage.Common/src/mage/remote/interfaces/ClientData.java index 64242130e99..2a9fe56b384 100644 --- a/Mage.Common/src/mage/remote/interfaces/ClientData.java +++ b/Mage.Common/src/mage/remote/interfaces/ClientData.java @@ -36,5 +36,5 @@ public interface ClientData { String getUserName(); - boolean updatePreferencesForServer(int avatarId, boolean showAbilityPickerForced, boolean allowRequestShowHandCards, boolean confirmEmptyManaPool, UserSkipPrioritySteps userSkipPrioritySteps); + boolean updatePreferencesForServer(int avatarId, boolean showAbilityPickerForced, boolean allowRequestShowHandCards, boolean confirmEmptyManaPool, UserSkipPrioritySteps userSkipPrioritySteps, String flagName); } diff --git a/Mage.Common/src/mage/view/PlayerView.java b/Mage.Common/src/mage/view/PlayerView.java index 5ed57121f84..3e9eb437d81 100644 --- a/Mage.Common/src/mage/view/PlayerView.java +++ b/Mage.Common/src/mage/view/PlayerView.java @@ -115,7 +115,7 @@ public class PlayerView implements Serializable { if (player.getUserData() != null) { this.userDataView = new UserDataView(player.getUserData()); } else { - this.userDataView = new UserDataView(0, false, false, true, null); + this.userDataView = new UserDataView(0, false, false, true, null,"world.png"); } for (CommandObject commandObject : game.getState().getCommand()) { diff --git a/Mage.Common/src/mage/view/UserDataView.java b/Mage.Common/src/mage/view/UserDataView.java index d1e17f3884c..9bf65b6f2e7 100644 --- a/Mage.Common/src/mage/view/UserDataView.java +++ b/Mage.Common/src/mage/view/UserDataView.java @@ -17,14 +17,16 @@ public class UserDataView implements Serializable { protected boolean allowRequestShowHandCards; protected boolean confirmEmptyManaPool; protected UserSkipPrioritySteps userSkipPrioritySteps; + String flagName; public UserDataView(int avatarId, boolean showAbilityPickerForced, boolean allowRequestShowHandCards, - boolean confirmEmptyManaPool, UserSkipPrioritySteps userSkipPrioritySteps) { + boolean confirmEmptyManaPool, UserSkipPrioritySteps userSkipPrioritySteps, String flagName) { this.avatarId = avatarId; this.showAbilityPickerForced = showAbilityPickerForced; this.allowRequestShowHandCards = allowRequestShowHandCards; this.userSkipPrioritySteps = userSkipPrioritySteps; this.confirmEmptyManaPool = confirmEmptyManaPool; + this.flagName = flagName; } public UserDataView(UserData userData) { @@ -34,6 +36,7 @@ public class UserDataView implements Serializable { this.showAbilityPickerForced = userData.isShowAbilityPickerForced(); this.userSkipPrioritySteps = userData.getUserSkipPrioritySteps(); this.confirmEmptyManaPool = userData.confirmEmptyManaPool(); + this.flagName = userData.getFlagName(); } public int getAvatarId() { @@ -55,5 +58,9 @@ public class UserDataView implements Serializable { public boolean confirmEmptyManaPool() { return confirmEmptyManaPool; } + + public String getFlagName() { + return flagName; + } } diff --git a/Mage.Common/src/mage/view/UsersView.java b/Mage.Common/src/mage/view/UsersView.java index 1a7a28ec978..c5e8522bec4 100644 --- a/Mage.Common/src/mage/view/UsersView.java +++ b/Mage.Common/src/mage/view/UsersView.java @@ -37,18 +37,24 @@ public class UsersView implements Serializable { private static final long serialVersionUID = 1L; + private final String flagName; private final String userName; private final String infoState; private final String infoGames; private final String infoPing; - public UsersView(String userName, String infoState, String infoGames, String infoPing) { + public UsersView(String flagName, String userName, String infoState, String infoGames, String infoPing) { + this.flagName = flagName; this.userName = userName; this.infoState = infoState; this.infoGames = infoGames; this.infoPing = infoPing; } + public String getFlagName() { + return flagName; + } + public String getUserName() { return userName; } diff --git a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java index 6e7e2e41228..e10917f2746 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.AI/src/main/java/mage/player/ai/ComputerPlayer.java @@ -175,7 +175,7 @@ public class ComputerPlayer extends PlayerImpl implements Player { public ComputerPlayer(String name, RangeOfInfluence range) { super(name, range); human = false; - userData = new UserData(UserGroup.COMPUTER, 64, false, true, false, null); + userData = new UserData(UserGroup.COMPUTER, 64, false, true, false, null, "Computer.png"); pickedCards = new ArrayList<>(); } diff --git a/Mage.Server/src/main/java/mage/server/Session.java b/Mage.Server/src/main/java/mage/server/Session.java index 73701d39fa4..2560f43da87 100644 --- a/Mage.Server/src/main/java/mage/server/Session.java +++ b/Mage.Server/src/main/java/mage/server/Session.java @@ -142,7 +142,7 @@ public class Session { if (user == null) { user = UserManager.getInstance().findUser("Admin"); } - user.setUserData(new UserData(UserGroup.ADMIN, 0, false, false, false, null)); + user.setUserData(new UserData(UserGroup.ADMIN, 0, false, false, false, null, "world.png")); if (!UserManager.getInstance().connectToSession(sessionId, user.getId())) { logger.info("Error connecting Admin!"); } @@ -156,7 +156,8 @@ public class Session { if (userData == null) { userData = new UserData(UserGroup.PLAYER, userDataView.getAvatarId(), userDataView.isShowAbilityPickerForced(), userDataView.allowRequestShowHandCards(), - userDataView.confirmEmptyManaPool(), userDataView.getUserSkipPrioritySteps()); + userDataView.confirmEmptyManaPool(), userDataView.getUserSkipPrioritySteps(), + userDataView.getFlagName()); user.setUserData(userData); } else { if (userDataView.getAvatarId() == 51) { // Update special avatar if first avatar is selected diff --git a/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java b/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java index 5ce4d40e853..55c92050658 100644 --- a/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java +++ b/Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java @@ -120,10 +120,10 @@ public class GamesRoomImpl extends RoomImpl implements GamesRoom, Serializable { List users = new ArrayList<>(); for (User user : UserManager.getInstance().getUsers()) { try { - users.add(new UsersView(user.getName(), user.getInfo(), user.getGameInfo(), user.getPingInfo())); + users.add(new UsersView(user.getUserData().getFlagName(), user.getName(), user.getInfo(), user.getGameInfo(), user.getPingInfo())); } catch (Exception ex) { logger.fatal("User update exception: " + user.getName() + " - " + ex.toString(), ex); - users.add(new UsersView(user.getName(), user.getInfo(), "[exception]", user.getPingInfo())); + users.add(new UsersView(user.getUserData().getFlagName(), user.getName(), user.getInfo(), "[exception]", user.getPingInfo())); } } diff --git a/Mage/src/mage/players/net/UserData.java b/Mage/src/mage/players/net/UserData.java index 71090e3e18c..72823bd53ea 100644 --- a/Mage/src/mage/players/net/UserData.java +++ b/Mage/src/mage/players/net/UserData.java @@ -15,15 +15,18 @@ public class UserData implements Serializable { protected boolean allowRequestShowHandCards; protected boolean confirmEmptyManaPool; protected UserSkipPrioritySteps userSkipPrioritySteps; + protected String flagName; public UserData(UserGroup userGroup, int avatarId, boolean showAbilityPickerForced, - boolean allowRequestShowHandCards, boolean confirmEmptyManaPool, UserSkipPrioritySteps userSkipPrioritySteps) { + boolean allowRequestShowHandCards, boolean confirmEmptyManaPool, UserSkipPrioritySteps userSkipPrioritySteps, + String flagName) { this.groupId = userGroup.getGroupId(); this.avatarId = avatarId; this.showAbilityPickerForced = showAbilityPickerForced; this.allowRequestShowHandCards = allowRequestShowHandCards; this.userSkipPrioritySteps = userSkipPrioritySteps; this.confirmEmptyManaPool = confirmEmptyManaPool; + this.flagName = flagName; } public void setGroupId(int groupId) { @@ -77,5 +80,9 @@ public class UserData implements Serializable { public void setConfirmEmptyManaPool(boolean confirmEmptyManaPool) { this.confirmEmptyManaPool = confirmEmptyManaPool; } + + public String getFlagName() { + return flagName; + } }