From befa33a87950b6d0f3364cb4fe603f6d84bf4b8f Mon Sep 17 00:00:00 2001 From: mat Date: Sun, 1 Oct 2023 15:19:13 -0500 Subject: organize azalea_core and re-export it from azalea --- azalea-protocol/src/packets/common.rs | 6 +++++- .../src/packets/configuration/clientbound_custom_payload_packet.rs | 2 +- .../src/packets/configuration/clientbound_registry_data_packet.rs | 2 +- .../configuration/clientbound_update_enabled_features_packet.rs | 2 +- .../src/packets/configuration/clientbound_update_tags_packet.rs | 2 +- .../packets/configuration/serverbound_client_information_packet.rs | 2 +- .../src/packets/configuration/serverbound_custom_payload_packet.rs | 2 +- azalea-protocol/src/packets/game/clientbound_add_entity_packet.rs | 2 +- .../src/packets/game/clientbound_block_destruction_packet.rs | 2 +- .../src/packets/game/clientbound_block_entity_data_packet.rs | 2 +- azalea-protocol/src/packets/game/clientbound_block_event_packet.rs | 2 +- azalea-protocol/src/packets/game/clientbound_block_update_packet.rs | 2 +- azalea-protocol/src/packets/game/clientbound_boss_event_packet.rs | 2 +- .../src/packets/game/clientbound_change_difficulty_packet.rs | 2 +- .../src/packets/game/clientbound_chunks_biomes_packet.rs | 2 +- azalea-protocol/src/packets/game/clientbound_commands_packet.rs | 2 +- .../src/packets/game/clientbound_custom_payload_packet.rs | 2 +- azalea-protocol/src/packets/game/clientbound_custom_sound_packet.rs | 2 +- azalea-protocol/src/packets/game/clientbound_damage_event_packet.rs | 2 +- azalea-protocol/src/packets/game/clientbound_explode_packet.rs | 2 +- .../src/packets/game/clientbound_forget_level_chunk_packet.rs | 2 +- azalea-protocol/src/packets/game/clientbound_level_event_packet.rs | 2 +- azalea-protocol/src/packets/game/clientbound_light_update_packet.rs | 2 +- azalea-protocol/src/packets/game/clientbound_login_packet.rs | 2 +- .../src/packets/game/clientbound_move_entity_pos_packet.rs | 2 +- .../src/packets/game/clientbound_move_entity_pos_rot_packet.rs | 2 +- .../src/packets/game/clientbound_open_sign_editor_packet.rs | 2 +- .../src/packets/game/clientbound_place_ghost_recipe_packet.rs | 2 +- .../src/packets/game/clientbound_player_abilities_packet.rs | 2 +- azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs | 2 +- .../src/packets/game/clientbound_player_info_update_packet.rs | 2 +- .../src/packets/game/clientbound_player_position_packet.rs | 2 +- azalea-protocol/src/packets/game/clientbound_recipe_packet.rs | 2 +- .../src/packets/game/clientbound_section_blocks_update_packet.rs | 2 +- .../src/packets/game/clientbound_select_advancements_tab_packet.rs | 2 +- .../packets/game/clientbound_set_default_spawn_position_packet.rs | 2 +- azalea-protocol/src/packets/game/clientbound_sound_packet.rs | 2 +- azalea-protocol/src/packets/game/clientbound_stop_sound_packet.rs | 2 +- .../src/packets/game/clientbound_teleport_entity_packet.rs | 2 +- .../src/packets/game/clientbound_update_advancements_packet.rs | 4 ++-- .../src/packets/game/clientbound_update_attributes_packet.rs | 2 +- .../src/packets/game/clientbound_update_enabled_features_packet.rs | 2 +- .../src/packets/game/clientbound_update_recipes_packet.rs | 2 +- azalea-protocol/src/packets/game/clientbound_update_tags_packet.rs | 2 +- .../src/packets/game/serverbound_block_entity_tag_query.rs | 2 +- .../src/packets/game/serverbound_change_difficulty_packet.rs | 2 +- azalea-protocol/src/packets/game/serverbound_chat_packet.rs | 2 +- .../src/packets/game/serverbound_custom_payload_packet.rs | 2 +- azalea-protocol/src/packets/game/serverbound_interact_packet.rs | 2 +- .../src/packets/game/serverbound_jigsaw_generate_packet.rs | 2 +- azalea-protocol/src/packets/game/serverbound_place_recipe_packet.rs | 2 +- .../src/packets/game/serverbound_player_abilities_packet.rs | 2 +- .../src/packets/game/serverbound_player_action_packet.rs | 4 ++-- azalea-protocol/src/packets/game/serverbound_player_input_packet.rs | 2 +- .../src/packets/game/serverbound_recipe_book_seen_recipe_packet.rs | 2 +- .../src/packets/game/serverbound_seen_advancements_packet.rs | 2 +- .../src/packets/game/serverbound_set_command_block_packet.rs | 2 +- .../src/packets/game/serverbound_set_jigsaw_block_packet.rs | 4 ++-- .../src/packets/game/serverbound_set_structure_block_packet.rs | 2 +- azalea-protocol/src/packets/game/serverbound_sign_update_packet.rs | 2 +- azalea-protocol/src/packets/game/serverbound_use_item_on_packet.rs | 5 ++++- .../src/packets/login/clientbound_custom_query_packet.rs | 2 +- 62 files changed, 72 insertions(+), 65 deletions(-) (limited to 'azalea-protocol') diff --git a/azalea-protocol/src/packets/common.rs b/azalea-protocol/src/packets/common.rs index 0fa7cb1f..8ad0b753 100644 --- a/azalea-protocol/src/packets/common.rs +++ b/azalea-protocol/src/packets/common.rs @@ -1,5 +1,9 @@ use azalea_buf::McBuf; -use azalea_core::{GameMode, GlobalPos, OptionalGameType, ResourceLocation}; +use azalea_core::{ + game_type::{GameMode, OptionalGameType}, + position::GlobalPos, + resource_location::ResourceLocation, +}; #[derive(Clone, Debug, McBuf)] pub struct CommonPlayerSpawnInfo { diff --git a/azalea-protocol/src/packets/configuration/clientbound_custom_payload_packet.rs b/azalea-protocol/src/packets/configuration/clientbound_custom_payload_packet.rs index 0b0ea902..701a317c 100644 --- a/azalea-protocol/src/packets/configuration/clientbound_custom_payload_packet.rs +++ b/azalea-protocol/src/packets/configuration/clientbound_custom_payload_packet.rs @@ -1,6 +1,6 @@ use azalea_buf::McBuf; use azalea_buf::UnsizedByteArray; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_protocol_macros::ClientboundConfigurationPacket; #[derive(Clone, Debug, McBuf, ClientboundConfigurationPacket)] diff --git a/azalea-protocol/src/packets/configuration/clientbound_registry_data_packet.rs b/azalea-protocol/src/packets/configuration/clientbound_registry_data_packet.rs index 85345a1e..08a1e880 100644 --- a/azalea-protocol/src/packets/configuration/clientbound_registry_data_packet.rs +++ b/azalea-protocol/src/packets/configuration/clientbound_registry_data_packet.rs @@ -18,7 +18,7 @@ pub mod registry { //! biomes. use azalea_buf::{BufReadError, McBufReadable, McBufWritable}; - use azalea_core::ResourceLocation; + use azalea_core::resource_location::ResourceLocation; use azalea_nbt::Nbt; use serde::{de, Deserialize, Deserializer, Serialize, Serializer}; use std::{collections::HashMap, io::Cursor}; diff --git a/azalea-protocol/src/packets/configuration/clientbound_update_enabled_features_packet.rs b/azalea-protocol/src/packets/configuration/clientbound_update_enabled_features_packet.rs index 5eedabc1..ec37c8f3 100644 --- a/azalea-protocol/src/packets/configuration/clientbound_update_enabled_features_packet.rs +++ b/azalea-protocol/src/packets/configuration/clientbound_update_enabled_features_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_protocol_macros::ClientboundConfigurationPacket; #[derive(Clone, Debug, McBuf, ClientboundConfigurationPacket)] diff --git a/azalea-protocol/src/packets/configuration/clientbound_update_tags_packet.rs b/azalea-protocol/src/packets/configuration/clientbound_update_tags_packet.rs index 215c9439..8ef42a76 100644 --- a/azalea-protocol/src/packets/configuration/clientbound_update_tags_packet.rs +++ b/azalea-protocol/src/packets/configuration/clientbound_update_tags_packet.rs @@ -1,6 +1,6 @@ use azalea_buf::{BufReadError, McBuf, McBufVarReadable, McBufVarWritable}; use azalea_buf::{McBufReadable, McBufWritable}; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_protocol_macros::ClientboundConfigurationPacket; use std::io::Cursor; use std::ops::Deref; diff --git a/azalea-protocol/src/packets/configuration/serverbound_client_information_packet.rs b/azalea-protocol/src/packets/configuration/serverbound_client_information_packet.rs index 2af70b83..fb980a46 100644 --- a/azalea-protocol/src/packets/configuration/serverbound_client_information_packet.rs +++ b/azalea-protocol/src/packets/configuration/serverbound_client_information_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::{McBuf, McBufReadable, McBufWritable}; -use azalea_core::FixedBitSet; +use azalea_core::bitset::FixedBitSet; use azalea_protocol_macros::ServerboundConfigurationPacket; use bevy_ecs::component::Component; diff --git a/azalea-protocol/src/packets/configuration/serverbound_custom_payload_packet.rs b/azalea-protocol/src/packets/configuration/serverbound_custom_payload_packet.rs index 589256bd..48c977b1 100644 --- a/azalea-protocol/src/packets/configuration/serverbound_custom_payload_packet.rs +++ b/azalea-protocol/src/packets/configuration/serverbound_custom_payload_packet.rs @@ -1,6 +1,6 @@ use azalea_buf::McBuf; use azalea_buf::UnsizedByteArray; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_protocol_macros::ServerboundConfigurationPacket; #[derive(Clone, Debug, McBuf, ServerboundConfigurationPacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_add_entity_packet.rs b/azalea-protocol/src/packets/game/clientbound_add_entity_packet.rs index 0f2686e6..59676fe5 100755 --- a/azalea-protocol/src/packets/game/clientbound_add_entity_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_add_entity_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::{ResourceLocation, Vec3}; +use azalea_core::{position::Vec3, resource_location::ResourceLocation}; use azalea_entity::{metadata::apply_default_metadata, EntityBundle}; use azalea_protocol_macros::ClientboundGamePacket; use uuid::Uuid; diff --git a/azalea-protocol/src/packets/game/clientbound_block_destruction_packet.rs b/azalea-protocol/src/packets/game/clientbound_block_destruction_packet.rs index 18021a51..130c698e 100755 --- a/azalea-protocol/src/packets/game/clientbound_block_destruction_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_block_destruction_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::BlockPos; +use azalea_core::position::BlockPos; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_block_entity_data_packet.rs b/azalea-protocol/src/packets/game/clientbound_block_entity_data_packet.rs index fda1bd43..f9c889f8 100755 --- a/azalea-protocol/src/packets/game/clientbound_block_entity_data_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_block_entity_data_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::BlockPos; +use azalea_core::position::BlockPos; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_block_event_packet.rs b/azalea-protocol/src/packets/game/clientbound_block_event_packet.rs index dbc04cc2..86f57b97 100755 --- a/azalea-protocol/src/packets/game/clientbound_block_event_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_block_event_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::BlockPos; +use azalea_core::position::BlockPos; use azalea_protocol_macros::ClientboundGamePacket; use azalea_registry::Block; diff --git a/azalea-protocol/src/packets/game/clientbound_block_update_packet.rs b/azalea-protocol/src/packets/game/clientbound_block_update_packet.rs index 3034accc..c1869e74 100755 --- a/azalea-protocol/src/packets/game/clientbound_block_update_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_block_update_packet.rs @@ -1,6 +1,6 @@ use azalea_block::BlockState; use azalea_buf::McBuf; -use azalea_core::BlockPos; +use azalea_core::position::BlockPos; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_boss_event_packet.rs b/azalea-protocol/src/packets/game/clientbound_boss_event_packet.rs index e73b55ba..d28b1e61 100755 --- a/azalea-protocol/src/packets/game/clientbound_boss_event_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_boss_event_packet.rs @@ -2,7 +2,7 @@ use azalea_buf::{ BufReadError, McBuf, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable, }; use azalea_chat::FormattedText; -use azalea_core::FixedBitSet; +use azalea_core::bitset::FixedBitSet; use azalea_protocol_macros::ClientboundGamePacket; use std::io::Cursor; use std::io::Write; diff --git a/azalea-protocol/src/packets/game/clientbound_change_difficulty_packet.rs b/azalea-protocol/src/packets/game/clientbound_change_difficulty_packet.rs index 4a956901..e7dafbeb 100755 --- a/azalea-protocol/src/packets/game/clientbound_change_difficulty_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_change_difficulty_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::Difficulty; +use azalea_core::difficulty::Difficulty; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_chunks_biomes_packet.rs b/azalea-protocol/src/packets/game/clientbound_chunks_biomes_packet.rs index 68b40b5d..7c8f2154 100644 --- a/azalea-protocol/src/packets/game/clientbound_chunks_biomes_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_chunks_biomes_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::ChunkPos; +use azalea_core::position::ChunkPos; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_commands_packet.rs b/azalea-protocol/src/packets/game/clientbound_commands_packet.rs index 54bf0b7d..0b14fbd1 100755 --- a/azalea-protocol/src/packets/game/clientbound_commands_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_commands_packet.rs @@ -1,7 +1,7 @@ use azalea_buf::{ BufReadError, McBuf, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable, }; -use azalea_core::{FixedBitSet, ResourceLocation}; +use azalea_core::{bitset::FixedBitSet, resource_location::ResourceLocation}; use azalea_protocol_macros::ClientboundGamePacket; use log::warn; use std::io::{Cursor, Write}; diff --git a/azalea-protocol/src/packets/game/clientbound_custom_payload_packet.rs b/azalea-protocol/src/packets/game/clientbound_custom_payload_packet.rs index e5ad6af0..fb5f11ba 100755 --- a/azalea-protocol/src/packets/game/clientbound_custom_payload_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_custom_payload_packet.rs @@ -1,6 +1,6 @@ use azalea_buf::McBuf; use azalea_buf::UnsizedByteArray; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_custom_sound_packet.rs b/azalea-protocol/src/packets/game/clientbound_custom_sound_packet.rs index 9cc348b2..05b1560b 100644 --- a/azalea-protocol/src/packets/game/clientbound_custom_sound_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_custom_sound_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_damage_event_packet.rs b/azalea-protocol/src/packets/game/clientbound_damage_event_packet.rs index 941ed01f..cf5d369a 100644 --- a/azalea-protocol/src/packets/game/clientbound_damage_event_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_damage_event_packet.rs @@ -1,7 +1,7 @@ use std::io::{Cursor, Write}; use azalea_buf::{McBuf, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable}; -use azalea_core::Vec3; +use azalea_core::position::Vec3; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_explode_packet.rs b/azalea-protocol/src/packets/game/clientbound_explode_packet.rs index 2146a254..720f06a4 100755 --- a/azalea-protocol/src/packets/game/clientbound_explode_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_explode_packet.rs @@ -1,7 +1,7 @@ use std::io::{Cursor, Write}; use azalea_buf::{BufReadError, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable}; -use azalea_core::BlockPos; +use azalea_core::position::BlockPos; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, PartialEq, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_forget_level_chunk_packet.rs b/azalea-protocol/src/packets/game/clientbound_forget_level_chunk_packet.rs index 524afd08..027d41ee 100755 --- a/azalea-protocol/src/packets/game/clientbound_forget_level_chunk_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_forget_level_chunk_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::ChunkPos; +use azalea_core::position::ChunkPos; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_level_event_packet.rs b/azalea-protocol/src/packets/game/clientbound_level_event_packet.rs index 6dbefb38..a79217f1 100755 --- a/azalea-protocol/src/packets/game/clientbound_level_event_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_level_event_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::BlockPos; +use azalea_core::position::BlockPos; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_light_update_packet.rs b/azalea-protocol/src/packets/game/clientbound_light_update_packet.rs index 3e5ca1b9..8d50e94d 100755 --- a/azalea-protocol/src/packets/game/clientbound_light_update_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_light_update_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::BitSet; +use azalea_core::bitset::BitSet; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_login_packet.rs b/azalea-protocol/src/packets/game/clientbound_login_packet.rs index b6054a75..1b70cbb9 100755 --- a/azalea-protocol/src/packets/game/clientbound_login_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_login_packet.rs @@ -1,7 +1,7 @@ use crate::packets::common::CommonPlayerSpawnInfo; use azalea_buf::McBuf; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_protocol_macros::ClientboundGamePacket; /// The first packet sent by the server to the client after login. diff --git a/azalea-protocol/src/packets/game/clientbound_move_entity_pos_packet.rs b/azalea-protocol/src/packets/game/clientbound_move_entity_pos_packet.rs index 593234a1..d909fdcc 100755 --- a/azalea-protocol/src/packets/game/clientbound_move_entity_pos_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_move_entity_pos_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::PositionDelta8; +use azalea_core::delta::PositionDelta8; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_move_entity_pos_rot_packet.rs b/azalea-protocol/src/packets/game/clientbound_move_entity_pos_rot_packet.rs index ff274bd9..5a5dfbd3 100755 --- a/azalea-protocol/src/packets/game/clientbound_move_entity_pos_rot_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_move_entity_pos_rot_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::PositionDelta8; +use azalea_core::delta::PositionDelta8; use azalea_protocol_macros::ClientboundGamePacket; /// This packet is sent by the server when an entity moves less then 8 blocks. diff --git a/azalea-protocol/src/packets/game/clientbound_open_sign_editor_packet.rs b/azalea-protocol/src/packets/game/clientbound_open_sign_editor_packet.rs index c774b647..0b03cbe2 100755 --- a/azalea-protocol/src/packets/game/clientbound_open_sign_editor_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_open_sign_editor_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::BlockPos; +use azalea_core::position::BlockPos; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_place_ghost_recipe_packet.rs b/azalea-protocol/src/packets/game/clientbound_place_ghost_recipe_packet.rs index 8951fa3e..4d61a526 100755 --- a/azalea-protocol/src/packets/game/clientbound_place_ghost_recipe_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_place_ghost_recipe_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_player_abilities_packet.rs b/azalea-protocol/src/packets/game/clientbound_player_abilities_packet.rs index 12fd45e8..edb5f949 100755 --- a/azalea-protocol/src/packets/game/clientbound_player_abilities_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_player_abilities_packet.rs @@ -1,6 +1,6 @@ use azalea_buf::{BufReadError, McBuf}; use azalea_buf::{McBufReadable, McBufWritable}; -use azalea_core::FixedBitSet; +use azalea_core::bitset::FixedBitSet; use azalea_protocol_macros::ClientboundGamePacket; use std::io::{Cursor, Write}; diff --git a/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs b/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs index 6ce86ea4..6a80e172 100644 --- a/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_player_chat_packet.rs @@ -5,7 +5,7 @@ use azalea_chat::{ translatable_component::{StringOrComponent, TranslatableComponent}, FormattedText, }; -use azalea_core::BitSet; +use azalea_core::bitset::BitSet; use azalea_crypto::MessageSignature; use azalea_protocol_macros::ClientboundGamePacket; use std::io::{Cursor, Write}; diff --git a/azalea-protocol/src/packets/game/clientbound_player_info_update_packet.rs b/azalea-protocol/src/packets/game/clientbound_player_info_update_packet.rs index 1dad147f..5d54cce2 100644 --- a/azalea-protocol/src/packets/game/clientbound_player_info_update_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_player_info_update_packet.rs @@ -3,7 +3,7 @@ use azalea_buf::{ BufReadError, McBuf, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable, }; use azalea_chat::FormattedText; -use azalea_core::{FixedBitSet, GameMode}; +use azalea_core::{bitset::FixedBitSet, game_type::GameMode}; use azalea_protocol_macros::ClientboundGamePacket; use std::{ collections::HashMap, diff --git a/azalea-protocol/src/packets/game/clientbound_player_position_packet.rs b/azalea-protocol/src/packets/game/clientbound_player_position_packet.rs index f59d20ac..d63108da 100755 --- a/azalea-protocol/src/packets/game/clientbound_player_position_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_player_position_packet.rs @@ -1,7 +1,7 @@ use std::io::{Cursor, Write}; use azalea_buf::{BufReadError, McBuf, McBufReadable, McBufWritable}; -use azalea_core::FixedBitSet; +use azalea_core::bitset::FixedBitSet; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_recipe_packet.rs b/azalea-protocol/src/packets/game/clientbound_recipe_packet.rs index b6ac6f3b..e948e53c 100755 --- a/azalea-protocol/src/packets/game/clientbound_recipe_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_recipe_packet.rs @@ -1,7 +1,7 @@ use azalea_buf::{ BufReadError, McBuf, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable, }; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_protocol_macros::ClientboundGamePacket; use std::io::{Cursor, Write}; diff --git a/azalea-protocol/src/packets/game/clientbound_section_blocks_update_packet.rs b/azalea-protocol/src/packets/game/clientbound_section_blocks_update_packet.rs index aeec52fc..e92ca422 100755 --- a/azalea-protocol/src/packets/game/clientbound_section_blocks_update_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_section_blocks_update_packet.rs @@ -4,7 +4,7 @@ use azalea_block::BlockState; use azalea_buf::{ BufReadError, McBuf, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable, }; -use azalea_core::{ChunkSectionBlockPos, ChunkSectionPos}; +use azalea_core::position::{ChunkSectionBlockPos, ChunkSectionPos}; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_select_advancements_tab_packet.rs b/azalea-protocol/src/packets/game/clientbound_select_advancements_tab_packet.rs index eee48df8..c0d5f2ee 100755 --- a/azalea-protocol/src/packets/game/clientbound_select_advancements_tab_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_select_advancements_tab_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_set_default_spawn_position_packet.rs b/azalea-protocol/src/packets/game/clientbound_set_default_spawn_position_packet.rs index 9ac40427..b45b645d 100755 --- a/azalea-protocol/src/packets/game/clientbound_set_default_spawn_position_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_set_default_spawn_position_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::BlockPos; +use azalea_core::position::BlockPos; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_sound_packet.rs b/azalea-protocol/src/packets/game/clientbound_sound_packet.rs index 2b071f2e..e60485a1 100755 --- a/azalea-protocol/src/packets/game/clientbound_sound_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_sound_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_stop_sound_packet.rs b/azalea-protocol/src/packets/game/clientbound_stop_sound_packet.rs index 5ea80e67..dd601da9 100755 --- a/azalea-protocol/src/packets/game/clientbound_stop_sound_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_stop_sound_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::{BufReadError, McBufReadable, McBufWritable}; -use azalea_core::{FixedBitSet, ResourceLocation}; +use azalea_core::{bitset::FixedBitSet, resource_location::ResourceLocation}; use azalea_protocol_macros::ClientboundGamePacket; use std::io::{Cursor, Write}; diff --git a/azalea-protocol/src/packets/game/clientbound_teleport_entity_packet.rs b/azalea-protocol/src/packets/game/clientbound_teleport_entity_packet.rs index eceaa3aa..c8fbc718 100755 --- a/azalea-protocol/src/packets/game/clientbound_teleport_entity_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_teleport_entity_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::Vec3; +use azalea_core::position::Vec3; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_update_advancements_packet.rs b/azalea-protocol/src/packets/game/clientbound_update_advancements_packet.rs index 5a792849..2eb93519 100755 --- a/azalea-protocol/src/packets/game/clientbound_update_advancements_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_update_advancements_packet.rs @@ -1,6 +1,6 @@ use azalea_buf::McBuf; use azalea_chat::FormattedText; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_inventory::ItemSlot; use azalea_protocol_macros::ClientboundGamePacket; use std::collections::HashMap; @@ -119,7 +119,7 @@ pub struct AdvancementHolder { mod tests { use super::*; use azalea_buf::{McBufReadable, McBufWritable}; - use azalea_core::ResourceLocation; + use azalea_core::resource_location::ResourceLocation; use std::io::Cursor; #[test] diff --git a/azalea-protocol/src/packets/game/clientbound_update_attributes_packet.rs b/azalea-protocol/src/packets/game/clientbound_update_attributes_packet.rs index 1468a77f..147d3618 100755 --- a/azalea-protocol/src/packets/game/clientbound_update_attributes_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_update_attributes_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_entity::attributes::AttributeModifier; use azalea_protocol_macros::ClientboundGamePacket; diff --git a/azalea-protocol/src/packets/game/clientbound_update_enabled_features_packet.rs b/azalea-protocol/src/packets/game/clientbound_update_enabled_features_packet.rs index 4f05b413..e08358f7 100644 --- a/azalea-protocol/src/packets/game/clientbound_update_enabled_features_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_update_enabled_features_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_protocol_macros::ClientboundGamePacket; #[derive(Clone, Debug, McBuf, ClientboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/clientbound_update_recipes_packet.rs b/azalea-protocol/src/packets/game/clientbound_update_recipes_packet.rs index 0ebd2fed..0699eb30 100755 --- a/azalea-protocol/src/packets/game/clientbound_update_recipes_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_update_recipes_packet.rs @@ -1,7 +1,7 @@ use azalea_buf::{ BufReadError, McBuf, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable, }; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_inventory::ItemSlot; use azalea_protocol_macros::ClientboundGamePacket; use azalea_registry::RecipeSerializer; diff --git a/azalea-protocol/src/packets/game/clientbound_update_tags_packet.rs b/azalea-protocol/src/packets/game/clientbound_update_tags_packet.rs index 7cf507b4..e861e575 100755 --- a/azalea-protocol/src/packets/game/clientbound_update_tags_packet.rs +++ b/azalea-protocol/src/packets/game/clientbound_update_tags_packet.rs @@ -1,6 +1,6 @@ use azalea_buf::{BufReadError, McBuf, McBufVarReadable, McBufVarWritable}; use azalea_buf::{McBufReadable, McBufWritable}; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_protocol_macros::ClientboundGamePacket; use std::io::Cursor; use std::ops::Deref; diff --git a/azalea-protocol/src/packets/game/serverbound_block_entity_tag_query.rs b/azalea-protocol/src/packets/game/serverbound_block_entity_tag_query.rs index dcd4d050..4b396a67 100755 --- a/azalea-protocol/src/packets/game/serverbound_block_entity_tag_query.rs +++ b/azalea-protocol/src/packets/game/serverbound_block_entity_tag_query.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::BlockPos; +use azalea_core::position::BlockPos; use azalea_protocol_macros::ServerboundGamePacket; #[derive(Clone, Debug, McBuf, ServerboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/serverbound_change_difficulty_packet.rs b/azalea-protocol/src/packets/game/serverbound_change_difficulty_packet.rs index 16db0e09..460de5b2 100755 --- a/azalea-protocol/src/packets/game/serverbound_change_difficulty_packet.rs +++ b/azalea-protocol/src/packets/game/serverbound_change_difficulty_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::Difficulty; +use azalea_core::difficulty::Difficulty; use azalea_protocol_macros::ServerboundGamePacket; #[derive(Clone, Debug, McBuf, ServerboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/serverbound_chat_packet.rs b/azalea-protocol/src/packets/game/serverbound_chat_packet.rs index a19a9aa7..e0a1726c 100755 --- a/azalea-protocol/src/packets/game/serverbound_chat_packet.rs +++ b/azalea-protocol/src/packets/game/serverbound_chat_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::FixedBitSet; +use azalea_core::bitset::FixedBitSet; use azalea_crypto::MessageSignature; use azalea_protocol_macros::ServerboundGamePacket; diff --git a/azalea-protocol/src/packets/game/serverbound_custom_payload_packet.rs b/azalea-protocol/src/packets/game/serverbound_custom_payload_packet.rs index e1800e42..d5d46627 100755 --- a/azalea-protocol/src/packets/game/serverbound_custom_payload_packet.rs +++ b/azalea-protocol/src/packets/game/serverbound_custom_payload_packet.rs @@ -1,6 +1,6 @@ use azalea_buf::McBuf; use azalea_buf::UnsizedByteArray; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_protocol_macros::ServerboundGamePacket; #[derive(Clone, Debug, McBuf, ServerboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/serverbound_interact_packet.rs b/azalea-protocol/src/packets/game/serverbound_interact_packet.rs index a117ca6f..315134c9 100755 --- a/azalea-protocol/src/packets/game/serverbound_interact_packet.rs +++ b/azalea-protocol/src/packets/game/serverbound_interact_packet.rs @@ -1,6 +1,6 @@ use crate::packets::BufReadError; use azalea_buf::{McBuf, McBufReadable, McBufVarReadable, McBufVarWritable, McBufWritable}; -use azalea_core::Vec3; +use azalea_core::position::Vec3; use azalea_protocol_macros::ServerboundGamePacket; use std::io::{Cursor, Write}; diff --git a/azalea-protocol/src/packets/game/serverbound_jigsaw_generate_packet.rs b/azalea-protocol/src/packets/game/serverbound_jigsaw_generate_packet.rs index f3cab5d4..34fd5985 100755 --- a/azalea-protocol/src/packets/game/serverbound_jigsaw_generate_packet.rs +++ b/azalea-protocol/src/packets/game/serverbound_jigsaw_generate_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::BlockPos; +use azalea_core::position::BlockPos; use azalea_protocol_macros::ServerboundGamePacket; #[derive(Clone, Debug, McBuf, ServerboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/serverbound_place_recipe_packet.rs b/azalea-protocol/src/packets/game/serverbound_place_recipe_packet.rs index c7aa6fd4..03dd833b 100755 --- a/azalea-protocol/src/packets/game/serverbound_place_recipe_packet.rs +++ b/azalea-protocol/src/packets/game/serverbound_place_recipe_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_protocol_macros::ServerboundGamePacket; #[derive(Clone, Debug, McBuf, ServerboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/serverbound_player_abilities_packet.rs b/azalea-protocol/src/packets/game/serverbound_player_abilities_packet.rs index 1f8727ac..384f7dcc 100755 --- a/azalea-protocol/src/packets/game/serverbound_player_abilities_packet.rs +++ b/azalea-protocol/src/packets/game/serverbound_player_abilities_packet.rs @@ -1,6 +1,6 @@ use crate::packets::BufReadError; use azalea_buf::{McBufReadable, McBufWritable}; -use azalea_core::FixedBitSet; +use azalea_core::bitset::FixedBitSet; use azalea_protocol_macros::ServerboundGamePacket; use std::io::Cursor; diff --git a/azalea-protocol/src/packets/game/serverbound_player_action_packet.rs b/azalea-protocol/src/packets/game/serverbound_player_action_packet.rs index 7091f3c1..6719202f 100755 --- a/azalea-protocol/src/packets/game/serverbound_player_action_packet.rs +++ b/azalea-protocol/src/packets/game/serverbound_player_action_packet.rs @@ -1,6 +1,6 @@ use azalea_buf::McBuf; -use azalea_core::BlockPos; -use azalea_core::Direction; +use azalea_core::direction::Direction; +use azalea_core::position::BlockPos; use azalea_protocol_macros::ServerboundGamePacket; #[derive(Clone, Debug, McBuf, ServerboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/serverbound_player_input_packet.rs b/azalea-protocol/src/packets/game/serverbound_player_input_packet.rs index f0c7c548..db6e51a9 100755 --- a/azalea-protocol/src/packets/game/serverbound_player_input_packet.rs +++ b/azalea-protocol/src/packets/game/serverbound_player_input_packet.rs @@ -2,7 +2,7 @@ use std::io::Cursor; use azalea_buf::BufReadError; use azalea_buf::{McBufReadable, McBufWritable}; -use azalea_core::FixedBitSet; +use azalea_core::bitset::FixedBitSet; use azalea_protocol_macros::ServerboundGamePacket; #[derive(Clone, Debug, ServerboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/serverbound_recipe_book_seen_recipe_packet.rs b/azalea-protocol/src/packets/game/serverbound_recipe_book_seen_recipe_packet.rs index e82462df..9923e3a6 100755 --- a/azalea-protocol/src/packets/game/serverbound_recipe_book_seen_recipe_packet.rs +++ b/azalea-protocol/src/packets/game/serverbound_recipe_book_seen_recipe_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_protocol_macros::ServerboundGamePacket; #[derive(Clone, Debug, McBuf, ServerboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/serverbound_seen_advancements_packet.rs b/azalea-protocol/src/packets/game/serverbound_seen_advancements_packet.rs index 5a9b0e48..fb15293b 100755 --- a/azalea-protocol/src/packets/game/serverbound_seen_advancements_packet.rs +++ b/azalea-protocol/src/packets/game/serverbound_seen_advancements_packet.rs @@ -1,6 +1,6 @@ use crate::packets::BufReadError; use azalea_buf::{McBuf, McBufReadable, McBufWritable}; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_protocol_macros::ServerboundGamePacket; use std::io::Cursor; diff --git a/azalea-protocol/src/packets/game/serverbound_set_command_block_packet.rs b/azalea-protocol/src/packets/game/serverbound_set_command_block_packet.rs index d73654c2..c5feb213 100755 --- a/azalea-protocol/src/packets/game/serverbound_set_command_block_packet.rs +++ b/azalea-protocol/src/packets/game/serverbound_set_command_block_packet.rs @@ -1,6 +1,6 @@ use crate::packets::McBufWritable; use azalea_buf::{BufReadError, McBuf, McBufReadable}; -use azalea_core::{BlockPos, FixedBitSet}; +use azalea_core::{bitset::FixedBitSet, position::BlockPos}; use azalea_protocol_macros::ServerboundGamePacket; use std::io::Cursor; diff --git a/azalea-protocol/src/packets/game/serverbound_set_jigsaw_block_packet.rs b/azalea-protocol/src/packets/game/serverbound_set_jigsaw_block_packet.rs index dbc08b16..a207147a 100755 --- a/azalea-protocol/src/packets/game/serverbound_set_jigsaw_block_packet.rs +++ b/azalea-protocol/src/packets/game/serverbound_set_jigsaw_block_packet.rs @@ -2,8 +2,8 @@ use crate::packets::BufReadError; use crate::packets::McBufWritable; use azalea_buf::McBuf; use azalea_buf::McBufReadable; -use azalea_core::BlockPos; -use azalea_core::ResourceLocation; +use azalea_core::position::BlockPos; +use azalea_core::resource_location::ResourceLocation; use azalea_protocol_macros::ServerboundGamePacket; use std::io::Cursor; use std::io::Write; diff --git a/azalea-protocol/src/packets/game/serverbound_set_structure_block_packet.rs b/azalea-protocol/src/packets/game/serverbound_set_structure_block_packet.rs index 28cc0035..c10966c9 100755 --- a/azalea-protocol/src/packets/game/serverbound_set_structure_block_packet.rs +++ b/azalea-protocol/src/packets/game/serverbound_set_structure_block_packet.rs @@ -1,7 +1,7 @@ use crate::packets::BufReadError; use azalea_buf::McBuf; use azalea_buf::{McBufReadable, McBufWritable}; -use azalea_core::{BlockPos, FixedBitSet}; +use azalea_core::{bitset::FixedBitSet, position::BlockPos}; use azalea_protocol_macros::ServerboundGamePacket; use std::io::{Cursor, Write}; diff --git a/azalea-protocol/src/packets/game/serverbound_sign_update_packet.rs b/azalea-protocol/src/packets/game/serverbound_sign_update_packet.rs index 82e4c2b8..0547c783 100755 --- a/azalea-protocol/src/packets/game/serverbound_sign_update_packet.rs +++ b/azalea-protocol/src/packets/game/serverbound_sign_update_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::McBuf; -use azalea_core::BlockPos; +use azalea_core::position::BlockPos; use azalea_protocol_macros::ServerboundGamePacket; #[derive(Clone, Debug, McBuf, ServerboundGamePacket)] diff --git a/azalea-protocol/src/packets/game/serverbound_use_item_on_packet.rs b/azalea-protocol/src/packets/game/serverbound_use_item_on_packet.rs index 50cbe914..2d471114 100755 --- a/azalea-protocol/src/packets/game/serverbound_use_item_on_packet.rs +++ b/azalea-protocol/src/packets/game/serverbound_use_item_on_packet.rs @@ -1,6 +1,9 @@ use crate::packets::game::serverbound_interact_packet::InteractionHand; use azalea_buf::{BufReadError, McBuf, McBufReadable, McBufWritable}; -use azalea_core::{BlockPos, Direction, Vec3}; +use azalea_core::{ + direction::Direction, + position::{BlockPos, Vec3}, +}; use azalea_protocol_macros::ServerboundGamePacket; use std::io::{Cursor, Write}; diff --git a/azalea-protocol/src/packets/login/clientbound_custom_query_packet.rs b/azalea-protocol/src/packets/login/clientbound_custom_query_packet.rs index 1a813ca8..50d2e2d3 100755 --- a/azalea-protocol/src/packets/login/clientbound_custom_query_packet.rs +++ b/azalea-protocol/src/packets/login/clientbound_custom_query_packet.rs @@ -1,5 +1,5 @@ use azalea_buf::{McBuf, UnsizedByteArray}; -use azalea_core::ResourceLocation; +use azalea_core::resource_location::ResourceLocation; use azalea_protocol_macros::ClientboundLoginPacket; use std::hash::Hash; -- cgit v1.2.3