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

Can now test the event bus, created testable interfaces

Browse Source
This commit is contained in:
lieght
2025-12-06 17:26:00 +01:00
parent 816a0b953e
commit fd357fd27d
15 changed files with 394 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/toop/Main.java
View File

@@ -1,13 +1,6 @@
package org.toop;
import org.toop.app.App;
import org.toop.framework.audio.*;
import org.toop.framework.networking.NetworkingClientEventListener;
import org.toop.framework.networking.NetworkingClientManager;
import org.toop.framework.resource.ResourceLoader;
import org.toop.framework.resource.ResourceManager;
import org.toop.framework.resource.resources.MusicAsset;
import org.toop.framework.resource.resources.SoundEffectAsset;
public final class Main {
static void main(String[] args) {

39
app/src/main/java/org/toop/app/Server.java
View File

@@ -88,7 +88,7 @@ public final class Server {
Primitive.text("connecting"), 0, 0, reconnectAttempts, true, true
);
WidgetContainer.getCurrentView().transitionNext(loading);
WidgetContainer.getCurrentView().transitionNextCustom(loading, "disconnect", this::disconnect);
var a = new EventFlow()
.addPostEvent(NetworkEvents.StartClient.class,
@@ -105,8 +105,9 @@ public final class Server {
);
});
a.onResponse(NetworkEvents.StartClientResponse.class, e -> {
a.onResponse(NetworkEvents.CreatedIdForClient.class, e -> clientId = e.clientId(), true);
a.onResponse(NetworkEvents.StartClientResponse.class, e -> {
if (!e.successful()) {
return;
}
@@ -118,7 +119,6 @@ public final class Server {
a.unsubscribe("startclient");
this.user = user;
clientId = e.clientId();
new EventFlow().addPostEvent(new NetworkEvents.SendLogin(clientId, user)).postEvent();
@@ -129,21 +129,24 @@ public final class Server {
}, false, "startclient")
.listen(
NetworkEvents.ConnectTry.class,
e -> Platform.runLater(
() -> {
try {
loading.setAmount(e.amount());
if (e.amount() >= loading.getMaxAmount()) {
loading.triggerFailure();
}
} catch (Exception ex) {
throw new RuntimeException(ex);
}
}
),
false, "connecting"
)
NetworkEvents.ConnectTry.class,
e -> {
if (clientId != e.clientId()) return;
Platform.runLater(
() -> {
try {
loading.setAmount(e.amount());
if (e.amount() >= loading.getMaxAmount()) {
loading.triggerFailure();
}
} catch (Exception ex) {
throw new RuntimeException(ex);
}
}
);
},
false, "connecting"
)
.postEvent();
a.listen(NetworkEvents.ChallengeResponse.class, this::handleReceivedChallenge, false, "challenge")

6
app/src/main/java/org/toop/app/widget/display/SongDisplay.java
View File

@@ -49,11 +49,11 @@ public class SongDisplay extends VBox implements Widget {
previousButton.getStyleClass().setAll("previous-button");
skipButton.setOnAction( event -> {
GlobalEventBus.post(new AudioEvents.SkipMusic());
GlobalEventBus.get().post(new AudioEvents.SkipMusic());
});
pauseButton.setOnAction(event -> {
GlobalEventBus.post(new AudioEvents.PauseMusic());
GlobalEventBus.get().post(new AudioEvents.PauseMusic());
if (pauseButton.getText().equals("⏸")) {
pauseButton.setText("▶");
}
@@ -63,7 +63,7 @@ public class SongDisplay extends VBox implements Widget {
});
previousButton.setOnAction( event -> {
GlobalEventBus.post(new AudioEvents.PreviousMusic());
GlobalEventBus.get().post(new AudioEvents.PreviousMusic());
});
HBox control = new HBox(10, previousButton, pauseButton, skipButton);