seb/NightTrainToBudapest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/SerainaSpiellogik' into SerainaSpiellogik

Browse Source
This commit is contained in:
Alexander Sazonov 2022-04-09 23:36:01 +02:00
commit 1db4042bc7
4 changed files with 86 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
View File

@ -77,28 +77,48 @@ public class Client {
* Tells user to enter a position to vote for passenger at that position
*/
public void voteGetter(String msg) {
public void voteGetter(final String msg) {
/*TODO(Jonas): find a way to integrate this with userInput listener, so we can still send the
* position to the server. This way doesnt work, after a game is finished it thinks you still
* want to vote when entering /c msg
*/
new Thread(new Runnable() {
@Override
public void run() {
int msgIndex = msg.indexOf('$');
String position = msg.substring(0, msgIndex);;
msg = msg.substring(msgIndex + 1);
Scanner userInput = new Scanner(System.in);
//TODO(Seraina): implement
System.out.println(msg);
System.out.println("Please enter your vote");
int vote;
String input = "";
String position = msg.substring(0, msgIndex);
String justMsg = msg.substring(msgIndex + 1);
BufferedReader bfr = new BufferedReader(new InputStreamReader(System.in));
while (socket.isConnected() && !socket.isClosed()) {
try {
input = userInput.nextLine();
vote = Integer.parseInt(input);
if (bfr.ready()) {
System.out.println(justMsg);
System.out.println("Please enter your vote");
String msgInput = bfr.readLine();
int vote;
try {
vote = Integer.parseInt(msgInput);
LOGGER.info("input is: " + vote);
} catch (Exception e) {
LOGGER.warn(e.getMessage());
System.out.println("Invalid vote");
input = String.valueOf(Integer.MAX_VALUE);
msgInput = String.valueOf(Integer.MAX_VALUE);
}
sendMsgToServer(Protocol.votedFor + "$" + position + "$" + input);
LOGGER.debug("msg to server is: " + Protocol.votedFor + "$" + position + "$" + input);
sendMsgToServer(Protocol.votedFor + "$" + position + "$" + msgInput);
LOGGER.debug(
"msg to server is: " + Protocol.votedFor + "$" + position + "$" + msgInput);
Thread.sleep(5);
}
//LOGGER.debug("just checked next line");
} catch (IOException | InterruptedException e) {
e.printStackTrace();
}
}
}
}).start();
}
/**

2
src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/helpers/Protocol.java
View File

@ -98,7 +98,7 @@ public class Protocol {
public static final String startANewGame = "STGAM";
/**
* Client informs server that they have voted and delivers this vote in the form of "CVOTE$position"
* Client informs server that they have voted and delivers this vote in the form of "CVOTE$position$vote"
*/
public static final String votedFor = "CVOTE";

41
src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/ClientHandler.java
View File

@ -1,6 +1,9 @@
package ch.unibas.dmi.dbis.cs108.multiplayer.server;
import ch.unibas.dmi.dbis.cs108.BudaLogConfig;
import ch.unibas.dmi.dbis.cs108.gamelogic.Game;
import ch.unibas.dmi.dbis.cs108.gamelogic.TrainOverflow;
import ch.unibas.dmi.dbis.cs108.gamelogic.VoteHandler;
import ch.unibas.dmi.dbis.cs108.multiplayer.helpers.Protocol;
import ch.unibas.dmi.dbis.cs108.multiplayer.helpers.ServerPinger;
import java.io.*;
@ -182,6 +185,44 @@ public class ClientHandler implements Runnable {
}
}
/**
* Takes a msg of the form position$vote and extracts vote and position from it and saves it
* in VoteHandler.getClientVoteData
* @param msg the messaged to decode
*/
public void decodeVote(String msg){
int msgIndex = msg.indexOf('$');
int vote = Integer.MAX_VALUE;
int position = 0;
LOGGER.debug("Message is " + msg);
try {
position = Integer.parseInt(msg.substring(0,msgIndex));
vote = Integer.parseInt(msg.substring(msgIndex + 1));
LOGGER.debug("Vote is:" + vote);
} catch (Exception e) {
LOGGER.warn("Invalid vote " + e.getMessage());
}
LOGGER.debug("Vote is:" + vote);
if(vote != Integer.MAX_VALUE) { //gets MAX_VALUE when the vote wasn't valid
VoteHandler.getClientVoteData().setVote(position,vote);
LOGGER.debug("Player vote: " + vote);
VoteHandler.getClientVoteData().setHasVoted(position,true);
}
}
/**
* Initializes a new Game instance and starts its run method in a new thread
*/
public void startNewGame() {
try {
Game game = new Game(this,6,1, ClientHandler.getConnectedClients().size());
Thread t = new Thread(game);
t.start();
} catch (TrainOverflow e) {
LOGGER.warn(e.getMessage());
}
}
/**
* Removes & disconnects the client. To be used if a severe connection loss is detected (i.e. if trying to
* send / receive a message throws an exception, not just if ping-pong detects a connection loss).

29
src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/JServerProtocolParser.java
View File

@ -78,34 +78,11 @@ public class JServerProtocolParser {
case Protocol.votedFor:
LOGGER.debug("Made it here");
msg = msg.substring(6);
int msgIndex = msg.indexOf('$');
int vote = Integer.MAX_VALUE;
int position = 0;
LOGGER.debug("Message is " + msg);
try {
position = Integer.parseInt(msg.substring(0,msgIndex));
vote = Integer.parseInt(msg.substring(msgIndex + 1));
LOGGER.debug("Vote is:" + vote);
} catch (Exception e) {
LOGGER.warn("Invalid vote " + e.getMessage());
}
LOGGER.debug("Vote is:" + vote);
if(vote != Integer.MAX_VALUE) { //gets MAX_VALUE when the vote wasn't valid
VoteHandler.getClientVoteData().setVote(position,vote);
LOGGER.debug("Player vote: " + vote);
VoteHandler.getClientVoteData().setHasVoted(position,true);
}
h.decodeVote(msg);
break;
case Protocol.startANewGame:
try {
Game game = new Game(h,6,1, ClientHandler.getConnectedClients().size());
Thread t = new Thread(game);
t.start();
} catch (TrainOverflow e) {
LOGGER.warn(e.getMessage());
}
h.startNewGame();
break;
default:
System.out.println("Received unknown command");
}