From d5fa5e32b37754b3b5c136e58821e48cd3b7c2ff Mon Sep 17 00:00:00 2001
From: mat <27899617+mat-1@users.noreply.github.com>
Date: Tue, 13 Jan 2026 10:51:30 -0600
Subject: Rename Instance to World (#304)

---
 azalea-client/src/plugins/inventory/equipment_effects.rs | 14 +++++++-------
 azalea-client/src/plugins/inventory/mod.rs               | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'azalea-client/src/plugins/inventory')

diff --git a/azalea-client/src/plugins/inventory/equipment_effects.rs b/azalea-client/src/plugins/inventory/equipment_effects.rs
index 47220bf2..d5897f48 100644
--- a/azalea-client/src/plugins/inventory/equipment_effects.rs
+++ b/azalea-client/src/plugins/inventory/equipment_effects.rs
@@ -19,7 +19,7 @@ use bevy_ecs::{
 };
 use tracing::{debug, error, warn};
 
-use crate::local_player::InstanceHolder;
+use crate::local_player::WorldHolder;
 
 /// A component that contains the equipment slots that we had last tick.
 ///
@@ -91,9 +91,9 @@ pub struct EquipmentChange {
 
 pub fn handle_equipment_changes(
     equipment_changes: On<EquipmentChangesEvent>,
-    mut query: Query<(&InstanceHolder, &mut LastEquipmentItems, &mut Attributes)>,
+    mut query: Query<(&WorldHolder, &mut LastEquipmentItems, &mut Attributes)>,
 ) {
-    let Ok((instance_holder, mut last_equipment_items, mut attributes)) =
+    let Ok((world_holder, mut last_equipment_items, mut attributes)) =
         query.get_mut(equipment_changes.entity)
     else {
         error!(
@@ -112,7 +112,7 @@ pub fn handle_equipment_changes(
             // stopLocationBasedEffects
 
             for (attribute, modifier) in
-                collect_attribute_modifiers_from_item(slot, &change.old, instance_holder)
+                collect_attribute_modifiers_from_item(slot, &change.old, world_holder)
             {
                 if let Some(attribute) = attributes.get_mut(attribute) {
                     attribute.remove(&modifier.id);
@@ -126,7 +126,7 @@ pub fn handle_equipment_changes(
             // see ItemStack.forEachModifier in vanilla
 
             for (attribute, modifier) in
-                collect_attribute_modifiers_from_item(slot, &change.new, instance_holder)
+                collect_attribute_modifiers_from_item(slot, &change.new, world_holder)
             {
                 if let Some(attribute) = attributes.get_mut(attribute) {
                     attribute.remove(&modifier.id);
@@ -144,7 +144,7 @@ pub fn handle_equipment_changes(
 fn collect_attribute_modifiers_from_item(
     slot: EquipmentSlot,
     item: &ItemStack,
-    instance_holder: &InstanceHolder,
+    world_holder: &WorldHolder,
 ) -> Vec<(azalea_registry::builtin::Attribute, AttributeModifier)> {
     let mut modifiers = Vec::new();
 
@@ -161,7 +161,7 @@ fn collect_attribute_modifiers_from_item(
         .get_component::<components::Enchantments>()
         .unwrap_or_default();
     if !enchants.levels.is_empty() {
-        let registry_holder = &instance_holder.instance.read().registries;
+        let registry_holder = &world_holder.shared.read().registries;
         for (enchant, &level) in &enchants.levels {
             let Some((_enchant_id, enchant_definition)) = enchant.resolve(registry_holder) else {
                 warn!(
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
-- 
cgit v1.2.3