diff --git a/client/src/lib.rs b/client/src/lib.rs index 81ac754024..44127459c3 100644 --- a/client/src/lib.rs +++ b/client/src/lib.rs @@ -439,7 +439,7 @@ impl Client { auth_trusted: impl FnMut(&str) -> bool, init_stage_update: &(dyn Fn(ClientInitStage) + Send + Sync), add_foreign_systems: impl Fn(&mut DispatcherBuilder) + Send + 'static, - config_dir: PathBuf, + #[allow(unused_variables)] config_dir: PathBuf, ) -> Result { let network = Network::new(Pid::new(), &runtime); @@ -615,6 +615,7 @@ impl Client { init_stage_update(ClientInitStage::LoadingInitData); // Wait for initial sync let mut ping_interval = tokio::time::interval(Duration::from_secs(1)); + #[allow(unused_variables)] let ServerInit::GameSync { entity_package, time_of_day, @@ -665,7 +666,9 @@ impl Client { #[cfg(feature = "plugins")] common_state::plugin::PluginMgr::from_asset_or_default(), ); + #[allow(unused_mut)] let mut missing_plugins: Vec = Vec::new(); + #[allow(unused_mut)] let mut local_plugins: Vec = Vec::new(); #[cfg(feature = "plugins")] { diff --git a/voxygen/src/menu/char_selection/mod.rs b/voxygen/src/menu/char_selection/mod.rs index bca1f708a7..22030a98c0 100644 --- a/voxygen/src/menu/char_selection/mod.rs +++ b/voxygen/src/menu/char_selection/mod.rs @@ -278,16 +278,16 @@ impl PlayState for CharSelectionState { Rc::clone(&self.client), ))); }, - client::Event::PluginDataReceived(data) => { + client::Event::PluginDataReceived(_data) => { #[cfg(feature = "plugins")] { - tracing::info!("plugin data {}", data.len()); + tracing::info!("plugin data {}", _data.len()); let mut client = self.client.borrow_mut(); let hash = client .state() .ecs() .write_resource::() - .cache_server_plugin(&global_state.config_dir, data); + .cache_server_plugin(&global_state.config_dir, _data); match hash { Ok(hash) => { if client.plugin_received(hash) == 0 { diff --git a/voxygen/src/menu/char_selection/ui.rs b/voxygen/src/menu/char_selection/ui.rs index 7b5560d374..c8e36e131f 100644 --- a/voxygen/src/menu/char_selection/ui.rs +++ b/voxygen/src/menu/char_selection/ui.rs @@ -41,7 +41,6 @@ use iced::{ button, scrollable, slider, text_input, Align, Button, Color, Column, Container, HorizontalAlignment, Length, Row, Scrollable, Slider, Space, Text, TextInput, }; -use server::settings::SINGLEPLAYER_SERVER_NAME; use std::sync::Arc; use vek::{Rgba, Vec2}; @@ -536,11 +535,15 @@ impl Controls { *info_content = None; } - let server_name = if client.server_info().name == SINGLEPLAYER_SERVER_NAME { - &i18n.get_msg("common-singleplayer").to_string() - } else { - &client.server_info().name - }; + #[cfg(feature = "singleplayer")] + let server_name = + if client.server_info().name == server::settings::SINGLEPLAYER_SERVER_NAME { + &i18n.get_msg("common-singleplayer").to_string() + } else { + &client.server_info().name + }; + #[cfg(not(feature = "singleplayer"))] + let server_name = &client.server_info().name; let server = Container::new( Column::with_children(vec![ diff --git a/voxygen/src/menu/main/mod.rs b/voxygen/src/menu/main/mod.rs index ec80ba0f8d..5149a14d2a 100644 --- a/voxygen/src/menu/main/mod.rs +++ b/voxygen/src/menu/main/mod.rs @@ -23,6 +23,7 @@ use common_state::plugin::PluginMgr; use i18n::LocalizationHandle; #[cfg(feature = "singleplayer")] use server::ServerInitStage; +#[cfg(feature = "singleplayer")] use specs::WorldExt; use std::{path::Path, sync::Arc}; use tokio::runtime; @@ -283,16 +284,16 @@ impl PlayState for MainMenuState { ); self.init = InitState::None; }, - client::Event::PluginDataReceived(data) => { + client::Event::PluginDataReceived(_data) => { #[cfg(feature = "plugins")] { - tracing::info!("plugin data {}", data.len()); + tracing::info!("plugin data {}", _data.len()); if let InitState::Pipeline(client) = &mut self.init { let hash = client .state() .ecs() .write_resource::() - .cache_server_plugin(&global_state.config_dir, data); + .cache_server_plugin(&global_state.config_dir, _data); match hash { Ok(hash) => { if client.plugin_received(hash) == 0 {