This commit is contained in:
2022-01-12 12:51:22 +01:00
parent ec77b05b0d
commit 2375a5ed83
35 changed files with 102 additions and 128 deletions

View File

@@ -3,6 +3,8 @@ plugins {
}
dependencies {
implementation(project(":wizard-common"))
implementation(JLine.id)
implementation(Jansi.id)
implementation(JavaWebSocket.id)

View File

@@ -3,12 +3,8 @@ package eu.jonahbauer.wizard.client.cli.commands;
import eu.jonahbauer.wizard.client.cli.Client;
import eu.jonahbauer.wizard.client.cli.ClientSocket;
import eu.jonahbauer.wizard.client.cli.state.AwaitingConnection;
import eu.jonahbauer.wizard.client.cli.state.Lobby;
import eu.jonahbauer.wizard.common.messages.server.SessionListMessage;
import java.net.URI;
import java.util.List;
import java.util.concurrent.CompletableFuture;
import static picocli.CommandLine.*;

View File

@@ -17,7 +17,7 @@ public final class AwaitingJoinLobby extends Awaiting {
@Override
public Optional<ClientState> onMessage(Client client, ServerMessage message) {
if (message instanceof SessionListMessage list) {
return Optional.of(new Lobby(list));
return Optional.of(new Lobby(list.getSessions()));
} else {
return super.onMessage(client, message);
}

View File

@@ -12,8 +12,8 @@ public final class Lobby extends BaseState {
@Getter
private final Map<UUID, SessionData> sessions = new HashMap<>();
public Lobby(SessionListMessage list) {
list.getSessions().forEach(session -> sessions.put(session.getUuid(), session));
public Lobby(Collection<SessionData> sessions) {
sessions.forEach(session -> this.sessions.put(session.getUuid(), session));
}
@Override