diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java index a05bb25..4cd9e6e 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java @@ -5,6 +5,7 @@ import ch.unibas.dmi.dbis.cs108.multiplayer.helpers.ClientPinger; import ch.unibas.dmi.dbis.cs108.multiplayer.helpers.Protocol; +import ch.unibas.dmi.dbis.cs108.sebaschi.CentralClientData; import java.net.Socket; import java.io.*; import java.net.UnknownHostException; @@ -23,6 +24,8 @@ public class Client { private BufferedWriter out; public ClientPinger clientPinger; + private CentralClientData data; + public Client(Socket socket) { try { this.socket = socket; @@ -177,6 +180,10 @@ public class Client { } + public CentralClientData getData(){ + return this.data; + } + public Socket getSocket() { return socket; } diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/JClientProtocolParser.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/JClientProtocolParser.java index bb3a7ab..3d02c69 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/JClientProtocolParser.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/JClientProtocolParser.java @@ -50,6 +50,7 @@ public class JClientProtocolParser { System.out.println("Human received Vote request"); //TODO(Seraina): How can be enforced, that clients won't vote otherwise? Trigger a methode here that listens to input break; + case Protocol.serverDeliversLobbyList: default: System.out.println("Received unknown command"); } diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/Protocol.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/Protocol.java index a064745..c9ff718 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/Protocol.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/Protocol.java @@ -100,5 +100,10 @@ public class Protocol { */ public static final String serverRequestsHumanVote = "HVOTR"; + /** + * todo: doch + */ + public static final String serverDeliversLobbyList = "LLIST"; + } diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/Protocol.txt b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/Protocol.txt index b050d31..ca740cc 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/Protocol.txt +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/Protocol.txt @@ -29,6 +29,8 @@ Implemented: * SPING Ping from server to client * PINGB Pingback from client to server. * QUITC Confirms to the client that they are being disconnected from the server. + * LLIST$LobbyIDAndAdmin + Response to LISTL. Parameter is a string. Future / planned: * MSGRS "Message received": Paramaters: a string detailing to the client that and what the server received as command. diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/sebaschi/CentralClientData.java b/src/main/java/ch/unibas/dmi/dbis/cs108/sebaschi/CentralClientData.java new file mode 100644 index 0000000..c275ac3 --- /dev/null +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/sebaschi/CentralClientData.java @@ -0,0 +1,10 @@ +package ch.unibas.dmi.dbis.cs108.sebaschi; + +/** + * Each Clients copy of data. In principle it is CentralServerData. + * The Client must update himself. + */ +public class CentralClientData extends CentralServerData{ + + +}