feat: merge 'games' directory into launcher installation directory #536
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Tobias Nett <[email protected]>
Signed-off-by: Tobias Nett <[email protected]>
Signed-off-by: Tobias Nett <[email protected]>
skaldarnar
added
Status: WIP
|
TODO |
Signed-off-by: Tobias Nett <[email protected]>
Signed-off-by: Tobias Nett <[email protected]>
Signed-off-by: Tobias Nett <[email protected]>
Signed-off-by: Tobias Nett <[email protected]>
skaldarnar
added
Status: Actionable
6 tasks
jdrueckert
reviewed
Mar 28, 2020
Comment on lines
-104
to
+114
| launcherInitTask.setOnSucceeded(new EventHandler<WorkerStateEvent>() { | ||
| @Override | ||
| public void handle(final WorkerStateEvent workerStateEvent) { | ||
| try { | ||
| LauncherConfiguration config = launcherInitTask.getValue(); | ||
| if (config == null) { | ||
| throw new LauncherStartFailedException("Launcher configuration was `null`."); | ||
| } else if (config instanceof NullLauncherConfiguration) { | ||
| logger.info("Closing the launcher ... (empty configuration, probably due to update)"); | ||
| Platform.exit(); | ||
| } else { | ||
| showMainStage(config); | ||
| } | ||
| } catch (IOException | LauncherStartFailedException e) { | ||
| openCrashReporterAndExit(e); | ||
| launcherInitTask.setOnSucceeded(workerStateEvent -> { | ||
| try { | ||
| LauncherConfiguration config = launcherInitTask.getValue(); | ||
| if (config == null) { | ||
| throw new LauncherStartFailedException("Launcher configuration was `null`."); | ||
| } else if (config instanceof NullLauncherConfiguration) { | ||
| logger.info("Closing the launcher ... (empty configuration, probably due to update)"); | ||
| Platform.exit(); | ||
| } else { | ||
| showMainStage(config); | ||
| } | ||
| } catch (IOException | LauncherStartFailedException e) { | ||
| openCrashReporterAndExit(e); |
There was a problem hiding this comment.
Are we sure this does the same?
Previous implementation of EventHandler seems to me as if the workerStateEvent may not yet be there when the launcherInitTask succeeds? But maybe I'm reading this wrong...
There was a problem hiding this comment.
This just uses a different syntax (lambda expression) for creating the handler for the onSucceeded event. As handle(WorkerStateEvent event) is the only method that needs to be implemented we can use the simplified syntax here.
new EventHandler<WorkerStateEvent>() {
@Override
public void handle(final WorkerStateEvent workerStateEvent) {
// do something
}
}Is replaced by
workerStateEvent -> {
// do something
}There was a problem hiding this comment.
Alright, so the new one also kind of "waits" for a workerStateEvent to come in?
jdrueckert
approved these changes
Mar 28, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Part of #469.
Take away the user choice for the game installation directory and place it directly in the launcher installation directory under
games. Technically, this introducesGAMESas launcher-managed directory and does not prompt the user for input.LauncherInitTask::getGameDirectoryand clean up labels, etc.<installDir>/games/games/...for some reason 🙄