diff options
| -rw-r--r-- | Cargo.lock | 1 | ||||
| -rw-r--r-- | azalea-world/Cargo.toml | 8 | ||||
| -rw-r--r-- | azalea-world/src/world.rs | 5 | ||||
| -rw-r--r-- | azalea/Cargo.toml | 4 |
4 files changed, 12 insertions, 6 deletions
@@ -547,6 +547,7 @@ dependencies = [ "nohash-hasher", "parking_lot", "rustc-hash 2.1.1", + "serde", "simdnbt", "thiserror 2.0.11", "tracing", diff --git a/azalea-world/Cargo.toml b/azalea-world/Cargo.toml index 2ce3d097..5354259e 100644 --- a/azalea-world/Cargo.toml +++ b/azalea-world/Cargo.toml @@ -13,19 +13,21 @@ criterion = "0.5.1" [dependencies] azalea-block = { path = "../azalea-block", default-features = false, version = "0.11.0" } azalea-buf = { path = "../azalea-buf", version = "0.11.0" } -azalea-core = { path = "../azalea-core", version = "0.11.0", features = [ - "bevy_ecs", -] } +azalea-core = { path = "../azalea-core", version = "0.11.0", features = ["bevy_ecs"] } azalea-registry = { path = "../azalea-registry", version = "0.11.0" } bevy_ecs.workspace = true derive_more = { workspace = true, features = ["deref", "deref_mut"] } nohash-hasher.workspace = true parking_lot.workspace = true rustc-hash.workspace = true +serde = { workspace = true, optional = true } simdnbt.workspace = true thiserror.workspace = true tracing.workspace = true +[features] +serde = ["dep:serde"] + [[bench]] name = "chunks" harness = false diff --git a/azalea-world/src/world.rs b/azalea-world/src/world.rs index ffd60026..ae257696 100644 --- a/azalea-world/src/world.rs +++ b/azalea-world/src/world.rs @@ -14,6 +14,8 @@ use azalea_core::registry_holder::RegistryHolder; use bevy_ecs::{component::Component, entity::Entity}; use derive_more::{Deref, DerefMut}; use nohash_hasher::IntMap; +#[cfg(feature = "serde")] +use serde::{Deserialize, Serialize}; use crate::{ChunkStorage, PartialChunkStorage}; @@ -57,7 +59,8 @@ impl PartialInstance { /// `#[var]` attribute. /// /// [`Entity`]: bevy_ecs::entity::Entity -#[derive(Component, Copy, Clone, Debug, PartialEq, Eq, Deref, DerefMut)] +#[derive(Component, Copy, Clone, Debug, Default, PartialEq, Eq, Deref, DerefMut)] +#[cfg_attr(feature = "serde", derive(Deserialize, Serialize))] pub struct MinecraftEntityId(pub i32); impl Hash for MinecraftEntityId { diff --git a/azalea/Cargo.toml b/azalea/Cargo.toml index 94fe2612..bd3e54b9 100644 --- a/azalea/Cargo.toml +++ b/azalea/Cargo.toml @@ -8,7 +8,7 @@ repository.workspace = true [package.metadata.release] pre-release-replacements = [ - { file = "README.md", search = "`azalea = \"[a-z0-9\\.-]+\"`", replace = "`azalea = \"{{version}}\"`" }, + { file = "README.md", search = "`azalea = \"[a-z0-9\\.-]+\"`", replace = "`azalea = \"{{version}}\"`" }, ] [dependencies] @@ -56,7 +56,7 @@ anyhow.workspace = true default = ["log", "serde"] # enables bevy_log::LogPlugin by default log = ["azalea-client/log"] -serde = ["dep:serde"] +serde = ["dep:serde", "azalea-core/serde", "azalea-registry/serde", "azalea-world/serde"] [[bench]] name = "pathfinder" |