Move mclib-protocol to main crate

.gitignore

@@ -1,4 +1,4 @@
 .idea/
 .vscode/
 
-/target
+target

Cargo.toml

@@ -9,18 +9,8 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[workspace]
-members = ["macros", "protocol"]
-
-[workspace.dependencies]
+[dependencies]
 mclib-macros = { path = "macros", version = "0.0.1" }
-mclib-protocol = { path = "protocol", version = "0.0.1" }
 
-darling = { version = "0.20.3" }
 flate2 = { version = "1.0.28" }
-syn = { version = "2.0.39" }
 uuid = { version = "1.5.0", features = ["v4", "fast-rng", "macro-diagnostics"] }
-
-[dependencies]
-mclib-macros = { workspace = true }
-mclib-protocol = { workspace = true }

macros/Cargo.toml

@@ -9,5 +9,5 @@ edition = "2021"
 proc-macro = true
 
 [dependencies]
-darling = { workspace = true }
-syn = { workspace = true }
+darling = { version = "0.20.3" }
+syn = { version = "2.0.39" }

protocol/src/chunk_format.rs → src/chunk_format.rs

@@ -1,11 +1,14 @@
-use crate::chunk_format::section::ChunkSection;
 use crate::types::base::MCType;
 use crate::utils::TcpUtils;
 use std::io::Read;
 
-pub mod data_array;
-pub mod palleted_container;
-pub mod section;
+pub(crate) mod data_array;
+pub(crate) mod palleted_container;
+pub(crate) mod section;
+
+pub use data_array::DataArray;
+pub use palleted_container::PalletedContainer;
+pub use section::ChunkSection;
 
 #[derive(Debug, Clone)]
 pub struct ChunkData(pub Vec<ChunkSection>);

src/lib.rs

@@ -71,91 +71,13 @@
 //! ```
 //! For more information about NBT tags [their pages](nbt)
 
+pub mod chunk_format;
+pub mod nbt;
+pub mod packets;
+pub mod types;
+pub mod utils;
+
+pub use crate::packets::base::MCPacket;
+pub use crate::types::base::MCType;
 pub use mclib_macros::MCPacket;
 pub use mclib_macros::MCType;
-pub use mclib_protocol::packets::base::MCPacket;
-pub use mclib_protocol::types::base::MCType;
-
-pub mod packets {
-    //! Minecraft protocol packets
-    pub mod server {
-        //! Packets that bound to server (from client to server)
-        pub use mclib_protocol::packets::server::finish_configuration::FinishConfigurationServerbound;
-        pub use mclib_protocol::packets::server::handshake::{Handshake, HandshakeNextState};
-        pub use mclib_protocol::packets::server::keepalive::ServerboundKeelAlivePlay;
-        pub use mclib_protocol::packets::server::login_acknowledged::LoginAcknowledged;
-        pub use mclib_protocol::packets::server::login_start::LoginStart;
-        pub use mclib_protocol::packets::server::ping::PingRequest;
-        pub use mclib_protocol::packets::server::set_player_position::SetPlayerPosition;
-        pub use mclib_protocol::packets::server::status_request::StatusRequest;
-    }
-    pub mod client {
-        //! Packets that bound to client (from server to client)
-        pub use mclib_protocol::packets::client::chunk_data_and_update_light::ChunkDataAndUpdateLight;
-        pub use mclib_protocol::packets::client::finish_configuration::FinishConfigurationClientbound;
-        pub use mclib_protocol::packets::client::keepalive::ClientboundKeelAlivePlay;
-        pub use mclib_protocol::packets::client::login_success::{
-            LoginSuccess, LoginSuccessProperty,
-        };
-        pub use mclib_protocol::packets::client::play::{DeathInfo, Play};
-        pub use mclib_protocol::packets::client::registry_data::RegistryData;
-        pub use mclib_protocol::packets::client::set_default_spawn_position::SetDefaultSpawnPosition;
-        pub use mclib_protocol::packets::client::status_response::StatusResponse;
-        pub use mclib_protocol::packets::client::synchronize_player_position::SynchronizePlayerPosition;
-    }
-}
-pub mod types {
-    //! Minecraft data types
-    pub use mclib_protocol::types::bitset::MCBitSet;
-    pub use mclib_protocol::types::boolean::MCBoolean;
-    pub use mclib_protocol::types::byte::MCByte;
-    pub use mclib_protocol::types::byte_array::MCByteArray;
-    pub use mclib_protocol::types::double::MCDouble;
-    pub use mclib_protocol::types::float::MCFloat;
-    pub use mclib_protocol::types::int::MCInt;
-    pub use mclib_protocol::types::long::MCLong;
-    pub use mclib_protocol::types::nbt::MCNBT;
-    pub use mclib_protocol::types::position::MCPosition;
-    pub use mclib_protocol::types::short::MCShort;
-    pub use mclib_protocol::types::string::MCString;
-    pub use mclib_protocol::types::ubyte::MCUByte;
-    pub use mclib_protocol::types::ushort::MCUShort;
-    pub use mclib_protocol::types::uuid::MCUuid;
-    pub use mclib_protocol::types::varint::MCVarInt;
-}
-pub mod nbt {
-    //! Named Binary Tag (NBT) protocol
-    //!
-    //! [More information](https://wiki.vg/NBT)
-    pub use mclib_protocol::nbt::tags::base::{IntoNBTTag, NBTTag};
-    /// TAG_Byte
-    pub use mclib_protocol::nbt::tags::byte::TagByte;
-    /// TAG_Byte_Array
-    pub use mclib_protocol::nbt::tags::byte_array::TagByteArray;
-    /// TAG_Compound (any non root)
-    pub use mclib_protocol::nbt::tags::compound::TagCompound;
-    /// TAG_Double
-    pub use mclib_protocol::nbt::tags::double::TagDouble;
-    /// TAG_Float
-    pub use mclib_protocol::nbt::tags::float::TagFloat;
-    /// TAG_Int
-    pub use mclib_protocol::nbt::tags::int::TagInt;
-    /// TAG_List
-    pub use mclib_protocol::nbt::tags::list::TagList;
-    /// TAG_Long
-    pub use mclib_protocol::nbt::tags::long::TagLong;
-    /// TAG_Long_Array
-    pub use mclib_protocol::nbt::tags::long_array::TagLongArray;
-    /// TAG_Short
-    pub use mclib_protocol::nbt::tags::short::TagShort;
-    /// TAG_String
-    pub use mclib_protocol::nbt::tags::string::TagString;
-    /// Parent NBT tag (Root TAG_Compound)
-    pub use mclib_protocol::nbt::NBT;
-}
-pub mod chunk_format {
-    pub use mclib_protocol::chunk_format::{
-        data_array::DataArray, palleted_container::PalletedContainer, section::ChunkSection,
-        ChunkData,
-    };
-}

protocol/src/nbt.rs → src/nbt.rs

@@ -1,9 +1,38 @@
-use crate::nbt::tags::base::{unpack_by_ty_id, NBTTag};
+//! Named Binary Tag (NBT) protocol
+//!
+//! [More information](https://wiki.vg/NBT)
+
+use crate::nbt::tags::base::unpack_by_ty_id;
 use crate::utils::TcpUtils;
 use std::io::Read;
 
-pub mod tags;
+pub(crate) mod tags;
+
+pub use tags::base::{IntoNBTTag, NBTTag};
+/// TAG_Byte
+pub use tags::byte::TagByte;
+/// TAG_Byte_Array
+pub use tags::byte_array::TagByteArray;
+/// TAG_Compound (any non root)
+pub use tags::compound::TagCompound;
+/// TAG_Double
+pub use tags::double::TagDouble;
+/// TAG_Float
+pub use tags::float::TagFloat;
+/// TAG_Int
+pub use tags::int::TagInt;
+/// TAG_List
+pub use tags::list::TagList;
+/// TAG_Long
+pub use tags::long::TagLong;
+/// TAG_Long_Array
+pub use tags::long_array::TagLongArray;
+/// TAG_Short
+pub use tags::short::TagShort;
+/// TAG_String
+pub use tags::string::TagString;
 
+/// Parent NBT tag (Root TAG_Compound)
 #[derive(Debug)]
 pub struct NBT(pub Option<String>, pub Box<dyn NBTTag>);
 

src/packets.rs

@@ -0,0 +1,5 @@
+//! Minecraft protocol packets
+
+pub(crate) mod base;
+pub mod client;
+pub mod server;

src/packets/client.rs

@@ -0,0 +1,20 @@
+//! Packets that bound to client (from server to client)
+
+mod chunk_data_and_update_light;
+pub use chunk_data_and_update_light::{BlockEntity, ChunkDataAndUpdateLight};
+mod finish_configuration;
+pub use finish_configuration::FinishConfigurationClientbound;
+mod keepalive;
+pub use keepalive::ClientboundKeelAlivePlay;
+mod login_success;
+pub use login_success::{LoginSuccess, LoginSuccessProperty};
+mod play;
+pub use play::{DeathInfo, Play};
+mod registry_data;
+pub use registry_data::RegistryData;
+mod set_default_spawn_position;
+pub use set_default_spawn_position::SetDefaultSpawnPosition;
+mod status_response;
+pub use status_response::StatusResponse;
+mod synchronize_player_position;
+pub use synchronize_player_position::SynchronizePlayerPosition;

protocol/src/packets/client/chunk_data_and_update_light.rs → src/packets/client/chunk_data_and_update_light.rs

@@ -39,12 +39,12 @@ pub struct ChunkDataAndUpdateLight {
 
 #[cfg(test)]
 mod tests {
-    use crate::chunk_format::ChunkData;
     use crate::chunk_format::data_array::DataArray;
     use crate::chunk_format::palleted_container::PalletedContainer;
     use crate::chunk_format::section::ChunkSection;
+    use crate::chunk_format::ChunkData;
+    use crate::nbt::IntoNBTTag;
     use crate::nbt::NBT;
-    use crate::nbt::tags::base::IntoNBTTag;
     use crate::packets::base::MCPacket;
     use crate::packets::client::chunk_data_and_update_light::ChunkDataAndUpdateLight;
     use crate::types::bitset::MCBitSet;
@@ -54,7 +54,7 @@ mod tests {
     #[test]
     fn test_chunk_data() {
         let reference =
-            include_bytes!("../../../../tests/references/chunk_data_and_update_light.packet");
+            include_bytes!("../../../tests/references/chunk_data_and_update_light.packet");
 
         let heightmap = NBT(
             None,

src/packets/server.rs

@@ -0,0 +1,18 @@
+//! Packets that bound to server (from client to server)
+
+mod finish_configuration;
+pub use finish_configuration::FinishConfigurationServerbound;
+mod handshake;
+pub use handshake::{Handshake, HandshakeNextState};
+mod keepalive;
+pub use keepalive::ServerboundKeelAlivePlay;
+mod login_acknowledged;
+pub use login_acknowledged::LoginAcknowledged;
+mod login_start;
+pub use login_start::LoginStart;
+mod ping;
+pub use ping::PingRequest;
+mod set_player_position;
+pub use set_player_position::SetPlayerPosition;
+mod status_request;
+pub use status_request::StatusRequest;

src/types.rs

@@ -0,0 +1,38 @@
+//! Minecraft data types
+
+pub(crate) mod base;
+pub(crate) mod bitset;
+pub(crate) mod boolean;
+pub(crate) mod byte;
+pub(crate) mod byte_array;
+pub(crate) mod double;
+pub(crate) mod float;
+pub(crate) mod int;
+pub(crate) mod long;
+pub(crate) mod nbt;
+pub(crate) mod option;
+pub(crate) mod position;
+pub(crate) mod short;
+pub(crate) mod string;
+pub(crate) mod ubyte;
+pub(crate) mod ushort;
+pub(crate) mod uuid;
+pub(crate) mod varint;
+pub(crate) mod vec;
+
+pub use bitset::MCBitSet;
+pub use boolean::MCBoolean;
+pub use byte::MCByte;
+pub use byte_array::MCByteArray;
+pub use double::MCDouble;
+pub use float::MCFloat;
+pub use int::MCInt;
+pub use long::MCLong;
+pub use nbt::MCNBT;
+pub use position::MCPosition;
+pub use short::MCShort;
+pub use string::MCString;
+pub use ubyte::MCUByte;
+pub use ushort::MCUShort;
+pub use uuid::MCUuid;
+pub use varint::MCVarInt;