From 9624a07ad2338cc0851769a50f7d629b402dc539 Mon Sep 17 00:00:00 2001
From: xeon <xeon@xeondev.com>
Date: Mon, 15 Apr 2024 21:16:37 +0300
Subject: [PATCH] Move data structs to 'common' crate and assets folder to the
 root

---
 .../assets => assets}/ExcelOutput/MapEntranceConfig.json      | 0
 common/Cargo.toml                                             | 4 ++++
 {gameserver => common}/src/data/excels.rs                     | 0
 {gameserver => common}/src/data/mod.rs                        | 0
 common/src/lib.rs                                             | 1 +
 gameserver/src/main.rs                                        | 3 +--
 gameserver/src/net/handlers/scene.rs                          | 2 +-
 xtask/src/main.rs                                             | 2 --
 8 files changed, 7 insertions(+), 5 deletions(-)
 rename {gameserver/assets => assets}/ExcelOutput/MapEntranceConfig.json (100%)
 rename {gameserver => common}/src/data/excels.rs (100%)
 rename {gameserver => common}/src/data/mod.rs (100%)

diff --git a/gameserver/assets/ExcelOutput/MapEntranceConfig.json b/assets/ExcelOutput/MapEntranceConfig.json
similarity index 100%
rename from gameserver/assets/ExcelOutput/MapEntranceConfig.json
rename to assets/ExcelOutput/MapEntranceConfig.json
diff --git a/common/Cargo.toml b/common/Cargo.toml
index 53bc00c..071924a 100644
--- a/common/Cargo.toml
+++ b/common/Cargo.toml
@@ -4,3 +4,7 @@ edition = "2021"
 version.workspace = true
 
 [dependencies]
+tracing.workspace = true
+lazy_static.workspace = true
+serde.workspace = true
+serde_json.workspace = true
diff --git a/gameserver/src/data/excels.rs b/common/src/data/excels.rs
similarity index 100%
rename from gameserver/src/data/excels.rs
rename to common/src/data/excels.rs
diff --git a/gameserver/src/data/mod.rs b/common/src/data/mod.rs
similarity index 100%
rename from gameserver/src/data/mod.rs
rename to common/src/data/mod.rs
diff --git a/common/src/lib.rs b/common/src/lib.rs
index 812d1ed..5b85385 100644
--- a/common/src/lib.rs
+++ b/common/src/lib.rs
@@ -1 +1,2 @@
+pub mod data;
 pub mod util;
diff --git a/gameserver/src/main.rs b/gameserver/src/main.rs
index b14e80e..95ae3d9 100644
--- a/gameserver/src/main.rs
+++ b/gameserver/src/main.rs
@@ -1,12 +1,11 @@
 use anyhow::Result;
 
-mod data;
 mod game;
 mod logging;
 mod net;
 mod util;
 
-use data::init_assets;
+use common::data::init_assets;
 use game::init_config;
 use logging::init_tracing;
 
diff --git a/gameserver/src/net/handlers/scene.rs b/gameserver/src/net/handlers/scene.rs
index eb59223..662409a 100644
--- a/gameserver/src/net/handlers/scene.rs
+++ b/gameserver/src/net/handlers/scene.rs
@@ -1,4 +1,4 @@
-use crate::data::EXCEL_COLLECTION;
+use common::data::EXCEL_COLLECTION;
 
 use super::*;
 
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
index 26a3a22..3ea8253 100644
--- a/xtask/src/main.rs
+++ b/xtask/src/main.rs
@@ -23,7 +23,6 @@ fn spawn_servers(release: bool) -> Result<(), Box<dyn std::error::Error>> {
     let tx1 = tx.clone();
     let handle1 = thread::spawn(move || {
         let mut gameserver = Command::new("cargo")
-            .current_dir("gameserver")
             .arg("run")
             .arg("--bin")
             .arg("gameserver")
@@ -39,7 +38,6 @@ fn spawn_servers(release: bool) -> Result<(), Box<dyn std::error::Error>> {
 
     let handle2 = thread::spawn(move || {
         let mut sdkserver = Command::new("cargo")
-            .current_dir("sdkserver")
             .arg("run")
             .arg("--bin")
             .arg("sdkserver")