Version 1.0: Fixing launcher

mumblers · Aug 9, 2015 · f5921b9 · f5921b9
1 parent 0a92458
commit f5921b9
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 110 deletions.
diff --git a/client/src/mumblers/tracers/client/Client.java b/client/src/mumblers/tracers/client/Client.java
@@ -86,9 +86,10 @@ public void render(Graphics2D g, Dimension size) {
         trackSprite.render(g, 0, 0, size.width, size.height);
 
         g.setColor(Color.WHITE);
-        g.drawString("y:" + myPlayer.getY(), 0, 24);
-        g.drawString("x:" + myPlayer.getX(), 0, 36);
-        g.drawString("v:" + myPlayer.getVelocity(), 0, 48);
+        g.drawString("y: " + myPlayer.getY(), 0, 24);
+        g.drawString("x: " + myPlayer.getX(), 0, 36);
+        g.drawString("v: " + myPlayer.getVelocity(), 0, 48);
+        g.drawString("ip:" + connection.getServerIp(), 0, 60);
     }
 
     public List<Player> getPlayers() {

diff --git a/client/src/mumblers/tracers/client/Display.java b/client/src/mumblers/tracers/client/Display.java
@@ -189,7 +189,6 @@ public void render() {
     private void resizeFrame(Dimension size) {
         this.width = size.width;
         this.height = size.height;
-        System.out.println("NEW FRAME SIZE::" + size);
     }
 
     public void setRenderer(DisplayRenderer renderer) {

diff --git a/client/src/mumblers/tracers/client/Launcher.java b/client/src/mumblers/tracers/client/Launcher.java
@@ -1,26 +1,25 @@
 package mumblers.tracers.client;
 
+import mumblers.tracers.common.Constants;
+import mumblers.tracers.server.Server;
+
 import javax.swing.*;
-import java.awt.BorderLayout;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.io.IOException;
 
 /**
  * Created by Sinius on 16-7-2015.
  */
 public class Launcher {
 
-    private static ActionListener hostBtnAction = new ActionListener() {
-        @Override
-        public void actionPerformed(ActionEvent e) {
-
-        }
-    };
+    private JTextField ipField;
+    JFrame frame;
 
-    public static void main(String[] args) {
-        JFrame frame = new JFrame("TRacers Launcher");
-        frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+    public Launcher(){
+        frame = new JFrame("TRacers | " + Constants.VERSION);
+        frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
         frame.setVisible(true);
         frame.setSize(new Dimension(250, 300));
         frame.setResizable(false);
@@ -29,28 +28,69 @@ public static void main(String[] args) {
         panel.add(new JLabel("Welcome to TRacers"));
         panel.add(Box.createHorizontalStrut(300));
         JButton hostBtn = new JButton("Host and Play");
+        ActionListener hostBtnAction = new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        try {
+                            Server server = new Server();
+                            server.startServer();
+                        } catch (IOException e1) {
+                            e1.printStackTrace();
+                            JOptionPane.showMessageDialog(null, "Something Went Wrong:" + e1.getMessage());
+                            System.exit(0);
+                        }
+                        new Client("localhost");
+                    }
+                }).start();
+                frame.dispose();
+            }
+        };
         hostBtn.addActionListener(hostBtnAction);
         panel.add(hostBtn);
 
         panel.add(Box.createHorizontalStrut(300));
 
         JButton connectBtn = new JButton("Connect to");
-        connectBtn.addActionListener(hostBtnAction);
+        ActionListener connectToAction = new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                String ip = ipField.getText();
+                if (ip.isEmpty())
+                    return;
+                new Thread(new Runnable() {
+                    @Override
+                    public void run() {
+                        new Client(ipField.getText());
+                    }
+                }).start();
+                frame.dispose();
+            }
+        };
+        connectBtn.addActionListener(connectToAction);
         panel.add(connectBtn);
-//
-        new JTextField(20);
-//        panel.add(ipField);
-
-        frame.setContentPane(panel);
 
+        ipField = new JTextField(20);
+        panel.add(ipField);
 
+        frame.setContentPane(panel);
+        frame.revalidate();
+    }
 
-//
-//        String ip = JOptionPane.showInputDialog("IP", "localhost");
-//        if(ip == null) {
-//            System.exit(0);
-//        }
+    public static void main(String[] args) {
+        try {
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+        } catch(Throwable e) {
+            e.printStackTrace();
+        }
 
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run() {
+                new Launcher();
+            }
+        });
     }
 
 }
diff --git a/client/src/mumblers/tracers/client/LauncherGui.form b/client/src/mumblers/tracers/client/LauncherGui.form
diff --git a/client/src/mumblers/tracers/client/LauncherGui.java b/client/src/mumblers/tracers/client/LauncherGui.java
diff --git a/client/src/mumblers/tracers/client/ServerConnection.java b/client/src/mumblers/tracers/client/ServerConnection.java
@@ -7,19 +7,31 @@
 import mumblers.tracers.common.network.Packet;
 import mumblers.tracers.common.network.PacketId;
 
+import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.net.Socket;
+import java.net.URL;
 
 /**
  * Created by Sinius15 on 14-7-2015.
  */
 public class ServerConnection extends Connection {
 
-    Client client;
+    private String serverIp = "unknown";
+    private Client client;
 
     public ServerConnection(Client client, String ip) throws IOException {
         super(new Socket(ip, Constants.SERVER_PORT));
         this.client = client;
+        if(ip.equals("localhost") || ip.equals("127.0.0.1")){
+            URL whatismyip = new URL("http://checkip.amazonaws.com");
+            BufferedReader in = new BufferedReader(new InputStreamReader(whatismyip.openStream()));
+            serverIp = in.readLine();
+        }else{
+            serverIp = ip;
+        }
+
     }
 
     @Override
@@ -68,4 +80,8 @@ public void sendPlayerConnectMessage() {
         Player player = client.getTrackingPlayer();
         send(new Packet(PacketId.PLAYER_CONNECT, player.getName()));
     }
+
+    public String getServerIp() {
+        return serverIp;
+    }
 }
diff --git a/common/src/mumblers/tracers/common/Constants.java b/common/src/mumblers/tracers/common/Constants.java
@@ -6,7 +6,7 @@
  */
 public class Constants {
 
-    public static final String VERSION = "0.01";
+    public static final String VERSION = "1.00";
     public static final int SERVER_PORT = 1862;
 
 }