Update

2 files changed, 17 insertions, 17 deletions

diff --git a/patches/api/0495-WIP-DataComponent-API.patch b/patches/api/0495-WIP-DataComponent-API.patch
index 9c190e3243..d36b910d81 100644
--- a/patches/api/0495-WIP-DataComponent-API.patch
+++ b/patches/api/0495-WIP-DataComponent-API.patch
@@ -1665,7 +1665,7 @@ index 0000000000000000000000000000000000000000..948505d38121d54df62e6a67d4597bc7
 +}
 diff --git a/src/main/java/io/papermc/paper/datacomponent/item/ItemComponentTypesBridge.java b/src/main/java/io/papermc/paper/datacomponent/item/ItemComponentTypesBridge.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..1097a6e0d0921abc6714017a123176ea23652ee0
+index 0000000000000000000000000000000000000000..1ce34642371a65590ce1ac74b402ccfc301671d7
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/datacomponent/item/ItemComponentTypesBridge.java
 @@ -0,0 +1,112 @@
@@ -1674,7 +1674,7 @@ index 0000000000000000000000000000000000000000..1097a6e0d0921abc6714017a123176ea
 +import com.destroystokyo.paper.profile.PlayerProfile;
 +import io.papermc.paper.registry.set.RegistryKeySet;
 +import io.papermc.paper.registry.tag.TagKey;
-+import io.papermc.paper.util.Filtered;
++import io.papermc.paper.text.Filtered;
 +import java.util.Optional;
 +import java.util.ServiceLoader;
 +import net.kyori.adventure.key.Key;
@@ -3305,14 +3305,14 @@ index 0000000000000000000000000000000000000000..50e42e073311332142980828d0beec18
 +}
 diff --git a/src/main/java/io/papermc/paper/datacomponent/item/WritableBookContent.java b/src/main/java/io/papermc/paper/datacomponent/item/WritableBookContent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..e1218114932d6965b073102920d7c4773496ec99
+index 0000000000000000000000000000000000000000..828d3bb1c763e0f3c89a73d6b70d1f006258644f
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/datacomponent/item/WritableBookContent.java
 @@ -0,0 +1,80 @@
 +package io.papermc.paper.datacomponent.item;
 +
 +import io.papermc.paper.datacomponent.DataComponentBuilder;
-+import io.papermc.paper.util.Filtered;
++import io.papermc.paper.text.Filtered;
 +import java.util.List;
 +import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.Contract;
@@ -3391,14 +3391,14 @@ index 0000000000000000000000000000000000000000..e1218114932d6965b073102920d7c477
 +}
 diff --git a/src/main/java/io/papermc/paper/datacomponent/item/WrittenBookContent.java b/src/main/java/io/papermc/paper/datacomponent/item/WrittenBookContent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..173ec331286635942145e55956ccf6bcc64535e4
+index 0000000000000000000000000000000000000000..979bc05009b84b6fcdb59938cceace351e61c78b
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/datacomponent/item/WrittenBookContent.java
 @@ -0,0 +1,172 @@
 +package io.papermc.paper.datacomponent.item;
 +
 +import io.papermc.paper.datacomponent.DataComponentBuilder;
-+import io.papermc.paper.util.Filtered;
++import io.papermc.paper.text.Filtered;
 +import java.util.List;
 +import net.kyori.adventure.text.Component;
 +import net.kyori.adventure.text.ComponentLike;
@@ -3818,13 +3818,13 @@ index 9b39e33514b15a9d07104e2ad826d0da11f569d6..116857b4479565b602b94d227ee32dc2
  
  
  
-diff --git a/src/main/java/io/papermc/paper/util/Filtered.java b/src/main/java/io/papermc/paper/util/Filtered.java
+diff --git a/src/main/java/io/papermc/paper/text/Filtered.java b/src/main/java/io/papermc/paper/text/Filtered.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..54e1a383c4eeb595417ea6e9e4e9527a8ffd9a99
+index 0000000000000000000000000000000000000000..9e892621354c784632204559f9fdf0827b3bc4f1
 --- /dev/null
-+++ b/src/main/java/io/papermc/paper/util/Filtered.java
++++ b/src/main/java/io/papermc/paper/text/Filtered.java
 @@ -0,0 +1,32 @@
-+package io.papermc.paper.util;
++package io.papermc.paper.text;
 +
 +import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.Contract;
diff --git a/patches/server/1036-WIP-DataComponent-API.patch b/patches/server/1036-WIP-DataComponent-API.patch
index 552ac83ab0..d47e420277 100644
--- a/patches/server/1036-WIP-DataComponent-API.patch
+++ b/patches/server/1036-WIP-DataComponent-API.patch
@@ -387,7 +387,7 @@ index 0000000000000000000000000000000000000000..f0d4ec462eee47840e91bac888ae4604
 +}
 diff --git a/src/main/java/io/papermc/paper/datacomponent/item/ItemComponentTypesBridgesImpl.java b/src/main/java/io/papermc/paper/datacomponent/item/ItemComponentTypesBridgesImpl.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..b57bff1a82bbf32c001f27dad94d80b13f99abc3
+index 0000000000000000000000000000000000000000..14d039995a16a2c85569ca09e7f825c7de42fd6b
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/datacomponent/item/ItemComponentTypesBridgesImpl.java
 @@ -0,0 +1,239 @@
@@ -399,7 +399,7 @@ index 0000000000000000000000000000000000000000..b57bff1a82bbf32c001f27dad94d80b1
 +import io.papermc.paper.registry.set.PaperRegistrySets;
 +import io.papermc.paper.registry.set.RegistryKeySet;
 +import io.papermc.paper.registry.tag.TagKey;
-+import io.papermc.paper.util.Filtered;
++import io.papermc.paper.text.Filtered;
 +import net.kyori.adventure.key.Key;
 +import net.kyori.adventure.util.TriState;
 +import net.minecraft.core.registries.BuiltInRegistries;
@@ -3056,14 +3056,14 @@ index 0000000000000000000000000000000000000000..c2c04506940704c2ec9a5e6bb469c477
 +}
 diff --git a/src/main/java/io/papermc/paper/datacomponent/item/PaperWritableBookContent.java b/src/main/java/io/papermc/paper/datacomponent/item/PaperWritableBookContent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..a254d6a3af97891aafd22903cd138afdbaf8177e
+index 0000000000000000000000000000000000000000..563ac5345efe68cfe223853df13d5f07cc48e850
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/datacomponent/item/PaperWritableBookContent.java
 @@ -0,0 +1,105 @@
 +package io.papermc.paper.datacomponent.item;
 +
 +import com.google.common.base.Preconditions;
-+import io.papermc.paper.util.Filtered;
++import io.papermc.paper.text.Filtered;
 +import io.papermc.paper.util.MCUtil;
 +import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 +import java.util.List;
@@ -3072,7 +3072,7 @@ index 0000000000000000000000000000000000000000..a254d6a3af97891aafd22903cd138afd
 +import org.bukkit.craftbukkit.util.Handleable;
 +import org.jetbrains.annotations.Unmodifiable;
 +
-+import static io.papermc.paper.util.Filtered.of;
++import static io.papermc.paper.text.Filtered.of;
 +
 +public record PaperWritableBookContent(
 +    net.minecraft.world.item.component.WritableBookContent impl
@@ -3167,7 +3167,7 @@ index 0000000000000000000000000000000000000000..a254d6a3af97891aafd22903cd138afd
 +}
 diff --git a/src/main/java/io/papermc/paper/datacomponent/item/PaperWrittenBookContent.java b/src/main/java/io/papermc/paper/datacomponent/item/PaperWrittenBookContent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..567725dd0b4dfdb50a73de2557dbe0f576c6150e
+index 0000000000000000000000000000000000000000..e6ce137806cd789586108fef5a5da508b19b7131
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/datacomponent/item/PaperWrittenBookContent.java
 @@ -0,0 +1,183 @@
@@ -3175,7 +3175,7 @@ index 0000000000000000000000000000000000000000..567725dd0b4dfdb50a73de2557dbe0f5
 +
 +import com.google.common.base.Preconditions;
 +import io.papermc.paper.adventure.PaperAdventure;
-+import io.papermc.paper.util.Filtered;
++import io.papermc.paper.text.Filtered;
 +import io.papermc.paper.util.MCUtil;
 +import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 +import java.util.List;