From 918214e8ba4eae65daf5d2da17aa0022f2ae5212 Mon Sep 17 00:00:00 2001
From: mat <git@matdoes.dev>
Date: Thu, 11 Dec 2025 18:04:14 -1400
Subject: fix data component codegen

---
 codegen/lib/code/data_components.py | 12 +++++++-----
 codegen/lib/code/entity.py          |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'codegen')

diff --git a/codegen/lib/code/data_components.py b/codegen/lib/code/data_components.py
index 38060662..abbe2eb6 100644
--- a/codegen/lib/code/data_components.py
+++ b/codegen/lib/code/data_components.py
@@ -182,7 +182,8 @@ use std::collections::HashMap;
 use azalea_chat::translatable_component::TranslatableComponent;
 use azalea_core::attribute_modifier_operation::AttributeModifierOperation;
 use azalea_registry::{
-    Attribute, BlockKind, DataRegistry, EntityKind, HolderSet, ItemKind, MobEffect, SoundEvent,
+    DataRegistry, HolderSet,
+    builtin::{Attribute, BlockKind, EntityKind, ItemKind, MobEffect, SoundEvent},
 };
 use simdnbt::owned::NbtCompound;
 
@@ -298,14 +299,14 @@ use crate::{
             hashmap_key = hashmap_key.strip()
             hashmap_value = hashmap_value.strip()
 
-            # HashMap::from_iter([("honey_level".to_string(), "0".to_string())])
+            # HashMap::from_iter([("honey_level".to_owned(), "0".to_owned())])
             t = "HashMap::from_iter(["
             for k, v in python_value.items():
                 t += f"({python_to_rust_value(k, hashmap_key)}, {python_to_rust_value(v, hashmap_value)}),"
             t = t.rstrip(",") + "])"
             return t
         elif target_rust_type == "String":
-            return f'"{python_value}".to_string()'
+            return f'"{python_value}".to_owned()'
         elif target_rust_type == "&str":
             if isinstance(python_value, dict):
                 return python_to_rust_value(
@@ -410,8 +411,9 @@ use crate::{
             fields_for_rust_type = enum_and_struct_fields.get(target_rust_type, [])
             if "Referenced(Identifier)" in fields_for_rust_type:
                 return f"{target_rust_type}::Referenced({python_to_rust_value(python_value, 'Identifier')})"
-            elif "Registry(registry::Instrument)" in fields_for_rust_type:
-                return f"{target_rust_type}::Registry({python_to_rust_value(python_value, 'azalea_registry::Instrument')})"
+            elif "Registry(data::Instrument)" in fields_for_rust_type:
+                # TODO
+                return f"{target_rust_type}::Registry(azalea_registry::data::Instrument::new_raw(0))"
             elif target_rust_type.startswith("HolderSet<"):
                 holderset_type = target_rust_type.split("<", 1)[1].split(",", 1)[0]
                 main_vec = python_to_rust_value(
diff --git a/codegen/lib/code/entity.py b/codegen/lib/code/entity.py
index 2fc66b0f..02167dfa 100644
--- a/codegen/lib/code/entity.py
+++ b/codegen/lib/code/entity.py
@@ -476,7 +476,7 @@ impl From<EntityDataValue> for UpdateMetadataError {
                             default = "true" if default else "false"
                         elif type_name == "String":
                             string_escaped = default.replace('"', '\\"')
-                            default = f'"{string_escaped}".to_string()'
+                            default = f'"{string_escaped}".to_owned()'
                         elif type_name == "BlockPos":
                             default = f"BlockPos::new{default}"
                         elif type_name == "OptionalBlockPos":  # Option<BlockPos>
-- 
cgit v1.2.3