Merge remote-tracking branch 'origin/master'

# Conflicts:
#	core/src/netwerkprog/game/client/MainGame.java

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

@@ -24,9 +24,8 @@ import netwerkprog.game.client.game.map.GameTile;
 import netwerkprog.game.client.game.map.Map;
 import netwerkprog.game.client.game.map.MapRenderer;
 import netwerkprog.game.util.data.Data;
-import netwerkprog.game.util.data.NameData;
-import netwerkprog.game.util.data.ReadyData;
-import netwerkprog.game.util.data.TeamData;
+import netwerkprog.game.util.data.connection.NameData;
+import netwerkprog.game.util.data.connection.TeamData;
 import netwerkprog.game.util.game.Faction;
 import netwerkprog.game.util.game.GameCharacter;
 import netwerkprog.game.util.graphics.FrameRate;

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

@@ -1,7 +1,7 @@
 package netwerkprog.game.client.game.connections;
 
 import netwerkprog.game.util.application.Controller;
-import netwerkprog.game.util.data.ConnectionData;
+import netwerkprog.game.util.data.connection.ConnectionData;
 import netwerkprog.game.util.data.Data;
 
 import java.io.IOException;

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

@@ -10,8 +10,8 @@ import com.badlogic.gdx.utils.TimeUtils;
 import netwerkprog.game.client.MainGame;
 import netwerkprog.game.client.game.GAMESTATE;
 import netwerkprog.game.util.data.Data;
-import netwerkprog.game.util.data.ReadyData;
-import netwerkprog.game.util.data.TeamData;
+import netwerkprog.game.util.data.connection.ReadyData;
+import netwerkprog.game.util.data.connection.TeamData;
 import netwerkprog.game.util.game.Faction;
 import netwerkprog.game.util.game.GameCharacter;
 

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

@@ -1,6 +1,6 @@
 package netwerkprog.game.server;
 
-import netwerkprog.game.util.data.ConnectionData;
+import netwerkprog.game.util.data.connection.ConnectionData;
 import netwerkprog.game.util.data.Data;
 
 import java.io.IOException;

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

@@ -1,7 +1,9 @@
 package netwerkprog.game.server;
 
 import netwerkprog.game.util.application.Controller;
-import netwerkprog.game.util.data.*;
+import netwerkprog.game.util.data.Data;
+import netwerkprog.game.util.data.connection.ConnectionData;
+import netwerkprog.game.util.data.connection.NameData;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;

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

@@ -1,15 +0,0 @@
-package netwerkprog.game.util.data;
-
-import netwerkprog.game.util.game.GameCharacter;
-
-public class CharacterData extends Data {
-    private final String name;
-    private final GameCharacter character;
-
-    public CharacterData(String name, GameCharacter character) {
-        super("Character");
-        super.setPayload(this);
-        this.name = name;
-        this.character = character;
-    }
-}

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

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

core/src/netwerkprog/game/util/data/character/DamageData.java

@@ -0,0 +1,13 @@
+package netwerkprog.game.util.data.character;
+
+import netwerkprog.game.util.data.Data;
+
+public class DamageData extends Data {
+    private final String name;
+
+    public DamageData(String name) {
+        super("Damage");
+        super.setPayload(this);
+        this.name = name;
+    }
+}

core/src/netwerkprog/game/util/data/character/MoveData.java

@@ -0,0 +1,29 @@
+package netwerkprog.game.util.data.character;
+
+import netwerkprog.game.util.data.Data;
+
+public class MoveData extends Data {
+    private final String name;
+    private final int x;
+    private final int y;
+
+    public MoveData(String name, int x, int y) {
+        super("Move");
+        super.setPayload(this);
+        this.name = name;
+        this.x = x;
+        this.y = y;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getX() {
+        return x;
+    }
+
+    public int getY() {
+        return y;
+    }
+}

core/src/netwerkprog/game/util/data/connection/ConnectionData.java

@@ -1,4 +1,6 @@
-package netwerkprog.game.util.data;
+package netwerkprog.game.util.data.connection;
+
+import netwerkprog.game.util.data.Data;
 
 import java.io.Serializable;
 

core/src/netwerkprog/game/util/data/connection/NameData.java

@@ -1,4 +1,6 @@
-package netwerkprog.game.util.data;
+package netwerkprog.game.util.data.connection;
+
+import netwerkprog.game.util.data.Data;
 
 public class NameData extends Data {
     private String name;

core/src/netwerkprog/game/util/data/connection/ReadyData.java

@@ -1,4 +1,6 @@
-package netwerkprog.game.util.data;
+package netwerkprog.game.util.data.connection;
+
+import netwerkprog.game.util.data.Data;
 
 public class ReadyData extends Data {
     private String username;

core/src/netwerkprog/game/util/data/connection/TeamData.java

@@ -1,5 +1,6 @@
-package netwerkprog.game.util.data;
+package netwerkprog.game.util.data.connection;
 
+import netwerkprog.game.util.data.Data;
 import netwerkprog.game.util.game.Faction;
 
 public class TeamData extends Data {