Move work definitions to their own module

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::{

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)]

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};

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::{

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};
 

src/world/database.rs

@@ -4,11 +4,11 @@ use rusqlite::Connection;
 use serde::Deserialize;
 
 use crate::{
-    common::{CustomizeData, Position},
+    common::{
-    lobby::{
+        CustomizeData, Position,
-        CharaMake, ClientSelectData, RemakeMode,
+        workdefinitions::{CharaMake, ClientSelectData, RemakeMode},
-        ipc::{CharacterDetails, CharacterFlag},
     },
+    lobby::ipc::{CharacterDetails, CharacterFlag},
 };
 
 use super::{Inventory, PlayerData};