Move data structs to 'common' crate and assets folder to the root

This commit is contained in:
xeon 2024-04-15 21:16:37 +03:00
parent 1f17230374
commit 9624a07ad2
8 changed files with 7 additions and 5 deletions

View file

@ -4,3 +4,7 @@ edition = "2021"
version.workspace = true version.workspace = true
[dependencies] [dependencies]
tracing.workspace = true
lazy_static.workspace = true
serde.workspace = true
serde_json.workspace = true

View file

@ -1 +1,2 @@
pub mod data;
pub mod util; pub mod util;

View file

@ -1,12 +1,11 @@
use anyhow::Result; use anyhow::Result;
mod data;
mod game; mod game;
mod logging; mod logging;
mod net; mod net;
mod util; mod util;
use data::init_assets; use common::data::init_assets;
use game::init_config; use game::init_config;
use logging::init_tracing; use logging::init_tracing;

View file

@ -1,4 +1,4 @@
use crate::data::EXCEL_COLLECTION; use common::data::EXCEL_COLLECTION;
use super::*; use super::*;

View file

@ -23,7 +23,6 @@ fn spawn_servers(release: bool) -> Result<(), Box<dyn std::error::Error>> {
let tx1 = tx.clone(); let tx1 = tx.clone();
let handle1 = thread::spawn(move || { let handle1 = thread::spawn(move || {
let mut gameserver = Command::new("cargo") let mut gameserver = Command::new("cargo")
.current_dir("gameserver")
.arg("run") .arg("run")
.arg("--bin") .arg("--bin")
.arg("gameserver") .arg("gameserver")
@ -39,7 +38,6 @@ fn spawn_servers(release: bool) -> Result<(), Box<dyn std::error::Error>> {
let handle2 = thread::spawn(move || { let handle2 = thread::spawn(move || {
let mut sdkserver = Command::new("cargo") let mut sdkserver = Command::new("cargo")
.current_dir("sdkserver")
.arg("run") .arg("run")
.arg("--bin") .arg("--bin")
.arg("sdkserver") .arg("sdkserver")