From ca39b8b6af27a91431d2a837037881bc882f0dde Mon Sep 17 00:00:00 2001 From: mat Date: Sat, 13 May 2023 19:08:08 -0500 Subject: [PATCH 01/13] reexport azalea-chat and add goto docs --- azalea/src/lib.rs | 1 + azalea/src/pathfinder/mod.rs | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/azalea/src/lib.rs b/azalea/src/lib.rs index 604961f4..8a00ff71 100644 --- a/azalea/src/lib.rs +++ b/azalea/src/lib.rs @@ -14,6 +14,7 @@ use app::{App, Plugin, PluginGroup}; pub use azalea_auth as auth; pub use azalea_block as blocks; pub use azalea_brigadier as brigadier; +pub use azalea_chat as chat; pub use azalea_client::*; pub use azalea_core::{BlockPos, Vec3}; pub use azalea_protocol as protocol; diff --git a/azalea/src/pathfinder/mod.rs b/azalea/src/pathfinder/mod.rs index 3f978c95..4db18b0e 100644 --- a/azalea/src/pathfinder/mod.rs +++ b/azalea/src/pathfinder/mod.rs @@ -70,6 +70,13 @@ pub trait PathfinderClientExt { } impl PathfinderClientExt for azalea_client::Client { + /// ```no_run + /// # use azalea::prelude::*; + /// # use azalea::{BlockPos, pathfinder::BlockPosGoal}; + /// # fn example(bot: &Client) { + /// bot.goto(BlockPosGoal::from(BlockPos::new(0, 70, 0))); + /// # } + /// ``` fn goto(&self, goal: impl Goal + Send + Sync + 'static) { self.ecs.lock().send_event(GotoEvent { entity: self.entity, From 0cc76dfb67e852868e30d1c8529826c41a18e9d1 Mon Sep 17 00:00:00 2001 From: mat Date: Sat, 13 May 2023 19:29:55 -0500 Subject: [PATCH 02/13] ChatPacket::is_whisper --- azalea-client/src/chat.rs | 10 ++++++++++ azalea/src/lib.rs | 2 +- azalea/src/pathfinder/mod.rs | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/azalea-client/src/chat.rs b/azalea-client/src/chat.rs index 0ae0250a..90618c80 100755 --- a/azalea-client/src/chat.rs +++ b/azalea-client/src/chat.rs @@ -108,6 +108,16 @@ impl ChatPacket { overlay: false, })) } + + /// Whether this message was sent with /msg (or aliases). It works by + /// checking the translation key, so it won't work on servers that use their + /// own whisper system. + pub fn is_whisper(&self) -> bool { + match self.message() { + FormattedText::Text(_) => false, + FormattedText::Translatable(t) => t.key == "commands.message.display.incoming", + } + } } impl Client { diff --git a/azalea/src/lib.rs b/azalea/src/lib.rs index 8a00ff71..dcfa43b1 100644 --- a/azalea/src/lib.rs +++ b/azalea/src/lib.rs @@ -14,7 +14,7 @@ use app::{App, Plugin, PluginGroup}; pub use azalea_auth as auth; pub use azalea_block as blocks; pub use azalea_brigadier as brigadier; -pub use azalea_chat as chat; +pub use azalea_chat::FormattedText; pub use azalea_client::*; pub use azalea_core::{BlockPos, Vec3}; pub use azalea_protocol as protocol; diff --git a/azalea/src/pathfinder/mod.rs b/azalea/src/pathfinder/mod.rs index 4db18b0e..b7ed222d 100644 --- a/azalea/src/pathfinder/mod.rs +++ b/azalea/src/pathfinder/mod.rs @@ -70,7 +70,7 @@ pub trait PathfinderClientExt { } impl PathfinderClientExt for azalea_client::Client { - /// ```no_run + /// ``` /// # use azalea::prelude::*; /// # use azalea::{BlockPos, pathfinder::BlockPosGoal}; /// # fn example(bot: &Client) { From 2ba7b83490f5fb6e40a4e94da743bebe23cd7862 Mon Sep 17 00:00:00 2001 From: mat Date: Tue, 16 May 2023 23:26:45 -0500 Subject: [PATCH 03/13] ClientBuilder::new_without_plugins --- Cargo.lock | 1 + azalea-client/src/client.rs | 49 ++++++++++++++-------------------- azalea-client/src/interact.rs | 2 +- azalea-client/src/inventory.rs | 4 +-- azalea-client/src/lib.rs | 2 +- azalea-client/src/respawn.rs | 21 +++++++-------- azalea/Cargo.toml | 1 + azalea/src/lib.rs | 34 ++++++++++++++++++++--- azalea/src/pathfinder/moves.rs | 3 ++- azalea/src/swarm/mod.rs | 41 +++++++++++++++++++++++++--- 10 files changed, 105 insertions(+), 53 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dcf982f2..2aa7d0eb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -177,6 +177,7 @@ dependencies = [ "azalea-world", "bevy_app", "bevy_ecs", + "bevy_log", "bevy_tasks", "derive_more", "futures", diff --git a/azalea-client/src/client.rs b/azalea-client/src/client.rs index f2e91dfa..739ec434 100644 --- a/azalea-client/src/client.rs +++ b/azalea-client/src/client.rs @@ -221,7 +221,10 @@ impl Client { // An event that causes the schedule to run. This is only used internally. let (run_schedule_sender, run_schedule_receiver) = mpsc::unbounded_channel(); - let app = init_ecs_app(); + + let mut app = App::new(); + app.add_plugins(DefaultPlugins); + let ecs_lock = start_ecs(app, run_schedule_receiver, run_schedule_sender.clone()); Self::start_client( @@ -583,35 +586,10 @@ impl Plugin for AzaleaPlugin { } } -/// Create the [`App`]. This won't actually run anything yet. +/// Start running the ECS loop! /// -/// Note that you usually only need this if you're creating a client manually, -/// otherwise use [`Client::join`]. -/// -/// Use [`start_ecs`] to actually start running the app and then -/// [`Client::start_client`] to add a client to the ECS and make it join a -/// server. -#[doc(hidden)] -pub fn init_ecs_app() -> App { - // if you get an error right here that means you're doing something with locks - // wrong read the error to see where the issue is - // you might be able to just drop the lock or put it in its own scope to fix - - let mut app = App::new(); - - app.edit_schedule(CoreSchedule::Main, |schedule| { - schedule.set_build_settings(ScheduleBuildSettings { - ambiguity_detection: LogLevel::Warn, - ..Default::default() - }); - }); - - app.add_plugins(DefaultPlugins); - app -} - -/// Start running the ECS loop! You must create your `App` from [`init_ecs_app`] -/// first. +/// You can create your app with `App::new()`, but don't forget to add +/// [`DefaultPlugins`]. #[doc(hidden)] pub fn start_ecs( mut app: App, @@ -698,6 +676,18 @@ impl Plugin for TickBroadcastPlugin { } } +pub struct AmbiguityLoggerPlugin; +impl Plugin for AmbiguityLoggerPlugin { + fn build(&self, app: &mut App) { + app.edit_schedule(CoreSchedule::Main, |schedule| { + schedule.set_build_settings(ScheduleBuildSettings { + ambiguity_detection: LogLevel::Warn, + ..Default::default() + }); + }); + } +} + /// This plugin group will add all the default plugins necessary for Azalea to /// work. pub struct DefaultPlugins; @@ -706,6 +696,7 @@ impl PluginGroup for DefaultPlugins { fn build(self) -> PluginGroupBuilder { PluginGroupBuilder::start::() .add(LogPlugin::default()) + .add(AmbiguityLoggerPlugin) .add(TimePlugin::default()) .add(PacketHandlerPlugin) .add(AzaleaPlugin) diff --git a/azalea-client/src/interact.rs b/azalea-client/src/interact.rs index 2da80760..fa05aa49 100644 --- a/azalea-client/src/interact.rs +++ b/azalea-client/src/interact.rs @@ -73,7 +73,7 @@ pub struct CurrentSequenceNumber(u32); #[derive(Component, Clone, Debug, Deref, DerefMut)] pub struct HitResultComponent(BlockHitResult); -fn handle_block_interact_event( +pub fn handle_block_interact_event( mut events: EventReader, mut query: Query<( &LocalPlayer, diff --git a/azalea-client/src/inventory.rs b/azalea-client/src/inventory.rs index d6f909a7..bce629b0 100644 --- a/azalea-client/src/inventory.rs +++ b/azalea-client/src/inventory.rs @@ -628,7 +628,7 @@ fn handle_container_close_event( pub struct ClientSideCloseContainerEvent { pub entity: Entity, } -fn handle_client_side_close_container_event( +pub fn handle_client_side_close_container_event( mut events: EventReader, mut query: Query<&mut InventoryComponent>, ) { @@ -645,7 +645,7 @@ pub struct ContainerClickEvent { pub window_id: u8, pub operation: ClickOperation, } -fn handle_container_click_event( +pub fn handle_container_click_event( mut events: EventReader, mut query: Query<(&mut InventoryComponent, &LocalPlayer)>, ) { diff --git a/azalea-client/src/lib.rs b/azalea-client/src/lib.rs index 2c08033b..10a50e92 100644 --- a/azalea-client/src/lib.rs +++ b/azalea-client/src/lib.rs @@ -30,7 +30,7 @@ pub mod task_pool; pub use account::{Account, AccountOpts}; pub use client::{ - init_ecs_app, start_ecs, Client, ClientInformation, JoinError, JoinedClientBundle, TabList, + start_ecs, Client, ClientInformation, DefaultPlugins, JoinError, JoinedClientBundle, TabList, TickBroadcast, }; pub use events::Event; diff --git a/azalea-client/src/respawn.rs b/azalea-client/src/respawn.rs index 4e42157c..3ac17612 100644 --- a/azalea-client/src/respawn.rs +++ b/azalea-client/src/respawn.rs @@ -4,7 +4,7 @@ use azalea_protocol::packets::game::serverbound_client_command_packet::{ use bevy_app::{App, Plugin}; use bevy_ecs::prelude::*; -use crate::LocalPlayer; +use crate::local_player::{handle_send_packet_event, SendPacketEvent}; /// Tell the server that we're respawning. #[derive(Debug, Clone)] @@ -17,22 +17,21 @@ pub struct RespawnPlugin; impl Plugin for RespawnPlugin { fn build(&self, app: &mut App) { app.add_event::() - .add_system(perform_respawn); + .add_system(perform_respawn.before(handle_send_packet_event)); } } pub fn perform_respawn( mut events: EventReader, - mut query: Query<&mut LocalPlayer>, + mut send_packets: EventWriter, ) { for event in events.iter() { - if let Ok(local_player) = query.get_mut(event.entity) { - local_player.write_packet( - ServerboundClientCommandPacket { - action: serverbound_client_command_packet::Action::PerformRespawn, - } - .get(), - ); - } + send_packets.send(SendPacketEvent { + entity: event.entity, + packet: ServerboundClientCommandPacket { + action: serverbound_client_command_packet::Action::PerformRespawn, + } + .get(), + }); } } diff --git a/azalea/Cargo.toml b/azalea/Cargo.toml index 4a7469d3..f7d050f6 100644 --- a/azalea/Cargo.toml +++ b/azalea/Cargo.toml @@ -39,3 +39,4 @@ priority-queue = "1.3.0" thiserror = "^1.0.37" tokio = "^1.24.2" uuid = "1.2.2" +bevy_log = "0.10.1" diff --git a/azalea/src/lib.rs b/azalea/src/lib.rs index dcfa43b1..09e88534 100644 --- a/azalea/src/lib.rs +++ b/azalea/src/lib.rs @@ -20,7 +20,7 @@ pub use azalea_core::{BlockPos, Vec3}; pub use azalea_protocol as protocol; pub use azalea_registry::{Block, EntityKind, Item}; pub use azalea_world::{entity, Instance}; -use bot::DefaultBotPlugins; +pub use bot::DefaultBotPlugins; use ecs::component::Component; use futures::Future; use protocol::{ @@ -81,16 +81,42 @@ where /// Start building a client that can join the world. #[must_use] pub fn new() -> Self { + Self::new_without_plugins() + .add_plugins(DefaultPlugins) + .add_plugins(DefaultBotPlugins) + } + + /// [`Self::new`] but without adding the plugins by default. This is useful + /// if you want to disable a default plugin. + /// + /// You **must** add [`DefaultPlugins`] and [`DefaultBotPlugins`] to this. + /// + /// ``` + /// # use azalea::prelude::*; + /// use azalea::{app::PluginGroup, DefaultBotPlugins, DefaultPlugins}; + /// use bevy_log::LogPlugin; + /// + /// let client = ClientBuilder::new_without_plugins() + /// .add_plugins(DefaultPlugins.build().disable::()) + /// .add_plugins(DefaultBotPlugins); + /// # client.set_handler(handle); + /// # #[derive(Component, Clone, Default)] + /// # pub struct State; + /// # async fn handle(mut bot: Client, event: Event, state: State) -> anyhow::Result<()> { + /// # Ok(()) + /// # } + /// ``` + #[must_use] + pub fn new_without_plugins() -> Self { Self { // we create the app here so plugins can add onto it. // the schedules won't run until [`Self::start`] is called. - app: init_ecs_app(), - + app: App::new(), handler: None, state: S::default(), } - .add_plugins(DefaultBotPlugins) } + /// Set the function that's called every time a bot receives an [`Event`]. /// This is the way to handle normal per-bot events. /// diff --git a/azalea/src/pathfinder/moves.rs b/azalea/src/pathfinder/moves.rs index 6625581d..0dca3c95 100644 --- a/azalea/src/pathfinder/moves.rs +++ b/azalea/src/pathfinder/moves.rs @@ -15,7 +15,8 @@ fn is_block_passable(pos: &BlockPos, world: &Instance) -> bool { /// whether this block has a solid hitbox (i.e. we can stand on it) fn is_block_solid(pos: &BlockPos, world: &Instance) -> bool { if let Some(block) = world.chunks.get_block_state(pos) { - block.shape() == &collision::block_shape() + // block.shape() == &collision::block_shape() + block.shape() != &collision::empty_shape() } else { false } diff --git a/azalea/src/swarm/mod.rs b/azalea/src/swarm/mod.rs index 2253f5bd..f138950f 100644 --- a/azalea/src/swarm/mod.rs +++ b/azalea/src/swarm/mod.rs @@ -5,7 +5,9 @@ mod events; pub mod prelude; use crate::{bot::DefaultBotPlugins, HandleFn}; -use azalea_client::{chat::ChatPacket, init_ecs_app, start_ecs, Account, Client, Event, JoinError}; +use azalea_client::{ + chat::ChatPacket, start_ecs, Account, Client, DefaultPlugins, Event, JoinError, +}; use azalea_protocol::{ connect::ConnectionError, resolver::{self, ResolverError}, @@ -83,10 +85,43 @@ where /// Start creating the swarm. #[must_use] pub fn new() -> Self { + Self::new_without_plugins() + .add_plugins(DefaultPlugins) + .add_plugins(DefaultBotPlugins) + .add_plugins(DefaultSwarmPlugins) + } + + /// [`Self::new`] but without adding the plugins by default. This is useful + /// if you want to disable a default plugin. + /// + /// You **must** add [`DefaultPlugins`], [`DefaultBotPlugins`], and + /// [`DefaultSwarmPlugins`] to this. + /// + /// ``` + /// # use azalea::{prelude::*, swarm::prelude::*}; + /// use azalea::{app::PluginGroup, DefaultBotPlugins, DefaultPlugins, swarm::{DefaultSwarmPlugins}}; + /// use bevy_log::LogPlugin; + /// + /// let client = SwarmBuilder::new_without_plugins() + /// .add_plugins(DefaultPlugins.build().disable::()) + /// .add_plugins(DefaultBotPlugins) + /// .add_plugins(DefaultSwarmPlugins); + /// # client.set_handler(handle).set_swarm_handler(swarm_handle); + /// # #[derive(Component, Resource, Clone, Default)] + /// # pub struct State; + /// # async fn handle(mut bot: Client, event: Event, state: State) -> anyhow::Result<()> { + /// # Ok(()) + /// # } + /// # async fn swarm_handle(swarm: Swarm, event: SwarmEvent, state: State) -> anyhow::Result<()> { + /// # Ok(()) + /// # } + /// ``` + #[must_use] + pub fn new_without_plugins() -> Self { Self { // we create the app here so plugins can add onto it. // the schedules won't run until [`Self::start`] is called. - app: init_ecs_app(), + app: App::new(), accounts: Vec::new(), states: Vec::new(), @@ -95,8 +130,6 @@ where swarm_handler: None, join_delay: None, } - .add_plugins(DefaultSwarmPlugins) - .add_plugins(DefaultBotPlugins) } /// Add a vec of [`Account`]s to the swarm. From e2f9d59c458bb226e88dca50355dbe49ce7f6fc7 Mon Sep 17 00:00:00 2001 From: mat Date: Tue, 16 May 2023 23:32:10 -0500 Subject: [PATCH 04/13] better variable naming in doc --- azalea/src/lib.rs | 4 ++-- azalea/src/swarm/mod.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/azalea/src/lib.rs b/azalea/src/lib.rs index 09e88534..fd735585 100644 --- a/azalea/src/lib.rs +++ b/azalea/src/lib.rs @@ -96,10 +96,10 @@ where /// use azalea::{app::PluginGroup, DefaultBotPlugins, DefaultPlugins}; /// use bevy_log::LogPlugin; /// - /// let client = ClientBuilder::new_without_plugins() + /// let client_builder = ClientBuilder::new_without_plugins() /// .add_plugins(DefaultPlugins.build().disable::()) /// .add_plugins(DefaultBotPlugins); - /// # client.set_handler(handle); + /// # client_builder.set_handler(handle); /// # #[derive(Component, Clone, Default)] /// # pub struct State; /// # async fn handle(mut bot: Client, event: Event, state: State) -> anyhow::Result<()> { diff --git a/azalea/src/swarm/mod.rs b/azalea/src/swarm/mod.rs index f138950f..0bb9f7cd 100644 --- a/azalea/src/swarm/mod.rs +++ b/azalea/src/swarm/mod.rs @@ -102,11 +102,11 @@ where /// use azalea::{app::PluginGroup, DefaultBotPlugins, DefaultPlugins, swarm::{DefaultSwarmPlugins}}; /// use bevy_log::LogPlugin; /// - /// let client = SwarmBuilder::new_without_plugins() + /// let swarm_builder = SwarmBuilder::new_without_plugins() /// .add_plugins(DefaultPlugins.build().disable::()) /// .add_plugins(DefaultBotPlugins) /// .add_plugins(DefaultSwarmPlugins); - /// # client.set_handler(handle).set_swarm_handler(swarm_handle); + /// # swarm_builder.set_handler(handle).set_swarm_handler(swarm_handle); /// # #[derive(Component, Resource, Clone, Default)] /// # pub struct State; /// # async fn handle(mut bot: Client, event: Event, state: State) -> anyhow::Result<()> { From 76428154f895fd3e8ae63e122c569c05c4ae9cb6 Mon Sep 17 00:00:00 2001 From: mat Date: Tue, 16 May 2023 23:39:06 -0500 Subject: [PATCH 05/13] upgrade dependencies have fun compiling nerds --- Cargo.lock | 143 ++++++++++++++++++++++++++++------------------------- 1 file changed, 76 insertions(+), 67 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2aa7d0eb..a947496d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -121,7 +121,7 @@ checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -138,7 +138,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -730,9 +730,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.12.1" +version = "3.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1ce199063694f33ffb7dd4e0ee620741495c32833cde5aa08f02a0bf96f0c8" +checksum = "3c6ed94e98ecff0c12dd1b04c15ec0d7d9458ca8fe806cea6f12954efe74c63b" [[package]] name = "bytemuck" @@ -806,9 +806,9 @@ dependencies = [ [[package]] name = "ciborium" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c137568cc60b904a7724001b35ce2630fd00d5d84805fbb608ab89509d788f" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" dependencies = [ "ciborium-io", "ciborium-ll", @@ -817,15 +817,15 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "346de753af073cc87b52b2083a506b38ac176a44cfb05497b622e27be899b369" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" [[package]] name = "ciborium-ll" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213030a2b5a4e0c0892b6652260cf6ccac84827b83a85a534e178e3906c4cf1b" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" dependencies = [ "ciborium-io", "half", @@ -1221,7 +1221,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -1320,9 +1320,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f8a914c2987b688368b5138aa05321db91f4090cf26118185672ad588bce21" +checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782" dependencies = [ "bytes", "fnv", @@ -1443,9 +1443,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" dependencies = [ "http", "hyper", @@ -1529,9 +1529,9 @@ checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" [[package]] name = "js-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730" +checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790" dependencies = [ "wasm-bindgen", ] @@ -1544,9 +1544,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.142" +version = "0.2.144" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a987beff54b60ffa6d51982e1aa1146bc42f19bd26be28b0586f252fccf5317" +checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1" [[package]] name = "libm" @@ -1905,18 +1905,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b63bdb0cd06f1f4dedf69b254734f9b45af66e4a031e42a7480257d9898b435" +checksum = "c4ec6d5fe0b140acb27c9a0444118cf55bfbb4e0b259739429abb4521dd67c16" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.26" +version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" dependencies = [ "proc-macro2", ] @@ -2016,9 +2016,9 @@ checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c" [[package]] name = "reqwest" -version = "0.11.17" +version = "0.11.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13293b639a097af28fc8a90f22add145a9c954e49d77da06263d58cf44d5fb91" +checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55" dependencies = [ "base64", "bytes", @@ -2102,14 +2102,14 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.8" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f" +checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" dependencies = [ "log", "ring", + "rustls-webpki", "sct", - "webpki", ] [[package]] @@ -2121,6 +2121,16 @@ dependencies = [ "base64", ] +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.12" @@ -2166,9 +2176,9 @@ checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed" [[package]] name = "serde" -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" +checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2" dependencies = [ "serde_derive", ] @@ -2184,13 +2194,13 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.160" +version = "1.0.163" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" +checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] @@ -2310,9 +2320,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "a6f671d4b5ffdb8eadec19c0ae67fe2639df8684bd7bc4b83d986b8db549cf01" dependencies = [ "proc-macro2", "quote", @@ -2351,14 +2361,14 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "thread-id" -version = "4.0.0" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fdfe0627923f7411a43ec9ec9c39c3a9b4151be313e0922042581fb6c9b717f" +checksum = "3ee93aa2b8331c0fec9091548843f2c90019571814057da3b783f9de09349d73" dependencies = [ "libc", "redox_syscall", @@ -2402,9 +2412,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.28.0" +version = "1.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c786bf8134e5a3a166db9b29ab8f48134739014a3eca7bc6bfa95d673b136f" +checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" dependencies = [ "autocfg", "bytes", @@ -2427,18 +2437,17 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "tokio-rustls" -version = "0.23.4" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" dependencies = [ "rustls", "tokio", - "webpki", ] [[package]] @@ -2498,14 +2507,14 @@ checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.16", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ "once_cell", "valuable", @@ -2646,9 +2655,9 @@ dependencies = [ [[package]] name = "uuid" -version = "1.3.2" +version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dad5567ad0cf5b760e5665964bec1b47dfd077ba8a2544b513f3556d3d239a2" +checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" dependencies = [ "getrandom", "serde", @@ -2711,9 +2720,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b" +checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -2721,24 +2730,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9" +checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.34" +version = "0.4.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f219e0d211ba40266969f6dbdd90636da12f75bee4fc9d6c23d1260dadb51454" +checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e" dependencies = [ "cfg-if", "js-sys", @@ -2748,9 +2757,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -2758,28 +2767,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6" +checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.16", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.84" +version = "0.2.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" +checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93" [[package]] name = "web-sys" -version = "0.3.61" +version = "0.3.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33b99f4b23ba3eec1a53ac264e35a755f00e966e0065077d6027c0f575b0b97" +checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2" dependencies = [ "js-sys", "wasm-bindgen", @@ -2969,9 +2978,9 @@ checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" [[package]] name = "winnow" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5617da7e1f97bf363947d767b91aaf3c2bbc19db7fda9c65af1278713d58e0a2" +checksum = "61de7bac303dc551fe038e2b3cef0f571087a47571ea6e79a87692ac99b99699" dependencies = [ "memchr", ] From c26bb0733f42d660d406d1714a07b51dda7c8b3e Mon Sep 17 00:00:00 2001 From: mat Date: Tue, 16 May 2023 23:47:54 -0500 Subject: [PATCH 06/13] format some Cargo.tomls --- azalea-brigadier/Cargo.toml | 4 ++-- azalea-buf/Cargo.toml | 4 ++-- azalea-buf/azalea-buf-macros/Cargo.toml | 2 +- azalea-crypto/Cargo.toml | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/azalea-brigadier/Cargo.toml b/azalea-brigadier/Cargo.toml index a1f5966b..7fddad7d 100644 --- a/azalea-brigadier/Cargo.toml +++ b/azalea-brigadier/Cargo.toml @@ -9,8 +9,8 @@ version = "0.6.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -azalea-buf = {path = "../azalea-buf", version = "^0.6.0", optional = true} -azalea-chat = {path = "../azalea-chat", version = "^0.6.0", optional = true} +azalea-buf = { path = "../azalea-buf", version = "^0.6.0", optional = true } +azalea-chat = { path = "../azalea-chat", version = "^0.6.0", optional = true } parking_lot = "0.12.1" [features] diff --git a/azalea-buf/Cargo.toml b/azalea-buf/Cargo.toml index b687d252..5f628b8a 100644 --- a/azalea-buf/Cargo.toml +++ b/azalea-buf/Cargo.toml @@ -9,10 +9,10 @@ version = "0.6.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -azalea-buf-macros = {path = "./azalea-buf-macros", version = "^0.6.0" } +azalea-buf-macros = { path = "./azalea-buf-macros", version = "^0.6.0" } byteorder = "^1.4.3" log = "0.4.17" -serde_json = {version = "^1.0", optional = true} +serde_json = { version = "^1.0", optional = true } thiserror = "1.0.37" uuid = "^1.1.2" diff --git a/azalea-buf/azalea-buf-macros/Cargo.toml b/azalea-buf/azalea-buf-macros/Cargo.toml index f6775b76..b46204db 100644 --- a/azalea-buf/azalea-buf-macros/Cargo.toml +++ b/azalea-buf/azalea-buf-macros/Cargo.toml @@ -13,4 +13,4 @@ proc-macro = true [dependencies] proc-macro2 = "^1.0.36" quote = "^1.0.10" -syn = {version = "^1.0.82", features = ["extra-traits"]} +syn = { version = "^1.0.82", features = ["extra-traits"] } diff --git a/azalea-crypto/Cargo.toml b/azalea-crypto/Cargo.toml index 41fcc262..1e4868a8 100644 --- a/azalea-crypto/Cargo.toml +++ b/azalea-crypto/Cargo.toml @@ -10,16 +10,16 @@ repository = "https://github.com/mat-1/azalea/tree/main/azalea-crypto" [dependencies] aes = "0.8.1" -azalea-buf = {path = "../azalea-buf", version = "^0.6.0" } +azalea-buf = { path = "../azalea-buf", version = "^0.6.0" } cfb8 = "0.8.1" num-bigint = "^0.4.3" -rand = {version = "^0.8.4", features = ["getrandom"]} +rand = { version = "^0.8.4", features = ["getrandom"] } rsa_public_encrypt_pkcs1 = "0.4.0" sha-1 = "^0.10.0" uuid = "^1.1.2" [dev-dependencies] -criterion = {version = "^0.4.0", features = ["html_reports"]} +criterion = { version = "^0.4.0", features = ["html_reports"] } [[bench]] harness = false From 3f8177a3022145ada55e8bc15c6f409de59d0bd4 Mon Sep 17 00:00:00 2001 From: mat Date: Tue, 16 May 2023 23:49:08 -0500 Subject: [PATCH 07/13] chore: Release --- Cargo.lock | 4 ++-- azalea-auth/Cargo.toml | 2 +- azalea-block/Cargo.toml | 2 +- azalea-brigadier/Cargo.toml | 2 +- azalea-buf/Cargo.toml | 4 ++-- azalea-buf/azalea-buf-macros/Cargo.toml | 2 +- azalea-chat/Cargo.toml | 2 +- azalea-core/Cargo.toml | 2 +- azalea-crypto/Cargo.toml | 2 +- azalea-inventory/Cargo.toml | 2 +- azalea-nbt/Cargo.toml | 2 +- azalea-protocol/Cargo.toml | 2 +- azalea-registry/Cargo.toml | 2 +- azalea-world/Cargo.toml | 2 +- 14 files changed, 16 insertions(+), 16 deletions(-) mode change 100755 => 100644 azalea-core/Cargo.toml diff --git a/Cargo.lock b/Cargo.lock index a947496d..8b76cd6f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -239,7 +239,7 @@ dependencies = [ [[package]] name = "azalea-buf" -version = "0.6.0" +version = "0.7.0" dependencies = [ "azalea-buf-macros", "byteorder", @@ -251,7 +251,7 @@ dependencies = [ [[package]] name = "azalea-buf-macros" -version = "0.6.0" +version = "0.7.0" dependencies = [ "proc-macro2", "quote", diff --git a/azalea-auth/Cargo.toml b/azalea-auth/Cargo.toml index c635d01b..401e20e0 100644 --- a/azalea-auth/Cargo.toml +++ b/azalea-auth/Cargo.toml @@ -9,7 +9,7 @@ version = "0.6.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -azalea-buf = { path = "../azalea-buf", version = "^0.6.0" } +azalea-buf = { path = "../azalea-buf", version = "^0.7.0" } azalea-crypto = { path = "../azalea-crypto", version = "^0.6.0" } chrono = { version = "0.4.22", default-features = false } log = "0.4.17" diff --git a/azalea-block/Cargo.toml b/azalea-block/Cargo.toml index 770bf336..bf546152 100644 --- a/azalea-block/Cargo.toml +++ b/azalea-block/Cargo.toml @@ -12,5 +12,5 @@ version = "0.6.0" [dependencies] azalea-block-macros = { path = "./azalea-block-macros", version = "^0.6.0" } -azalea-buf = { path = "../azalea-buf", version = "^0.6.0" } +azalea-buf = { path = "../azalea-buf", version = "^0.7.0" } azalea-registry = { version = "0.6.0", path = "../azalea-registry" } diff --git a/azalea-brigadier/Cargo.toml b/azalea-brigadier/Cargo.toml index 7fddad7d..4f2e1b0d 100644 --- a/azalea-brigadier/Cargo.toml +++ b/azalea-brigadier/Cargo.toml @@ -9,7 +9,7 @@ version = "0.6.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -azalea-buf = { path = "../azalea-buf", version = "^0.6.0", optional = true } +azalea-buf = { path = "../azalea-buf", version = "^0.7.0", optional = true } azalea-chat = { path = "../azalea-chat", version = "^0.6.0", optional = true } parking_lot = "0.12.1" diff --git a/azalea-buf/Cargo.toml b/azalea-buf/Cargo.toml index 5f628b8a..cbd00bef 100644 --- a/azalea-buf/Cargo.toml +++ b/azalea-buf/Cargo.toml @@ -4,12 +4,12 @@ edition = "2021" license = "MIT" name = "azalea-buf" repository = "https://github.com/mat-1/azalea/tree/main/azalea-buf" -version = "0.6.0" +version = "0.7.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -azalea-buf-macros = { path = "./azalea-buf-macros", version = "^0.6.0" } +azalea-buf-macros = { path = "./azalea-buf-macros", version = "^0.7.0" } byteorder = "^1.4.3" log = "0.4.17" serde_json = { version = "^1.0", optional = true } diff --git a/azalea-buf/azalea-buf-macros/Cargo.toml b/azalea-buf/azalea-buf-macros/Cargo.toml index b46204db..2aa98fd7 100644 --- a/azalea-buf/azalea-buf-macros/Cargo.toml +++ b/azalea-buf/azalea-buf-macros/Cargo.toml @@ -4,7 +4,7 @@ edition = "2021" license = "MIT" name = "azalea-buf-macros" repository = "https://github.com/mat-1/azalea/tree/main/azalea-buf" -version = "0.6.0" +version = "0.7.0" [lib] proc-macro = true diff --git a/azalea-chat/Cargo.toml b/azalea-chat/Cargo.toml index c3ffb464..f26bd402 100644 --- a/azalea-chat/Cargo.toml +++ b/azalea-chat/Cargo.toml @@ -14,7 +14,7 @@ default = ["azalea-buf"] [dependencies] azalea-buf = { path = "../azalea-buf", features = [ "serde_json", -], version = "^0.6.0", optional = true } +], version = "^0.7.0", optional = true } azalea-language = { path = "../azalea-language", version = "^0.6.0" } log = "0.4.17" once_cell = "1.16.0" diff --git a/azalea-core/Cargo.toml b/azalea-core/Cargo.toml old mode 100755 new mode 100644 index 76f4b456..7f642acd --- a/azalea-core/Cargo.toml +++ b/azalea-core/Cargo.toml @@ -9,7 +9,7 @@ version = "0.6.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -azalea-buf = { path = "../azalea-buf", version = "^0.6.0" } +azalea-buf = { path = "../azalea-buf", version = "^0.7.0" } azalea-chat = { path = "../azalea-chat", version = "^0.6.0" } azalea-inventory = { version = "0.1.0", path = "../azalea-inventory" } azalea-nbt = { path = "../azalea-nbt", version = "^0.6.0" } diff --git a/azalea-crypto/Cargo.toml b/azalea-crypto/Cargo.toml index 1e4868a8..29223ea2 100644 --- a/azalea-crypto/Cargo.toml +++ b/azalea-crypto/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/mat-1/azalea/tree/main/azalea-crypto" [dependencies] aes = "0.8.1" -azalea-buf = { path = "../azalea-buf", version = "^0.6.0" } +azalea-buf = { path = "../azalea-buf", version = "^0.7.0" } cfb8 = "0.8.1" num-bigint = "^0.4.3" rand = { version = "^0.8.4", features = ["getrandom"] } diff --git a/azalea-inventory/Cargo.toml b/azalea-inventory/Cargo.toml index 4b00901f..80dcd95b 100644 --- a/azalea-inventory/Cargo.toml +++ b/azalea-inventory/Cargo.toml @@ -6,7 +6,7 @@ version = "0.1.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -azalea-buf = { version = "0.6.0", path = "../azalea-buf" } +azalea-buf = { version = "0.7.0", path = "../azalea-buf" } azalea-inventory-macros = { version = "0.1.0", path = "./azalea-inventory-macros" } azalea-nbt = { version = "0.6.0", path = "../azalea-nbt" } azalea-registry = { version = "0.6.0", path = "../azalea-registry" } diff --git a/azalea-nbt/Cargo.toml b/azalea-nbt/Cargo.toml index 6958e992..278df81f 100644 --- a/azalea-nbt/Cargo.toml +++ b/azalea-nbt/Cargo.toml @@ -9,7 +9,7 @@ repository = "https://github.com/mat-1/azalea/tree/main/azalea-nbt" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -azalea-buf = { path = "../azalea-buf", version = "^0.6.0" } +azalea-buf = { path = "../azalea-buf", version = "^0.7.0" } byteorder = "^1.4.3" compact_str = { version = "0.7.0", features = ["serde"] } enum-as-inner = "0.5.1" diff --git a/azalea-protocol/Cargo.toml b/azalea-protocol/Cargo.toml index f555af4e..8754ff05 100644 --- a/azalea-protocol/Cargo.toml +++ b/azalea-protocol/Cargo.toml @@ -19,7 +19,7 @@ azalea-block = { path = "../azalea-block", default-features = false, version = " azalea-brigadier = { path = "../azalea-brigadier", version = "^0.6.0", features = [ "azalea-buf", ] } -azalea-buf = { path = "../azalea-buf", version = "^0.6.0" } +azalea-buf = { path = "../azalea-buf", version = "^0.7.0" } azalea-chat = { path = "../azalea-chat", version = "^0.6.0" } azalea-core = { path = "../azalea-core", optional = true, version = "^0.6.0", features = [ "serde", diff --git a/azalea-registry/Cargo.toml b/azalea-registry/Cargo.toml index 6fc93849..473af69c 100644 --- a/azalea-registry/Cargo.toml +++ b/azalea-registry/Cargo.toml @@ -9,7 +9,7 @@ version = "0.6.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -azalea-buf = { path = "../azalea-buf", version = "^0.6.0" } +azalea-buf = { path = "../azalea-buf", version = "^0.7.0" } azalea-registry-macros = { path = "./azalea-registry-macros", version = "^0.6.0" } serde = { version = "^1.0", optional = true } diff --git a/azalea-world/Cargo.toml b/azalea-world/Cargo.toml index 81984900..8c304cbe 100644 --- a/azalea-world/Cargo.toml +++ b/azalea-world/Cargo.toml @@ -10,7 +10,7 @@ version = "0.6.0" [dependencies] azalea-block = { path = "../azalea-block", default-features = false, version = "^0.6.0" } -azalea-buf = { path = "../azalea-buf", version = "^0.6.0" } +azalea-buf = { path = "../azalea-buf", version = "^0.7.0" } azalea-chat = { path = "../azalea-chat", version = "^0.6.0" } azalea-core = { path = "../azalea-core", version = "^0.6.0", features = [ "bevy_ecs", From 667b15be6f7ee2941cffab42ace3b6199095ffb1 Mon Sep 17 00:00:00 2001 From: mat Date: Tue, 16 May 2023 23:52:11 -0500 Subject: [PATCH 08/13] set version of azalea-inventory to 0.6 --- azalea-inventory/Cargo.toml | 2 +- azalea-inventory/azalea-inventory-macros/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/azalea-inventory/Cargo.toml b/azalea-inventory/Cargo.toml index 80dcd95b..fe6676f6 100644 --- a/azalea-inventory/Cargo.toml +++ b/azalea-inventory/Cargo.toml @@ -1,7 +1,7 @@ [package] edition = "2021" name = "azalea-inventory" -version = "0.1.0" +version = "0.6.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/azalea-inventory/azalea-inventory-macros/Cargo.toml b/azalea-inventory/azalea-inventory-macros/Cargo.toml index 9ac1cd68..2aac8be5 100644 --- a/azalea-inventory/azalea-inventory-macros/Cargo.toml +++ b/azalea-inventory/azalea-inventory-macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "azalea-inventory-macros" -version = "0.1.0" +version = "0.6.0" edition = "2021" [lib] From bb49c78ebcb1a6df7b8edf51b2207704a14143ca Mon Sep 17 00:00:00 2001 From: mat Date: Tue, 16 May 2023 23:53:13 -0500 Subject: [PATCH 09/13] and also update the dependents lol --- Cargo.lock | 4 ++-- azalea-client/Cargo.toml | 2 +- azalea-core/Cargo.toml | 2 +- azalea-inventory/Cargo.toml | 2 +- azalea-physics/Cargo.toml | 2 +- azalea-protocol/Cargo.toml | 2 +- azalea-world/Cargo.toml | 2 +- azalea/Cargo.toml | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8b76cd6f..eefd20cd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -335,7 +335,7 @@ dependencies = [ [[package]] name = "azalea-inventory" -version = "0.1.0" +version = "0.6.0" dependencies = [ "azalea-buf", "azalea-inventory-macros", @@ -345,7 +345,7 @@ dependencies = [ [[package]] name = "azalea-inventory-macros" -version = "0.1.0" +version = "0.6.0" dependencies = [ "proc-macro2", "quote", diff --git a/azalea-client/Cargo.toml b/azalea-client/Cargo.toml index 2a80467a..fce8a31b 100644 --- a/azalea-client/Cargo.toml +++ b/azalea-client/Cargo.toml @@ -25,7 +25,7 @@ bevy_ecs = "0.10.0" bevy_log = "0.10.0" bevy_tasks = "0.10.0" bevy_time = "0.10.0" -azalea-inventory = { path = "../azalea-inventory", version = "0.1.0" } +azalea-inventory = { path = "../azalea-inventory", version = "0.6.0" } derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] } futures = "0.3.25" log = "0.4.17" diff --git a/azalea-core/Cargo.toml b/azalea-core/Cargo.toml index 7f642acd..6f953359 100644 --- a/azalea-core/Cargo.toml +++ b/azalea-core/Cargo.toml @@ -11,7 +11,7 @@ version = "0.6.0" [dependencies] azalea-buf = { path = "../azalea-buf", version = "^0.7.0" } azalea-chat = { path = "../azalea-chat", version = "^0.6.0" } -azalea-inventory = { version = "0.1.0", path = "../azalea-inventory" } +azalea-inventory = { version = "0.6.0", path = "../azalea-inventory" } azalea-nbt = { path = "../azalea-nbt", version = "^0.6.0" } azalea-registry = { path = "../azalea-registry", version = "^0.6.0" } bevy_ecs = { version = "0.10.0", default-features = false, optional = true } diff --git a/azalea-inventory/Cargo.toml b/azalea-inventory/Cargo.toml index fe6676f6..e792a1e5 100644 --- a/azalea-inventory/Cargo.toml +++ b/azalea-inventory/Cargo.toml @@ -7,6 +7,6 @@ version = "0.6.0" [dependencies] azalea-buf = { version = "0.7.0", path = "../azalea-buf" } -azalea-inventory-macros = { version = "0.1.0", path = "./azalea-inventory-macros" } +azalea-inventory-macros = { version = "0.6.0", path = "./azalea-inventory-macros" } azalea-nbt = { version = "0.6.0", path = "../azalea-nbt" } azalea-registry = { version = "0.6.0", path = "../azalea-registry" } diff --git a/azalea-physics/Cargo.toml b/azalea-physics/Cargo.toml index ca7390eb..d42e5d1d 100644 --- a/azalea-physics/Cargo.toml +++ b/azalea-physics/Cargo.toml @@ -11,7 +11,7 @@ version = "0.6.0" [dependencies] azalea-block = { path = "../azalea-block", version = "^0.6.0" } azalea-core = { path = "../azalea-core", version = "^0.6.0" } -azalea-inventory = { version = "0.1.0", path = "../azalea-inventory" } +azalea-inventory = { version = "0.6.0", path = "../azalea-inventory" } azalea-registry = { path = "../azalea-registry", version = "^0.6.0" } azalea-world = { path = "../azalea-world", version = "^0.6.0" } bevy_app = "0.10.0" diff --git a/azalea-protocol/Cargo.toml b/azalea-protocol/Cargo.toml index 8754ff05..1f16c240 100644 --- a/azalea-protocol/Cargo.toml +++ b/azalea-protocol/Cargo.toml @@ -25,7 +25,7 @@ azalea-core = { path = "../azalea-core", optional = true, version = "^0.6.0", fe "serde", ] } azalea-crypto = { path = "../azalea-crypto", version = "^0.6.0" } -azalea-inventory = { version = "0.1.0", path = "../azalea-inventory" } +azalea-inventory = { version = "0.6.0", path = "../azalea-inventory" } azalea-nbt = { path = "../azalea-nbt", version = "^0.6.0", features = [ "serde", ] } diff --git a/azalea-world/Cargo.toml b/azalea-world/Cargo.toml index 8c304cbe..7242bdfc 100644 --- a/azalea-world/Cargo.toml +++ b/azalea-world/Cargo.toml @@ -15,7 +15,7 @@ azalea-chat = { path = "../azalea-chat", version = "^0.6.0" } azalea-core = { path = "../azalea-core", version = "^0.6.0", features = [ "bevy_ecs", ] } -azalea-inventory = { version = "0.1.0", path = "../azalea-inventory" } +azalea-inventory = { version = "0.6.0", path = "../azalea-inventory" } azalea-nbt = { path = "../azalea-nbt", version = "^0.6.0" } azalea-registry = { path = "../azalea-registry", version = "^0.6.0" } bevy_app = "0.10.0" diff --git a/azalea/Cargo.toml b/azalea/Cargo.toml index f7d050f6..c79b44f9 100644 --- a/azalea/Cargo.toml +++ b/azalea/Cargo.toml @@ -18,7 +18,7 @@ azalea-block = { version = "0.6.0", path = "../azalea-block" } azalea-chat = { version = "0.6.0", path = "../azalea-chat" } azalea-client = { version = "0.6.0", path = "../azalea-client" } azalea-core = { version = "0.6.0", path = "../azalea-core" } -azalea-inventory = { version = "0.1.0", path = "../azalea-inventory" } +azalea-inventory = { version = "0.6.0", path = "../azalea-inventory" } azalea-physics = { version = "0.6.0", path = "../azalea-physics" } azalea-protocol = { version = "0.6.0", path = "../azalea-protocol" } azalea-registry = { version = "0.6.0", path = "../azalea-registry" } From a63beff5e395ebf104a62047cefe1c8f6d426f6f Mon Sep 17 00:00:00 2001 From: mat Date: Tue, 16 May 2023 23:55:39 -0500 Subject: [PATCH 10/13] and add the required fields --- azalea-inventory/Cargo.toml | 3 +++ azalea-inventory/azalea-inventory-macros/Cargo.toml | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/azalea-inventory/Cargo.toml b/azalea-inventory/Cargo.toml index e792a1e5..5fe756f7 100644 --- a/azalea-inventory/Cargo.toml +++ b/azalea-inventory/Cargo.toml @@ -1,6 +1,9 @@ [package] +description = "Representations of various inventory data structures in Minecraft." edition = "2021" +license = "MIT" name = "azalea-inventory" +repository = "https://github.com/mat-1/azalea/tree/main/azalea-inventory-macros" version = "0.6.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/azalea-inventory/azalea-inventory-macros/Cargo.toml b/azalea-inventory/azalea-inventory-macros/Cargo.toml index 2aac8be5..0db33255 100644 --- a/azalea-inventory/azalea-inventory-macros/Cargo.toml +++ b/azalea-inventory/azalea-inventory-macros/Cargo.toml @@ -1,7 +1,10 @@ [package] -name = "azalea-inventory-macros" -version = "0.6.0" +description = "Internal macros for azalea-inventory." edition = "2021" +license = "MIT" +name = "azalea-inventory-macros" +repository = "https://github.com/mat-1/azalea/tree/main/azalea-inventory/azalea-inventory-macros" +version = "0.6.0" [lib] proc-macro = true From cb204304813f63b8ef6601dce84f8f911b0af154 Mon Sep 17 00:00:00 2001 From: mat Date: Tue, 16 May 2023 23:57:06 -0500 Subject: [PATCH 11/13] chore: Release --- Cargo.lock | 14 +++++++------- azalea-block/Cargo.toml | 2 +- azalea-brigadier/Cargo.toml | 2 +- azalea-chat/Cargo.toml | 2 +- azalea-client/Cargo.toml | 8 ++++---- azalea-core/Cargo.toml | 10 +++++----- azalea-inventory/Cargo.toml | 8 ++++---- .../azalea-inventory-macros/Cargo.toml | 2 +- azalea-nbt/Cargo.toml | 2 +- azalea-physics/Cargo.toml | 6 +++--- azalea-protocol/Cargo.toml | 10 +++++----- azalea-registry/Cargo.toml | 4 ++-- azalea-registry/azalea-registry-macros/Cargo.toml | 2 +- azalea-world/Cargo.toml | 10 +++++----- azalea/Cargo.toml | 8 ++++---- 15 files changed, 45 insertions(+), 45 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index eefd20cd..99e87e80 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -260,7 +260,7 @@ dependencies = [ [[package]] name = "azalea-chat" -version = "0.6.0" +version = "0.7.0" dependencies = [ "azalea-buf", "azalea-language", @@ -305,7 +305,7 @@ dependencies = [ [[package]] name = "azalea-core" -version = "0.6.0" +version = "0.7.0" dependencies = [ "azalea-buf", "azalea-chat", @@ -335,7 +335,7 @@ dependencies = [ [[package]] name = "azalea-inventory" -version = "0.6.0" +version = "0.7.0" dependencies = [ "azalea-buf", "azalea-inventory-macros", @@ -345,7 +345,7 @@ dependencies = [ [[package]] name = "azalea-inventory-macros" -version = "0.6.0" +version = "0.7.0" dependencies = [ "proc-macro2", "quote", @@ -363,7 +363,7 @@ dependencies = [ [[package]] name = "azalea-nbt" -version = "0.6.0" +version = "0.7.0" dependencies = [ "azalea-buf", "byteorder", @@ -445,7 +445,7 @@ dependencies = [ [[package]] name = "azalea-registry" -version = "0.6.0" +version = "0.7.0" dependencies = [ "azalea-buf", "azalea-registry-macros", @@ -454,7 +454,7 @@ dependencies = [ [[package]] name = "azalea-registry-macros" -version = "0.6.0" +version = "0.7.0" dependencies = [ "proc-macro2", "quote", diff --git a/azalea-block/Cargo.toml b/azalea-block/Cargo.toml index bf546152..fe648991 100644 --- a/azalea-block/Cargo.toml +++ b/azalea-block/Cargo.toml @@ -13,4 +13,4 @@ version = "0.6.0" [dependencies] azalea-block-macros = { path = "./azalea-block-macros", version = "^0.6.0" } azalea-buf = { path = "../azalea-buf", version = "^0.7.0" } -azalea-registry = { version = "0.6.0", path = "../azalea-registry" } +azalea-registry = { version = "0.7.0", path = "../azalea-registry" } diff --git a/azalea-brigadier/Cargo.toml b/azalea-brigadier/Cargo.toml index 4f2e1b0d..2c61ea3c 100644 --- a/azalea-brigadier/Cargo.toml +++ b/azalea-brigadier/Cargo.toml @@ -10,7 +10,7 @@ version = "0.6.0" [dependencies] azalea-buf = { path = "../azalea-buf", version = "^0.7.0", optional = true } -azalea-chat = { path = "../azalea-chat", version = "^0.6.0", optional = true } +azalea-chat = { path = "../azalea-chat", version = "^0.7.0", optional = true } parking_lot = "0.12.1" [features] diff --git a/azalea-chat/Cargo.toml b/azalea-chat/Cargo.toml index f26bd402..3794b256 100644 --- a/azalea-chat/Cargo.toml +++ b/azalea-chat/Cargo.toml @@ -4,7 +4,7 @@ edition = "2021" license = "MIT" name = "azalea-chat" repository = "https://github.com/mat-1/azalea/tree/main/azalea-chat" -version = "0.6.0" +version = "0.7.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/azalea-client/Cargo.toml b/azalea-client/Cargo.toml index fce8a31b..a4fe20eb 100644 --- a/azalea-client/Cargo.toml +++ b/azalea-client/Cargo.toml @@ -13,19 +13,19 @@ anyhow = "1.0.59" async-trait = "0.1.58" azalea-auth = { path = "../azalea-auth", version = "0.6.0" } azalea-block = { path = "../azalea-block", version = "0.6.0" } -azalea-chat = { path = "../azalea-chat", version = "0.6.0" } -azalea-core = { path = "../azalea-core", version = "0.6.0" } +azalea-chat = { path = "../azalea-chat", version = "0.7.0" } +azalea-core = { path = "../azalea-core", version = "0.7.0" } azalea-crypto = { path = "../azalea-crypto", version = "0.6.0" } azalea-physics = { path = "../azalea-physics", version = "0.6.0" } azalea-protocol = { path = "../azalea-protocol", version = "0.6.0" } -azalea-registry = { path = "../azalea-registry", version = "0.6.0" } +azalea-registry = { path = "../azalea-registry", version = "0.7.0" } azalea-world = { path = "../azalea-world", version = "0.6.0" } bevy_app = "0.10.0" bevy_ecs = "0.10.0" bevy_log = "0.10.0" bevy_tasks = "0.10.0" bevy_time = "0.10.0" -azalea-inventory = { path = "../azalea-inventory", version = "0.6.0" } +azalea-inventory = { path = "../azalea-inventory", version = "0.7.0" } derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] } futures = "0.3.25" log = "0.4.17" diff --git a/azalea-core/Cargo.toml b/azalea-core/Cargo.toml index 6f953359..1982f878 100644 --- a/azalea-core/Cargo.toml +++ b/azalea-core/Cargo.toml @@ -4,16 +4,16 @@ edition = "2021" license = "MIT" name = "azalea-core" repository = "https://github.com/mat-1/azalea/tree/main/azalea-core" -version = "0.6.0" +version = "0.7.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] azalea-buf = { path = "../azalea-buf", version = "^0.7.0" } -azalea-chat = { path = "../azalea-chat", version = "^0.6.0" } -azalea-inventory = { version = "0.6.0", path = "../azalea-inventory" } -azalea-nbt = { path = "../azalea-nbt", version = "^0.6.0" } -azalea-registry = { path = "../azalea-registry", version = "^0.6.0" } +azalea-chat = { path = "../azalea-chat", version = "^0.7.0" } +azalea-inventory = { version = "0.7.0", path = "../azalea-inventory" } +azalea-nbt = { path = "../azalea-nbt", version = "^0.7.0" } +azalea-registry = { path = "../azalea-registry", version = "^0.7.0" } bevy_ecs = { version = "0.10.0", default-features = false, optional = true } num-traits = "0.2.15" serde = { version = "^1.0", optional = true } diff --git a/azalea-inventory/Cargo.toml b/azalea-inventory/Cargo.toml index 5fe756f7..4e689d03 100644 --- a/azalea-inventory/Cargo.toml +++ b/azalea-inventory/Cargo.toml @@ -4,12 +4,12 @@ edition = "2021" license = "MIT" name = "azalea-inventory" repository = "https://github.com/mat-1/azalea/tree/main/azalea-inventory-macros" -version = "0.6.0" +version = "0.7.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] azalea-buf = { version = "0.7.0", path = "../azalea-buf" } -azalea-inventory-macros = { version = "0.6.0", path = "./azalea-inventory-macros" } -azalea-nbt = { version = "0.6.0", path = "../azalea-nbt" } -azalea-registry = { version = "0.6.0", path = "../azalea-registry" } +azalea-inventory-macros = { version = "0.7.0", path = "./azalea-inventory-macros" } +azalea-nbt = { version = "0.7.0", path = "../azalea-nbt" } +azalea-registry = { version = "0.7.0", path = "../azalea-registry" } diff --git a/azalea-inventory/azalea-inventory-macros/Cargo.toml b/azalea-inventory/azalea-inventory-macros/Cargo.toml index 0db33255..ee41c6b6 100644 --- a/azalea-inventory/azalea-inventory-macros/Cargo.toml +++ b/azalea-inventory/azalea-inventory-macros/Cargo.toml @@ -4,7 +4,7 @@ edition = "2021" license = "MIT" name = "azalea-inventory-macros" repository = "https://github.com/mat-1/azalea/tree/main/azalea-inventory/azalea-inventory-macros" -version = "0.6.0" +version = "0.7.0" [lib] proc-macro = true diff --git a/azalea-nbt/Cargo.toml b/azalea-nbt/Cargo.toml index 278df81f..e2c253f5 100644 --- a/azalea-nbt/Cargo.toml +++ b/azalea-nbt/Cargo.toml @@ -3,7 +3,7 @@ description = "A fast NBT serializer and deserializer." edition = "2021" license = "MIT" name = "azalea-nbt" -version = "0.6.0" +version = "0.7.0" repository = "https://github.com/mat-1/azalea/tree/main/azalea-nbt" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/azalea-physics/Cargo.toml b/azalea-physics/Cargo.toml index d42e5d1d..67f14c29 100644 --- a/azalea-physics/Cargo.toml +++ b/azalea-physics/Cargo.toml @@ -10,9 +10,9 @@ version = "0.6.0" [dependencies] azalea-block = { path = "../azalea-block", version = "^0.6.0" } -azalea-core = { path = "../azalea-core", version = "^0.6.0" } -azalea-inventory = { version = "0.6.0", path = "../azalea-inventory" } -azalea-registry = { path = "../azalea-registry", version = "^0.6.0" } +azalea-core = { path = "../azalea-core", version = "^0.7.0" } +azalea-inventory = { version = "0.7.0", path = "../azalea-inventory" } +azalea-registry = { path = "../azalea-registry", version = "^0.7.0" } azalea-world = { path = "../azalea-world", version = "^0.6.0" } bevy_app = "0.10.0" bevy_ecs = "0.10.0" diff --git a/azalea-protocol/Cargo.toml b/azalea-protocol/Cargo.toml index 1f16c240..5b622d39 100644 --- a/azalea-protocol/Cargo.toml +++ b/azalea-protocol/Cargo.toml @@ -20,17 +20,17 @@ azalea-brigadier = { path = "../azalea-brigadier", version = "^0.6.0", features "azalea-buf", ] } azalea-buf = { path = "../azalea-buf", version = "^0.7.0" } -azalea-chat = { path = "../azalea-chat", version = "^0.6.0" } -azalea-core = { path = "../azalea-core", optional = true, version = "^0.6.0", features = [ +azalea-chat = { path = "../azalea-chat", version = "^0.7.0" } +azalea-core = { path = "../azalea-core", optional = true, version = "^0.7.0", features = [ "serde", ] } azalea-crypto = { path = "../azalea-crypto", version = "^0.6.0" } -azalea-inventory = { version = "0.6.0", path = "../azalea-inventory" } -azalea-nbt = { path = "../azalea-nbt", version = "^0.6.0", features = [ +azalea-inventory = { version = "0.7.0", path = "../azalea-inventory" } +azalea-nbt = { path = "../azalea-nbt", version = "^0.7.0", features = [ "serde", ] } azalea-protocol-macros = { path = "./azalea-protocol-macros", version = "^0.6.0" } -azalea-registry = { path = "../azalea-registry", version = "^0.6.0" } +azalea-registry = { path = "../azalea-registry", version = "^0.7.0" } azalea-world = { path = "../azalea-world", version = "^0.6.0" } bevy_ecs = { version = "0.10.0", default-features = false } byteorder = "^1.4.3" diff --git a/azalea-registry/Cargo.toml b/azalea-registry/Cargo.toml index 473af69c..af36946f 100644 --- a/azalea-registry/Cargo.toml +++ b/azalea-registry/Cargo.toml @@ -4,13 +4,13 @@ edition = "2021" license = "MIT" name = "azalea-registry" repository = "https://github.com/mat-1/azalea/tree/main/azalea-registry" -version = "0.6.0" +version = "0.7.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] azalea-buf = { path = "../azalea-buf", version = "^0.7.0" } -azalea-registry-macros = { path = "./azalea-registry-macros", version = "^0.6.0" } +azalea-registry-macros = { path = "./azalea-registry-macros", version = "^0.7.0" } serde = { version = "^1.0", optional = true } [features] diff --git a/azalea-registry/azalea-registry-macros/Cargo.toml b/azalea-registry/azalea-registry-macros/Cargo.toml index 6b58e43b..1bb659ac 100644 --- a/azalea-registry/azalea-registry-macros/Cargo.toml +++ b/azalea-registry/azalea-registry-macros/Cargo.toml @@ -4,7 +4,7 @@ edition = "2021" license = "MIT" name = "azalea-registry-macros" repository = "https://github.com/mat-1/azalea/tree/main/azalea-registry/azalea-registry-macros" -version = "0.6.0" +version = "0.7.0" [lib] proc-macro = true diff --git a/azalea-world/Cargo.toml b/azalea-world/Cargo.toml index 7242bdfc..42f056ca 100644 --- a/azalea-world/Cargo.toml +++ b/azalea-world/Cargo.toml @@ -11,13 +11,13 @@ version = "0.6.0" [dependencies] azalea-block = { path = "../azalea-block", default-features = false, version = "^0.6.0" } azalea-buf = { path = "../azalea-buf", version = "^0.7.0" } -azalea-chat = { path = "../azalea-chat", version = "^0.6.0" } -azalea-core = { path = "../azalea-core", version = "^0.6.0", features = [ +azalea-chat = { path = "../azalea-chat", version = "^0.7.0" } +azalea-core = { path = "../azalea-core", version = "^0.7.0", features = [ "bevy_ecs", ] } -azalea-inventory = { version = "0.6.0", path = "../azalea-inventory" } -azalea-nbt = { path = "../azalea-nbt", version = "^0.6.0" } -azalea-registry = { path = "../azalea-registry", version = "^0.6.0" } +azalea-inventory = { version = "0.7.0", path = "../azalea-inventory" } +azalea-nbt = { path = "../azalea-nbt", version = "^0.7.0" } +azalea-registry = { path = "../azalea-registry", version = "^0.7.0" } bevy_app = "0.10.0" bevy_ecs = "0.10.0" derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] } diff --git a/azalea/Cargo.toml b/azalea/Cargo.toml index c79b44f9..1fd25ccd 100644 --- a/azalea/Cargo.toml +++ b/azalea/Cargo.toml @@ -15,13 +15,13 @@ pre-release-replacements = [ anyhow = "^1.0.65" async-trait = "0.1.58" azalea-block = { version = "0.6.0", path = "../azalea-block" } -azalea-chat = { version = "0.6.0", path = "../azalea-chat" } +azalea-chat = { version = "0.7.0", path = "../azalea-chat" } azalea-client = { version = "0.6.0", path = "../azalea-client" } -azalea-core = { version = "0.6.0", path = "../azalea-core" } -azalea-inventory = { version = "0.6.0", path = "../azalea-inventory" } +azalea-core = { version = "0.7.0", path = "../azalea-core" } +azalea-inventory = { version = "0.7.0", path = "../azalea-inventory" } azalea-physics = { version = "0.6.0", path = "../azalea-physics" } azalea-protocol = { version = "0.6.0", path = "../azalea-protocol" } -azalea-registry = { version = "0.6.0", path = "../azalea-registry" } +azalea-registry = { version = "0.7.0", path = "../azalea-registry" } azalea-world = { version = "0.6.0", path = "../azalea-world" } azalea-auth = { version = "0.6.0", path = "../azalea-auth" } azalea-brigadier = { version = "0.6.0", path = "../azalea-brigadier" } From 8ef57aa698a373661076933e8aa25af0f82c758d Mon Sep 17 00:00:00 2001 From: mat Date: Wed, 17 May 2023 00:04:16 -0500 Subject: [PATCH 12/13] chore: Release --- Cargo.lock | 24 +++++++++---------- azalea-auth/Cargo.toml | 4 ++-- azalea-block/Cargo.toml | 4 ++-- azalea-block/azalea-block-macros/Cargo.toml | 2 +- azalea-brigadier/Cargo.toml | 2 +- azalea-chat/Cargo.toml | 2 +- azalea-client/Cargo.toml | 14 +++++------ azalea-crypto/Cargo.toml | 2 +- azalea-language/Cargo.toml | 2 +- azalea-physics/Cargo.toml | 6 ++--- azalea-protocol/Cargo.toml | 14 +++++------ .../azalea-protocol-macros/Cargo.toml | 2 +- azalea-world/Cargo.toml | 4 ++-- azalea/Cargo.toml | 16 ++++++------- azalea/README.md | 2 +- 15 files changed, 50 insertions(+), 50 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 99e87e80..c76696cb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -160,7 +160,7 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "azalea" -version = "0.6.0" +version = "0.7.0" dependencies = [ "anyhow", "async-trait", @@ -194,7 +194,7 @@ dependencies = [ [[package]] name = "azalea-auth" -version = "0.6.0" +version = "0.7.0" dependencies = [ "azalea-buf", "azalea-crypto", @@ -212,7 +212,7 @@ dependencies = [ [[package]] name = "azalea-block" -version = "0.6.0" +version = "0.7.0" dependencies = [ "azalea-block-macros", "azalea-buf", @@ -221,7 +221,7 @@ dependencies = [ [[package]] name = "azalea-block-macros" -version = "0.6.0" +version = "0.7.0" dependencies = [ "proc-macro2", "quote", @@ -230,7 +230,7 @@ dependencies = [ [[package]] name = "azalea-brigadier" -version = "0.6.0" +version = "0.7.0" dependencies = [ "azalea-buf", "azalea-chat", @@ -272,7 +272,7 @@ dependencies = [ [[package]] name = "azalea-client" -version = "0.6.0" +version = "0.7.0" dependencies = [ "anyhow", "async-trait", @@ -320,7 +320,7 @@ dependencies = [ [[package]] name = "azalea-crypto" -version = "0.6.0" +version = "0.7.0" dependencies = [ "aes", "azalea-buf", @@ -354,7 +354,7 @@ dependencies = [ [[package]] name = "azalea-language" -version = "0.6.0" +version = "0.7.0" dependencies = [ "once_cell", "serde", @@ -381,7 +381,7 @@ dependencies = [ [[package]] name = "azalea-physics" -version = "0.6.0" +version = "0.7.0" dependencies = [ "azalea-block", "azalea-core", @@ -398,7 +398,7 @@ dependencies = [ [[package]] name = "azalea-protocol" -version = "0.6.0" +version = "0.7.0" dependencies = [ "anyhow", "async-compression", @@ -436,7 +436,7 @@ dependencies = [ [[package]] name = "azalea-protocol-macros" -version = "0.6.0" +version = "0.7.0" dependencies = [ "proc-macro2", "quote", @@ -463,7 +463,7 @@ dependencies = [ [[package]] name = "azalea-world" -version = "0.6.0" +version = "0.7.0" dependencies = [ "azalea-block", "azalea-buf", diff --git a/azalea-auth/Cargo.toml b/azalea-auth/Cargo.toml index 401e20e0..a795407f 100644 --- a/azalea-auth/Cargo.toml +++ b/azalea-auth/Cargo.toml @@ -4,13 +4,13 @@ edition = "2021" license = "MIT" name = "azalea-auth" repository = "https://github.com/mat-1/azalea/tree/main/azalea-auth" -version = "0.6.0" +version = "0.7.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] azalea-buf = { path = "../azalea-buf", version = "^0.7.0" } -azalea-crypto = { path = "../azalea-crypto", version = "^0.6.0" } +azalea-crypto = { path = "../azalea-crypto", version = "^0.7.0" } chrono = { version = "0.4.22", default-features = false } log = "0.4.17" num-bigint = "0.4.3" diff --git a/azalea-block/Cargo.toml b/azalea-block/Cargo.toml index fe648991..9db6d481 100644 --- a/azalea-block/Cargo.toml +++ b/azalea-block/Cargo.toml @@ -4,13 +4,13 @@ edition = "2021" license = "MIT" name = "azalea-block" repository = "https://github.com/mat-1/azalea/tree/main/azalea-block" -version = "0.6.0" +version = "0.7.0" [lib] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -azalea-block-macros = { path = "./azalea-block-macros", version = "^0.6.0" } +azalea-block-macros = { path = "./azalea-block-macros", version = "^0.7.0" } azalea-buf = { path = "../azalea-buf", version = "^0.7.0" } azalea-registry = { version = "0.7.0", path = "../azalea-registry" } diff --git a/azalea-block/azalea-block-macros/Cargo.toml b/azalea-block/azalea-block-macros/Cargo.toml index 1cc1d0f7..80d9a818 100644 --- a/azalea-block/azalea-block-macros/Cargo.toml +++ b/azalea-block/azalea-block-macros/Cargo.toml @@ -4,7 +4,7 @@ edition = "2021" license = "MIT" name = "azalea-block-macros" repository = "https://github.com/mat-1/azalea/tree/main/azalea-block/azalea-block-macros" -version = "0.6.0" +version = "0.7.0" [lib] proc-macro = true diff --git a/azalea-brigadier/Cargo.toml b/azalea-brigadier/Cargo.toml index 2c61ea3c..f7b475b7 100644 --- a/azalea-brigadier/Cargo.toml +++ b/azalea-brigadier/Cargo.toml @@ -4,7 +4,7 @@ edition = "2021" license = "MIT" name = "azalea-brigadier" repository = "https://github.com/mat-1/azalea/tree/main/azalea-brigadier" -version = "0.6.0" +version = "0.7.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/azalea-chat/Cargo.toml b/azalea-chat/Cargo.toml index 3794b256..8a9cf2ef 100644 --- a/azalea-chat/Cargo.toml +++ b/azalea-chat/Cargo.toml @@ -15,7 +15,7 @@ default = ["azalea-buf"] azalea-buf = { path = "../azalea-buf", features = [ "serde_json", ], version = "^0.7.0", optional = true } -azalea-language = { path = "../azalea-language", version = "^0.6.0" } +azalea-language = { path = "../azalea-language", version = "^0.7.0" } log = "0.4.17" once_cell = "1.16.0" serde = { version = "^1.0", features = ["derive"] } diff --git a/azalea-client/Cargo.toml b/azalea-client/Cargo.toml index a4fe20eb..0271d42e 100644 --- a/azalea-client/Cargo.toml +++ b/azalea-client/Cargo.toml @@ -4,22 +4,22 @@ edition = "2021" license = "MIT" name = "azalea-client" repository = "https://github.com/mat-1/azalea/tree/main/azalea-client" -version = "0.6.0" +version = "0.7.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] anyhow = "1.0.59" async-trait = "0.1.58" -azalea-auth = { path = "../azalea-auth", version = "0.6.0" } -azalea-block = { path = "../azalea-block", version = "0.6.0" } +azalea-auth = { path = "../azalea-auth", version = "0.7.0" } +azalea-block = { path = "../azalea-block", version = "0.7.0" } azalea-chat = { path = "../azalea-chat", version = "0.7.0" } azalea-core = { path = "../azalea-core", version = "0.7.0" } -azalea-crypto = { path = "../azalea-crypto", version = "0.6.0" } -azalea-physics = { path = "../azalea-physics", version = "0.6.0" } -azalea-protocol = { path = "../azalea-protocol", version = "0.6.0" } +azalea-crypto = { path = "../azalea-crypto", version = "0.7.0" } +azalea-physics = { path = "../azalea-physics", version = "0.7.0" } +azalea-protocol = { path = "../azalea-protocol", version = "0.7.0" } azalea-registry = { path = "../azalea-registry", version = "0.7.0" } -azalea-world = { path = "../azalea-world", version = "0.6.0" } +azalea-world = { path = "../azalea-world", version = "0.7.0" } bevy_app = "0.10.0" bevy_ecs = "0.10.0" bevy_log = "0.10.0" diff --git a/azalea-crypto/Cargo.toml b/azalea-crypto/Cargo.toml index 29223ea2..aed12e04 100644 --- a/azalea-crypto/Cargo.toml +++ b/azalea-crypto/Cargo.toml @@ -3,7 +3,7 @@ description = "Cryptography features used in Minecraft." edition = "2021" license = "MIT" name = "azalea-crypto" -version = "0.6.0" +version = "0.7.0" repository = "https://github.com/mat-1/azalea/tree/main/azalea-crypto" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/azalea-language/Cargo.toml b/azalea-language/Cargo.toml index 2e518b70..ae24aed3 100644 --- a/azalea-language/Cargo.toml +++ b/azalea-language/Cargo.toml @@ -4,7 +4,7 @@ edition = "2021" license = "MIT" name = "azalea-language" repository = "https://github.com/mat-1/azalea/tree/main/azalea-language" -version = "0.6.0" +version = "0.7.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/azalea-physics/Cargo.toml b/azalea-physics/Cargo.toml index 67f14c29..086620dc 100644 --- a/azalea-physics/Cargo.toml +++ b/azalea-physics/Cargo.toml @@ -4,16 +4,16 @@ edition = "2021" license = "MIT" name = "azalea-physics" repository = "https://github.com/mat-1/azalea/tree/main/azalea-physics" -version = "0.6.0" +version = "0.7.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -azalea-block = { path = "../azalea-block", version = "^0.6.0" } +azalea-block = { path = "../azalea-block", version = "^0.7.0" } azalea-core = { path = "../azalea-core", version = "^0.7.0" } azalea-inventory = { version = "0.7.0", path = "../azalea-inventory" } azalea-registry = { path = "../azalea-registry", version = "^0.7.0" } -azalea-world = { path = "../azalea-world", version = "^0.6.0" } +azalea-world = { path = "../azalea-world", version = "^0.7.0" } bevy_app = "0.10.0" bevy_ecs = "0.10.0" once_cell = "1.16.0" diff --git a/azalea-protocol/Cargo.toml b/azalea-protocol/Cargo.toml index 5b622d39..8f702aa4 100644 --- a/azalea-protocol/Cargo.toml +++ b/azalea-protocol/Cargo.toml @@ -4,7 +4,7 @@ edition = "2021" license = "MIT" name = "azalea-protocol" repository = "https://github.com/mat-1/azalea/tree/main/azalea-protocol" -version = "0.6.0" +version = "0.7.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -14,9 +14,9 @@ async-compression = { version = "^0.3.8", features = [ "zlib", ], optional = true } async-recursion = "1.0.0" -azalea-auth = { path = "../azalea-auth", version = "^0.6.0" } -azalea-block = { path = "../azalea-block", default-features = false, version = "^0.6.0" } -azalea-brigadier = { path = "../azalea-brigadier", version = "^0.6.0", features = [ +azalea-auth = { path = "../azalea-auth", version = "^0.7.0" } +azalea-block = { path = "../azalea-block", default-features = false, version = "^0.7.0" } +azalea-brigadier = { path = "../azalea-brigadier", version = "^0.7.0", features = [ "azalea-buf", ] } azalea-buf = { path = "../azalea-buf", version = "^0.7.0" } @@ -24,14 +24,14 @@ azalea-chat = { path = "../azalea-chat", version = "^0.7.0" } azalea-core = { path = "../azalea-core", optional = true, version = "^0.7.0", features = [ "serde", ] } -azalea-crypto = { path = "../azalea-crypto", version = "^0.6.0" } +azalea-crypto = { path = "../azalea-crypto", version = "^0.7.0" } azalea-inventory = { version = "0.7.0", path = "../azalea-inventory" } azalea-nbt = { path = "../azalea-nbt", version = "^0.7.0", features = [ "serde", ] } -azalea-protocol-macros = { path = "./azalea-protocol-macros", version = "^0.6.0" } +azalea-protocol-macros = { path = "./azalea-protocol-macros", version = "^0.7.0" } azalea-registry = { path = "../azalea-registry", version = "^0.7.0" } -azalea-world = { path = "../azalea-world", version = "^0.6.0" } +azalea-world = { path = "../azalea-world", version = "^0.7.0" } bevy_ecs = { version = "0.10.0", default-features = false } byteorder = "^1.4.3" bytes = "^1.1.0" diff --git a/azalea-protocol/azalea-protocol-macros/Cargo.toml b/azalea-protocol/azalea-protocol-macros/Cargo.toml index 914de95a..dcd9a329 100644 --- a/azalea-protocol/azalea-protocol-macros/Cargo.toml +++ b/azalea-protocol/azalea-protocol-macros/Cargo.toml @@ -3,7 +3,7 @@ description = "Macros internally used in azalea-protocol." edition = "2021" license = "MIT" name = "azalea-protocol-macros" -version = "0.6.0" +version = "0.7.0" repository = "https://github.com/mat-1/azalea/tree/main/azalea-protocol/azalea-protocol-macros" [lib] diff --git a/azalea-world/Cargo.toml b/azalea-world/Cargo.toml index 42f056ca..b2c1aa5c 100644 --- a/azalea-world/Cargo.toml +++ b/azalea-world/Cargo.toml @@ -4,12 +4,12 @@ edition = "2021" license = "MIT" name = "azalea-world" repository = "https://github.com/mat-1/azalea/tree/main/azalea-world" -version = "0.6.0" +version = "0.7.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -azalea-block = { path = "../azalea-block", default-features = false, version = "^0.6.0" } +azalea-block = { path = "../azalea-block", default-features = false, version = "^0.7.0" } azalea-buf = { path = "../azalea-buf", version = "^0.7.0" } azalea-chat = { path = "../azalea-chat", version = "^0.7.0" } azalea-core = { path = "../azalea-core", version = "^0.7.0", features = [ diff --git a/azalea/Cargo.toml b/azalea/Cargo.toml index 1fd25ccd..c03248a7 100644 --- a/azalea/Cargo.toml +++ b/azalea/Cargo.toml @@ -4,7 +4,7 @@ edition = "2021" license = "MIT" name = "azalea" repository = "https://github.com/mat-1/azalea/tree/main/azalea" -version = "0.6.0" +version = "0.7.0" [package.metadata.release] pre-release-replacements = [ @@ -14,17 +14,17 @@ pre-release-replacements = [ [dependencies] anyhow = "^1.0.65" async-trait = "0.1.58" -azalea-block = { version = "0.6.0", path = "../azalea-block" } +azalea-block = { version = "0.7.0", path = "../azalea-block" } azalea-chat = { version = "0.7.0", path = "../azalea-chat" } -azalea-client = { version = "0.6.0", path = "../azalea-client" } +azalea-client = { version = "0.7.0", path = "../azalea-client" } azalea-core = { version = "0.7.0", path = "../azalea-core" } azalea-inventory = { version = "0.7.0", path = "../azalea-inventory" } -azalea-physics = { version = "0.6.0", path = "../azalea-physics" } -azalea-protocol = { version = "0.6.0", path = "../azalea-protocol" } +azalea-physics = { version = "0.7.0", path = "../azalea-physics" } +azalea-protocol = { version = "0.7.0", path = "../azalea-protocol" } azalea-registry = { version = "0.7.0", path = "../azalea-registry" } -azalea-world = { version = "0.6.0", path = "../azalea-world" } -azalea-auth = { version = "0.6.0", path = "../azalea-auth" } -azalea-brigadier = { version = "0.6.0", path = "../azalea-brigadier" } +azalea-world = { version = "0.7.0", path = "../azalea-world" } +azalea-auth = { version = "0.7.0", path = "../azalea-auth" } +azalea-brigadier = { version = "0.7.0", path = "../azalea-brigadier" } bevy_app = "0.10.0" bevy_ecs = "0.10.0" bevy_tasks = "0.10.0" diff --git a/azalea/README.md b/azalea/README.md index 21be566a..e173bdd2 100755 --- a/azalea/README.md +++ b/azalea/README.md @@ -15,7 +15,7 @@ Then, add one of the following lines to your Cargo.toml: Latest bleeding-edge version: `azalea = { git="https://github.com/mat-1/azalea" }`\ Latest "stable" release: -`azalea = "0.6.0"` +`azalea = "0.7.0"` ## Optimization From eb65b0ad6e03f5ffcf8f0f2328ec91bb7e26259f Mon Sep 17 00:00:00 2001 From: mat Date: Sun, 21 May 2023 17:29:28 -0500 Subject: [PATCH 13/13] fix respawn system ambiguity --- azalea/src/auto_respawn.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azalea/src/auto_respawn.rs b/azalea/src/auto_respawn.rs index c5dd12a4..d2973a2f 100644 --- a/azalea/src/auto_respawn.rs +++ b/azalea/src/auto_respawn.rs @@ -1,6 +1,6 @@ use crate::app::{App, Plugin}; use azalea_client::packet_handling::DeathEvent; -use azalea_client::respawn::PerformRespawnEvent; +use azalea_client::respawn::{perform_respawn, PerformRespawnEvent}; use bevy_ecs::prelude::*; /// A plugin that makes [`DeathEvent`]s send [`PerformRespawnEvent`]s. @@ -8,7 +8,7 @@ use bevy_ecs::prelude::*; pub struct AutoRespawnPlugin; impl Plugin for AutoRespawnPlugin { fn build(&self, app: &mut App) { - app.add_system(auto_respawn); + app.add_system(auto_respawn.before(perform_respawn)); } }