From 95d66395eda5b72449b44e552e522df67e28da42 Mon Sep 17 00:00:00 2001 From: JieningYu Date: Tue, 13 Feb 2024 11:45:24 +0800 Subject: [PATCH] move registry to core --- crates/core/block/Cargo.toml | 2 +- crates/core/item/Cargo.toml | 2 +- crates/{util => core}/registry/Cargo.toml | 4 ++-- crates/{util => core}/registry/src/entry.rs | 0 crates/{util => core}/registry/src/key.rs | 0 crates/{util => core}/registry/src/lib.rs | 0 crates/{util => core}/registry/src/tag.rs | 0 crates/{util => core}/registry/src/tests.rs | 0 8 files changed, 4 insertions(+), 4 deletions(-) rename crates/{util => core}/registry/Cargo.toml (79%) rename crates/{util => core}/registry/src/entry.rs (100%) rename crates/{util => core}/registry/src/key.rs (100%) rename crates/{util => core}/registry/src/lib.rs (100%) rename crates/{util => core}/registry/src/tag.rs (100%) rename crates/{util => core}/registry/src/tests.rs (100%) diff --git a/crates/core/block/Cargo.toml b/crates/core/block/Cargo.toml index 9173e97..5c77424 100644 --- a/crates/core/block/Cargo.toml +++ b/crates/core/block/Cargo.toml @@ -12,7 +12,7 @@ categories = [] maintenance = { status = "passively-maintained" } [dependencies] -rimecraft-registry = { path = "../../util/registry" } +rimecraft-registry = { path = "../registry" } glam = "0.25" rimecraft-state = { path = "../state", optional = true } rimecraft-edcode = { path = "../../util/edcode", optional = true } diff --git a/crates/core/item/Cargo.toml b/crates/core/item/Cargo.toml index 31d8d45..7762339 100644 --- a/crates/core/item/Cargo.toml +++ b/crates/core/item/Cargo.toml @@ -12,7 +12,7 @@ categories = [] maintenance = { status = "passively-maintained" } [dependencies] -rimecraft-registry = { path = "../../util/registry" } +rimecraft-registry = { path = "../registry" } rimecraft-fmt = { path = "../../util/fmt" } rimecraft-attachment = { path = "../../util/attachment" } rimecraft-serde-update = { path = "../../util/serde-update", optional = true } diff --git a/crates/util/registry/Cargo.toml b/crates/core/registry/Cargo.toml similarity index 79% rename from crates/util/registry/Cargo.toml rename to crates/core/registry/Cargo.toml index 2de3f8a..53d1e1a 100644 --- a/crates/util/registry/Cargo.toml +++ b/crates/core/registry/Cargo.toml @@ -14,8 +14,8 @@ maintenance = { status = "passively-maintained" } [dependencies] parking_lot = "0.12" serde = { version = "1.0", optional = true } -rimecraft-edcode = { path = "../edcode", optional = true } -rimecraft-identifier = { path = "../identifier", optional = true, features = [ +rimecraft-edcode = { path = "../../util/edcode", optional = true } +rimecraft-identifier = { path = "../../util/identifier", optional = true, features = [ "vanilla", ] } diff --git a/crates/util/registry/src/entry.rs b/crates/core/registry/src/entry.rs similarity index 100% rename from crates/util/registry/src/entry.rs rename to crates/core/registry/src/entry.rs diff --git a/crates/util/registry/src/key.rs b/crates/core/registry/src/key.rs similarity index 100% rename from crates/util/registry/src/key.rs rename to crates/core/registry/src/key.rs diff --git a/crates/util/registry/src/lib.rs b/crates/core/registry/src/lib.rs similarity index 100% rename from crates/util/registry/src/lib.rs rename to crates/core/registry/src/lib.rs diff --git a/crates/util/registry/src/tag.rs b/crates/core/registry/src/tag.rs similarity index 100% rename from crates/util/registry/src/tag.rs rename to crates/core/registry/src/tag.rs diff --git a/crates/util/registry/src/tests.rs b/crates/core/registry/src/tests.rs similarity index 100% rename from crates/util/registry/src/tests.rs rename to crates/core/registry/src/tests.rs