External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-22 19:41:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Now client can start embedded Mage Server (player's feature request).

Browse source 
Works only for "localhost". Still can be used with external server but in such case server should be started first.
This commit is contained in:
magenoxx 2011-12-23 13:14:32 +04:00
parent 810d33c8ba
commit a7a496af0e
23 changed files with 118 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -61,12 +61,13 @@ import mage.client.util.SettingsManager;
import mage.client.util.gui.ArrowBuilder;
import mage.components.ImagePanel;
import mage.game.match.MatchOptions;
import mage.interfaces.MageClient;
import mage.interfaces.*;
import mage.interfaces.callback.CallbackClient;
import mage.interfaces.callback.ClientCallback;
import mage.remote.Connection;
import mage.remote.Connection.ProxyType;
import mage.remote.Session;
import mage.server.Main;
import mage.sets.Sets;
import mage.utils.MageVersion;
import mage.view.TableView;
@ -180,6 +181,12 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
this.setExtendedState(JFrame.MAXIMIZED_BOTH);
session = new Session(this);
session.setEmbeddedMageServerAction(new mage.interfaces.Action() {
@Override
public void execute() {
Main.main(new String[] {});
}
});
callbackClient = new CallbackClientImpl(this);
connectDialog = new ConnectDialog();
desktopPane.add(connectDialog, JLayeredPane.POPUP_LAYER);