Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'isse/fix-test-voxygen' into 'master'

Browse Source 
Fix `test-voxygen` errors and warnings

See merge request veloren/veloren!4560
This commit is contained in:
Isse 2024-08-21 17:04:01 +00:00
commit 67905d0388
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/lib.rs
View File

@ -439,7 +439,7 @@ impl Client {
auth_trusted: impl FnMut(&str) -> bool, auth_trusted: impl FnMut(&str) -> bool,
init_stage_update: &(dyn Fn(ClientInitStage) + Send + Sync), init_stage_update: &(dyn Fn(ClientInitStage) + Send + Sync),
add_foreign_systems: impl Fn(&mut DispatcherBuilder) + Send + 'static, add_foreign_systems: impl Fn(&mut DispatcherBuilder) + Send + 'static,
config_dir: PathBuf, #[cfg_attr(not(feature = "plugins"), allow(unused_variables))] config_dir: PathBuf,
) -> Result<Self, Error> { ) -> Result<Self, Error> {
let network = Network::new(Pid::new(), &runtime); let network = Network::new(Pid::new(), &runtime);
@ -628,7 +628,7 @@ impl Client {
server_constants, server_constants,
repair_recipe_book, repair_recipe_book,
description, description,
active_plugins, active_plugins: _active_plugins,
} = loop { } = loop {
tokio::select! { tokio::select! {
// Spawn in a blocking thread (leaving the network thread free). This is mostly // Spawn in a blocking thread (leaving the network thread free). This is mostly
@ -665,12 +665,15 @@ impl Client {
#[cfg(feature = "plugins")] #[cfg(feature = "plugins")]
common_state::plugin::PluginMgr::from_asset_or_default(), common_state::plugin::PluginMgr::from_asset_or_default(),
); );
#[cfg_attr(not(feature = "plugins"), allow(unused_mut))]
let mut missing_plugins: Vec<PluginHash> = Vec::new(); let mut missing_plugins: Vec<PluginHash> = Vec::new();
#[cfg_attr(not(feature = "plugins"), allow(unused_mut))]
let mut local_plugins: Vec<PathBuf> = Vec::new(); let mut local_plugins: Vec<PathBuf> = Vec::new();
#[cfg(feature = "plugins")] #[cfg(feature = "plugins")]
{ {
let already_present = state.ecs().read_resource::<PluginMgr>().plugin_list(); let already_present = state.ecs().read_resource::<PluginMgr>().plugin_list();
for hash in active_plugins.iter() { for hash in _active_plugins.iter() {
if !already_present.contains(hash) { if !already_present.contains(hash) {
// look in config_dir first (cache) // look in config_dir first (cache)
if let Ok(local_path) = common_state::plugin::find_cached(&config_dir, hash) if let Ok(local_path) = common_state::plugin::find_cached(&config_dir, hash)

1
voxygen/src/menu/char_selection/mod.rs
View File

@ -278,6 +278,7 @@ impl PlayState for CharSelectionState {
Rc::clone(&self.client), Rc::clone(&self.client),
))); )));
}, },
#[cfg_attr(not(feature = "plugins"), allow(unused_variables))]
client::Event::PluginDataReceived(data) => { client::Event::PluginDataReceived(data) => {
#[cfg(feature = "plugins")] #[cfg(feature = "plugins")]
{ {

7
voxygen/src/menu/char_selection/ui.rs
View File

@ -41,7 +41,6 @@ use iced::{
button, scrollable, slider, text_input, Align, Button, Color, Column, Container, button, scrollable, slider, text_input, Align, Button, Color, Column, Container,
HorizontalAlignment, Length, Row, Scrollable, Slider, Space, Text, TextInput, HorizontalAlignment, Length, Row, Scrollable, Slider, Space, Text, TextInput,
}; };
use server::settings::SINGLEPLAYER_SERVER_NAME;
use std::sync::Arc; use std::sync::Arc;
use vek::{Rgba, Vec2}; use vek::{Rgba, Vec2};
@ -536,11 +535,15 @@ impl Controls {
*info_content = None; *info_content = None;
} }
let server_name = if client.server_info().name == SINGLEPLAYER_SERVER_NAME { #[cfg(feature = "singleplayer")]
let server_name =
if client.server_info().name == server::settings::SINGLEPLAYER_SERVER_NAME {
&i18n.get_msg("common-singleplayer").to_string() &i18n.get_msg("common-singleplayer").to_string()
} else { } else {
&client.server_info().name &client.server_info().name
}; };
#[cfg(not(feature = "singleplayer"))]
let server_name = &client.server_info().name;
let server = Container::new( let server = Container::new(
Column::with_children(vec![ Column::with_children(vec![

2
voxygen/src/menu/main/mod.rs
View File

@ -23,6 +23,7 @@ use common_state::plugin::PluginMgr;
use i18n::LocalizationHandle; use i18n::LocalizationHandle;
#[cfg(feature = "singleplayer")] #[cfg(feature = "singleplayer")]
use server::ServerInitStage; use server::ServerInitStage;
#[cfg(feature = "singleplayer")]
use specs::WorldExt; use specs::WorldExt;
use std::{path::Path, sync::Arc}; use std::{path::Path, sync::Arc};
use tokio::runtime; use tokio::runtime;
@ -283,6 +284,7 @@ impl PlayState for MainMenuState {
); );
self.init = InitState::None; self.init = InitState::None;
}, },
#[cfg_attr(not(feature = "plugins"), allow(unused_variables))]
client::Event::PluginDataReceived(data) => { client::Event::PluginDataReceived(data) => {
#[cfg(feature = "plugins")] #[cfg(feature = "plugins")]
{ {