move palette to core folder instead of world

rimecraft-rs · Mar 9, 2024 · 52bdaa1 · 52bdaa1
1 parent 415b2a6
commit 52bdaa1
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,11 +2,8 @@
 resolver = "2"
 members = [
     "crates/util/*",
-
-	"crates/client/*",
-
+    "crates/client/*",
     "crates/core/*",
-    "crates/core/world/palette",
 
     "crates/flare3d",
     "crates/flare3d/example",

diff --git a/crates/core/world/palette/Cargo.toml → crates/core/palette/Cargo.toml b/crates/core/world/palette/Cargo.toml → crates/core/palette/Cargo.toml
@@ -12,11 +12,11 @@ categories = []
 maintenance = { status = "passively-maintained" }
 
 [dependencies]
-rimecraft-packed-int-array = { path = "../../../util/packed-int-array" }
-rimecraft-maybe = { path = "../../../util/maybe" }
-rimecraft-edcode = { path = "../../../util/edcode", optional = true }
+rimecraft-packed-int-array = { path = "../../util/packed-int-array" }
+rimecraft-maybe = { path = "../../util/maybe" }
+rimecraft-edcode = { path = "../../util/edcode", optional = true }
 serde = { version = "1.0", features = ["derive"], optional = true }
-rimecraft-serde-update = { path = "../../../util/serde-update", optional = true }
+rimecraft-serde-update = { path = "../../util/serde-update", optional = true }
 ahash = "0.8"
 
 [features]

diff --git a/crates/core/world/palette/src/container.rs → crates/core/palette/src/container.rs b/crates/core/world/palette/src/container.rs → crates/core/palette/src/container.rs
@@ -510,11 +510,13 @@ mod _serde {
             let is = is;
 
             let j = Cx::bits(&self.list, pal.len());
+
             #[derive(Serialize)]
             struct Serialized<'a, T> {
                 palette: &'a [T], // forward field in BiMapPalette
                 data: Option<&'a [u64]>,
             }
+
             let entries = {
                 let PaletteImpl::BiMap { forward, .. } = &pal.internal else {
                     unreachable!()

diff --git a/crates/core/world/palette/src/iter.rs → crates/core/palette/src/iter.rs b/crates/core/world/palette/src/iter.rs → crates/core/palette/src/iter.rs
diff --git a/crates/core/world/palette/src/lib.rs → crates/core/palette/src/lib.rs b/crates/core/world/palette/src/lib.rs → crates/core/palette/src/lib.rs
diff --git a/crates/core/world/Cargo.toml b/crates/core/world/Cargo.toml
@@ -13,7 +13,7 @@ maintenance = { status = "passively-maintained" }
 
 [dependencies]
 rimecraft-global-cx = { path = "../global-cx" }
-rimecraft-chunk-palette = { path = "./palette" }
+rimecraft-chunk-palette = { path = "../palette" }
 rimecraft-registry = { path = "../../util/registry", features = ["serde"] }
 rimecraft-state = { path = "../state" }
 rimecraft-block = { path = "../block" }