From 20030c18c86d7c39da80daea5d382b1732ff3bcc Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Tue, 22 Apr 2025 16:07:39 -0400
Subject: [PATCH] Move work definitions to their own module

---
 src/bin/kawari-world.rs                                   | 2 +-
 src/common/mod.rs                                         | 2 ++
 src/{lobby => common/workdefinitions}/chara_make.rs       | 0
 .../workdefinitions}/client_select_data.rs                | 0
 src/common/workdefinitions/mod.rs                         | 5 +++++
 src/lobby/connection.rs                                   | 2 +-
 src/lobby/mod.rs                                          | 6 ------
 src/world/database.rs                                     | 8 ++++----
 8 files changed, 13 insertions(+), 12 deletions(-)
 rename src/{lobby => common/workdefinitions}/chara_make.rs (100%)
 rename src/{lobby => common/workdefinitions}/client_select_data.rs (100%)
 create mode 100644 src/common/workdefinitions/mod.rs

diff --git a/src/bin/kawari-world.rs b/src/bin/kawari-world.rs
index f23d342..b5180c4 100644
--- a/src/bin/kawari-world.rs
+++ b/src/bin/kawari-world.rs
@@ -4,10 +4,10 @@ use std::sync::{Arc, Mutex};
 
 use kawari::RECEIVE_BUFFER_SIZE;
 use kawari::common::custom_ipc::{CustomIpcData, CustomIpcSegment, CustomIpcType};
+use kawari::common::workdefinitions::CharaMake;
 use kawari::common::{GameData, ObjectId, timestamp_secs};
 use kawari::common::{Position, determine_initial_starting_zone};
 use kawari::config::get_config;
-use kawari::lobby::CharaMake;
 use kawari::oodle::OodleNetwork;
 use kawari::opcodes::ServerZoneIpcType;
 use kawari::packet::{
diff --git a/src/common/mod.rs b/src/common/mod.rs
index 4df859b..572e508 100644
--- a/src/common/mod.rs
+++ b/src/common/mod.rs
@@ -15,6 +15,8 @@ pub use position::Position;
 mod gamedata;
 pub use gamedata::GameData;
 
+pub mod workdefinitions;
+
 #[binrw]
 #[brw(little)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
diff --git a/src/lobby/chara_make.rs b/src/common/workdefinitions/chara_make.rs
similarity index 100%
rename from src/lobby/chara_make.rs
rename to src/common/workdefinitions/chara_make.rs
diff --git a/src/lobby/client_select_data.rs b/src/common/workdefinitions/client_select_data.rs
similarity index 100%
rename from src/lobby/client_select_data.rs
rename to src/common/workdefinitions/client_select_data.rs
diff --git a/src/common/workdefinitions/mod.rs b/src/common/workdefinitions/mod.rs
new file mode 100644
index 0000000..87e7d45
--- /dev/null
+++ b/src/common/workdefinitions/mod.rs
@@ -0,0 +1,5 @@
+mod chara_make;
+pub use chara_make::CharaMake;
+
+mod client_select_data;
+pub use client_select_data::{ClientSelectData, RemakeMode};
diff --git a/src/lobby/connection.rs b/src/lobby/connection.rs
index bf18673..b2ef774 100644
--- a/src/lobby/connection.rs
+++ b/src/lobby/connection.rs
@@ -8,9 +8,9 @@ use crate::{
     common::{
         custom_ipc::{CustomIpcData, CustomIpcSegment, CustomIpcType},
         timestamp_secs,
+        workdefinitions::CharaMake,
     },
     config::get_config,
-    lobby::CharaMake,
     oodle::OodleNetwork,
     opcodes::ServerLobbyIpcType,
     packet::{
diff --git a/src/lobby/mod.rs b/src/lobby/mod.rs
index e2afb98..78043eb 100644
--- a/src/lobby/mod.rs
+++ b/src/lobby/mod.rs
@@ -1,9 +1,3 @@
-mod chara_make;
-pub use chara_make::CharaMake;
-
-mod client_select_data;
-pub use client_select_data::{ClientSelectData, RemakeMode};
-
 mod connection;
 pub use connection::{LobbyConnection, send_custom_world_packet};
 
diff --git a/src/world/database.rs b/src/world/database.rs
index 8034220..ab734b7 100644
--- a/src/world/database.rs
+++ b/src/world/database.rs
@@ -4,11 +4,11 @@ use rusqlite::Connection;
 use serde::Deserialize;
 
 use crate::{
-    common::{CustomizeData, Position},
-    lobby::{
-        CharaMake, ClientSelectData, RemakeMode,
-        ipc::{CharacterDetails, CharacterFlag},
+    common::{
+        CustomizeData, Position,
+        workdefinitions::{CharaMake, ClientSelectData, RemakeMode},
     },
+    lobby::ipc::{CharacterDetails, CharacterFlag},
 };
 
 use super::{Inventory, PlayerData};