Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Custom run command #412

Open
wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

Custom run command #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0bfbc6a
add non-working implementation
seliayeu Aug 17, 2024
0a1c26d
fix build
CheatCod Aug 19, 2024
5ca781f
finish implementation (without support for spaces in arguments)
seliayeu Aug 25, 2024
998218d
merge and fix custom command not being shown
seliayeu Aug 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 26 additions & 1 deletion core/src/implementations/minecraft/configurable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ pub(super) enum CmdArgSetting {
MinRam(u32),
MaxRam(u32),
JavaCmd(String),
CustomCmd(String),
Args(Vec<String>),
}

Expand All @@ -288,6 +289,7 @@ impl CmdArgSetting {
CmdArgSetting::MinRam(_) => "min_ram",
CmdArgSetting::MaxRam(_) => "max_ram",
CmdArgSetting::JavaCmd(_) => "java_cmd",
CmdArgSetting::CustomCmd(_) => "custom_cmd",
CmdArgSetting::Args(_) => "cmd_args",
}
}
Expand All @@ -296,6 +298,7 @@ impl CmdArgSetting {
CmdArgSetting::MinRam(_) => "Minimum RAM",
CmdArgSetting::MaxRam(_) => "Maximum RAM",
CmdArgSetting::JavaCmd(_) => "Java command",
CmdArgSetting::CustomCmd(_) => "Custom command",
CmdArgSetting::Args(_) => "Command line arguments",
}
}
Expand All @@ -308,6 +311,7 @@ impl CmdArgSetting {
"The maximum amount of RAM to allocate to the server instance"
}
CmdArgSetting::JavaCmd(_) => "The command to use to run the java executable",
CmdArgSetting::CustomCmd(_) => "A custom command to use instead of the Java command",
CmdArgSetting::Args(_) => "The command line arguments to pass to the server",
}
}
Expand All @@ -320,6 +324,7 @@ impl CmdArgSetting {
val.parse().context("Invalid value. Expected a u32")?,
)),
"java_cmd" => Ok(CmdArgSetting::JavaCmd(val.to_string())),
"custom_cmd" => Ok(CmdArgSetting::CustomCmd(val.to_string())),
"cmd_args" => Ok(CmdArgSetting::Args(
val.split(' ').map(|s| s.to_string()).collect(),
)),
Expand All @@ -330,7 +335,10 @@ impl CmdArgSetting {
}
}
pub fn is_key_valid(key: &str) -> bool {
matches!(key, "min_ram" | "max_ram" | "java_cmd" | "cmd_args")
matches!(
key,
"min_ram" | "max_ram" | "java_cmd" | "cmd_args" | "custom_cmd"
)
}
}

Expand Down Expand Up @@ -373,6 +381,16 @@ impl From<CmdArgSetting> for SettingManifest {
false,
true,
),
CmdArgSetting::CustomCmd(ref custom_cmd) => SettingManifest::new_optional_value(
value.get_identifier().to_owned(),
value.get_name().to_owned(),
value.get_description().to_owned(),
Some(ConfigurableValue::String(custom_cmd.to_owned())),
ConfigurableValueType::String { regex: None },
None,
false,
true,
),
CmdArgSetting::Args(ref args) => SettingManifest::new_optional_value(
value.get_identifier().to_owned(),
value.get_name().to_owned(),
Expand Down Expand Up @@ -411,6 +429,13 @@ impl TryFrom<SettingManifest> for CmdArgSetting {
.try_as_string()?
.to_owned(),
)),
"custom_cmd" => Ok(CmdArgSetting::CustomCmd(
value
.get_value()
.context("Expected a value")?
.try_as_string()?
.to_owned(),
)),
"cmd_args" => Ok(CmdArgSetting::Args(
value
.get_value()
Expand Down
38 changes: 38 additions & 0 deletions core/src/implementations/minecraft/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ pub struct RestoreConfig {
pub description: String,
pub cmd_args: Vec<String>,
pub java_cmd: Option<String>,
pub custom_cmd: Option<String>,
pub port: u32,
pub min_ram: u32,
pub max_ram: u32,
Expand Down Expand Up @@ -396,6 +397,9 @@ impl MinecraftInstance {
cmd_args_config_map.insert(max_ram.get_identifier().to_owned(), max_ram.into());
let java_cmd = CmdArgSetting::JavaCmd(java_cmd);
cmd_args_config_map.insert(java_cmd.get_identifier().to_owned(), java_cmd.into());
let custom_cmd =
CmdArgSetting::CustomCmd(restore_config.custom_cmd.clone().unwrap_or(String::new()));
cmd_args_config_map.insert(custom_cmd.get_identifier().to_owned(), custom_cmd.into());

let cmd_line_section_manifest = SectionManifest::new(
CmdArgSetting::get_section_id().to_string(),
Expand Down Expand Up @@ -638,12 +642,34 @@ impl MinecraftInstance {
1.0,
));

// let custom_args = if let Some(custom_cmd) = config.custom_cmd.clone() {
// let mut split: Vec<String> = custom_cmd.split(" ").map(|c| String::from(c)).collect();
// if split.len() != 0 {
// split.remove(0);
// }
// split
// } else {
// vec![]
// };
//
// let custom_cmd = if let Some(custom_cmd) = config.custom_cmd.clone() {
// let split: Vec<String> = custom_cmd.split(" ").map(|c| String::from(c)).collect();
// if split.len() == 0 {
// None
// } else {
// Some(split[0].clone())
// }
// } else {
// None
// };

let restore_config = RestoreConfig {
name: config.name,
version: config.version,
flavour,
description: config.description.unwrap_or_default(),
cmd_args: config.cmd_args,
custom_cmd: None,
port: config.port,
min_ram: config.min_ram.unwrap_or(2048),
max_ram: config.max_ram.unwrap_or(4096),
Expand Down Expand Up @@ -884,6 +910,18 @@ impl MinecraftInstance {
.expect("Programming error, value is not a string")
.to_owned(),
);

config_lock.custom_cmd = Some(
configurable_map
.get(CmdArgSetting::CustomCmd(Default::default()).get_identifier())
.expect("Programming error, value is not set")
.get_value()
.expect("Programming error, value is not set")
.clone()
.try_as_string()
.expect("Programming error, value is not a string")
.to_owned(),
);
}

pub fn get_rcon(&self) -> Arc<Mutex<Option<rcon::Connection<tokio::net::TcpStream>>>> {
Expand Down
110 changes: 22 additions & 88 deletions core/src/implementations/minecraft/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ use crate::traits::t_macro::TaskEntry;
use crate::traits::t_server::{MonitorReport, State, StateAction, TServer};

use crate::types::Snowflake;
use crate::util::{dont_spawn_terminal, list_dir};
use crate::util::dont_spawn_terminal;

use super::r#macro::resolve_macro_invocation;
use super::{Flavour, ForgeBuildVersion, MinecraftInstance};
use super::util::create_java_launch_cmd;
use super::MinecraftInstance;
use tracing::{error, info, warn};

#[async_trait::async_trait]
Expand Down Expand Up @@ -113,98 +114,31 @@ impl TServer for MinecraftInstance {
.join("java")
};

let mut server_start_command = Command::new(&jre);
let server_start_command = server_start_command
.arg(format!("-Xmx{}M", config.max_ram))
.arg(format!("-Xms{}M", config.min_ram))
.args(
&config
.cmd_args
.iter()
let mut server_start_command = if config.custom_cmd.is_none()
|| (config.custom_cmd.is_some() && config.custom_cmd.clone().unwrap().is_empty())
{
create_java_launch_cmd(config.clone(), jre, self.path_to_instance.clone())
.await
.unwrap()
} else {
let mut args: Vec<String> = config
.custom_cmd
.unwrap()
.split(' ')
.map(String::from)
.collect();
let mut server_start_command = Command::new(args.remove(0));
server_start_command.args(
args.iter()
.filter(|s| !s.is_empty())
.collect::<Vec<&String>>(),
);

let server_start_command = match &config.flavour {
Flavour::Forge { build_version } => {
let ForgeBuildVersion(build_version) = build_version
.as_ref()
.ok_or_else(|| eyre!("Forge version not found"))?;
let version_parts: Vec<&str> = config.version.split('.').collect();
let major_version: i32 = version_parts[1]
.parse()
.context("Unable to parse major Minecraft version for Forge")?;

if 17 <= major_version {
let forge_args = match std::env::consts::OS {
"windows" => "win_args.txt",
_ => "unix_args.txt",
};

let mut full_forge_args = std::ffi::OsString::from("@");
full_forge_args.push(
self.path_to_instance
.join("libraries")
.join("net")
.join("minecraftforge")
.join("forge")
.join(build_version.as_str())
.join(forge_args)
.into_os_string()
.as_os_str(),
);

server_start_command.arg(full_forge_args)
} else if (7..=16).contains(&major_version) {
let files = list_dir(&self.path_to_instance, Some(false))
.await
.context("Failed to find forge.jar")?;
let forge_jar_name = files
.iter()
.find(|p| {
p.extension().unwrap_or_default() == "jar"
&& p.file_name()
.unwrap_or_default()
.to_str()
.unwrap_or_default()
.starts_with(format!("forge-{}-", config.version,).as_str())
})
.ok_or_else(|| eyre!("Failed to find forge.jar"))?;
server_start_command
.arg("-jar")
.arg(&self.path_to_instance.join(forge_jar_name))
} else {
// 1.5 doesn't work due to JRE issues
// 1.4 doesn't work since forge doesn't provide an installer
let files = list_dir(&self.path_to_instance, Some(false))
.await
.context("Failed to find minecraftforge.jar")?;
let server_jar_name = files
.iter()
.find(|p| {
p.extension().unwrap_or_default() == "jar"
&& p.file_name()
.unwrap_or_default()
.to_str()
.unwrap_or_default()
.starts_with("minecraftforge")
})
.ok_or_else(|| eyre!("Failed to find minecraftforge.jar"))?;
server_start_command
.arg("-jar")
.arg(&self.path_to_instance.join(server_jar_name))
}
}
_ => server_start_command
.arg("-jar")
.arg(&self.path_to_instance.join("server.jar")),
server_start_command
};

let server_start_command = server_start_command
.arg("nogui")
.current_dir(&self.path_to_instance);
server_start_command.current_dir(&self.path_to_instance);

match dont_spawn_terminal(server_start_command)
match dont_spawn_terminal(&mut server_start_command)
.stdout(Stdio::piped())
.stdin(Stdio::piped())
.stderr(Stdio::piped())
Expand Down
Loading
Loading