From 02ae3f591b55fa470b916a4428a66d0f9a37c958 Mon Sep 17 00:00:00 2001
From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com>
Date: Wed, 4 Dec 2024 20:01:17 +0100
Subject: [PATCH] fix asset id

---
 patches/api/DataComponent-API.patch    | 6 +++---
 patches/server/DataComponent-API.patch | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/patches/api/DataComponent-API.patch b/patches/api/DataComponent-API.patch
index 1850a6cf53..d7c4dff8e7 100644
--- a/patches/api/DataComponent-API.patch
+++ b/patches/api/DataComponent-API.patch
@@ -1307,13 +1307,13 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        Builder equipSound(Key sound);
 +
 +        /**
-+         * Sets the model key for this item.
++         * Sets the asset id for this item.
 +         *
-+         * @param model the model key, nullable
++         * @param assetId the asset id, nullable
 +         * @return the builder for chaining
 +         */
 +        @Contract(value = "_ -> this", mutates = "this")
-+        Builder assetId(@Nullable Key model);
++        Builder assetId(@Nullable Key assetId);
 +
 +        /**
 +         * Sets the camera overlay key for this item.
diff --git a/patches/server/DataComponent-API.patch b/patches/server/DataComponent-API.patch
index 4073274bdf..5a0a7f4b7d 100644
--- a/patches/server/DataComponent-API.patch
+++ b/patches/server/DataComponent-API.patch
@@ -1376,8 +1376,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        }
 +
 +        @Override
-+        public Builder assetId(final @Nullable Key model) {
-+            this.assetId = Optional.ofNullable(model)
++        public Builder assetId(final @Nullable Key assetId) {
++            this.assetId = Optional.ofNullable(assetId)
 +                .map(key -> PaperAdventure.asVanilla(EquipmentAssets.ROOT_ID, key));
 +
 +            return this;
@@ -1422,7 +1422,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +                new net.minecraft.world.item.equipment.Equippable(
 +                    this.equipmentSlot,
 +                    this.equipSound,
-+                    null, // TODO
++                    this.assetId,
 +                    this.cameraOverlay,
 +                    this.allowedEntities,
 +                    this.dispensable,