moved Session to Mage.Common

Mage.Common/src/mage/interfaces/MageClient.java

@@ -0,0 +1,48 @@
+/*
+* Copyright 2011 BetaSteward_at_googlemail.com. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without modification, are
+* permitted provided that the following conditions are met:
+*
+*    1. Redistributions of source code must retain the above copyright notice, this list of
+*       conditions and the following disclaimer.
+*
+*    2. Redistributions in binary form must reproduce the above copyright notice, this list
+*       of conditions and the following disclaimer in the documentation and/or other materials
+*       provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+* FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*
+* The views and conclusions contained in the software and documentation are those of the
+* authors and should not be interpreted as representing official policies, either expressed
+* or implied, of BetaSteward_at_googlemail.com.
+*/
+
+package mage.interfaces;
+
+import java.util.UUID;
+import mage.interfaces.callback.CallbackClient;
+import mage.utils.MageVersion;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public interface MageClient extends CallbackClient {
+
+	public UUID getId();
+	public MageVersion getVersion();
+	public void connected(String message);
+	public void disconnected();
+	public void showMessage(String message);
+	public void showError(String message);
+	
+}

Mage.Common/src/mage/remote/Connection.java

@@ -26,7 +26,11 @@
 * or implied, of BetaSteward_at_googlemail.com.
 */
 
-package mage.utils;
+package mage.remote;
+
+import java.rmi.registry.LocateRegistry;
+import java.rmi.registry.Registry;
+import mage.interfaces.Server;
 
 /**
  *
@@ -44,6 +48,39 @@ public class Connection {
 	private String proxyUsername;
 	private String proxyPassword;
 
+//	protected Server getServer() {
+//		Server server = null;
+//		try {
+//			Registry reg = LocateRegistry.getRegistry(host, port);
+//			server = (Server) reg.lookup("mage-server");
+//		}
+//		catch (Exception ignored) {}
+//		return server;
+//	}
+
+	@Override
+	public int hashCode() {
+		return (host + Integer.toString(port) + proxyType.toString()).hashCode();	
+	}
+
+	@Override
+	public boolean equals(Object object) {
+		if (! (object instanceof Connection)) {
+			return false;	
+		}
+		Connection otherConnection = (Connection) object;
+		return hashCode() == otherConnection.hashCode();
+	}
+
+	@Override
+	public String toString() {
+		return host + ":" + Integer.toString(port);
+	}
+
+	public String getURI() {
+		return "bisocket://" + host + ":" + port;
+	}
+	
 	public ProxyType getProxyType() {
 		return proxyType;
 	}

Mage.Common/src/mage/remote/MageRemoteException.java

@@ -0,0 +1,37 @@
+/*
+* 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.remote;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class MageRemoteException extends Exception {
+
+}

Mage.Common/src/mage/remote/Session.java

@@ -0,0 +1,784 @@
+/*
+* 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.remote;
+
+import java.net.Authenticator;
+import java.net.PasswordAuthentication;
+import java.rmi.NotBoundException;
+import java.rmi.RemoteException;
+import java.rmi.registry.LocateRegistry;
+import java.rmi.registry.Registry;
+import java.util.Collection;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import mage.cards.decks.DeckCardLists;
+import mage.game.GameException;
+import mage.MageException;
+import mage.constants.Constants.SessionState;
+import mage.game.match.MatchOptions;
+import mage.game.tournament.TournamentOptions;
+import mage.interfaces.MageClient;
+import mage.interfaces.Server;
+import mage.interfaces.ServerState;
+import mage.interfaces.callback.CallbackClientDaemon;
+import mage.view.DraftPickView;
+import mage.view.GameTypeView;
+import mage.view.TableView;
+import mage.view.TournamentTypeView;
+import mage.view.TournamentView;
+import org.apache.log4j.Logger;
+
+/**
+ *
+ * @author BetaSteward_at_googlemail.com
+ */
+public class Session {
+
+	private final static Logger logger = Logger.getLogger(Session.class);
+	private static ScheduledExecutorService sessionExecutor = Executors.newScheduledThreadPool(1);
+
+	private UUID sessionId;
+	private Server server;
+	private MageClient client;
+	private String userName;
+	private ServerState serverState;
+	private SessionState sessionState = SessionState.DISCONNECTED;
+	private CallbackClientDaemon callbackDaemon;
+	private ScheduledFuture<?> future;
+	private Connection connection;
+	private boolean reconnecting = false;
+	private boolean connecting = false;
+
+	/**
+	 * For locking session object.
+	 * Read-write locking is used for better performance, as in most cases session object won't be changed so
+	 * there shouldn't be any penalty for synchronization.
+	 *
+	 * @author nantuko
+	*/
+	private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
+
+	public Session(MageClient client) {
+		this.client = client;
+	}
+	
+	public synchronized boolean connect(Connection connection) {
+		this.connecting = true;
+		if (isConnected()) {
+			disconnect(true);
+		}
+		this.connection = connection;
+		return connect();
+	}
+
+	public boolean connect() {
+		try {
+			System.setSecurityManager(null);
+			System.setProperty("http.nonProxyHosts", "code.google.com");
+			System.setProperty("socksNonProxyHosts", "code.google.com");
+
+			// clear previous values
+			System.clearProperty("socksProxyHost");
+			System.clearProperty("socksProxyPort");
+			System.clearProperty("http.proxyHost");
+			System.clearProperty("http.proxyPort");
+
+			switch (connection.getProxyType()) {
+				case SOCKS:
+					System.setProperty("socksProxyHost", connection.getProxyHost());
+					System.setProperty("socksProxyPort", Integer.toString(connection.getProxyPort()));
+					break;
+				case HTTP:
+					System.setProperty("http.proxyHost", connection.getProxyHost());
+					System.setProperty("http.proxyPort", Integer.toString(connection.getProxyPort()));
+					Authenticator.setDefault(new MageAuthenticator(connection.getProxyUsername(), connection.getProxyPassword()));
+					break;
+			}
+			Registry reg = LocateRegistry.getRegistry(connection.getHost(), connection.getPort());
+			this.server = (Server) reg.lookup("mage-server");
+			this.userName = connection.getUsername();
+			sessionId = server.registerClient(userName, client.getId(), client.getVersion());
+			callbackDaemon = new CallbackClientDaemon(sessionId, client, server);
+			serverState = server.getServerState();
+			future = sessionExecutor.scheduleWithFixedDelay(new ServerPinger(), 5, 5, TimeUnit.SECONDS);
+			logger.info("Connected to RMI server at " + connection.getHost() + ":" + connection.getPort());
+			client.connected("Connected to " + connection.getHost() + ":" + connection.getPort() + " ");
+			reconnecting = false;
+			connecting = false;
+			return true;
+		} catch (MageException ex) {
+			logger.fatal("", ex);
+			if (!reconnecting) {
+				disconnect(false);
+				client.showMessage("Unable to connect to server. "  + ex.getMessage());
+			}
+		} catch (RemoteException ex) {
+			logger.fatal("Unable to connect to server - ", ex);
+			if (!reconnecting) {
+				disconnect(false);
+				client.showMessage("Unable to connect to server. "  + ex.getMessage());
+			}
+		} catch (NotBoundException ex) {
+			logger.fatal("Unable to connect to server - ", ex);
+		}
+		return false;
+	}
+	
+	public synchronized void disconnect(boolean showMessage) {
+		if (sessionState == SessionState.CONNECTED)
+			sessionState = SessionState.DISCONNECTING;
+		if (connection == null)
+			return;
+		if (sessionState == SessionState.CONNECTED) {
+			try {
+				server.deregisterClient(sessionId);
+			} catch (Exception ex) {
+					logger.fatal("Error disconnecting ...", ex);
+			}
+		}
+		client.disconnected();
+		logger.info("Disconnected ... ");
+		if (sessionState == SessionState.SERVER_UNAVAILABLE && showMessage) {
+			client.showError("Server error.  You have been disconnected");
+		}
+		else {
+			sessionState = SessionState.DISCONNECTED;
+		}
+	}
+
+	public boolean ping() {
+		try {
+			return server.ping(sessionId);
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+		
+	public boolean isConnected() {
+		return sessionState == SessionState.CONNECTED;
+	}
+
+	public String[] getPlayerTypes() {
+		return serverState.getPlayerTypes();
+	}
+
+	public List<GameTypeView> getGameTypes() {
+		return serverState.getGameTypes();
+	}
+
+	public String[] getDeckTypes() {
+		return serverState.getDeckTypes();
+	}
+
+	public List<TournamentTypeView> getTournamentTypes() {
+		return serverState.getTournamentTypes();
+	}
+
+	public boolean isTestMode() {
+		if (serverState != null)
+			return serverState.isTestMode();
+		return false;
+	}
+
+	public UUID getMainRoomId() {
+		try {
+			return server.getMainRoomId();
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return null;
+	}
+
+	public UUID getRoomChatId(UUID roomId) {
+		try {
+			return server.getRoomChatId(roomId);
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return null;
+	}
+
+	public UUID getTableChatId(UUID tableId) {
+		try {
+			return server.getTableChatId(tableId);
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return null;
+	}
+
+	public UUID getGameChatId(UUID gameId) {
+		try {
+			return server.getGameChatId(gameId);
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return null;
+	}
+
+	public TableView getTable(UUID roomId, UUID tableId) {
+		try {
+			return server.getTable(roomId, tableId);
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return null;
+	}
+
+	public boolean watchTable(UUID roomId, UUID tableId) {
+		try {
+			server.watchTable(sessionId, roomId, tableId);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean joinTable(UUID roomId, UUID tableId, String playerName, String playerType, int skill, DeckCardLists deckList) {
+		try {
+			return server.joinTable(sessionId, roomId, tableId, playerName, playerType, skill, deckList);
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (GameException ex) {
+			handleGameException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean joinTournamentTable(UUID roomId, UUID tableId, String playerName, String playerType, int skill) {
+		try {
+			return server.joinTournamentTable(sessionId, roomId, tableId, playerName, playerType, skill);
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (GameException ex) {
+			handleGameException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public Collection<TableView> getTables(UUID roomId) throws MageRemoteException {
+		lock.readLock().lock();
+		try {
+			if (server == null) return null;
+			return server.getTables(roomId);
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+			throw new MageRemoteException();
+		} catch (MageException ex) {
+			handleMageException(ex);
+			throw new MageRemoteException();
+		} finally {
+			lock.readLock().unlock();
+		}
+	}
+
+	public Collection<String> getConnectedPlayers(UUID roomId) throws MageRemoteException {
+		lock.readLock().lock();
+		try {
+			return server.getConnectedPlayers(roomId);
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+			throw new MageRemoteException();
+		} catch (MageException ex) {
+			handleMageException(ex);
+			throw new MageRemoteException();
+		} finally {
+			lock.readLock().unlock();
+		}
+	}
+
+	public TournamentView getTournament(UUID tournamentId) throws MageRemoteException {
+		try {
+			return server.getTournament(tournamentId);
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+			throw new MageRemoteException();
+		} catch (MageException ex) {
+			handleMageException(ex);
+			throw new MageRemoteException();
+		}
+	}
+
+	public UUID getTournamentChatId(UUID tournamentId) {
+		try {
+			return server.getTournamentChatId(tournamentId);
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return null;
+	}
+
+	public boolean sendPlayerUUID(UUID gameId, UUID data) {
+		try {
+			server.sendPlayerUUID(gameId, sessionId, data);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean sendPlayerBoolean(UUID gameId, boolean data) {
+		try {
+			server.sendPlayerBoolean(gameId, sessionId, data);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean sendPlayerInteger(UUID gameId, int data) {
+		try {
+			server.sendPlayerInteger(gameId, sessionId, data);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean sendPlayerString(UUID gameId, String data) {
+		try {
+			server.sendPlayerString(gameId, sessionId, data);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public DraftPickView sendCardPick(UUID draftId, UUID cardId) {
+		try {
+			return server.sendCardPick(draftId, sessionId, cardId);
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return null;
+	}
+
+	public boolean joinChat(UUID chatId) {
+		try {
+			server.joinChat(chatId, sessionId, userName);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean leaveChat(UUID chatId) {
+		lock.readLock().lock();
+		try {
+			if (server == null) return false;
+			server.leaveChat(chatId, sessionId);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		} finally {
+			lock.readLock().unlock();
+		}
+		return false;
+	}
+
+	public boolean sendChatMessage(UUID chatId, String message) {
+		lock.readLock().lock();
+		try {
+			if (server == null) return false;
+			server.sendChatMessage(chatId, userName, message);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		} finally {
+			lock.readLock().unlock();
+		}
+		return false;
+	}
+
+	public boolean joinGame(UUID gameId) {
+		try {
+			server.joinGame(gameId, sessionId);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean joinDraft(UUID draftId) {
+		try {
+			server.joinDraft(draftId, sessionId);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean joinTournament(UUID tournamentId) {
+		try {
+			server.joinTournament(tournamentId, sessionId);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean watchGame(UUID gameId) {
+		try {
+			server.watchGame(gameId, sessionId);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean replayGame(UUID gameId) {
+		try {
+			server.replayGame(gameId, sessionId);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public TableView createTable(UUID roomId, MatchOptions matchOptions) {
+		try {
+			return server.createTable(sessionId, roomId, matchOptions);
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return null;
+	}
+
+	public TableView createTournamentTable(UUID roomId, TournamentOptions tournamentOptions) {
+		try {
+			return server.createTournamentTable(sessionId, roomId, tournamentOptions);
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return null;
+	}
+
+	public boolean isTableOwner(UUID roomId, UUID tableId) {
+		try {
+			return server.isTableOwner(sessionId, roomId, tableId);
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean removeTable(UUID roomId, UUID tableId) {
+		try {
+			server.removeTable(sessionId, roomId, tableId);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean swapSeats(UUID roomId, UUID tableId, int seatNum1, int seatNum2) {
+		try {
+			server.swapSeats(sessionId, roomId, tableId, seatNum1, seatNum2);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean leaveTable(UUID roomId, UUID tableId) {
+		try {
+			server.leaveTable(sessionId, roomId, tableId);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean startGame(UUID roomId, UUID tableId) {
+		try {
+			server.startMatch(sessionId, roomId, tableId);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean startTournament(UUID roomId, UUID tableId) {
+		try {
+			server.startTournament(sessionId, roomId, tableId);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean startChallenge(UUID roomId, UUID tableId, UUID challengeId) {
+		try {
+			server.startChallenge(sessionId, roomId, tableId, challengeId);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean submitDeck(UUID tableId, DeckCardLists deck) {
+		try {
+			return server.submitDeck(sessionId, tableId, deck);
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (GameException ex) {
+			handleGameException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean concedeGame(UUID gameId) {
+		try {
+			server.concedeGame(gameId, sessionId);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean stopWatching(UUID gameId) {
+		try {
+			server.stopWatching(gameId, sessionId);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean startReplay(UUID gameId) {
+		try {
+			server.startReplay(gameId, sessionId);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean stopReplay(UUID gameId) {
+		try {
+			server.stopReplay(gameId, sessionId);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean nextPlay(UUID gameId) {
+		try {
+			server.nextPlay(gameId, sessionId);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean previousPlay(UUID gameId) {
+		try {
+			server.previousPlay(gameId, sessionId);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	public boolean cheat(UUID gameId, UUID playerId, DeckCardLists deckList) {
+		try {
+			server.cheat(gameId, sessionId, playerId, deckList);
+			return true;
+		} catch (RemoteException ex) {
+			handleRemoteException(ex);
+		} catch (MageException ex) {
+			handleMageException(ex);
+		}
+		return false;
+	}
+
+	private void handleRemoteException(RemoteException ex) {
+		logger.fatal("Communication error", ex);
+		disconnect(false);
+	}
+
+	private void handleMageException(MageException ex) {
+		logger.fatal("Server error", ex);
+		disconnect(false);
+	}
+
+	private void handleGameException(GameException ex) {
+		logger.warn(ex.getMessage());
+		client.showError(ex.getMessage());
+	}
+
+
+	public String getUserName() {
+		return userName;
+	}
+
+	class ServerPinger implements Runnable {
+
+		private int missed = 0;
+		
+		@Override
+		public void run() {
+			if (!ping()) {
+				missed++;
+				if (missed > 10) {
+					logger.info("Connection to server timed out");
+					disconnect(true);
+				}
+			}
+			else {
+				missed = 0;
+			}
+		}
+
+	}
+}
+
+class MageAuthenticator extends Authenticator {
+
+	private String username;
+	private String password;
+
+	public MageAuthenticator(String username, String password) {
+		this.username = username;
+		this.password = password;
+	}
+
+	@Override
+	public PasswordAuthentication getPasswordAuthentication () {
+		return new PasswordAuthentication (username, password.toCharArray());
+	}
+}