diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/Cargo.toml | 2 | ||||
| -rw-r--r-- | server/src/data/mod.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/server/Cargo.toml b/server/Cargo.toml index 39b9ea1c..929f806d 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -13,7 +13,7 @@ tokio = { version = "1.38.0", features = ["full"] } serde_json = "1.0.120" tokio-tungstenite = "0.23.1" futures-util = "0.3.30" -serde_yaml = "0.9.34+deprecated" +serde_yml = "0.0.10" rand = "0.9.0-alpha.1" shlex = "1.3.0" clap = { version = "4.5.8", features = ["derive"] } diff --git a/server/src/data/mod.rs b/server/src/data/mod.rs index 0f1976b9..28347a25 100644 --- a/server/src/data/mod.rs +++ b/server/src/data/mod.rs @@ -136,7 +136,7 @@ fn data_dir() -> PathBuf { impl DataIndex { pub fn reload(&mut self) -> Result<()> { - *self = serde_yaml::from_reader(File::open(data_dir().join("index.yaml"))?)?; + *self = serde_yml::from_reader(File::open(data_dir().join("index.yaml"))?)?; Ok(()) } @@ -165,8 +165,8 @@ impl DataIndex { pub async fn generate(&self, spec: String) -> Result<Gamedata> { let (map, recipes) = spec.split_once("-").unwrap_or((spec.as_str(), "default")); - let map_in = serde_yaml::from_str(&self.read_map(map).await?)?; - let recipes_in = serde_yaml::from_str(&self.read_recipes(recipes).await?)?; + let map_in = serde_yml::from_str(&self.read_map(map).await?)?; + let recipes_in = serde_yml::from_str(&self.read_recipes(recipes).await?)?; let mut gd = Gamedata::build(spec, map_in, recipes_in)?; gd.map = self.maps.clone(); |