From 1a1d014f4269af7dc218330b9a54c25dc023579e Mon Sep 17 00:00:00 2001
From: MickWerf <mickwerf@outlook.com>
Date: Sun, 7 Jun 2020 15:03:32 +0200
Subject: [PATCH 1/2] Added package structure for Data Renamed CharacterData to
 MoveData Added DamageData.

---
 .../src/netwerkprog/game/client/MainGame.java |  4 +--
 .../game/client/game/connections/Client.java  |  2 +-
 .../client/game/map/GameInputProcessor.java   |  2 +-
 .../netwerkprog/game/server/ServerClient.java |  2 +-
 .../game/server/SessionController.java        |  1 +
 .../game/util/data/CharacterData.java         | 15 ----------
 .../src/netwerkprog/game/util/data/Event.java |  4 ---
 .../game/util/data/character/DamageData.java  | 13 +++++++++
 .../game/util/data/character/MoveData.java    | 29 +++++++++++++++++++
 .../data/{ => connection}/ConnectionData.java |  4 ++-
 .../util/data/{ => connection}/NameData.java  |  4 ++-
 .../util/data/{ => connection}/TeamData.java  |  3 +-
 12 files changed, 56 insertions(+), 27 deletions(-)
 delete mode 100644 core/src/netwerkprog/game/util/data/CharacterData.java
 delete mode 100644 core/src/netwerkprog/game/util/data/Event.java
 create mode 100644 core/src/netwerkprog/game/util/data/character/DamageData.java
 create mode 100644 core/src/netwerkprog/game/util/data/character/MoveData.java
 rename core/src/netwerkprog/game/util/data/{ => connection}/ConnectionData.java (84%)
 rename core/src/netwerkprog/game/util/data/{ => connection}/NameData.java (73%)
 rename core/src/netwerkprog/game/util/data/{ => connection}/TeamData.java (84%)

diff --git a/core/src/netwerkprog/game/client/MainGame.java b/core/src/netwerkprog/game/client/MainGame.java
index ab5e800..2fefeae 100644
--- a/core/src/netwerkprog/game/client/MainGame.java
+++ b/core/src/netwerkprog/game/client/MainGame.java
@@ -24,8 +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.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;
diff --git a/core/src/netwerkprog/game/client/game/connections/Client.java b/core/src/netwerkprog/game/client/game/connections/Client.java
index e503266..73629e1 100644
--- a/core/src/netwerkprog/game/client/game/connections/Client.java
+++ b/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;
diff --git a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
index d84cbc1..f780406 100644
--- a/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
+++ b/core/src/netwerkprog/game/client/game/map/GameInputProcessor.java
@@ -10,7 +10,7 @@ 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.TeamData;
+import netwerkprog.game.util.data.connection.TeamData;
 import netwerkprog.game.util.game.Faction;
 import netwerkprog.game.util.game.GameCharacter;
 
diff --git a/core/src/netwerkprog/game/server/ServerClient.java b/core/src/netwerkprog/game/server/ServerClient.java
index 3fe92d2..08b9814 100644
--- a/core/src/netwerkprog/game/server/ServerClient.java
+++ b/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;
diff --git a/core/src/netwerkprog/game/server/SessionController.java b/core/src/netwerkprog/game/server/SessionController.java
index f9585d1..83ecc6d 100644
--- a/core/src/netwerkprog/game/server/SessionController.java
+++ b/core/src/netwerkprog/game/server/SessionController.java
@@ -2,6 +2,7 @@ package netwerkprog.game.server;
 
 import netwerkprog.game.util.application.Controller;
 import netwerkprog.game.util.data.*;
+import netwerkprog.game.util.data.connection.ConnectionData;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
diff --git a/core/src/netwerkprog/game/util/data/CharacterData.java b/core/src/netwerkprog/game/util/data/CharacterData.java
deleted file mode 100644
index b034d63..0000000
--- a/core/src/netwerkprog/game/util/data/CharacterData.java
+++ /dev/null
@@ -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;
-    }
-}
diff --git a/core/src/netwerkprog/game/util/data/Event.java b/core/src/netwerkprog/game/util/data/Event.java
deleted file mode 100644
index 9ff7808..0000000
--- a/core/src/netwerkprog/game/util/data/Event.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package netwerkprog.game.util.data;
-
-public class Event {
-}
diff --git a/core/src/netwerkprog/game/util/data/character/DamageData.java b/core/src/netwerkprog/game/util/data/character/DamageData.java
new file mode 100644
index 0000000..211d21f
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/core/src/netwerkprog/game/util/data/character/MoveData.java b/core/src/netwerkprog/game/util/data/character/MoveData.java
new file mode 100644
index 0000000..9222796
--- /dev/null
+++ b/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;
+    }
+}
diff --git a/core/src/netwerkprog/game/util/data/ConnectionData.java b/core/src/netwerkprog/game/util/data/connection/ConnectionData.java
similarity index 84%
rename from core/src/netwerkprog/game/util/data/ConnectionData.java
rename to core/src/netwerkprog/game/util/data/connection/ConnectionData.java
index 911181f..161dafe 100644
--- a/core/src/netwerkprog/game/util/data/ConnectionData.java
+++ b/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;
 
diff --git a/core/src/netwerkprog/game/util/data/NameData.java b/core/src/netwerkprog/game/util/data/connection/NameData.java
similarity index 73%
rename from core/src/netwerkprog/game/util/data/NameData.java
rename to core/src/netwerkprog/game/util/data/connection/NameData.java
index 72f07f7..b410827 100644
--- a/core/src/netwerkprog/game/util/data/NameData.java
+++ b/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;
diff --git a/core/src/netwerkprog/game/util/data/TeamData.java b/core/src/netwerkprog/game/util/data/connection/TeamData.java
similarity index 84%
rename from core/src/netwerkprog/game/util/data/TeamData.java
rename to core/src/netwerkprog/game/util/data/connection/TeamData.java
index b5ddd50..b85e998 100644
--- a/core/src/netwerkprog/game/util/data/TeamData.java
+++ b/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 {

From 8b70287aa0e837f4923c203ec6622b678f01eaeb Mon Sep 17 00:00:00 2001
From: MickWerf <mickwerf@outlook.com>
Date: Sun, 7 Jun 2020 15:06:54 +0200
Subject: [PATCH 2/2] fixed import issue

---
 core/src/netwerkprog/game/server/SessionController.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/netwerkprog/game/server/SessionController.java b/core/src/netwerkprog/game/server/SessionController.java
index f1c4ca3..91b8732 100644
--- a/core/src/netwerkprog/game/server/SessionController.java
+++ b/core/src/netwerkprog/game/server/SessionController.java
@@ -1,8 +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;