Merge branch 'Mick'

* Mick:
  Restructured Util for better usability Moved MainGame from util to client. Moved server port static from serverData to Data

core/src/netwerkprog/game/client/Client.java

@@ -1,7 +1,8 @@
 package netwerkprog.game.client;
 
-import netwerkprog.game.util.Controller;
+import netwerkprog.game.util.application.Controller;
-import netwerkprog.game.util.ServerData;
+import netwerkprog.game.util.data.Data;
+import netwerkprog.game.util.data.DataParser;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -13,13 +14,20 @@ import java.util.Scanner;
 public class Client extends Controller {
     private int port;
     private String hostname;
+    private DataParser parser;
     private boolean isConnected = true;
 
 
 
     public Client(String hostname) {
-        this.port = ServerData.port();
+        this.port = Data.port();
         this.hostname = hostname;
+        this.parser = new DataParser();
+    }
+
+    @Override
+    public void run() {
+        this.connect();
     }
 
     public void connect() {
@@ -66,15 +74,12 @@ public class Client extends Controller {
         while (isConnected) {
             try {
                 received = in.readUTF();
-                System.out.println(received);
+
             } catch (IOException e) {
                 System.out.println("exception caught - " + e.getMessage());;
             }
         }
     }
 
-    @Override
+
-    public void run() {
-        this.connect();
-    }
 }

core/src/netwerkprog/game/client/MainGame.java

@@ -1,4 +1,4 @@
-package netwerkprog.game;
+package netwerkprog.game.client;
 
 import com.badlogic.gdx.ApplicationAdapter;
 import com.badlogic.gdx.Files;
@@ -7,8 +7,7 @@ import com.badlogic.gdx.audio.Music;
 import com.badlogic.gdx.graphics.GL20;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import netwerkprog.game.client.Client;
+import netwerkprog.game.util.graphics.FrameRate;
-import netwerkprog.game.util.FrameRate;
 
 public class MainGame extends ApplicationAdapter {
     SpriteBatch batch;

core/src/netwerkprog/game/client/game/Game.java

@@ -1,6 +1,6 @@
 package netwerkprog.game.client.game;
 
-import netwerkprog.game.util.Controller;
+import netwerkprog.game.util.application.Controller;
 
 public class Game extends Controller {
 

core/src/netwerkprog/game/client/game/Graphics.java

@@ -1,6 +1,6 @@
 package netwerkprog.game.client.game;
 
-import netwerkprog.game.util.Controller;
+import netwerkprog.game.util.application.Controller;
 
 public class Graphics extends Controller {
     public Graphics() {

core/src/netwerkprog/game/client/game/logic/Logic.java

@@ -1,6 +1,6 @@
 package netwerkprog.game.client.game.logic;
 
-import netwerkprog.game.util.Controller;
+import netwerkprog.game.util.application.Controller;
 
 public class Logic extends Controller {
 

core/src/netwerkprog/game/client/game/map/MapRenderer.java

@@ -2,7 +2,7 @@ package netwerkprog.game.client.game.map;
 
 import com.badlogic.gdx.graphics.g2d.Batch;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
-import netwerkprog.game.util.Renderable;
+import netwerkprog.game.util.graphics.Renderable;
 
 public class MapRenderer implements Renderable {
     private int tileWidth;

core/src/netwerkprog/game/server/ServerClient.java

@@ -1,7 +1,7 @@
 package netwerkprog.game.server;
 
 import netwerkprog.game.server.controllers.SessionController;
-import netwerkprog.game.server.data.Data;
+import netwerkprog.game.util.data.Data;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

core/src/netwerkprog/game/server/controllers/SessionController.java

@@ -1,10 +1,9 @@
 package netwerkprog.game.server.controllers;
 
 import netwerkprog.game.server.ServerClient;
-import netwerkprog.game.server.data.Data;
+import netwerkprog.game.util.data.Data;
-import netwerkprog.game.server.data.DataParser;
+import netwerkprog.game.util.data.DataParser;
-import netwerkprog.game.util.Controller;
+import netwerkprog.game.util.application.Controller;
-import netwerkprog.game.util.ServerData;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -46,8 +45,8 @@ public class SessionController extends Controller {
      */
     public void listen() {
         try {
-            this.serverSocket = new ServerSocket(ServerData.port());
+            this.serverSocket = new ServerSocket(Data.port());
-            System.out.println("[SERVER] listening on port " + ServerData.port());
+            System.out.println("[SERVER] listening on port " + Data.port());
             registerClient(serverSocket.accept());
             this.serverSocket.close();
         } catch (IOException ex) {

core/src/netwerkprog/game/server/data/Data.java

@@ -1,4 +0,0 @@
-package netwerkprog.game.server.data;
-
-public class Data {
-}

core/src/netwerkprog/game/server/data/Event.java

@@ -1,4 +0,0 @@
-package netwerkprog.game.server.data;
-
-public class Event {
-}

core/src/netwerkprog/game/util/Faction.java

@@ -1,4 +0,0 @@
-package netwerkprog.game.util;
-
-public enum Faction {
-}

core/src/netwerkprog/game/util/Renderable.java

@@ -1,5 +0,0 @@
-package netwerkprog.game.util;
-
-public interface Renderable extends Updatable {
-    void render();
-}

core/src/netwerkprog/game/util/application/Controller.java

@@ -1,4 +1,4 @@
-package netwerkprog.game.util;
+package netwerkprog.game.util.application;
 
 public abstract class Controller implements Runnable {
 

core/src/netwerkprog/game/util/application/GameApplicationConfiguration.java

@@ -1,4 +1,4 @@
-package netwerkprog.game.util;
+package netwerkprog.game.util.application;
 
 import com.badlogic.gdx.backends.lwjgl.LwjglApplicationConfiguration;
 

core/src/netwerkprog/game/util/application/Timer.java

@@ -1,4 +1,4 @@
-package netwerkprog.game.util;
+package netwerkprog.game.util.application;
 
 public class Timer implements Updatable {
     private double wait;

core/src/netwerkprog/game/util/application/Updatable.java

@@ -1,4 +1,4 @@
-package netwerkprog.game.util;
+package netwerkprog.game.util.application;
 
 public interface Updatable {
     void update(double deltaTime);

core/src/netwerkprog/game/util/data/Callback.java

@@ -1,4 +1,4 @@
-package netwerkprog.game.util;
+package netwerkprog.game.util.data;
 
 public interface Callback {
     void onDataReceived();

core/src/netwerkprog/game/util/data/Data.java

@@ -1,7 +1,6 @@
-package netwerkprog.game.util;
+package netwerkprog.game.util.data;
-
-public class ServerData {
 
+public class Data {
     public static int port() {
         return 8000;
     }

core/src/netwerkprog/game/util/data/DataParser.java

@@ -1,4 +1,4 @@
-package netwerkprog.game.server.data;
+package netwerkprog.game.util.data;
 
 public class DataParser {
     public DataParser() {

core/src/netwerkprog/game/util/data/Event.java

@@ -0,0 +1,4 @@
+package netwerkprog.game.util.data;
+
+public class Event {
+}

core/src/netwerkprog/game/util/game/Ability.java

@@ -1,4 +1,4 @@
-package netwerkprog.game.util;
+package netwerkprog.game.util.game;
 
 public abstract class Ability {
     protected String name;

core/src/netwerkprog/game/util/game/Character.java

@@ -1,4 +1,4 @@
-package netwerkprog.game.util;
+package netwerkprog.game.util.game;
 
 import java.util.Arrays;
 import java.util.HashSet;

core/src/netwerkprog/game/util/game/Faction.java

@@ -0,0 +1,4 @@
+package netwerkprog.game.util.game;
+
+public enum Faction {
+}

core/src/netwerkprog/game/util/graphics/FrameRate.java

@@ -1,4 +1,4 @@
-package netwerkprog.game.util;
+package netwerkprog.game.util.graphics;
 
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.graphics.OrthographicCamera;

core/src/netwerkprog/game/util/graphics/Renderable.java

@@ -0,0 +1,7 @@
+package netwerkprog.game.util.graphics;
+
+import netwerkprog.game.util.application.Updatable;
+
+public interface Renderable extends Updatable {
+    void render();
+}

desktop/src/netwerkprog/game/desktop/DesktopLauncher.java

@@ -1,8 +1,8 @@
 package netwerkprog.game.desktop;
 
 import com.badlogic.gdx.backends.lwjgl.LwjglApplication;
-import netwerkprog.game.MainGame;
+import netwerkprog.game.client.MainGame;
-import netwerkprog.game.util.GameApplicationConfiguration;
+import netwerkprog.game.util.application.GameApplicationConfiguration;
 
 public class DesktopLauncher {
 	public static void main (String[] arg) {