diff --git a/CHANGELOG.md b/CHANGELOG.md index e7b9e3eb05..c5aec983db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed - Plugins can no longer prevent users from logging in +- Removed fallback support for old save folder pre 0.8.0 ### Fixed diff --git a/Cargo.lock b/Cargo.lock index 7c9133c4cf..26332a5e3f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -107,7 +107,7 @@ checksum = "8c4afb09dd642feec8408e33f92f3ffc4052946f6b20f32fb99c1f58cd4fa7cf" dependencies = [ "bitflags 1.3.2", "rusttype 0.9.3", - "walkdir 2.3.3", + "walkdir", "xdg", "xml-rs", ] @@ -190,7 +190,7 @@ checksum = "a7e7b35733e3a8c1ccb90385088dd5b6eaa61325cb4d1ad56e683b5224ff352e" dependencies = [ "jni 0.21.1", "ndk-context", - "winapi 0.3.9", + "winapi", "xdg", ] @@ -353,7 +353,7 @@ checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ "hermit-abi 0.1.19", "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -679,7 +679,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -786,7 +786,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fdf5e01086b6be750428ba4a40619f847eb2e95756eee84b18e06e5f0b50342" dependencies = [ "lazy-bytes-cast", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -797,7 +797,7 @@ checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" dependencies = [ "error-code", "str-buf", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -962,15 +962,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -[[package]] -name = "copy_dir" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4281031634644843bd2f5aa9c48cf98fc48d6b083bd90bb11becf10deaf8b0" -dependencies = [ - "walkdir 0.1.8", -] - [[package]] name = "copyless" version = "0.1.5" @@ -1127,7 +1118,7 @@ dependencies = [ "stdweb 0.1.3", "thiserror", "web-sys", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1280,7 +1271,7 @@ dependencies = [ "serde_json", "tinytemplate", "tokio", - "walkdir 2.3.3", + "walkdir", ] [[package]] @@ -1416,7 +1407,7 @@ dependencies = [ "mio 0.7.14", "parking_lot 0.10.2", "signal-hook 0.1.17", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1432,7 +1423,7 @@ dependencies = [ "parking_lot 0.12.1", "signal-hook 0.3.15", "signal-hook-mio", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1441,7 +1432,7 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2265c3f8e080075d9b6417aa72293fc71662f34b4af2612d8d1b074d29510db" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1450,7 +1441,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1551,7 +1542,7 @@ checksum = "2daefd788d1e96e0a9d66dee4b828b883509bc3ea9ce30665f04c3246372690c" dependencies = [ "bitflags 1.3.2", "libloading 0.7.4", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -1765,7 +1756,7 @@ checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", "redox_users", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2150,7 +2141,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "redox_syscall 0.2.16", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2391,7 +2382,7 @@ dependencies = [ "libc", "log", "rustversion", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2411,7 +2402,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2463,7 +2454,7 @@ dependencies = [ "smallvec", "spirv_cross", "thunderdome", - "winapi 0.3.9", + "winapi", "wio", ] @@ -2485,7 +2476,7 @@ dependencies = [ "smallvec", "spirv_cross", "thunderdome", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -2566,7 +2557,7 @@ dependencies = [ "raw-window-handle 0.3.4", "renderdoc-sys", "smallvec", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3058,7 +3049,7 @@ dependencies = [ "iced_native", "log", "thiserror", - "winapi 0.3.9", + "winapi", "window_clipboard", "winit", ] @@ -3235,7 +3226,7 @@ dependencies = [ "jni-sys", "log", "thiserror", - "walkdir 2.3.3", + "walkdir", ] [[package]] @@ -3250,7 +3241,7 @@ dependencies = [ "jni-sys", "log", "thiserror", - "walkdir 2.3.3", + "walkdir", "windows-sys 0.45.0", ] @@ -3284,16 +3275,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - [[package]] name = "keyboard-keynames" version = "0.1.2" @@ -3301,7 +3282,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f32e85d306d31d33240ea15accdf6e153d0a31da1409a21a0d5fb7ca5ef91d6c" dependencies = [ "wayland-client 0.29.5", - "winapi 0.3.9", + "winapi", "winit", "xcb", "xkbcommon", @@ -3400,7 +3381,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883" dependencies = [ "cfg-if 1.0.0", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3410,7 +3391,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if 1.0.0", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3679,7 +3660,7 @@ dependencies = [ "wayland-client 0.29.5", "wayland-cursor 0.29.5", "wayland-protocols 0.29.5", - "winapi 0.3.9", + "winapi", "x11-dl", ] @@ -3718,7 +3699,7 @@ dependencies = [ "log", "miow", "ntapi", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3751,7 +3732,7 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -3768,13 +3749,12 @@ checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" [[package]] name = "mumble-link" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a92ff7d87d3ca752fda7a1ccfcde284ea3de84fc8b8a0c43bf434652226bd95" +checksum = "c7f4c53745d4e7afd0faaf6ee46c0c3114d4b7d0db63bef96917751906453285" dependencies = [ - "kernel32-sys", "libc", - "winapi 0.2.8", + "winapi", ] [[package]] @@ -3811,7 +3791,7 @@ dependencies = [ "thiserror", "wfd", "which", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -4055,7 +4035,7 @@ dependencies = [ "kqueue", "libc", "mio 0.8.6", - "walkdir 2.3.3", + "walkdir", "windows-sys 0.42.0", ] @@ -4064,7 +4044,7 @@ name = "ntapi" version = "0.3.7" source = "git+https://github.com/MSxDOS/ntapi.git?rev=9f56b149c9e25796739157c0fce3e0007a7de6eb#9f56b149c9e25796739157c0fce3e0007a7de6eb" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -4074,7 +4054,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" dependencies = [ "overload", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -4462,7 +4442,7 @@ dependencies = [ "libc", "redox_syscall 0.1.57", "smallvec", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -4476,7 +4456,7 @@ dependencies = [ "libc", "redox_syscall 0.2.16", "smallvec", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -5167,7 +5147,7 @@ dependencies = [ "time 0.3.20", "toml 0.7.3", "url", - "walkdir 2.3.3", + "walkdir", ] [[package]] @@ -5236,7 +5216,7 @@ dependencies = [ "bitflags 1.3.2", "libc", "mach", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -5266,7 +5246,7 @@ dependencies = [ "spin 0.5.2", "untrusted", "web-sys", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -5581,7 +5561,7 @@ dependencies = [ "unicode-segmentation", "unicode-width", "utf8parse", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -5606,7 +5586,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" dependencies = [ "lazy_static", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -6066,7 +6046,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -6130,7 +6110,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cafa7900db085f4354dbc7025e25d7a839a14360ea13b5fc4fd717f2d3b23134" dependencies = [ "once_cell", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -6170,7 +6150,7 @@ dependencies = [ "cfg-if 1.0.0", "libc", "psm", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -6448,7 +6428,7 @@ dependencies = [ "stdweb 0.4.20", "time-macros 0.1.1", "version_check", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -7111,7 +7091,7 @@ dependencies = [ "ron 0.8.0", "serde", "tracing", - "walkdir 2.3.3", + "walkdir", "wavefront", ] @@ -7435,7 +7415,6 @@ dependencies = [ "cmake", "conrod_core", "conrod_winit", - "copy_dir", "cpal 0.14.2", "criterion", "crossbeam-channel", @@ -7663,16 +7642,6 @@ dependencies = [ "unicode-xid 0.2.4", ] -[[package]] -name = "walkdir" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c66c0b9792f0a765345452775f3adbd28dde9d33f30d13e5dcc5ae17cf6f3780" -dependencies = [ - "kernel32-sys", - "winapi 0.2.8", -] - [[package]] name = "walkdir" version = "2.3.3" @@ -7828,7 +7797,7 @@ dependencies = [ "wasmer-types", "wasmer-vm", "wat", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -7851,7 +7820,7 @@ dependencies = [ "wasmer-types", "wasmer-vm", "wasmparser", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -7925,7 +7894,7 @@ dependencies = [ "scopeguard", "thiserror", "wasmer-types", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -8173,7 +8142,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e713040b67aae5bf1a0ae3e1ebba8cc29ab2b90da9aa1bff6e09031a8a41d7a8" dependencies = [ "libc", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -8256,12 +8225,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - [[package]] name = "winapi" version = "0.3.9" @@ -8272,12 +8235,6 @@ dependencies = [ "winapi-x86_64-pc-windows-gnu", ] -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" @@ -8290,7 +8247,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -8299,7 +8256,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44c17110f57155602a80dca10be03852116403c9ff3cd25b079d666f2aa3df6e" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -8593,7 +8550,7 @@ dependencies = [ "serde", "smithay-client-toolkit 0.12.3", "wayland-client 0.28.6", - "winapi 0.3.9", + "winapi", "x11-dl", ] @@ -8613,7 +8570,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76a1a57ff50e9b408431e8f97d5456f2807f8eb2a2cd79b06068fc87f8ecf189" dependencies = [ "cfg-if 1.0.0", - "winapi 0.3.9", + "winapi", ] [[package]] @@ -8631,7 +8588,7 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d129932f4644ac2396cb456385cbf9e63b5b30c6e8dc4820bdca4eb082037a5" dependencies = [ - "winapi 0.3.9", + "winapi", ] [[package]] @@ -8671,7 +8628,7 @@ checksum = "6e99be55648b3ae2a52342f9a870c0e138709a3493261ce9b469afe6e4df6d8a" dependencies = [ "gethostname", "nix 0.22.3", - "winapi 0.3.9", + "winapi", "winapi-wsapoll", ] @@ -8683,7 +8640,7 @@ checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" dependencies = [ "gethostname", "nix 0.24.3", - "winapi 0.3.9", + "winapi", "winapi-wsapoll", "x11rb-protocol", ] diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index b5c1189d8a..3467736b98 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -105,7 +105,6 @@ bincode = { workspace = true } chrono = { workspace = true } chumsky = "0.9" cpal = "0.14" -copy_dir = "0.1.2" crossbeam-utils = { workspace = true } crossbeam-channel = { workspace = true } # TODO: remove @@ -149,7 +148,7 @@ mimalloc = "0.1.29" # Mumble [target.'cfg(not(target_os="macos"))'.dependencies] -mumble-link = "0.1.0" +mumble-link = "0.2.0" [dev-dependencies] criterion = "0.3" diff --git a/voxygen/src/singleplayer.rs b/voxygen/src/singleplayer.rs index 44e0a789c3..c1937ffdf3 100644 --- a/voxygen/src/singleplayer.rs +++ b/voxygen/src/singleplayer.rs @@ -13,7 +13,7 @@ use std::{ time::Duration, }; use tokio::runtime::Runtime; -use tracing::{error, info, trace, warn}; +use tracing::{info, trace, warn}; const TPS: u64 = 30; @@ -40,43 +40,6 @@ impl Singleplayer { path }; - // Copy saves from old folder if they don't exist in the new location - (|| { - let new_path = server_data_dir.join("saves"); - if new_path.exists() { - return; - } - - let working_dir = std::path::PathBuf::from("saves"); - let config_dir = directories_next::ProjectDirs::from("net", "veloren", "voxygen") - .expect("System's $HOME directory path not found!") - .config_dir() - .join("saves"); - let old_path = if working_dir.exists() { - working_dir - } else if config_dir.exists() { - config_dir - } else { - return; - }; - - info!( - "Saves folder doesn't exist, but there is one in the old saves location ({}), \ - copying it to the new location", - old_path.display() - ); - if let Some(parent) = new_path.parent() { - if let Err(e) = std::fs::create_dir_all(parent) { - error!(?e, "Could not create folder to hold saves folder."); - return; - } - } - - if let Err(e) = copy_dir::copy_dir(old_path, new_path) { - error!(?e, "Failed to copy saves from the old location"); - } - })(); - // Create server let settings = server::Settings::singleplayer(&server_data_dir); let editable_settings = server::EditableSettings::singleplayer(&server_data_dir);