From a1435b3b951746a79561c24fd7bdab9324bd00df Mon Sep 17 00:00:00 2001
From: mat <git@matdoes.dev>
Date: Sun, 12 Jan 2025 22:43:37 +0000
Subject: fix bugs with decoding/encoding DataComponentPatch

---
 azalea-inventory/src/components.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'azalea-inventory/src/components.rs')

diff --git a/azalea-inventory/src/components.rs b/azalea-inventory/src/components.rs
index e62288c6..2675bee4 100644
--- a/azalea-inventory/src/components.rs
+++ b/azalea-inventory/src/components.rs
@@ -305,8 +305,7 @@ pub enum AttributeModifierOperation {
 // circular dependency)
 #[derive(Clone, PartialEq, AzBuf)]
 pub struct AttributeModifier {
-    pub uuid: Uuid,
-    pub name: String,
+    pub id: ResourceLocation,
     pub amount: f64,
     pub operation: AttributeModifierOperation,
 }
@@ -877,8 +876,12 @@ impl DataComponent for DamageResistant {
 pub struct Equippable {
     pub slot: EquipmentSlot,
     pub equip_sound: SoundEvent,
-    pub model: Option<ResourceLocation>,
-    pub allowed_entities: HolderSet<EntityKind, ResourceLocation>,
+    pub asset_id: Option<ResourceLocation>,
+    pub camera_overlay: Option<ResourceLocation>,
+    pub allowed_entities: Option<HolderSet<EntityKind, ResourceLocation>>,
+    pub dispensable: bool,
+    pub swappable: bool,
+    pub damage_on_hurt: bool,
 }
 impl DataComponent for Equippable {
     const KIND: DataComponentKind = DataComponentKind::Equippable;
-- 
cgit v1.2.3