don't use PaperNBTApplier on unsupported component types

Author: HSGamer

core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.projectunified</groupId>
         <artifactId>craftitem</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
     </parent>
 
     <artifactId>craftitem-core</artifactId>

modifier/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.projectunified</groupId>
         <artifactId>craftitem</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
     </parent>
 
     <artifactId>craftitem-modifier</artifactId>

nbt/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.projectunified</groupId>
         <artifactId>craftitem</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
     </parent>
 
     <artifactId>craftitem-nbt</artifactId>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>io.github.projectunified</groupId>
     <artifactId>craftitem</artifactId>
-    <version>1.6.1</version>
+    <version>1.6.2</version>
     <packaging>pom</packaging>
 
     <name>CraftItem</name>

spigot/core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.projectunified</groupId>
         <artifactId>craftitem-spigot</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
     </parent>
 
     <artifactId>craftitem-spigot-core</artifactId>

spigot/modifier/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.projectunified</groupId>
         <artifactId>craftitem-spigot</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
     </parent>
 
     <artifactId>craftitem-spigot-modifier</artifactId>

spigot/nbt/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.projectunified</groupId>
         <artifactId>craftitem-spigot</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
     </parent>
 
     <artifactId>craftitem-spigot-nbt</artifactId>

spigot/nbt/src/main/java/io/github/projectunified/craftitem/spigot/nbt/NBTModifier.java

@@ -84,7 +84,7 @@ private void applyNBT(SpigotItem item, String nbtString, boolean useDataComponen
             if (useDataComponent) {
                 ItemStack nbtItemStack = Bukkit.getItemFactory().createItemStack(nbtString);
                 try {
-                    if (PaperNBTApplier.SUPPORTED) {
+                    if (PaperNBTApplier.SUPPORTED && PaperNBTApplier.hasAllSupportedComponentTypes(nbtItemStack)) {
                         item.edit(itemStack -> PaperNBTApplier.mergeComponent(itemStack, nbtItemStack));
                         return;
                     }

spigot/nbt/src/main/java/io/github/projectunified/craftitem/spigot/nbt/PaperNBTApplier.java

@@ -15,6 +15,7 @@ class PaperNBTApplier {
             Class.forName("io.papermc.paper.datacomponent.DataComponentType");
             Class.forName("io.papermc.paper.datacomponent.DataComponentType$Valued");
             Class.forName("io.papermc.paper.datacomponent.DataComponentType$NonValued");
+            Class.forName("io.papermc.paper.datacomponent.PaperDataComponentType$Unimplemented");
 
             Class<?> dataComponentHolderClass = Class.forName("io.papermc.paper.datacomponent.DataComponentHolder");
             supported = dataComponentHolderClass.isAssignableFrom(ItemStack.class);
@@ -24,6 +25,16 @@ class PaperNBTApplier {
         SUPPORTED = supported;
     }
 
+    @SuppressWarnings("UnstableApiUsage")
+    static boolean hasAllSupportedComponentTypes(ItemStack referenceItem) {
+        for (DataComponentType type : referenceItem.getDataTypes()) {
+            if (!(type instanceof DataComponentType.Valued) && !(type instanceof DataComponentType.NonValued)) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     @SuppressWarnings({"UnstableApiUsage", "unchecked"})
     static void mergeComponent(ItemStack currentItem, ItemStack referenceItem) {
         Material material = currentItem.getType();

spigot/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.github.projectunified</groupId>
         <artifactId>craftitem</artifactId>
-        <version>1.6.1</version>
+        <version>1.6.2</version>
     </parent>
 
     <artifactId>craftitem-spigot</artifactId>