diff options
| author | mat <27899617+mat-1@users.noreply.github.com> | 2026-01-13 10:51:30 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-13 10:51:30 -0600 |
| commit | d5fa5e32b37754b3b5c136e58821e48cd3b7c2ff (patch) | |
| tree | ea04702f96ad170fb1d90e5ed2dc875ae8166495 /azalea-client/src/plugins/inventory/mod.rs | |
| parent | efb36d5fc0fe56a98f5795c53dfa109887cd5aae (diff) | |
| download | azalea-drasl-d5fa5e32b37754b3b5c136e58821e48cd3b7c2ff.tar.xz | |
Rename Instance to World (#304)
Diffstat (limited to 'azalea-client/src/plugins/inventory/mod.rs')
| -rw-r--r-- | azalea-client/src/plugins/inventory/mod.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/azalea-client/src/plugins/inventory/mod.rs b/azalea-client/src/plugins/inventory/mod.rs index 740decb1..908ebe66 100644 --- a/azalea-client/src/plugins/inventory/mod.rs +++ b/azalea-client/src/plugins/inventory/mod.rs @@ -11,7 +11,7 @@ use azalea_protocol::packets::game::{ s_set_carried_item::ServerboundSetCarriedItem, }; use azalea_registry::builtin::MenuKind; -use azalea_world::{InstanceContainer, InstanceName}; +use azalea_world::{WorldName, Worlds}; use bevy_app::{App, Plugin}; use bevy_ecs::prelude::*; use indexmap::IndexMap; @@ -167,10 +167,10 @@ pub struct ContainerClickEvent { pub fn handle_container_click_event( container_click: On<ContainerClickEvent>, mut commands: Commands, - mut query: Query<(Entity, &mut Inv, Option<&PlayerAbilities>, &InstanceName)>, - instance_container: Res<InstanceContainer>, + mut query: Query<(Entity, &mut Inv, Option<&PlayerAbilities>, &WorldName)>, + worlds: Res<Worlds>, ) { - let (entity, mut inventory, player_abilities, instance_name) = + let (entity, mut inventory, player_abilities, world_name) = query.get_mut(container_click.entity).unwrap(); if inventory.id != container_click.window_id { error!( @@ -180,7 +180,7 @@ pub fn handle_container_click_event( return; } - let Some(instance) = instance_container.get(instance_name) else { + let Some(world) = worlds.get(world_name) else { return; }; @@ -191,7 +191,7 @@ pub fn handle_container_click_event( ); let new_slots = inventory.menu().slots(); - let registry_holder = &instance.read().registries; + let registry_holder = &world.read().registries; // see which slots changed after clicking and put them in the map the server // uses this to check if we desynced |
