From 749f27d448722c80f6ec59be16aa329ae03084c2 Mon Sep 17 00:00:00 2001
From: Sem van der Hoeven <semmer99@gmail.com>
Date: Sun, 7 Jun 2020 14:05:45 +0200
Subject: [PATCH] made game extend game

---
 core/src/netwerkprog/game/client/MainGame.java               | 5 +++--
 .../src/netwerkprog/game/client/game/connections/Client.java | 1 +
 .../netwerkprog/game/server/controllers/DataController.java  | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/netwerkprog/game/client/MainGame.java b/core/src/netwerkprog/game/client/MainGame.java
index b664b7d..857d9b9 100644
--- a/core/src/netwerkprog/game/client/MainGame.java
+++ b/core/src/netwerkprog/game/client/MainGame.java
@@ -2,6 +2,7 @@ package netwerkprog.game.client;
 
 import com.badlogic.gdx.ApplicationAdapter;
 import com.badlogic.gdx.Files;
+import com.badlogic.gdx.Game;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.assets.AssetManager;
 import com.badlogic.gdx.audio.Music;
@@ -32,7 +33,7 @@ import netwerkprog.game.util.graphics.TextRenderer;
 
 import java.awt.*;
 
-public class MainGame extends ApplicationAdapter implements DataCallback {
+public class MainGame extends Game implements DataCallback {
     SpriteBatch batch;
     float screenWidth;
     float screenHeight;
@@ -351,7 +352,7 @@ public class MainGame extends ApplicationAdapter implements DataCallback {
 
     @Override
     public void onDataReceived(Data data, DataSource source) {
-        System.out.println("[MAINGAME] Got data: " + data.toString());
+        System.out.println("[MAINGAME CALLBACK] Got data: " + data.toString());
         
     }
 }
diff --git a/core/src/netwerkprog/game/client/game/connections/Client.java b/core/src/netwerkprog/game/client/game/connections/Client.java
index 22153f7..a6c6b94 100644
--- a/core/src/netwerkprog/game/client/game/connections/Client.java
+++ b/core/src/netwerkprog/game/client/game/connections/Client.java
@@ -65,6 +65,7 @@ public class Client extends Controller implements DataSource {
             Arrays.stream(e.getStackTrace()).forEach(n -> sb.append("\t\t").append(n).append("\n"));
             System.out.println(sb.toString());
         }
+        System.out.println("[CLIENT CONNECT] connected");
     }
 
     public void register(ObjectInputStream in) {
diff --git a/core/src/netwerkprog/game/server/controllers/DataController.java b/core/src/netwerkprog/game/server/controllers/DataController.java
index a5ecf54..2e48320 100644
--- a/core/src/netwerkprog/game/server/controllers/DataController.java
+++ b/core/src/netwerkprog/game/server/controllers/DataController.java
@@ -52,6 +52,7 @@ public class DataController implements DataCallback {
     @Override
     public void onDataReceived(Data data, DataSource source) {
         System.out.println("[DATACONTROLLER] got data: " + data);
+        source.writeData(data);
         switch (data.getType()) {
             case "Character" :
                 if (data.getPayload() instanceof CharacterData) {