You've already forked AstralRinth
forked from didirus/AstralRinth
String settings hooks (#82)
* added theme; env change * began refactoring * added process hook * now singular string for each hook * fixed splitting by comma to by space * profile_create function updated * prettier * added jre validator * restructured so that it doesnt look like a vec * fixed merge issue * snake case * resolved merge issues + added process events * clippy, fmt * removed unnecssary func
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
use crate::api::Result;
|
||||
use std::path::{Path, PathBuf};
|
||||
use theseus::prelude::*;
|
||||
use uuid::Uuid;
|
||||
|
||||
// Remove a profile
|
||||
// invoke('profile_add_path',path)
|
||||
@@ -73,18 +74,14 @@ pub async fn profile_remove_project(
|
||||
Ok(())
|
||||
}
|
||||
// Run minecraft using a profile using the default credentials
|
||||
// Returns a u32 representing the PID, which can be used to poll
|
||||
// Returns the UUID, which can be used to poll
|
||||
// for the actual Child in the state.
|
||||
// invoke('profile_run', path)
|
||||
#[tauri::command]
|
||||
pub async fn profile_run(path: &Path) -> Result<u32> {
|
||||
let proc_lock = profile::run(path).await?;
|
||||
let pid = proc_lock.read().await.child.id().ok_or_else(|| {
|
||||
theseus::Error::from(theseus::ErrorKind::LauncherError(
|
||||
"Process failed to stay open.".to_string(),
|
||||
))
|
||||
})?;
|
||||
Ok(pid)
|
||||
pub async fn profile_run(path: &Path) -> Result<Uuid> {
|
||||
let minecraft_child = profile::run(path).await?;
|
||||
let uuid = minecraft_child.read().await.uuid;
|
||||
Ok(uuid)
|
||||
}
|
||||
|
||||
// Run Minecraft using a profile using the default credentials, and wait for the result
|
||||
@@ -97,21 +94,17 @@ pub async fn profile_run_wait(path: &Path) -> Result<()> {
|
||||
}
|
||||
|
||||
// Run Minecraft using a profile using chosen credentials
|
||||
// Returns a u32 representing the PID, which can be used to poll
|
||||
// Returns the UUID, which can be used to poll
|
||||
// for the actual Child in the state.
|
||||
// invoke('profile_run_credentials', {path, credentials})')
|
||||
#[tauri::command]
|
||||
pub async fn profile_run_credentials(
|
||||
path: &Path,
|
||||
credentials: Credentials,
|
||||
) -> Result<u32> {
|
||||
let proc_lock = profile::run_credentials(path, &credentials).await?;
|
||||
let pid = proc_lock.read().await.child.id().ok_or_else(|| {
|
||||
theseus::Error::from(theseus::ErrorKind::LauncherError(
|
||||
"Process failed to stay open.".to_string(),
|
||||
))
|
||||
})?;
|
||||
Ok(pid)
|
||||
) -> Result<Uuid> {
|
||||
let minecraft_child = profile::run_credentials(path, &credentials).await?;
|
||||
let uuid = minecraft_child.read().await.uuid;
|
||||
Ok(uuid)
|
||||
}
|
||||
|
||||
// Run Minecraft using a profile using the chosen credentials, and wait for the result
|
||||
|
||||
Reference in New Issue
Block a user