fix: NMS exceptions being thrown when applying modifiers

Spigot's validation for this is like my hoover: it sucks.

bukkit/src/main/java/net/william278/husksync/data/BukkitData.java

@@ -625,7 +625,7 @@ public abstract class BukkitData implements Data {
         @Nullable
         private static UUID getModifierId(@NotNull AttributeModifier modifier) {
             try {
-                return UUID.fromString(modifier.getName());
+                return modifier.getUniqueId();
             } catch (Throwable e) {
                 return null;
             }
@@ -656,10 +656,12 @@ public abstract class BukkitData implements Data {
                     // Reflexively create a modern keyed attribute modifier instance. Remove in favor of API long-term.
                     final EquipmentSlot slot = slotId != -1 ? EquipmentSlot.values()[slotId] : null;
                     final Class<?> slotGroup = Class.forName(EQUIPMENT_SLOT_GROUP);
+                    final String modifierName = modifier.name() == null ? modifier.uuid().toString() : modifier.name();
                     return AttributeModifier.class.getDeclaredConstructor(
                             NamespacedKey.class, double.class, AttributeModifier.Operation.class, slotGroup
                     ).newInstance(
-                            NamespacedKey.fromString(modifier.name()), modifier.amount(),
+                            NamespacedKey.fromString(modifierName),
+                            modifier.amount(),
                             AttributeModifier.Operation.values()[modifier.operationType()],
                             slot == null ? slotGroup.getField(EQUIPMENT_SLOT_GROUP$ANY).get(null)
                                     : EquipmentSlot.class.getDeclaredMethod(EQUIPMENT_SLOT$getGroup).invoke(slot)

common/src/main/java/net/william278/husksync/data/DataSnapshot.java

@@ -395,7 +395,7 @@ public class DataSnapshot {
                     .map(entry -> Map.entry(plugin.getIdentifier(entry.getKey()).orElseThrow(), entry.getValue()))
                     .collect(Collectors.toMap(
                             Map.Entry::getKey,
-                            entry -> plugin.deserializeData(entry.getKey(), entry.getValue()),
+                            entry -> plugin.deserializeData(entry.getKey(), entry.getValue(), getMinecraftVersion()),
                             (a, b) -> b, () -> Maps.newTreeMap(SerializerRegistry.DEPENDENCY_ORDER_COMPARATOR)
                     ));
         }

common/src/main/java/net/william278/husksync/data/SerializerRegistry.java

@@ -19,6 +19,7 @@
 
 package net.william278.husksync.data;
 
+import net.william278.desertwell.util.Version;
 import net.william278.husksync.HuskSync;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -119,19 +120,36 @@ public interface SerializerRegistry {
     }
 
     /**
-     * Deserialize data for the given {@link Identifier}
+     * Deserialize data of a given {@link Version Minecraft version} for the given {@link Identifier data identifier}
+     *
+     * @param identifier    the {@link Identifier} to deserialize data for
+     * @param data          the data to deserialize
+     * @param dataMcVersion the Minecraft version of the data
+     * @return the deserialized data
+     * @throws IllegalStateException if no serializer is found for the given {@link Identifier}
+     * @since 3.6.4
+     */
+    @NotNull
+    default Data deserializeData(@NotNull Identifier identifier, @NotNull String data,
+                                 @NotNull Version dataMcVersion) throws IllegalStateException {
+        return getSerializer(identifier).map(serializer -> serializer.deserialize(data, dataMcVersion)).orElseThrow(
+                () -> new IllegalStateException("No serializer found for %s".formatted(identifier))
+        );
+    }
+
+    /**
+     * Deserialize data for the given {@link Identifier data identifier}
      *
      * @param identifier the {@link Identifier} to deserialize data for
      * @param data       the data to deserialize
      * @return the deserialized data
-     * @throws IllegalStateException if no serializer is found for the given {@link Identifier}
      * @since 3.5.4
+     * @deprecated Use {@link #deserializeData(Identifier, String, Version)} instead
      */
     @NotNull
-    default Data deserializeData(@NotNull Identifier identifier, @NotNull String data) throws IllegalStateException {
+    @Deprecated(since = "3.6.5")
-        return getSerializer(identifier).map(serializer -> serializer.deserialize(data)).orElseThrow(
+    default Data deserializeData(@NotNull Identifier identifier, @NotNull String data) {
-                () -> new IllegalStateException("No serializer found for %s".formatted(identifier))
+        return deserializeData(identifier, data, getPlugin().getMinecraftVersion());
-        );
     }
 
     /**

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs='-Dfile.encoding=UTF-8'
 org.gradle.daemon=true
 javaVersion=17
 
-plugin_version=3.6.4
+plugin_version=3.6.5
 plugin_archive=husksync
 plugin_description=A modern, cross-server player data synchronization system