Add options for whether to register a comparator in utility ClassInfos (SkriptLang#7286)

Author: Absolutionism

src/main/java/ch/njol/skript/classes/EnumClassInfo.java

@@ -25,7 +25,17 @@ public class EnumClassInfo<T extends Enum<T>> extends ClassInfo<T> {
 	 * @param languageNode The language node of the type
 	 */
 	public EnumClassInfo(Class<T> enumClass, String codeName, String languageNode) {
-		this(enumClass, codeName, languageNode, new EventValueExpression<>(enumClass));
+		this(enumClass, codeName, languageNode, new EventValueExpression<>(enumClass), true);
+	}
+
+	/**
+	 * @param enumClass The class
+	 * @param codeName The name used in patterns
+	 * @param languageNode The language node of the type
+	 * @param registerComparator Whether a default comparator should be registered for this enum's classinfo
+	 */
+	public EnumClassInfo(Class<T> enumClass, String codeName, String languageNode, boolean registerComparator) {
+		this(enumClass, codeName, languageNode, new EventValueExpression<>(enumClass), registerComparator);
 	}
 
 	/**
@@ -35,6 +45,17 @@ public EnumClassInfo(Class<T> enumClass, String codeName, String languageNode) {
 	 * @param defaultExpression The default expression of the type
 	 */
 	public EnumClassInfo(Class<T> enumClass, String codeName, String languageNode, DefaultExpression<T> defaultExpression) {
+		this(enumClass, codeName, languageNode, defaultExpression, true);
+	}
+
+	/**
+	 * @param enumClass The class
+	 * @param codeName The name used in patterns
+	 * @param languageNode The language node of the type
+	 * @param defaultExpression The default expression of the type
+	 * @param registerComparator Whether a default comparator should be registered for this enum's classinfo
+	 */
+	public EnumClassInfo(Class<T> enumClass, String codeName, String languageNode, DefaultExpression<T> defaultExpression, boolean registerComparator) {
 		super(enumClass, codeName);
 		EnumUtils<T> enumUtils = new EnumUtils<>(enumClass, languageNode);
 		usage(enumUtils.getAllNames())
@@ -57,8 +78,8 @@ public EnumClassInfo(Class<T> enumClass, String codeName, String languageNode, D
 					return enumUtils.toString(constant, StringMode.VARIABLE_NAME);
 				}
 			});
-
-		Comparators.registerComparator(enumClass, enumClass, (o1, o2) -> Relation.get(o1.ordinal() - o2.ordinal()));
+		if (registerComparator)
+			Comparators.registerComparator(enumClass, enumClass, (o1, o2) -> Relation.get(o1.ordinal() - o2.ordinal()));
 	}
 
 }

src/main/java/ch/njol/skript/classes/registry/RegistryClassInfo.java

@@ -16,15 +16,47 @@
  */
 public class RegistryClassInfo<R extends Keyed> extends ClassInfo<R> {
 
+	/**
+	 * @param registryClass The registry class
+	 * @param registry The registry
+	 * @param codeName The name used in patterns
+	 * @param languageNode The language node of the type
+	 */
 	public RegistryClassInfo(Class<R> registryClass, Registry<R> registry, String codeName, String languageNode) {
-		this(registryClass, registry, codeName, languageNode, new EventValueExpression<>(registryClass));
+		this(registryClass, registry, codeName, languageNode, new EventValueExpression<>(registryClass), true);
+	}
+
+	/**
+	 * @param registryClass The registry class
+	 * @param registry The registry
+	 * @param codeName The name used in patterns
+	 * @param languageNode The language node of the type
+	 * @param registerComparator Whether a default comparator should be registered for this registry's classinfo
+	 */
+	public RegistryClassInfo(Class<R> registryClass, Registry<R> registry, String codeName, String languageNode, boolean registerComparator) {
+		this(registryClass, registry, codeName, languageNode, new EventValueExpression<>(registryClass), registerComparator);
 	}
 
 	/**
+	 * @param registryClass The registry class
 	 * @param registry The registry
 	 * @param codeName The name used in patterns
+	 * @param languageNode The language node of the type
+	 * @param defaultExpression The default expression of the type
 	 */
 	public RegistryClassInfo(Class<R> registryClass, Registry<R> registry, String codeName, String languageNode, DefaultExpression<R> defaultExpression) {
+		this(registryClass, registry, codeName, languageNode,  defaultExpression, true);
+	}
+
+	/**
+	 * @param registryClass The registry class
+	 * @param registry The registry
+	 * @param codeName The name used in patterns
+	 * @param languageNode The language node of the type
+	 * @param defaultExpression The default expression of the type
+	 * @param registerComparator Whether a default comparator should be registered for this registry's classinfo
+	 */
+	public RegistryClassInfo(Class<R> registryClass, Registry<R> registry, String codeName, String languageNode, DefaultExpression<R> defaultExpression, boolean registerComparator) {
 		super(registryClass, codeName);
 		RegistryParser<R> registryParser = new RegistryParser<>(registry, languageNode);
 		usage(registryParser.getAllNames())
@@ -33,7 +65,8 @@ public RegistryClassInfo(Class<R> registryClass, Registry<R> registry, String co
 			.defaultExpression(defaultExpression)
 			.parser(registryParser);
 
-		Comparators.registerComparator(registryClass, registryClass, (o1, o2) -> Relation.get(o1.getKey() == o2.getKey()));
+		if (registerComparator)
+			Comparators.registerComparator(registryClass, registryClass, (o1, o2) -> Relation.get(o1.getKey() == o2.getKey()));
 	}
 
 }