fix some incorrect component impls

2 files changed, 13 insertions, 25 deletions

diff --git a/azalea-inventory/src/components/mod.rs b/azalea-inventory/src/components/mod.rs
index e54ad775..d2825779 100644
--- a/azalea-inventory/src/components/mod.rs
+++ b/azalea-inventory/src/components/mod.rs
@@ -17,7 +17,7 @@ use azalea_core::{
     codec_utils::*,
     filterable::Filterable,
     position::GlobalPos,
-    registry_holder::{RegistryHolder, dimension_type::DamageTypeElement},
+    registry_holder::RegistryHolder,
     sound::CustomSound,
 };
 use azalea_registry::{
@@ -1664,17 +1664,19 @@ pub struct ProvidesTrimMaterial {
 
 #[derive(AzBuf, Clone, Debug, PartialEq, Serialize)]
 pub struct DirectTrimMaterial {
+    #[serde(flatten)]
     pub assets: MaterialAssetGroup,
     pub description: FormattedText,
 }
 #[derive(AzBuf, Clone, Debug, PartialEq, Serialize)]
 pub struct MaterialAssetGroup {
-    pub base: AssetInfo,
+    pub assert_name: AssetInfo,
     #[serde(skip_serializing_if = "is_default")]
-    pub overrides: Vec<(Identifier, AssetInfo)>,
+    pub override_armor_assets: Vec<(Identifier, AssetInfo)>,
 }
 
 #[derive(AzBuf, Clone, Debug, PartialEq, Serialize)]
+#[serde(transparent)]
 pub struct AssetInfo {
     pub suffix: String,
 }
@@ -1745,7 +1747,7 @@ pub struct MinimumAttackCharge {
 #[derive(AzBuf, Clone, Debug, PartialEq, Serialize)]
 #[serde(transparent)]
 pub struct DamageType {
-    pub value: Holder<azalea_registry::data::DamageKind, DamageTypeElement>,
+    pub value: azalea_registry::data::DamageKind,
 }
 
 #[derive(AzBuf, Clone, Debug, PartialEq, Serialize)]
diff --git a/azalea-inventory/src/default_components/generated.rs b/azalea-inventory/src/default_components/generated.rs
index 883fcd08..1dc433fa 100644
--- a/azalea-inventory/src/default_components/generated.rs
+++ b/azalea-inventory/src/default_components/generated.rs
@@ -5479,27 +5479,13 @@ impl DefaultableComponent for AttackRange {
 impl DefaultableComponent for DamageType {
     fn default_for_item(item: ItemKind) -> Option<Self> {
         let value = match item {
-            ItemKind::CopperSpear => {
-                azalea_registry::Holder::Reference(azalea_registry::data::DamageKind::new_raw(0))
-            }
-            ItemKind::DiamondSpear => {
-                azalea_registry::Holder::Reference(azalea_registry::data::DamageKind::new_raw(0))
-            }
-            ItemKind::GoldenSpear => {
-                azalea_registry::Holder::Reference(azalea_registry::data::DamageKind::new_raw(0))
-            }
-            ItemKind::IronSpear => {
-                azalea_registry::Holder::Reference(azalea_registry::data::DamageKind::new_raw(0))
-            }
-            ItemKind::NetheriteSpear => {
-                azalea_registry::Holder::Reference(azalea_registry::data::DamageKind::new_raw(0))
-            }
-            ItemKind::StoneSpear => {
-                azalea_registry::Holder::Reference(azalea_registry::data::DamageKind::new_raw(0))
-            }
-            ItemKind::WoodenSpear => {
-                azalea_registry::Holder::Reference(azalea_registry::data::DamageKind::new_raw(0))
-            }
+            ItemKind::CopperSpear => azalea_registry::data::DamageKind::new_raw(0),
+            ItemKind::DiamondSpear => azalea_registry::data::DamageKind::new_raw(0),
+            ItemKind::GoldenSpear => azalea_registry::data::DamageKind::new_raw(0),
+            ItemKind::IronSpear => azalea_registry::data::DamageKind::new_raw(0),
+            ItemKind::NetheriteSpear => azalea_registry::data::DamageKind::new_raw(0),
+            ItemKind::StoneSpear => azalea_registry::data::DamageKind::new_raw(0),
+            ItemKind::WoodenSpear => azalea_registry::data::DamageKind::new_raw(0),
             _ => return None,
         };
         Some(DamageType { value: value })