Merge branch 'undead-variants' into tamable-mobs

Author: Purdze

pomme-client/src/entity/mod.rs

@@ -76,8 +76,9 @@ pub struct LivingEntity {
     pub wool_color: Option<u8>,
     /// Sheep wool shorn / bogged mushrooms shorn.
     pub is_sheared: bool,
-    /// Registry/wire variant slot; meaning is per-kind (pool index for
-    /// cow/chicken). Normalized in `EntityStore::set_variant`.
+    /// Registry/wire variant slot; meaning is per-kind. Holder-backed values
+    /// are pre-resolved to pool indices by the net handler; raw-int kinds are
+    /// normalized in `EntityStore::apply_entity_data`.
     pub variant: u32,
     /// Chicken wing-flap state (vanilla `Chicken.aiStep`): `flap` is the
     /// unbounded wing-cycle phase, `flap_speed` the 0..1 amplitude.
@@ -796,10 +797,8 @@ impl EntityStore {
             (EntityKind::Enderman, 17, Bool(b)) => entity.is_creepy = b,
             (EntityKind::Witch, 17, Bool(b)) => entity.witch_drinking = b,
             // Zombie-family underwater conversion / zombie villager curing.
-            (EntityKind::Zombie | EntityKind::Husk | EntityKind::Drowned, 18, Bool(b)) => {
-                entity.is_converting = b
-            }
-            (EntityKind::ZombieVillager, 19, Bool(b)) => entity.is_converting = b,
+            (EntityKind::Zombie | EntityKind::Husk | EntityKind::Drowned, 18, Bool(b))
+            | (EntityKind::ZombieVillager, 19, Bool(b)) => entity.is_converting = b,
             (EntityKind::Villager, 18, Int(c)) => entity.unhappy_counter = c,
             // Vanilla sparse rabbit id map: 99 = evil, unknown ids fall back
             // to brown.

pomme-client/src/net/handler.rs

@@ -497,24 +497,22 @@ pub fn handle_game_packet(
                 if item.index == 18
                     && let azalea_entity::EntityDataValue::CowVariant(variant) = &item.value
                 {
-                    use azalea_registry::DataRegistry;
                     let _ = event_tx.try_send(variant_event(
                         registry_holder,
                         p.id.0,
                         EntityKind::Cow,
-                        variant.protocol_id(),
+                        variant,
                     ));
                 }
                 // Index 18 on chickens = ChickenVariant Holder.
                 if item.index == 18
                     && let azalea_entity::EntityDataValue::ChickenVariant(variant) = &item.value
                 {
-                    use azalea_registry::DataRegistry;
                     let _ = event_tx.try_send(variant_event(
                         registry_holder,
                         p.id.0,
                         EntityKind::Chicken,
-                        variant.protocol_id(),
+                        variant,
                     ));
                 }
                 // Index 20 on cats = CatVariant Holder.
@@ -780,12 +778,12 @@ fn variant_event(
     registry_holder: &RegistryHolder,
     id: i32,
     kind: EntityKind,
-    protocol_id: u32,
+    holder: &impl azalea_registry::DataRegistry,
 ) -> NetworkEvent {
     NetworkEvent::EntityVariant {
         id,
         kind,
-        variant: variant_index(registry_holder, kind, protocol_id),
+        variant: variant_index(registry_holder, kind, holder.protocol_id()),
     }
 }
 

pomme-client/src/net/mod.rs

@@ -307,10 +307,8 @@ pub enum NetworkEvent {
     FinishUseItem {
         id: i32,
     },
-    /// Registry/wire variant slot; meaning is per-kind (pool index for
-    /// cow/chicken). Per-kind normalization lives in
-    /// `EntityStore::set_variant`; `kind` is the mob the emitting arm
-    /// resolved for, guarding overloaded metadata indices.
+    /// Registry/wire variant slot; meaning is per-kind. `kind` is the mob
+    /// the emitting arm resolved for, guarding overloaded metadata indices.
     EntityVariant {
         id: i32,
         kind: EntityKind,