From 228f31c568d447d7e214654948fb6c2dfd15eaee Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sun, 20 Aug 2023 16:55:10 +0200
Subject: [PATCH] Move resource module to a separate crate

The resource module does not depend on any other part of MinedMap.
---
 Cargo.lock                                            | 11 ++++++++++-
 Cargo.toml                                            |  2 +-
 crates/resource/Cargo.toml                            | 11 +++++++++++
 {src/resource => crates/resource/src}/biomes.rs       |  0
 {src/resource => crates/resource/src}/block_color.rs  |  0
 {src/resource => crates/resource/src}/block_types.rs  |  0
 .../resource/src}/legacy_block_types.rs               |  0
 src/resource/mod.rs => crates/resource/src/lib.rs     |  0
 resource/README.md                                    |  4 ++--
 src/main.rs                                           |  2 +-
 10 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 crates/resource/Cargo.toml
 rename {src/resource => crates/resource/src}/biomes.rs (100%)
 rename {src/resource => crates/resource/src}/block_color.rs (100%)
 rename {src/resource => crates/resource/src}/block_types.rs (100%)
 rename {src/resource => crates/resource/src}/legacy_block_types.rs (100%)
 rename src/resource/mod.rs => crates/resource/src/lib.rs (100%)

diff --git a/Cargo.lock b/Cargo.lock
index 2b755fb..21eee69 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -559,7 +559,6 @@ dependencies = [
  "anyhow",
  "bincode",
  "clap",
- "enumflags2",
  "fastnbt",
  "futures-util",
  "glam",
@@ -567,6 +566,7 @@ dependencies = [
  "indexmap",
  "lru",
  "minedmap-nbt",
+ "minedmap-resource",
  "minedmap-types",
  "num-integer",
  "num_cpus",
@@ -590,6 +590,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "minedmap-resource"
+version = "0.1.0"
+dependencies = [
+ "enumflags2",
+ "glam",
+ "serde",
+]
+
 [[package]]
 name = "minedmap-types"
 version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 7c9ab32..df11d5e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,6 @@ default-run = "minedmap"
 anyhow = "1.0.68"
 bincode = "1.3.3"
 clap = { version = "4.1.4", features = ["derive"] }
-enumflags2 = { version = "0.7.5", features = ["serde"] }
 fastnbt = "2.3.2"
 futures-util = "0.3.28"
 glam = "0.24.0"
@@ -20,6 +19,7 @@ image = { version = "0.24.5", default-features = false, features = ["png"] }
 indexmap = { version = "2.0.0", features = ["serde"] }
 lru = "0.11.0"
 minedmap-nbt = { version = "0.1.0", path = "crates/nbt", default-features = false }
+minedmap-resource = { version = "0.1.0", path = "crates/resource" }
 minedmap-types = { version = "0.1.0", path = "crates/types" }
 num-integer = "0.1.45"
 num_cpus = "1.16.0"
diff --git a/crates/resource/Cargo.toml b/crates/resource/Cargo.toml
new file mode 100644
index 0000000..2436548
--- /dev/null
+++ b/crates/resource/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "minedmap-resource"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+enumflags2 = { version = "0.7.7", features = ["serde"] }
+glam = "0.24.1"
+serde = "1.0.183"
diff --git a/src/resource/biomes.rs b/crates/resource/src/biomes.rs
similarity index 100%
rename from src/resource/biomes.rs
rename to crates/resource/src/biomes.rs
diff --git a/src/resource/block_color.rs b/crates/resource/src/block_color.rs
similarity index 100%
rename from src/resource/block_color.rs
rename to crates/resource/src/block_color.rs
diff --git a/src/resource/block_types.rs b/crates/resource/src/block_types.rs
similarity index 100%
rename from src/resource/block_types.rs
rename to crates/resource/src/block_types.rs
diff --git a/src/resource/legacy_block_types.rs b/crates/resource/src/legacy_block_types.rs
similarity index 100%
rename from src/resource/legacy_block_types.rs
rename to crates/resource/src/legacy_block_types.rs
diff --git a/src/resource/mod.rs b/crates/resource/src/lib.rs
similarity index 100%
rename from src/resource/mod.rs
rename to crates/resource/src/lib.rs
diff --git a/resource/README.md b/resource/README.md
index 5211fd3..08857ad 100644
--- a/resource/README.md
+++ b/resource/README.md
@@ -63,8 +63,8 @@ with MinedMap's resource metadata.
 7. Update the source code with the new block colors:
 
      ```sh
-     ./generate.py colors.json ../src/resource/block_types.rs
-     cargo fmt
+     ./generate.py colors.json ../crates/resource/src/block_types.rs
+     cargo fmt --all
      ```
 
 After the update, the new version should be tested with old savegames (both
diff --git a/src/main.rs b/src/main.rs
index 9bbe0ab..4409dff 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -5,11 +5,11 @@
 
 mod core;
 mod io;
-mod resource;
 mod util;
 mod world;
 
 use minedmap_nbt as nbt;
+use minedmap_resource as resource;
 use minedmap_types as types;
 
 use anyhow::Result;