Requested changes

Author: sovdeeth

src/main/java/org/skriptlang/skript/bukkit/pdc/PDCUtils.java

@@ -11,7 +11,10 @@
 
 import java.util.function.Consumer;
 
-public class PDCUtils {
+/**
+ * Utilities for working with {@link PersistentDataContainer}s.
+ */
+public final class PDCUtils {
 
 	/**
 	 * Gets the data container of an object.

src/main/java/org/skriptlang/skript/bukkit/pdc/elements/conditions/CondHasPersistentDataTag.java

@@ -13,12 +13,8 @@
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.bukkit.pdc.PDCUtils;
-import org.skriptlang.skript.registration.SyntaxInfo;
 import org.skriptlang.skript.registration.SyntaxRegistry;
 
-import static ch.njol.skript.conditions.base.PropertyCondition.PropertyType;
-import static ch.njol.skript.conditions.base.PropertyCondition.getPatterns;
-
 @Name("Has Persistent Data Tag")
 @Description("""
 	Checks if the specified objects have persistent data tags with the given keys.
@@ -46,8 +42,9 @@ public class CondHasPersistentDataTag extends Condition {
 	public static void register(SyntaxRegistry registry) {
 		registry.register(
 			SyntaxRegistry.CONDITION,
-			SyntaxInfo.builder(CondHasPersistentDataTag.class)
-				.addPatterns(getPatterns(PropertyType.HAVE, "[persistent] data tag[s] %strings%", "objects"))
+			PropertyCondition.infoBuilder(
+					CondHasPersistentDataTag.class, PropertyCondition.PropertyType.HAVE,
+					"[persistent] data tag[s] %strings%", "objects")
 				.supplier(CondHasPersistentDataTag::new)
 				.build());
 	}
@@ -83,7 +80,7 @@ public boolean check(Event event) {
 
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
-		return PropertyCondition.toString(this, PropertyType.HAVE, event, debug, holders, "persistent data tag " + keys.toString(event, debug));
+		return PropertyCondition.toString(this, PropertyCondition.PropertyType.HAVE, event, debug, holders, "persistent data tag " + keys.toString(event, debug));
 	}
 
 }

src/main/java/org/skriptlang/skript/bukkit/pdc/elements/expressions/ExprAllPersistentDataKeys.java

@@ -10,6 +10,7 @@
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.bukkit.pdc.PDCUtils;
+import org.skriptlang.skript.registration.SyntaxInfo;
 import org.skriptlang.skript.registration.SyntaxRegistry;
 
 import java.util.ArrayList;
@@ -37,7 +38,12 @@ public class ExprAllPersistentDataKeys extends PropertyExpression<Object, String
 
 	public static void register(SyntaxRegistry registry) {
 		registry.register(SyntaxRegistry.EXPRESSION,
-			infoBuilder(ExprAllPersistentDataKeys.class, String.class, "[persistent] data [tag] key[s]", "objects", false)
+			SyntaxInfo.Expression.builder(ExprAllPersistentDataKeys.class, String.class)
+				.addPatterns(
+					"[all [[of] the]] [persistent] data [tag] keys of %objects%",
+					"[all of] %objects%'[s] [persistent] data [tag] keys"
+				)
+				.priority(DEFAULT_PRIORITY)
 				.supplier(ExprAllPersistentDataKeys::new)
 				.build());
 	}