Alez/Babylonia-terminal
1
0
Fork 0
mirror of https://github.com/ALEZ-DEV/Babylonia-terminal.git synced 2025-12-16 01:18:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

can now start the game from GUI

Browse Source
This commit is contained in:
ALEZ-DEV 2024-06-10 21:39:06 +02:00
parent 62ffdd2dff
commit 787b1ea216
11 changed files with 189 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
babylonia_terminal_launcher/lib/models/game.dart
View File

@ -11,8 +11,14 @@ enum GameInstallationState {
patching,
}
enum GameRunState {
idle,
running,
}
class Game with ChangeNotifier {
GameInstallationState gameInstallationState = GameInstallationState.idle;
GameRunState gameRunState = GameRunState.idle;
Int64 currentProgress = Int64(0);
Int64 maxProgress = Int64(0);
@ -55,4 +61,17 @@ class Game with ChangeNotifier {
break;
}
}
Future startGame() async {
RunGame().sendSignalToRust();
gameRunState = GameRunState.running;
notifyListeners();
final stream = GameStopped.rustSignalStream;
await for (final _ in stream) {
gameRunState = GameRunState.idle;
notifyListeners();
break;
}
}
}

35
babylonia_terminal_launcher/lib/screens/home_screen.dart
View File

@ -4,7 +4,7 @@ import 'package:provider/provider.dart';
import '../widgets/background_widget.dart';
import '../widgets/serious_lee_widget.dart';
import '../widgets/simple_button.dart';
import '../widgets/play_button.dart';
import '../widgets/steps/game_steps_widget.dart';
import './../providers/providers.dart';
import './../models/settings.dart';
@ -22,38 +22,7 @@ class HomeScreen extends StatelessWidget {
const ShowBackground(),
gameStateProvider.gameState != States.GameInstalled
? const GameSteps()
: Padding(
padding: const EdgeInsets.all(50.0),
child: Row(
children: [
const Expanded(
child: SizedBox(),
),
const Expanded(
child: SizedBox(),
),
Expanded(
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
children: [
ConstrainedBox(
constraints: const BoxConstraints(
maxWidth: 600,
maxHeight: 50,
),
child: SimpleButton(
onPressed: () async {},
child: const Center(
child: Text("Play"),
),
),
),
],
),
),
],
),
),
: const PlayButton(),
],
);
}

54
babylonia_terminal_launcher/lib/widgets/play_button.dart Normal file
View File

@ -0,0 +1,54 @@
import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import './simple_button.dart';
import './../models/game.dart';
class PlayButton extends StatelessWidget {
const PlayButton({super.key});
@override
Widget build(BuildContext context) {
final game = Provider.of<Game>(context);
return Padding(
padding: const EdgeInsets.all(50.0),
child: Row(
children: [
const Expanded(
child: SizedBox(),
),
const Expanded(
child: SizedBox(),
),
Expanded(
child: Column(
mainAxisAlignment: MainAxisAlignment.end,
children: [
ConstrainedBox(
constraints: const BoxConstraints(
maxWidth: 600,
maxHeight: 50,
),
child: SimpleButton(
onPressed: game.gameRunState == GameRunState.idle
? () {
Provider.of<Game>(context, listen: false)
.startGame();
}
: null,
child: Center(
child: game.gameRunState == GameRunState.idle
? const Text("Play")
: const Text("Running..."),
),
),
),
],
),
),
],
),
);
}
}

6
babylonia_terminal_launcher/messages/steps/game.proto
View File

@ -20,3 +20,9 @@ message NotifyGameStartPatching {}
// [RINF:RUST-SIGNAL]
message NotifyGameSuccessfullyInstalled {}
// [RINF:DART-SIGNAL]
message RunGame {}
// [RINF:RUST-SIGNAL]
message GameStopped {}

9
babylonia_terminal_launcher/native/hub/Cargo.toml
View File

@ -17,5 +17,12 @@ prost = "0.12.3"
wasm-bindgen = "0.2.91"
tokio_with_wasm = "0.4.3"
babylonia-terminal-sdk = { path = "./../../../babylonia-terminal-sdk" }
downloader = { git = "https://github.com/ALEZ-DEV/downloader" } # version = "0.2.7",
downloader = { git = "https://github.com/ALEZ-DEV/downloader" } # version = "0.2.7",
once_cell = "1.19.0"
wincompatlib = { version = "0.7.4", features = [
"dxvk",
"wine-bundles",
"wine-proton",
"wine-fonts",
"winetricks",
] }

23
babylonia_terminal_launcher/native/hub/src/dependencies.rs
View File

@ -5,23 +5,20 @@ use babylonia_terminal_sdk::{
};
use tokio_with_wasm::tokio;
use crate::messages::{
error::ReportError,
steps::dependencies::{NotifyDependenciesSuccessfullyInstalled, StartDependenciesInstallation},
use crate::{
messages::{
error::ReportError,
steps::dependencies::{
NotifyDependenciesSuccessfullyInstalled, StartDependenciesInstallation,
},
},
proton::get_proton,
};
pub async fn listen_dependecies_installation() {
let mut receiver = StartDependenciesInstallation::get_dart_signal_receiver();
while let Some(_) = receiver.recv().await {
let proton_component = ProtonComponent::new(GameState::get_config().await.config_dir);
let proton = proton_component.init_proton();
if let Err(e) = proton {
ReportError {
error_message: format!("Failed to install DXVK : {}", e),
}
.send_signal_to_dart();
continue;
}
let proton = get_proton().await;
thread::spawn(move || {
tokio::runtime::Builder::new_current_thread()
@ -29,7 +26,7 @@ pub async fn listen_dependecies_installation() {
.build()
.unwrap()
.block_on(async {
match GameManager::install_dependencies(&proton.unwrap()).await {
match GameManager::install_dependencies(&proton).await {
Err(e) => ReportError {
error_message: format!("Failed to install dependencies : {}", e),
}

13
babylonia_terminal_launcher/native/hub/src/dxvk.rs
View File

@ -20,6 +20,7 @@ use crate::{
StartDxvkInstallation,
},
},
proton::get_proton,
};
pub async fn listen_dxvk_installation() {
@ -48,15 +49,7 @@ pub async fn listen_dxvk_installation() {
continue;
}
let proton_component = ProtonComponent::new(GameState::get_config().await.config_dir);
let proton = proton_component.init_proton();
if let Err(e) = proton {
ReportError {
error_message: format!("Failed to install DXVK : {}", e),
}
.send_signal_to_dart();
continue;
}
let proton = get_proton().await;
thread::spawn(move || {
tokio::runtime::Builder::new_current_thread()
@ -65,7 +58,7 @@ pub async fn listen_dxvk_installation() {
.unwrap()
.block_on(async {
match GameManager::install_dxvk(
&proton.unwrap(),
&proton,
GameState::get_config().await.config_dir,
release_index.unwrap(),
Some(DownloadReporter::create()),

28
babylonia_terminal_launcher/native/hub/src/fonts.rs
View File

@ -5,25 +5,20 @@ use babylonia_terminal_sdk::{
};
use tokio_with_wasm::tokio;
use crate::messages::{
error::ReportError,
steps::fonts::{
FontsInstallationProgress, NotifyFontsSuccessfullyInstalled, StartFontsInstallation,
use crate::{
messages::{
error::ReportError,
steps::fonts::{
FontsInstallationProgress, NotifyFontsSuccessfullyInstalled, StartFontsInstallation,
},
},
proton::get_proton,
};
pub async fn listen_fonts_installation() {
let mut receiver = StartFontsInstallation::get_dart_signal_receiver();
while let Some(_) = receiver.recv().await {
let proton_component = ProtonComponent::new(GameState::get_config().await.config_dir);
let proton = proton_component.init_proton();
if let Err(e) = proton {
ReportError {
error_message: format!("Failed to install DXVK : {}", e),
}
.send_signal_to_dart();
continue;
}
let proton = get_proton().await;
thread::spawn(move || {
tokio::runtime::Builder::new_current_thread()
@ -31,11 +26,8 @@ pub async fn listen_fonts_installation() {
.build()
.unwrap()
.block_on(async {
match GameManager::install_font(
&proton.unwrap(),
Some(InstallationReporter::create()),
)
.await
match GameManager::install_font(&proton, Some(InstallationReporter::create()))
.await
{
Err(e) => ReportError {
error_message: format!("Failed to install DXVK : {}", e),

61
babylonia_terminal_launcher/native/hub/src/game.rs
View File

@ -6,14 +6,38 @@ use babylonia_terminal_sdk::{
use rinf::debug_print;
use tokio_with_wasm::tokio;
use crate::messages::{
error::ReportError,
steps::game::{
GameInstallationProgress, NotifyGameStartDownloading, NotifyGameStartPatching,
NotifyGameSuccessfullyInstalled, StartGameInstallation,
use crate::{
messages::{
error::ReportError,
steps::game::{
GameInstallationProgress, GameStopped, NotifyGameStartDownloading,
NotifyGameStartPatching, NotifyGameSuccessfullyInstalled, RunGame,
StartGameInstallation,
},
},
proton::get_proton,
};
pub async fn listen_game_running() {
let mut receiver = RunGame::get_dart_signal_receiver();
while let Some(_) = receiver.recv().await {
let proton = get_proton().await;
let game_dir = GameState::get_game_dir().await;
if game_dir.is_none() {
ReportError {
error_message: "Failed to start game, the game directory was not found".to_string(),
}
.send_signal_to_dart();
GameStopped {}.send_signal_to_dart();
continue;
}
GameManager::start_game(&proton, game_dir.unwrap()).await;
GameStopped {}.send_signal_to_dart();
}
}
pub async fn listen_game_installation() {
let mut receiver = StartGameInstallation::get_dart_signal_receiver();
while let Some(info) = receiver.recv().await {
@ -24,6 +48,21 @@ pub async fn listen_game_installation() {
.build()
.unwrap()
.block_on(async {
if GameState::get_game_dir().await.is_none() {
if let Err(e) = GameState::set_game_dir(Some(
GameState::get_config_directory()
.await
.join("babylonia-terminal-config"),
))
.await
{
ReportError {
error_message: format!("Failed to set new path : {}", e),
}
.send_signal_to_dart();
}
}
if info.message.is_updating {
if let Err(e) = GameManager::update_game().await {
ReportError {
@ -33,10 +72,16 @@ pub async fn listen_game_installation() {
}
}
let game_dir = GameState::get_config().await.config_dir;
let game_dir = GameState::get_game_dir().await;
if game_dir.is_none() {
ReportError {
error_message: "Failed to get the game directory".to_string(),
}
.send_signal_to_dart();
}
match GameManager::install_game(
game_dir.clone(),
game_dir.clone().unwrap(),
InstallationReporter::create(),
)
.await
@ -48,7 +93,7 @@ pub async fn listen_game_installation() {
Ok(_) => {
NotifyGameStartPatching {}.send_signal_to_dart();
debug_print!("start patching game...");
match GameManager::patch_game(game_dir).await {
match GameManager::patch_game(game_dir.unwrap()).await {
Err(e) => ReportError {
error_message: format!("Failed to install game : {}", e),
}

3
babylonia_terminal_launcher/native/hub/src/lib.rs
View File

@ -27,4 +27,7 @@ async fn main() {
tokio::spawn(fonts::listen_fonts_installation());
tokio::spawn(dependencies::listen_dependecies_installation());
tokio::spawn(game::listen_game_installation());
// game
tokio::spawn(game::listen_game_running());
}

22
babylonia_terminal_launcher/native/hub/src/proton.rs
View File

@ -10,7 +10,8 @@ use babylonia_terminal_sdk::{
utils::github_requester::{GithubRelease, GithubRequester},
};
use rinf::debug_print;
use tokio_with_wasm::tokio;
use tokio_with_wasm::tokio::{self, sync::OnceCell};
use wincompatlib::wine::bundle::proton::Proton;
use crate::{
github::GithubInfo,
@ -23,6 +24,25 @@ use crate::{
},
};
static PROTON: OnceCell<Proton> = OnceCell::const_new();
pub async fn get_proton() -> Proton {
PROTON
.get_or_init(|| async {
let proton_component = ProtonComponent::new(GameState::get_config().await.config_dir);
let proton = proton_component.init_proton();
if let Err(ref e) = proton {
ReportError {
error_message: format!("Failed to initialize proton : {}", e),
}
.send_signal_to_dart();
}
proton.unwrap()
})
.await
.clone()
}
pub async fn listen_proton_installation() {
let mut receiver = StartProtonInstallation::get_dart_signal_receiver();
while let Some(info) = receiver.recv().await {