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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	core/src/netwerkprog/game/server/controllers/SessionController.java
This commit is contained in:
Sem van der Hoeven
2020-06-07 14:26:12 +02:00
parent ddaf07df49 51558d1d4d
commit 2aeec735d4
3 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/netwerkprog/game/server/Server.java
View File

@@ -13,7 +13,7 @@ public class Server {
public void start() { public void start() {
this.sessionController = new SessionController(this); this.sessionController = new SessionController(this);
this.dataController = new DataController(); this.dataController = new DataController(sessionController);
this.gameThreads = new HashMap<>(); this.gameThreads = new HashMap<>();
this.sessionThread = new Thread(sessionController); this.sessionThread = new Thread(sessionController);

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

@@ -1,23 +1,23 @@
package netwerkprog.game.server.controllers; package netwerkprog.game.server.controllers;
import netwerkprog.game.util.data.CharacterData; import netwerkprog.game.util.data.*;
import netwerkprog.game.util.data.Data;
import netwerkprog.game.util.data.DataCallback;
import netwerkprog.game.util.data.DataSource;
import netwerkprog.game.util.game.GameCharacter; import netwerkprog.game.util.game.GameCharacter;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
public class DataController implements DataCallback { public class DataController implements DataCallback {
private final DataChangeCallback callback;
private final HashSet<GameCharacter> gameCharacters; private final HashSet<GameCharacter> gameCharacters;
public DataController() { public DataController(DataChangeCallback callback) {
this.callback = callback;
gameCharacters = new HashSet<>(); gameCharacters = new HashSet<>();
} }
public void addCharacter(GameCharacter gameCharacter) { public void addCharacter(GameCharacter gameCharacter) {
this.gameCharacters.add(gameCharacter); this.gameCharacters.add(gameCharacter);
callback.onDataChange(new CharacterData(gameCharacter.getName(), gameCharacter));
} }
public void addAllCharacters(GameCharacter... gameCharacters) { public void addAllCharacters(GameCharacter... gameCharacters) {
@@ -26,10 +26,12 @@ public class DataController implements DataCallback {
public void removeCharacter(String name) { public void removeCharacter(String name) {
this.gameCharacters.removeIf(character -> character.getName().equals(name)); this.gameCharacters.removeIf(character -> character.getName().equals(name));
callback.onDataChange(new CharacterData(name, getCharacter(name))); //todo modify Character data to allow for removal.
} }
public void removeCharacter(GameCharacter character) { public void removeCharacter(GameCharacter gameCharacter) {
this.gameCharacters.remove(character); this.gameCharacters.remove(gameCharacter);
callback.onDataChange(new CharacterData(gameCharacter.getName(), gameCharacter)); //todo modify Character data to allow for removal.
} }
public void clearCharacters() { public void clearCharacters() {

5
core/src/netwerkprog/game/util/data/DataChangeCallback.java Normal file
View File

@@ -0,0 +1,5 @@
package netwerkprog.game.util.data;
public interface DataChangeCallback {
void onDataChange(Data data);
}