sem/netwerk-programming-eindopdracht
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'master' of https://github.com/SemvdH/netwerk-programming-eindopdracht

Browse Source
This commit is contained in:
MickWerf
2020-06-07 14:13:08 +02:00
parent 60d478bb1e 749f27d448
commit 51558d1d4d
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/netwerkprog/game/client/MainGame.java
View File

@@ -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());
}
}

1
core/src/netwerkprog/game/client/game/connections/Client.java
View File

@@ -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) {

1
core/src/netwerkprog/game/server/controllers/DataController.java
View File

@@ -54,6 +54,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) {