From 58e22958eca62e0d2d2d98c5de3052900fff1884 Mon Sep 17 00:00:00 2001 From: lcdr Date: Wed, 7 Apr 2021 14:20:12 +0200 Subject: [PATCH] Make more things public --- src/chat/client/mod.rs | 2 +- src/chat/mod.rs | 2 +- src/chat/server/mod.rs | 3 ++- src/world/gm/client/mod.rs | 3 ++- src/world/gm/server/mod.rs | 3 ++- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/chat/client/mod.rs b/src/chat/client/mod.rs index 2be077a..2cbbb65 100644 --- a/src/chat/client/mod.rs +++ b/src/chat/client/mod.rs @@ -3,7 +3,7 @@ use lu_packets_derive::{MessageFromVariants, VariantTests}; use crate::common::{LuWString33, ObjId}; use crate::world::client::Message; -use super::{GeneralChatMessage, PrivateChatMessage}; +pub use super::{GeneralChatMessage, PrivateChatMessage}; #[derive(Debug, Deserialize, PartialEq, Serialize, MessageFromVariants, VariantTests)] #[non_exhaustive] diff --git a/src/chat/mod.rs b/src/chat/mod.rs index 45fc3b7..b466125 100644 --- a/src/chat/mod.rs +++ b/src/chat/mod.rs @@ -10,7 +10,7 @@ use endio::LittleEndian as LE; use crate::common::{LuVarWString, LuWString33, ObjId}; -#[derive(Debug, Deserialize, PartialEq, Serialize)] +#[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)] #[repr(u8)] pub enum ChatChannel { SystemNotify, diff --git a/src/chat/server/mod.rs b/src/chat/server/mod.rs index 4662d12..9c451a1 100644 --- a/src/chat/server/mod.rs +++ b/src/chat/server/mod.rs @@ -2,7 +2,8 @@ use endio::{Deserialize, Serialize}; use lu_packets_derive::VariantTests; use crate::common::{LuWString33, ObjId}; -use super::{ChatChannel, GeneralChatMessage, PrivateChatMessage}; +pub use super::{GeneralChatMessage, PrivateChatMessage}; +use super::ChatChannel; #[derive(Debug, Deserialize, PartialEq, Serialize, VariantTests)] #[post_disc_padding=9] diff --git a/src/world/gm/client/mod.rs b/src/world/gm/client/mod.rs index 55059ed..5812b53 100644 --- a/src/world/gm/client/mod.rs +++ b/src/world/gm/client/mod.rs @@ -7,7 +7,8 @@ use crate::common::{ObjId, OBJID_EMPTY}; use crate::world::{CloneId, CLONE_ID_INVALID, Lot, LOT_NULL, LuNameValue, MapId, MAP_ID_INVALID, Quaternion, Vector3, ZoneId}; use crate::world::amf3::Amf3; -use super::{EquipInventory, GmString, GmWString, InventoryType, KillType, UnEquipInventory, MissionState, PetNotificationType, MoveItemInInventory, MoveInventoryBatch, RemoveSkill, SetIgnoreProjectileCollision}; +pub use super::{EquipInventory, InventoryType, KillType, UnEquipInventory, MissionState, PetNotificationType, MoveItemInInventory, MoveInventoryBatch, RemoveSkill, SetIgnoreProjectileCollision}; +use super::{GmString, GmWString}; #[derive(Debug, Deserialize, PartialEq, Serialize)] pub struct SubjectGameMessage { diff --git a/src/world/gm/server/mod.rs b/src/world/gm/server/mod.rs index 2985abf..c9a2deb 100644 --- a/src/world/gm/server/mod.rs +++ b/src/world/gm/server/mod.rs @@ -7,7 +7,8 @@ use crate::common::{ObjId, OBJID_EMPTY}; use crate::world::{Lot, LOT_NULL, Quaternion, Vector3}; use crate::world::amf3::Amf3; -use super::{EquipInventory, GmString, GmWString, InventoryType, KillType, UnEquipInventory, MissionState, PetNotificationType, MoveItemInInventory, MoveInventoryBatch, SetIgnoreProjectileCollision}; +pub use super::{EquipInventory, InventoryType, KillType, UnEquipInventory, MissionState, PetNotificationType, MoveItemInInventory, MoveInventoryBatch, SetIgnoreProjectileCollision}; +use super::{GmString, GmWString}; #[derive(Debug, Deserialize, PartialEq, Serialize)] pub struct SubjectGameMessage {