stef_buwalda/pism
1
0
Fork 0
mirror of https://github.com/2OOP/pism.git synced 2026-02-04 02:44:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bas de Jong
2025-10-06 22:27:27 +02:00
parent 95c4a2fc8e ce02fc2b88
commit 501b411e34
1 changed files with 67 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
app/src/main/java/org/toop/app/layer/layers/ConnectedLayer.java
View File

@@ -1,69 +1,89 @@
package org.toop.app.layer.layers; package org.toop.app.layer.layers;
import org.toop.app.GameInformation; import org.toop.app.layer.Container;
import org.toop.app.layer.Layer; import org.toop.app.layer.Layer;
import org.toop.app.layer.NodeBuilder;
import org.toop.app.layer.containers.VerticalContainer;
import org.toop.framework.eventbus.EventFlow; import org.toop.framework.eventbus.EventFlow;
import org.toop.framework.networking.events.NetworkEvents; import org.toop.framework.networking.events.NetworkEvents;
import javafx.geometry.Pos;
import javafx.scene.control.Label;
import javafx.scene.control.ListView;
import java.util.List;
import java.util.Timer; import java.util.Timer;
import java.util.TimerTask; import java.util.TimerTask;
import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArrayList;
import java.util.List;
public final class ConnectedLayer extends Layer { public final class ConnectedLayer extends Layer {
long clientId; long clientId;
String user; String user;
List<String> onlinePlayers = new CopyOnWriteArrayList<>(); List<String> onlinePlayers = new CopyOnWriteArrayList<>();
public ConnectedLayer(long clientId, String user) { public ConnectedLayer(long clientId, String user) {
super("primary-bg"); super("bg-primary");
this.clientId = clientId; this.clientId = clientId;
this.user = user; this.user = user;
reload(); reload();
new EventFlow().addPostEvent(new NetworkEvents.SendLogin(this.clientId, this.user)).postEvent(); new EventFlow().addPostEvent(new NetworkEvents.SendLogin(this.clientId, this.user)).postEvent();
new EventFlow().listen(this::handleReceivedChallenge); new EventFlow().listen(this::handleReceivedChallenge);
new Thread(this::populatePlayerList).start(); new Thread(this::populatePlayerList).start();
} }
private void populatePlayerList() { private void populatePlayerList() {
EventFlow sendGetPlayerList = new EventFlow().addPostEvent(new NetworkEvents.SendGetPlayerlist(this.clientId)); EventFlow sendGetPlayerList = new EventFlow().addPostEvent(new NetworkEvents.SendGetPlayerlist(this.clientId));
new EventFlow().listen(NetworkEvents.PlayerlistResponse.class, e -> { new EventFlow().listen(NetworkEvents.PlayerlistResponse.class, e -> {
if (e.clientId() == this.clientId) { if (e.clientId() == this.clientId) {
List<String> playerList = new java.util.ArrayList<>(List.of(e.playerlist())); // TODO: Garbage, but works List<String> playerList = new java.util.ArrayList<>(List.of(e.playerlist())); // TODO: Garbage, but works
playerList.removeIf(name -> name.equalsIgnoreCase(user)); playerList.removeIf(name -> name.equalsIgnoreCase(user));
if (this.onlinePlayers != playerList) { if (this.onlinePlayers != playerList) {
this.onlinePlayers.clear(); this.onlinePlayers.clear();
this.onlinePlayers.addAll(playerList); this.onlinePlayers.addAll(playerList);
} }
} }
}); });
TimerTask task = new TimerTask() { TimerTask task = new TimerTask() {
public void run() { public void run() {
sendGetPlayerList.postEvent(); sendGetPlayerList.postEvent();
} }
}; };
Timer pollTimer = new Timer(); Timer pollTimer = new Timer();
pollTimer.schedule(task, 0L, 5000L); pollTimer.schedule(task, 0L, 5000L);
} }
private void sendChallenge(String oppUsername, String gameType) { private void sendChallenge(String oppUsername, String gameType) {
if (onlinePlayers.contains(oppUsername)) { if (onlinePlayers.contains(oppUsername)) {
new EventFlow().addPostEvent(new NetworkEvents.SendChallenge(this.clientId, oppUsername, gameType)) new EventFlow().addPostEvent(new NetworkEvents.SendChallenge(this.clientId, oppUsername, gameType))
.postEvent(); .postEvent();
} }
} }
private void handleReceivedChallenge(NetworkEvents.ChallengeResponse response) { private void handleReceivedChallenge(NetworkEvents.ChallengeResponse response) {
// TODO: Popup? Idk what this actually sends back. // TODO: Popup? Idk what this actually sends back.
} }
@Override @Override
public void reload() { public void reload() {
popAll(); popAll();
}
ListView<Label> players = new ListView<>();
for (int i = 0; i < onlinePlayers.size(); i++) {
players.getItems().add(NodeBuilder.button(onlinePlayers.get(i), () -> {
// get clicked player name with: onlinePlayers.get(i)
// connection logic here
}));
}
final Container playersContainer = new VerticalContainer(10);
playersContainer.addNodes(players);
addContainer(playersContainer, Pos.CENTER, 0, 0, 0, 0);
}
} }