rename derive to macros

Cargo.toml

@@ -14,7 +14,7 @@ bedrockrs_nbt = { git = "https://github.com/bedrock-crustaceans/bedrockrs-nbt" }
 
 bedrockrs_proto = { path = "crates/proto", optional = true }
 bedrockrs_proto_core = { path = "crates/proto_core", optional = true }
-bedrockrs_proto_derive = { path = "crates/proto_derive", optional = true }
+bedrockrs_proto_macros = { path = "crates/proto_macros", optional = true }
 
 bedrockrs_addon = { path = "crates/addon", optional = true }
 
@@ -27,5 +27,5 @@ bedrockrs_paletted_storage = { path = "crates/paletted_storage", optional = true
 full = ["addons", "proto", "world"]
 
 addons = ["dep:bedrockrs_addon"]
-proto = ["dep:bedrockrs_proto", "dep:bedrockrs_proto_core", "dep:bedrockrs_proto_derive"]
+proto = ["dep:bedrockrs_proto", "dep:bedrockrs_proto_core", "dep:bedrockrs_proto_macros"]
 world = ["dep:bedrockrs_world", "dep:bedrockrs_paletted_storage"]

crates/proto/Cargo.toml

@@ -8,7 +8,7 @@ bedrockrs_core = { path = "../core" }
 bedrockrs_shared = { path = "../shared" }
 bedrockrs_nbt = { git = "https://github.com/bedrock-crustaceans/bedrockrs-nbt" }
 bedrockrs_proto_core = { path = "../proto_core" }
-bedrockrs_proto_derive = { path = "../proto_derive" }
+bedrockrs_proto_macros = { path = "../proto_macros" }
 bedrockrs_addon = { path = "../addon" }
 
 thiserror = "1.0"

crates/proto/src/connection.rs

@@ -45,7 +45,11 @@ impl Connection {
         for game_packet in gamepackets {
             // Write gamepacket
             game_packet
-                .pk_serialize(&mut pk_stream, SubClientID::PrimaryClient, SubClientID::PrimaryClient)
+                .pk_serialize(
+                    &mut pk_stream,
+                    SubClientID::PrimaryClient,
+                    SubClientID::PrimaryClient,
+                )
                 .map_err(ConnectionError::ProtoCodecError)?
         }
 

crates/proto/src/gamepackets.rs

@@ -55,10 +55,10 @@ use crate::packets::show_profile::ShowProfilePacket;
 use crate::packets::start_game::StartGamePacket;
 use crate::packets::text_message::TextMessagePacket;
 use crate::packets::toast_request::ToastRequestPacket;
+use crate::sub_client::SubClientID;
 use bedrockrs_core::int::VAR;
 use bedrockrs_proto_core::{error::ProtoCodecError, GamePacket, ProtoCodec};
-use bedrockrs_proto_derive::gamepackets;
-use crate::sub_client::SubClientID;
+use bedrockrs_proto_macros::gamepackets;
 
 gamepackets! {
     Login: LoginPacket,
@@ -282,10 +282,12 @@ fn read_gamepacket_header(
 
     // Get the next 2 bits as the sub client sender id
     // Can never be more than an 8-bit integer due to being 2 bits big
-    let subclient_sender_id = SubClientID::proto_from((game_packet_header & 0b0000_1100_0000_0000 >> 10) as u8)?;
+    let subclient_sender_id =
+        SubClientID::proto_from((game_packet_header & 0b0000_1100_0000_0000 >> 10) as u8)?;
     // Get the next 2 bits as the sub client target id
     // Can never be more than an 8-bit integer due to being 2 bits big
-    let subclient_target_id = SubClientID::proto_from((game_packet_header & 0b0011_0000_0000_0000 >> 12) as u8)?;
+    let subclient_target_id =
+        SubClientID::proto_from((game_packet_header & 0b0011_0000_0000_0000 >> 12) as u8)?;
 
     Ok((
         length,
@@ -316,10 +318,10 @@ fn write_gamepacket_header(
 
     // Set the next 2 bits as the sub client sender id
     // Can never be more than an 8-bit integer due to being 2 bits big
-    game_packet_header |= subclient_sender_id as u16 >> 10 & 0b0000_1100_0000_0000;
+    game_packet_header |= subclient_sender_id.proto_to() as u16 >> 10 & 0b0000_1100_0000_0000;
     // Set the next 2 bits as the sub client target id
     // Can never be more than an 8-bit integer due to being 2 bits big
-    game_packet_header |= subclient_target_id as u16 >> 12 & 0b0011_0000_0000_0000;
+    game_packet_header |= subclient_target_id.proto_to() as u16 >> 12 & 0b0011_0000_0000_0000;
 
     // Write the gamepacket header
     VAR::<u16>::new(game_packet_header).proto_serialize(stream)?;

crates/proto/src/packets/add_actor.rs

@@ -2,7 +2,7 @@ use bedrockrs_core::{
     int::{LE, VAR},
     Vec2, Vec3,
 };
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 use bedrockrs_shared::{actor_runtime_id::ActorRuntimeID, actor_unique_id::ActorUniqueID};
 
 use crate::types::{

crates/proto/src/packets/add_painting.rs

@@ -2,7 +2,7 @@ use bedrockrs_core::{
     int::{LE, VAR},
     Vec3,
 };
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 use bedrockrs_shared::{actor_runtime_id::ActorRuntimeID, actor_unique_id::ActorUniqueID};
 
 #[gamepacket(id = 22)]

crates/proto/src/packets/add_player.rs

@@ -4,7 +4,7 @@ use crate::types::network_item_stack_descriptor::NetworkItemStackDescriptor;
 use crate::types::property_sync_data::PropertySyncData;
 use bedrockrs_core::int::{LE, VAR};
 use bedrockrs_core::Vec3;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 use bedrockrs_shared::actor_runtime_id::ActorRuntimeID;
 use bedrockrs_shared::world::gamemode::Gamemode;
 use uuid::Uuid;

crates/proto/src/packets/animate_player.rs

@@ -2,7 +2,7 @@ use crate::types::animate_action::AnimateAction;
 use bedrockrs_core::int::{LE, VAR};
 use bedrockrs_proto_core::error::ProtoCodecError;
 use bedrockrs_proto_core::ProtoCodec;
-use bedrockrs_proto_derive::gamepacket;
+use bedrockrs_proto_macros::gamepacket;
 use bedrockrs_shared::actor_runtime_id::ActorRuntimeID;
 use std::io::Cursor;
 

crates/proto/src/packets/boss_event.rs

@@ -1,5 +1,5 @@
 use crate::types::event_type::BossEventType;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 use bedrockrs_shared::actor_unique_id::ActorUniqueID;
 
 #[gamepacket(id = 74)]

crates/proto/src/packets/camera.rs

@@ -1,4 +1,4 @@
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 use bedrockrs_shared::actor_unique_id::ActorUniqueID;
 
 #[gamepacket(id = 73)]

crates/proto/src/packets/change_dimension.rs

@@ -1,6 +1,6 @@
 use bedrockrs_core::int::LE;
 use bedrockrs_core::Vec3;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 use bedrockrs_shared::world::dimension::Dimension;
 
 #[gamepacket(id = 61)]

crates/proto/src/packets/chunk_radius_request.rs

@@ -1,5 +1,5 @@
 use bedrockrs_core::int::VAR;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 #[gamepacket(id = 69)]
 #[derive(ProtoCodec, Debug, Clone)]

crates/proto/src/packets/chunk_radius_updated.rs

@@ -1,5 +1,5 @@
 use bedrockrs_core::int::{LE, VAR};
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 #[gamepacket(id = 70)]
 #[derive(ProtoCodec, Debug, Clone)]

crates/proto/src/packets/client_cache_status.rs

@@ -1,4 +1,4 @@
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 #[gamepacket(id = 129)]
 #[derive(ProtoCodec, Debug, Copy, Clone)]

crates/proto/src/packets/command_request.rs

@@ -1,5 +1,5 @@
 use bedrockrs_core::int::VAR;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 use crate::types::command_origin_data::CommandOriginData;
 

crates/proto/src/packets/container_close.rs

@@ -1,4 +1,4 @@
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 use crate::types::container_type::ContainerType;
 

crates/proto/src/packets/container_open.rs

@@ -1,4 +1,4 @@
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 use bedrockrs_shared::actor_unique_id::ActorUniqueID;
 
 use crate::types::{

crates/proto/src/packets/correct_player_move_prediction.rs

@@ -1,5 +1,5 @@
 use bedrockrs_core::{int::LE, Vec3};
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 #[gamepacket(id = 161)]
 #[derive(ProtoCodec, Debug, Clone)]

crates/proto/src/packets/debug_info.rs

@@ -1,4 +1,4 @@
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 use bedrockrs_shared::actor_unique_id::ActorUniqueID;
 
 #[gamepacket(id = 155)]

crates/proto/src/packets/emote_list.rs

@@ -1,5 +1,5 @@
 use bedrockrs_core::int::VAR;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 use bedrockrs_shared::actor_runtime_id::ActorRuntimeID;
 use uuid::Uuid;
 

crates/proto/src/packets/handshake_server_to_client.rs

@@ -3,7 +3,7 @@ use std::io::Cursor;
 
 use bedrockrs_proto_core::error::ProtoCodecError;
 use bedrockrs_proto_core::ProtoCodec;
-use bedrockrs_proto_derive::gamepacket;
+use bedrockrs_proto_macros::gamepacket;
 use serde_json::Value;
 
 #[gamepacket(id = 3)]

crates/proto/src/packets/interact.rs

@@ -3,7 +3,7 @@ use bedrockrs_core::int::LE;
 use bedrockrs_core::Vec3;
 use bedrockrs_proto_core::error::ProtoCodecError;
 use bedrockrs_proto_core::ProtoCodec;
-use bedrockrs_proto_derive::gamepacket;
+use bedrockrs_proto_macros::gamepacket;
 use bedrockrs_shared::actor_runtime_id::ActorRuntimeID;
 use std::io::Cursor;
 

crates/proto/src/packets/inventory_content.rs

@@ -1,5 +1,5 @@
 use bedrockrs_core::int::VAR;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 use crate::types::network_item_stack_descriptor::NetworkItemStackDescriptor;
 

crates/proto/src/packets/level_chunk.rs

@@ -2,7 +2,7 @@ use crate::types::chunk_pos::ChunkPos;
 use bedrockrs_core::int::{LE, VAR};
 use bedrockrs_proto_core::error::ProtoCodecError;
 use bedrockrs_proto_core::ProtoCodec;
-use bedrockrs_proto_derive::gamepacket;
+use bedrockrs_proto_macros::gamepacket;
 
 #[gamepacket(id = 58)]
 #[derive(Debug, Clone)]

crates/proto/src/packets/login.rs

@@ -1,5 +1,5 @@
 use bedrockrs_core::int::BE;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 use crate::types::connection_request::ConnectionRequest;
 

crates/proto/src/packets/mob_equipment.rs

@@ -1,5 +1,5 @@
 use bedrockrs_core::int::VAR;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 use crate::types::network_item_stack_descriptor::NetworkItemStackDescriptor;
 

crates/proto/src/packets/modal_form_request.rs

@@ -1,5 +1,5 @@
 use bedrockrs_core::int::VAR;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 #[gamepacket(id = 100)]
 #[derive(ProtoCodec, Debug, Clone)]

crates/proto/src/packets/modal_form_response.rs

@@ -1,6 +1,6 @@
 use crate::types::modal_form_cancel_reason::ModalFormCancelReason;
 use bedrockrs_core::int::VAR;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 #[gamepacket(id = 101)]
 #[derive(ProtoCodec, Debug, Clone)]

crates/proto/src/packets/network_settings.rs

@@ -1,5 +1,5 @@
 use bedrockrs_core::int::LE;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 #[gamepacket(id = 143)]
 #[derive(ProtoCodec, Debug, Clone)]

crates/proto/src/packets/network_settings_request.rs

@@ -1,5 +1,5 @@
 use bedrockrs_core::int::BE;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 #[gamepacket(id = 193)]
 #[derive(ProtoCodec, Debug, Copy, Clone)]

crates/proto/src/packets/packet_violation_warning.rs

@@ -1,5 +1,5 @@
 use bedrockrs_core::int::VAR;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 #[gamepacket(id = 156)]
 #[derive(ProtoCodec, Debug, Clone)]

crates/proto/src/packets/play_status.rs

@@ -1,4 +1,4 @@
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 use crate::types::play_status::PlayStatusType;
 

crates/proto/src/packets/player_action.rs

@@ -1,6 +1,6 @@
 use crate::types::{network_block_pos::NetworkBlockPos, player_action_type::PlayerActionType};
 use bedrockrs_core::int::VAR;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 use bedrockrs_shared::actor_runtime_id::ActorRuntimeID;
 
 #[gamepacket(id = 36)]

crates/proto/src/packets/player_auth_input.rs

@@ -6,7 +6,7 @@ use bedrockrs_core::int::{LE, VAR};
 use bedrockrs_core::{Vec2, Vec3};
 use bedrockrs_proto_core::error::ProtoCodecError;
 use bedrockrs_proto_core::ProtoCodec;
-use bedrockrs_proto_derive::gamepacket;
+use bedrockrs_proto_macros::gamepacket;
 use bedrockrs_shared::actor_unique_id::ActorUniqueID;
 use std::io::Cursor;
 

crates/proto/src/packets/player_disconnect.rs

@@ -3,7 +3,7 @@ use std::io::Cursor;
 use crate::types::disconnect_reason::DisconnectReason;
 use bedrockrs_proto_core::error::ProtoCodecError;
 use bedrockrs_proto_core::ProtoCodec;
-use bedrockrs_proto_derive::gamepacket;
+use bedrockrs_proto_macros::gamepacket;
 
 #[gamepacket(id = 5)]
 #[derive(Debug, Clone)]

crates/proto/src/packets/player_hotbar.rs

@@ -1,7 +1,7 @@
 use crate::types::container_id::ContainerID;
 use bedrockrs_core::int::VAR;
 use bedrockrs_proto_core::ProtoCodec;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 #[gamepacket(id = 48)]
 #[derive(ProtoCodec, Debug, Clone)]

crates/proto/src/packets/player_move.rs

@@ -3,7 +3,7 @@ use bedrockrs_core::Vec2;
 use bedrockrs_core::Vec3;
 use bedrockrs_proto_core::error::ProtoCodecError;
 use bedrockrs_proto_core::ProtoCodec;
-use bedrockrs_proto_derive::gamepacket;
+use bedrockrs_proto_macros::gamepacket;
 use bedrockrs_shared::actor_runtime_id::ActorRuntimeID;
 use std::io::Cursor;
 

crates/proto/src/packets/player_transfer.rs

@@ -1,5 +1,5 @@
 use bedrockrs_core::int::LE;
-use bedrockrs_proto_derive::{gamepacket, gamepackets, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, gamepackets, ProtoCodec};
 
 #[gamepacket(id = 85)]
 #[derive(ProtoCodec, Debug, Clone)]

crates/proto/src/packets/remove_actor.rs

@@ -1,4 +1,4 @@
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 use bedrockrs_shared::actor_unique_id::ActorUniqueID;
 
 #[gamepacket(id = 14)]

crates/proto/src/packets/resource_packs_info.rs

@@ -1,7 +1,7 @@
 use bedrockrs_core::int::LE;
 use bedrockrs_core::int::VAR;
 use bedrockrs_proto_core::ProtoCodec;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 use crate::types::pack_info_behavior::BehaviorPackInfoType;
 use crate::types::pack_info_resource::ResourcePackInfoType;

crates/proto/src/packets/resource_packs_response.rs

@@ -1,6 +1,6 @@
 use bedrockrs_core::int::LE;
 use bedrockrs_proto_core::ProtoCodec;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 use crate::types::resource_packs_response_status::ResourcePacksResponseStatus;
 

crates/proto/src/packets/resource_packs_stack.rs

@@ -1,5 +1,5 @@
 use bedrockrs_core::int::VAR;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 use crate::types::base_game_version::BaseGameVersion;
 use crate::types::experiments::Experiments;

crates/proto/src/packets/respawn.rs

@@ -1,7 +1,7 @@
 use crate::types::respawn_state::RespawnState;
 use bedrockrs_core::int::LE;
 use bedrockrs_core::Vec3;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 use bedrockrs_shared::actor_runtime_id::ActorRuntimeID;
 
 #[gamepacket(id = 45)]

crates/proto/src/packets/server_player_post_move_position.rs

@@ -1,5 +1,5 @@
 use bedrockrs_core::{int::LE, Vec3};
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 #[gamepacket(id = 18)]
 #[derive(ProtoCodec, Debug, Clone)]

crates/proto/src/packets/server_settings_request.rs

@@ -1,4 +1,4 @@
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 #[gamepacket(id = 102)]
 #[derive(ProtoCodec, Debug, Clone)]

crates/proto/src/packets/server_settings_response.rs

@@ -1,5 +1,5 @@
 use bedrockrs_core::int::VAR;
-use bedrockrs_proto_derive::{gamepacket, ProtoCodec};
+use bedrockrs_proto_macros::{gamepacket, ProtoCodec};
 
 #[gamepacket(id = 103)]
 #[derive(ProtoCodec, Debug, Clone)]