aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/api
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2024-12-03 22:06:05 +0100
committerNassim Jahnke <[email protected]>2024-12-03 22:06:05 +0100
commitb8aeecb52000d224ae8a8ca72f99603ee479629e (patch)
tree8b1e44c7ab3ed2ffa86aa301ac7efd30648bf572 /patches/api
parent71a4ef8d06578009142c1682044663a289a1f404 (diff)
downloadPaper-b8aeecb52000d224ae8a8ca72f99603ee479629e.tar.gz
Paper-b8aeecb52000d224ae8a8ca72f99603ee479629e.zip
Compilation fixes
Diffstat (limited to 'patches/api')
-rw-r--r--patches/api/0495-DataComponent-API.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/api/0495-DataComponent-API.patch b/patches/api/0495-DataComponent-API.patch
index daf693effa..550b81d926 100644
--- a/patches/api/0495-DataComponent-API.patch
+++ b/patches/api/0495-DataComponent-API.patch
@@ -1094,7 +1094,7 @@ index 0000000000000000000000000000000000000000..a128348247d8845321d3fecebaa09a51
+}
diff --git a/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java b/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java
new file mode 100644
-index 0000000000000000000000000000000000000000..826bb860bd55ff18f91d9bc7a5dde4d638b39f98
+index 0000000000000000000000000000000000000000..135ebe0b84027073793c21c71d37eff496d23fec
--- /dev/null
+++ b/src/main/java/io/papermc/paper/datacomponent/item/Equippable.java
@@ -0,0 +1,169 @@
@@ -1153,7 +1153,7 @@ index 0000000000000000000000000000000000000000..826bb860bd55ff18f91d9bc7a5dde4d6
+ * @return the model key or null
+ */
+ @Contract(pure = true)
-+ @Nullable Key model();
++ @Nullable Key assetId();
+
+ /**
+ * Gets the camera overlay key if present.
@@ -1219,7 +1219,7 @@ index 0000000000000000000000000000000000000000..826bb860bd55ff18f91d9bc7a5dde4d6
+ * @return the builder for chaining
+ */
+ @Contract(value = "_ -> this", mutates = "this")
-+ Builder model(@Nullable Key model);
++ Builder assetId(@Nullable Key model);
+
+ /**
+ * Sets the camera overlay key for this item.