From d71287ef9a3b771c8c968d1aff303db58071d6d9 Mon Sep 17 00:00:00 2001 From: jake Date: Sun, 12 Nov 2023 19:16:55 -0700 Subject: [PATCH] move patch_server to own crate --- Cargo.toml | 3 +++ patch_server/Cargo.toml | 15 +++++++++++++++ src/patch/mod.rs => patch_server/src/lib.rs | 0 src/bin/main.rs | 2 +- src/bin/patch.rs | 2 +- src/lib.rs | 2 +- 6 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 patch_server/Cargo.toml rename src/patch/mod.rs => patch_server/src/lib.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index ee03ec9..a1eba71 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -19,6 +19,7 @@ members = [ "shops", "stats", "trade", + "patch_server", ] [workspace.dependencies] @@ -35,6 +36,7 @@ client = { path = "./client" } drops = { path = "./drops" } trade = { path = "./trade" } room = { path = "./room" } +patch_server = { path = "./patch_server" } libpso = { git = "http://git.sharnoth.com/jake/libpso" } @@ -80,6 +82,7 @@ client = { workspace = true } drops = { workspace = true } trade = { workspace = true } room = { workspace = true } +patch_server = { workspace = true } libpso = { workspace = true } diff --git a/patch_server/Cargo.toml b/patch_server/Cargo.toml new file mode 100644 index 0000000..f528b04 --- /dev/null +++ b/patch_server/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "patch_server" +version = "0.1.0" +edition = "2021" + +[dependencies] +networking = { workspace = true } + +libpso = { workspace = true } + +async-trait = { workspace = true } +rand = { workspace = true } +crc = { workspace = true } +ron = { workspace = true } +serde = { workspace = true } diff --git a/src/patch/mod.rs b/patch_server/src/lib.rs similarity index 100% rename from src/patch/mod.rs rename to patch_server/src/lib.rs diff --git a/src/bin/main.rs b/src/bin/main.rs index e50db30..a61bf7b 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -4,7 +4,7 @@ use log::{info}; use networking::interserver::AuthToken; use elseware::login::login::LoginServerState; use elseware::login::character::CharacterServerState; -use elseware::patch::{PatchServerState, generate_patch_tree, load_config, load_motd}; +use patch_server::{PatchServerState, generate_patch_tree, load_config, load_motd}; use elseware::ship::ship::ShipServerStateBuilder; use maps::Holiday; diff --git a/src/bin/patch.rs b/src/bin/patch.rs index a9fb839..c38f025 100644 --- a/src/bin/patch.rs +++ b/src/bin/patch.rs @@ -1,4 +1,4 @@ -use elseware::patch::{PatchServerState, generate_patch_tree, load_config_env, load_motd}; +use patch_server::{PatchServerState, generate_patch_tree, load_config_env, load_motd}; use log::info; fn main() { diff --git a/src/lib.rs b/src/lib.rs index f194399..5436b77 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -10,6 +10,6 @@ extern crate test; //pub mod common; //pub mod entity; -pub mod patch; +//pub mod patch; pub mod login; pub mod ship;