aboutsummaryrefslogtreecommitdiff
path: root/azalea
diff options
context:
space:
mode:
authormat <git@matdoes.dev>2023-11-06 18:04:48 -0600
committermat <git@matdoes.dev>2023-11-06 18:04:57 -0600
commitee55453fbf9a799e23cbca60e384f6adf3d11acf (patch)
tree94ffd6b431ade8434d4ed4bf6dbf7126d60d5a2b /azalea
parent48b5d121718c98c3280e0945508324fc4527beec (diff)
downloadazalea-drasl-ee55453fbf9a799e23cbca60e384f6adf3d11acf.tar.xz
bevy 0.12
Diffstat (limited to 'azalea')
-rw-r--r--azalea/Cargo.toml24
-rw-r--r--azalea/src/accept_resource_packs.rs2
-rw-r--r--azalea/src/auto_respawn.rs2
-rw-r--r--azalea/src/bot.rs4
-rw-r--r--azalea/src/container.rs4
-rw-r--r--azalea/src/pathfinder/mod.rs6
-rw-r--r--azalea/src/pathfinder/simulation.rs4
-rw-r--r--azalea/src/swarm/chat.rs4
8 files changed, 25 insertions, 25 deletions
diff --git a/azalea/Cargo.toml b/azalea/Cargo.toml
index bdab1233..c3133d13 100644
--- a/azalea/Cargo.toml
+++ b/azalea/Cargo.toml
@@ -13,7 +13,7 @@ pre-release-replacements = [
[dependencies]
anyhow = "^1.0.75"
-async-trait = "0.1.73"
+async-trait = "0.1.74"
azalea-block = { version = "0.8.0", path = "../azalea-block" }
azalea-chat = { version = "0.8.0", path = "../azalea-chat" }
azalea-client = { version = "0.8.0", path = "../azalea-client", default-features = false }
@@ -25,23 +25,23 @@ azalea-registry = { version = "0.8.0", path = "../azalea-registry" }
azalea-world = { version = "0.8.0", path = "../azalea-world" }
azalea-auth = { version = "0.8.0", path = "../azalea-auth" }
azalea-brigadier = { version = "0.8.0", path = "../azalea-brigadier" }
-bevy_app = "0.11.3"
-bevy_ecs = "0.11.3"
-bevy_tasks = "0.11.3"
+bevy_app = "0.12.0"
+bevy_ecs = "0.12.0"
+bevy_tasks = { version = "0.12.0", features = ["multi-threaded"] }
derive_more = { version = "0.99.17", features = ["deref", "deref_mut"] }
-futures = "0.3.28"
-futures-lite = "1.13.0"
+futures = "0.3.29"
+futures-lite = "2.0.1"
log = "0.4.20"
nohash-hasher = "0.2.0"
-num-traits = "0.2.16"
+num-traits = "0.2.17"
parking_lot = { version = "^0.12.1", features = ["deadlock_detection"] }
priority-queue = "1.3.2"
-thiserror = "^1.0.49"
-tokio = "^1.32.0"
-uuid = "1.4.1"
-bevy_log = "0.11.3"
+thiserror = "^1.0.50"
+tokio = "^1.33.0"
+uuid = "1.5.0"
+bevy_log = "0.12.0"
azalea-entity = { version = "0.8.0", path = "../azalea-entity" }
-bevy_time = "0.11.3"
+bevy_time = "0.12.0"
rustc-hash = "1.1.0"
[dev-dependencies]
diff --git a/azalea/src/accept_resource_packs.rs b/azalea/src/accept_resource_packs.rs
index c7891f92..281af420 100644
--- a/azalea/src/accept_resource_packs.rs
+++ b/azalea/src/accept_resource_packs.rs
@@ -30,7 +30,7 @@ fn accept_resource_pack(
mut events: EventReader<ResourcePackEvent>,
mut send_packet_events: EventWriter<SendPacketEvent>,
) {
- for event in events.iter() {
+ for event in events.read() {
send_packet_events.send(SendPacketEvent {
entity: event.entity,
packet: ServerboundResourcePackPacket {
diff --git a/azalea/src/auto_respawn.rs b/azalea/src/auto_respawn.rs
index 67e28b51..07b3e0f5 100644
--- a/azalea/src/auto_respawn.rs
+++ b/azalea/src/auto_respawn.rs
@@ -24,7 +24,7 @@ fn auto_respawn(
mut events: EventReader<DeathEvent>,
mut perform_respawn_events: EventWriter<PerformRespawnEvent>,
) {
- for event in events.iter() {
+ for event in events.read() {
perform_respawn_events.send(PerformRespawnEvent {
entity: event.entity,
});
diff --git a/azalea/src/bot.rs b/azalea/src/bot.rs
index 509d0e2d..4fe10e74 100644
--- a/azalea/src/bot.rs
+++ b/azalea/src/bot.rs
@@ -148,7 +148,7 @@ pub fn jump_listener(
mut query: Query<(&mut Jumping, &mut Bot)>,
mut events: EventReader<JumpEvent>,
) {
- for event in events.iter() {
+ for event in events.read() {
if let Ok((mut jumping, mut bot)) = query.get_mut(event.entity) {
**jumping = true;
bot.jumping_once = true;
@@ -167,7 +167,7 @@ fn look_at_listener(
mut events: EventReader<LookAtEvent>,
mut query: Query<(&Position, &EyeHeight, &mut LookDirection)>,
) {
- for event in events.iter() {
+ for event in events.read() {
if let Ok((position, eye_height, mut look_direction)) = query.get_mut(event.entity) {
let (y_rot, x_rot) =
direction_looking_at(&position.up(eye_height.into()), &event.position);
diff --git a/azalea/src/container.rs b/azalea/src/container.rs
index f5ac710e..08c60dd9 100644
--- a/azalea/src/container.rs
+++ b/azalea/src/container.rs
@@ -140,7 +140,7 @@ impl ContainerHandle {
///
/// Note that any modifications you make to the `Menu` you're given will not
/// actually cause any packets to be sent. If you're trying to modify your
- /// inventory, use [`Self::open_inventory`] instead
+ /// inventory, use [`Client::open_inventory`] instead
pub fn menu(&self) -> Option<Menu> {
let ecs = self.client.ecs.lock();
let inventory = ecs
@@ -179,7 +179,7 @@ impl ContainerHandle {
pub struct WaitingForInventoryOpen;
fn handle_menu_opened_event(mut commands: Commands, mut events: EventReader<PacketEvent>) {
- for event in events.iter() {
+ for event in events.read() {
if let ClientboundGamePacket::ContainerSetContent { .. } = event.packet {
commands
.entity(event.entity)
diff --git a/azalea/src/pathfinder/mod.rs b/azalea/src/pathfinder/mod.rs
index e82b0179..bb10fa8e 100644
--- a/azalea/src/pathfinder/mod.rs
+++ b/azalea/src/pathfinder/mod.rs
@@ -185,7 +185,7 @@ fn goto_listener(
) {
let thread_pool = AsyncComputeTaskPool::get();
- for event in events.iter() {
+ for event in events.read() {
let (mut pathfinder, executing_path, position, instance_name, inventory) = query
.get_mut(event.entity)
.expect("Called goto on an entity that's not in the world");
@@ -328,7 +328,7 @@ fn path_found_listener(
instance_container: Res<InstanceContainer>,
mut commands: Commands,
) {
- for event in events.iter() {
+ for event in events.read() {
let (mut pathfinder, executing_path, instance_name, inventory) = query
.get_mut(event.entity)
.expect("Path found for an entity that doesn't have a pathfinder");
@@ -676,7 +676,7 @@ fn handle_stop_pathfinding_event(
mut walk_events: EventWriter<StartWalkEvent>,
mut commands: Commands,
) {
- for event in events.iter() {
+ for event in events.read() {
let Ok((mut pathfinder, mut executing_path)) = query.get_mut(event.entity) else {
continue;
};
diff --git a/azalea/src/pathfinder/simulation.rs b/azalea/src/pathfinder/simulation.rs
index cc077985..0cffb416 100644
--- a/azalea/src/pathfinder/simulation.rs
+++ b/azalea/src/pathfinder/simulation.rs
@@ -11,7 +11,7 @@ use azalea_entity::{
use azalea_world::{ChunkStorage, Instance, InstanceContainer, InstanceName, MinecraftEntityId};
use bevy_app::{App, FixedUpdate};
use bevy_ecs::prelude::*;
-use bevy_time::fixed_timestep::FixedTime;
+use bevy_time::{Fixed, Time};
use parking_lot::RwLock;
#[derive(Bundle, Clone)]
@@ -70,7 +70,7 @@ impl Simulation {
azalea_client::task_pool::TaskPoolPlugin::default(),
))
// make sure it doesn't do fixed ticks without us telling it to
- .insert_resource(FixedTime::new(Duration::MAX))
+ .insert_resource(Time::<Fixed>::from_duration(Duration::MAX))
.insert_resource(InstanceContainer {
instances: [(instance_name.clone(), Arc::downgrade(&instance.clone()))]
.iter()
diff --git a/azalea/src/swarm/chat.rs b/azalea/src/swarm/chat.rs
index 6cf4d6b6..8ed5d7f5 100644
--- a/azalea/src/swarm/chat.rs
+++ b/azalea/src/swarm/chat.rs
@@ -64,7 +64,7 @@ fn chat_listener(
mut global_chat_state: ResMut<GlobalChatState>,
mut new_chat_messages_events: EventWriter<NewChatMessageEvent>,
) {
- for event in events.iter() {
+ for event in events.read() {
let mut client_chat_state = query.get_mut(event.entity);
let mut client_chat_index = if let Ok(ref client_chat_state) = client_chat_state {
client_chat_state.chat_index
@@ -119,7 +119,7 @@ fn update_min_index_and_shrink_queue(
mut events: EventReader<NewChatMessageEvent>,
swarm: Option<Res<Swarm>>,
) {
- for event in events.iter() {
+ for event in events.read() {
if let Some(swarm) = &swarm {
// it should also work if Swarm isn't present (so the tests don't need it)
swarm