aboutsummaryrefslogtreecommitdiff
path: root/azalea/src/container.rs
diff options
context:
space:
mode:
authormat <27899617+mat-1@users.noreply.github.com>2024-11-27 19:31:40 -0600
committerGitHub <noreply@github.com>2024-11-27 19:31:40 -0600
commit08958c2278b15ebeac8a964f392ebb792e479b61 (patch)
tree4ae3664cea38d7fd1a8f1e95ed06fac04ffe519e /azalea/src/container.rs
parent139d77d3c2b0922fba5e9d4fa2bd9819d78bd773 (diff)
downloadazalea-drasl-08958c2278b15ebeac8a964f392ebb792e479b61.tar.xz
Refactor azalea-protocol (#190)
* start updating to 1.21.4 * fix block codegen and stop using block data from burger * rename packet related modules and structs to be simpler * ItemSlot -> ItemStack for more consistency with mojmap * .get() -> .into_packet() * simplify declare_state_packets by removing packet ids * rename read_from and write_into to azalea_read and azalea_write * rename McBufReadable and McBufWritable to AzaleaRead and AzaleaWrite * McBuf -> AzBuf * remove most uses of into_variant * update codegen and use resourcelocation names for packets * implement #[limit(i)] attribute for AzBuf derive macro * fixes for 1.21.4 * fix examples * update some physics code and fix ChatType * remove unused imports in codegen * re-add some things to migrate.py and update +mc version numbers automatically * downgrade to 1.21.3 lol
Diffstat (limited to 'azalea/src/container.rs')
-rw-r--r--azalea/src/container.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/azalea/src/container.rs b/azalea/src/container.rs
index 980210ae..df020dbe 100644
--- a/azalea/src/container.rs
+++ b/azalea/src/container.rs
@@ -7,7 +7,7 @@ use azalea_client::{
Client,
};
use azalea_core::position::BlockPos;
-use azalea_inventory::{operations::ClickOperation, ItemSlot, Menu};
+use azalea_inventory::{operations::ClickOperation, ItemStack, Menu};
use azalea_protocol::packets::game::ClientboundGamePacket;
use bevy_app::{App, Plugin, Update};
use bevy_ecs::{component::Component, prelude::EventReader, system::Commands};
@@ -168,7 +168,7 @@ impl ContainerHandleRef {
/// Returns the item slots in the container, not including the player's
/// inventory. If the container is closed, this will return `None`.
- pub fn contents(&self) -> Option<Vec<ItemSlot>> {
+ pub fn contents(&self) -> Option<Vec<ItemStack>> {
self.menu().map(|menu| menu.contents())
}
@@ -222,7 +222,7 @@ impl ContainerHandle {
/// Returns the item slots in the container, not including the player's
/// inventory. If the container is closed, this will return `None`.
- pub fn contents(&self) -> Option<Vec<ItemSlot>> {
+ pub fn contents(&self) -> Option<Vec<ItemStack>> {
self.0.contents()
}