diff --git a/client/src/lib.rs b/client/src/lib.rs index 81ac754024..808e1bae3a 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, + #[cfg_attr(not(feature = "plugins"), allow(unused_variables))] config_dir: PathBuf, ) -> Result { let network = Network::new(Pid::new(), &runtime); @@ -628,7 +628,7 @@ impl Client { server_constants, repair_recipe_book, description, - active_plugins, + active_plugins: _active_plugins, } = loop { tokio::select! { // Spawn in a blocking thread (leaving the network thread free). This is mostly @@ -665,12 +665,15 @@ impl Client { #[cfg(feature = "plugins")] common_state::plugin::PluginMgr::from_asset_or_default(), ); + + #[cfg_attr(not(feature = "plugins"), allow(unused_mut))] let mut missing_plugins: Vec = Vec::new(); + #[cfg_attr(not(feature = "plugins"), allow(unused_mut))] let mut local_plugins: Vec = Vec::new(); #[cfg(feature = "plugins")] { let already_present = state.ecs().read_resource::().plugin_list(); - for hash in active_plugins.iter() { + for hash in _active_plugins.iter() { if !already_present.contains(hash) { // look in config_dir first (cache) if let Ok(local_path) = common_state::plugin::find_cached(&config_dir, hash) diff --git a/voxygen/src/menu/char_selection/mod.rs b/voxygen/src/menu/char_selection/mod.rs index bca1f708a7..0090e4ab98 100644 --- a/voxygen/src/menu/char_selection/mod.rs +++ b/voxygen/src/menu/char_selection/mod.rs @@ -278,6 +278,7 @@ impl PlayState for CharSelectionState { Rc::clone(&self.client), ))); }, + #[cfg_attr(not(feature = "plugins"), allow(unused_variables))] client::Event::PluginDataReceived(data) => { #[cfg(feature = "plugins")] { 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..8b04c092ff 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,6 +284,7 @@ impl PlayState for MainMenuState { ); self.init = InitState::None; }, + #[cfg_attr(not(feature = "plugins"), allow(unused_variables))] client::Event::PluginDataReceived(data) => { #[cfg(feature = "plugins")] {