aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/api
diff options
context:
space:
mode:
authorLulu13022002 <[email protected]>2024-11-18 18:41:14 +0100
committerOwen1212055 <[email protected]>2024-11-18 14:50:39 -0500
commit1ff855ba8bd3ecaee79457aab9407c7619880195 (patch)
tree28292b02ef1bc7103d16d65c164462ed55bbad1a /patches/api
parent22790e0cbd166cca22a611d37d0f9142ad2bf065 (diff)
downloadPaper-1ff855ba8bd3ecaee79457aab9407c7619880195.tar.gz
Paper-1ff855ba8bd3ecaee79457aab9407c7619880195.zip
move diff
Diffstat (limited to 'patches/api')
-rw-r--r--patches/api/0495-WIP-DataComponent-API.patch9
1 files changed, 5 insertions, 4 deletions
diff --git a/patches/api/0495-WIP-DataComponent-API.patch b/patches/api/0495-WIP-DataComponent-API.patch
index d36b910d81..bab14a7f05 100644
--- a/patches/api/0495-WIP-DataComponent-API.patch
+++ b/patches/api/0495-WIP-DataComponent-API.patch
@@ -3607,10 +3607,10 @@ index 0000000000000000000000000000000000000000..a845ccfc21f101f0632249745bbd8b33
+}
diff --git a/src/main/java/io/papermc/paper/datacomponent/item/consumable/ConsumeEffect.java b/src/main/java/io/papermc/paper/datacomponent/item/consumable/ConsumeEffect.java
new file mode 100644
-index 0000000000000000000000000000000000000000..45d674b68ab0e532c2f87bc528c1b095a50b5068
+index 0000000000000000000000000000000000000000..ff1a14e19c21dd22f249503a0b738f190a75aca0
--- /dev/null
+++ b/src/main/java/io/papermc/paper/datacomponent/item/consumable/ConsumeEffect.java
-@@ -0,0 +1,149 @@
+@@ -0,0 +1,150 @@
+package io.papermc.paper.datacomponent.item.consumable;
+
+import io.papermc.paper.registry.set.RegistryKeySet;
@@ -3697,6 +3697,7 @@ index 0000000000000000000000000000000000000000..45d674b68ab0e532c2f87bc528c1b095
+ */
+ float diameter();
+ }
++
+ /**
+ * Represents a consumable effect that removes status effects on consumption
+ */
@@ -3796,7 +3797,7 @@ index 0000000000000000000000000000000000000000..5843768d0be2ae4a0219636ed7640727
+ SCALE
+}
diff --git a/src/main/java/io/papermc/paper/registry/RegistryKey.java b/src/main/java/io/papermc/paper/registry/RegistryKey.java
-index 9b39e33514b15a9d07104e2ad826d0da11f569d6..116857b4479565b602b94d227ee32dc29ebd6e5f 100644
+index 9b39e33514b15a9d07104e2ad826d0da11f569d6..e5319bdb9f75358b8bb0ac35373125a7d94edfa6 100644
--- a/src/main/java/io/papermc/paper/registry/RegistryKey.java
+++ b/src/main/java/io/papermc/paper/registry/RegistryKey.java
@@ -1,5 +1,6 @@
@@ -3812,7 +3813,7 @@ index 9b39e33514b15a9d07104e2ad826d0da11f569d6..116857b4479565b602b94d227ee32dc2
RegistryKey<Sound> SOUND_EVENT = create("sound_event");
+ /**
+ * Built-in registry for data component types.
-+ * @see io.papermc.paper.registry.keys.DataComponentTypeKeys
++ * <!-- @see io.papermc.paper.registry.keys.DataComponentTypeKeys -->
+ */
+ RegistryKey<DataComponentType> DATA_COMPONENT_TYPE = create("data_component_type");