From cd2f298a62819a3fabc52ef17560c2124a74d555 Mon Sep 17 00:00:00 2001 From: Shayne Hartford Date: Mon, 21 Oct 2024 20:21:38 -0400 Subject: Rename InventoryComponent to Inventory to match other components (#177) (cherry picked from commit 266058a8d441169b46ef819595eee62337ab324c) --- azalea/src/container.rs | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'azalea/src/container.rs') diff --git a/azalea/src/container.rs b/azalea/src/container.rs index c354390e..c9283b6b 100644 --- a/azalea/src/container.rs +++ b/azalea/src/container.rs @@ -1,7 +1,7 @@ use std::fmt::Formatter; use azalea_client::{ - inventory::{CloseContainerEvent, ContainerClickEvent, InventoryComponent}, + inventory::{CloseContainerEvent, ContainerClickEvent, Inventory}, packet_handling::game::PacketEvent, Client, }; @@ -65,9 +65,7 @@ impl ContainerClientExt for Client { } let ecs = self.ecs.lock(); - let inventory = ecs - .get::(self.entity) - .expect("no inventory"); + let inventory = ecs.get::(self.entity).expect("no inventory"); if inventory.id == 0 { None } else { @@ -87,9 +85,7 @@ impl ContainerClientExt for Client { /// and [`Menu::slots`]. fn open_inventory(&mut self) -> Option { let ecs = self.ecs.lock(); - let inventory = ecs - .get::(self.entity) - .expect("no inventory"); + let inventory = ecs.get::(self.entity).expect("no inventory"); if inventory.id == 0 { Some(ContainerHandle::new(0, self.clone())) @@ -105,9 +101,7 @@ impl ContainerClientExt for Client { /// your own inventory. fn get_open_container(&self) -> Option { let ecs = self.ecs.lock(); - let inventory = ecs - .get::(self.entity) - .expect("no inventory"); + let inventory = ecs.get::(self.entity).expect("no inventory"); if inventory.id == 0 { None @@ -157,7 +151,7 @@ impl ContainerHandleRef { pub fn menu(&self) -> Option { let ecs = self.client.ecs.lock(); let inventory = ecs - .get::(self.client.entity) + .get::(self.client.entity) .expect("no inventory"); // this also makes sure we can't access the inventory while a container is open -- cgit v1.2.3