Move data structs to 'common' crate and assets folder to the root
This commit is contained in:
parent
1f17230374
commit
9624a07ad2
8 changed files with 7 additions and 5 deletions
|
@ -4,3 +4,7 @@ edition = "2021"
|
|||
version.workspace = true
|
||||
|
||||
[dependencies]
|
||||
tracing.workspace = true
|
||||
lazy_static.workspace = true
|
||||
serde.workspace = true
|
||||
serde_json.workspace = true
|
||||
|
|
|
@ -1 +1,2 @@
|
|||
pub mod data;
|
||||
pub mod util;
|
||||
|
|
|
@ -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;
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
use crate::data::EXCEL_COLLECTION;
|
||||
use common::data::EXCEL_COLLECTION;
|
||||
|
||||
use super::*;
|
||||
|
||||
|
|
|
@ -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")
|
||||
|
|
Loading…
Reference in a new issue