mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
Add CLI argument to voxygen that allows specifying a value to place into the server field in the main menu.
This commit is contained in:
Imbris
parent
e35e533d88
commit
1888863915
29
Cargo.lock
generated
29
Cargo.lock
generated
@ -687,16 +687,16 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "3.1.10"
|
||||
version = "3.2.20"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3124f3f75ce09e22d1410043e1e24f2ecc44fad3afe4f08408f1f7663d68da2b"
|
||||
checksum = "23b71c3ce99b7611011217b366d923f1d0a7e07a92bb2dbf1e84508c673ca3bd"
|
||||
dependencies = [
|
||||
"atty",
|
||||
"bitflags",
|
||||
"clap_derive",
|
||||
"clap_lex",
|
||||
"indexmap",
|
||||
"lazy_static",
|
||||
"once_cell",
|
||||
"strsim 0.10.0",
|
||||
"termcolor",
|
||||
"textwrap 0.15.0",
|
||||
@ -704,9 +704,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_derive"
|
||||
version = "3.1.7"
|
||||
version = "3.2.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1"
|
||||
checksum = "ea0c8bce528c4be4da13ea6fead8965e95b6073585a2f05204bd8f4119f82a65"
|
||||
dependencies = [
|
||||
"heck 0.4.0",
|
||||
"proc-macro-error",
|
||||
@ -717,9 +717,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_lex"
|
||||
version = "0.1.1"
|
||||
version = "0.2.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "189ddd3b5d32a70b35e7686054371742a937b0d99128e76dde6340210e966669"
|
||||
checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
|
||||
dependencies = [
|
||||
"os_str_bytes",
|
||||
]
|
||||
@ -4016,9 +4016,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "once_cell"
|
||||
version = "1.10.0"
|
||||
version = "1.14.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
|
||||
checksum = "2f7254b99e31cad77da24b08ebf628882739a608578bb1bcdfc1f9c21260d7c0"
|
||||
|
||||
[[package]]
|
||||
name = "oorandom"
|
||||
@ -6501,7 +6501,7 @@ dependencies = [
|
||||
"async-channel",
|
||||
"authc",
|
||||
"byteorder",
|
||||
"clap 3.1.10",
|
||||
"clap 3.2.20",
|
||||
"hashbrown 0.12.0",
|
||||
"image",
|
||||
"num 0.4.0",
|
||||
@ -6688,7 +6688,7 @@ dependencies = [
|
||||
"bincode",
|
||||
"bitflags",
|
||||
"bytes",
|
||||
"clap 3.1.10",
|
||||
"clap 3.2.20",
|
||||
"criterion",
|
||||
"crossbeam-channel",
|
||||
"futures-core",
|
||||
@ -6811,7 +6811,7 @@ name = "veloren-server-cli"
|
||||
version = "0.13.0"
|
||||
dependencies = [
|
||||
"ansi-parser",
|
||||
"clap 3.1.10",
|
||||
"clap 3.2.20",
|
||||
"crossterm 0.23.2",
|
||||
"lazy_static",
|
||||
"mimalloc",
|
||||
@ -6840,6 +6840,7 @@ dependencies = [
|
||||
"bytemuck",
|
||||
"chrono",
|
||||
"chumsky",
|
||||
"clap 3.2.20",
|
||||
"cmake",
|
||||
"conrod_core",
|
||||
"conrod_winit",
|
||||
@ -6962,7 +6963,7 @@ dependencies = [
|
||||
name = "veloren-voxygen-i18n"
|
||||
version = "0.13.0"
|
||||
dependencies = [
|
||||
"clap 3.1.10",
|
||||
"clap 3.2.20",
|
||||
"deunicode",
|
||||
"fluent",
|
||||
"fluent-bundle",
|
||||
@ -6983,7 +6984,7 @@ dependencies = [
|
||||
"arr_macro",
|
||||
"bincode",
|
||||
"bitvec",
|
||||
"clap 3.1.10",
|
||||
"clap 3.2.20",
|
||||
"criterion",
|
||||
"csv",
|
||||
"deflate",
|
||||
|
||||
@ -91,6 +91,9 @@ gilrs = {version = "0.8.0", features = ["serde-serialize"]}
|
||||
# Singleplayer
|
||||
server = { package = "veloren-server", path = "../server", optional = true, default-features = false, features = ["worldgen"] }
|
||||
|
||||
# CLI
|
||||
clap = { version = "3.2.20", features = ["derive"] }
|
||||
|
||||
# Utility
|
||||
assets_manager = {version = "0.8", features = ["ab_glyph"]}
|
||||
backtrace = "0.3.40"
|
||||
|
||||
19
voxygen/src/cli.rs
Normal file
19
voxygen/src/cli.rs
Normal file
@ -0,0 +1,19 @@
|
||||
//! NOTE: Some of these arguments are used by airshipper, so those needs to be
|
||||
//! kept fairly stable (probably with some sort of migration period if we need
|
||||
//! to modify the name or semantics).
|
||||
//!
|
||||
//! The arguments used by airshipper are:
|
||||
//! * `server`
|
||||
//!
|
||||
//! Airshipper should only use arguments listed above! Since we will not try to
|
||||
//! be careful about their stability otherwise.
|
||||
use clap::Parser;
|
||||
|
||||
#[derive(Parser)]
|
||||
pub struct Args {
|
||||
/// Value to auto-fill into the server field.
|
||||
///
|
||||
/// This allows passing in server selection performed in airshipper.
|
||||
#[clap(short, long)]
|
||||
pub server: Option<String>,
|
||||
}
|
||||
@ -2,6 +2,8 @@
|
||||
#![feature(bool_to_option)]
|
||||
#![recursion_limit = "2048"]
|
||||
|
||||
mod cli;
|
||||
|
||||
#[cfg(all(
|
||||
target_os = "windows",
|
||||
not(feature = "tracy-memory"),
|
||||
@ -182,6 +184,10 @@ fn main() {
|
||||
default_hook(panic_info);
|
||||
}));
|
||||
|
||||
// Process CLI arguments
|
||||
use clap::Parser;
|
||||
let args = cli::Args::parse();
|
||||
|
||||
// Setup tokio runtime
|
||||
use common::consts::MIN_RECOMMENDED_TOKIO_THREADS;
|
||||
use std::sync::{
|
||||
@ -317,5 +323,5 @@ fn main() {
|
||||
discord,
|
||||
};
|
||||
|
||||
run::run(global_state, event_loop);
|
||||
run::run(global_state, event_loop, args.server);
|
||||
}
|
||||
|
||||
@ -54,9 +54,9 @@ pub struct MainMenuState {
|
||||
|
||||
impl MainMenuState {
|
||||
/// Create a new `MainMenuState`.
|
||||
pub fn new(global_state: &mut GlobalState) -> Self {
|
||||
pub fn new(global_state: &mut GlobalState, server: Option<String>) -> Self {
|
||||
Self {
|
||||
main_menu_ui: MainMenuUi::new(global_state),
|
||||
main_menu_ui: MainMenuUi::new(global_state, server),
|
||||
init: InitState::None,
|
||||
scene: Scene::new(global_state.window.renderer_mut()),
|
||||
}
|
||||
|
||||
@ -180,6 +180,7 @@ impl Controls {
|
||||
bg_img: widget::image::Handle,
|
||||
i18n: LocalizationHandle,
|
||||
settings: &Settings,
|
||||
server: Option<String>,
|
||||
) -> Self {
|
||||
let version = common::util::DISPLAY_VERSION_LONG.clone();
|
||||
let alpha = format!("Veloren {}", common::util::DISPLAY_VERSION.as_str());
|
||||
@ -201,7 +202,7 @@ impl Controls {
|
||||
let login_info = LoginInfo {
|
||||
username: settings.networking.username.clone(),
|
||||
password: String::new(),
|
||||
server: settings.networking.default_server.clone(),
|
||||
server: server.unwrap_or_else(|| settings.networking.default_server.clone()),
|
||||
};
|
||||
let selected_server_index = settings
|
||||
.networking
|
||||
@ -517,7 +518,7 @@ pub struct MainMenuUi {
|
||||
}
|
||||
|
||||
impl MainMenuUi {
|
||||
pub fn new(global_state: &mut GlobalState) -> Self {
|
||||
pub fn new(global_state: &mut GlobalState, server: Option<String>) -> Self {
|
||||
// Load language
|
||||
let i18n = &global_state.i18n.read();
|
||||
// TODO: don't add default font twice
|
||||
@ -541,6 +542,7 @@ impl MainMenuUi {
|
||||
ui.add_graphic(Graphic::Image(bg_img, None)),
|
||||
global_state.i18n,
|
||||
&global_state.settings,
|
||||
server,
|
||||
);
|
||||
|
||||
Self { ui, controls }
|
||||
|
||||
@ -9,9 +9,10 @@ use common_base::{prof_span, span};
|
||||
use std::{mem, time::Duration};
|
||||
use tracing::debug;
|
||||
|
||||
pub fn run(mut global_state: GlobalState, event_loop: EventLoop) {
|
||||
pub fn run(mut global_state: GlobalState, event_loop: EventLoop, server: Option<String>) {
|
||||
// Set up the initial play state.
|
||||
let mut states: Vec<Box<dyn PlayState>> = vec![Box::new(MainMenuState::new(&mut global_state))];
|
||||
let mut states: Vec<Box<dyn PlayState>> =
|
||||
vec![Box::new(MainMenuState::new(&mut global_state, server))];
|
||||
states.last_mut().map(|current_state| {
|
||||
current_state.enter(&mut global_state, Direction::Forwards);
|
||||
let current_state = current_state.name();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user