Fix ConditionType support

src/main/java/ch/njol/skript/lang/Condition.java

@@ -19,10 +19,14 @@
 package ch.njol.skript.lang;
 
 import ch.njol.skript.Skript;
+import ch.njol.skript.conditions.base.PropertyCondition;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Checker;
 import org.bukkit.event.Event;
+import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
+import org.skriptlang.skript.registration.SyntaxInfo;
+import org.skriptlang.skript.util.Priority;
 
 import java.util.Iterator;
 
@@ -39,17 +43,34 @@ public enum ConditionType {
 		 * 
 		 * @see #PROPERTY
 		 */
-		COMBINED,
+		COMBINED(SyntaxInfo.COMBINED),
 
 		/**
 		 * Property conditions, e.g. "%properties% is/are data value[s]"
 		 */
-		PROPERTY,
+		PROPERTY(PropertyCondition.DEFAULT_PRIORITY),
 
 		/**
 		 * Conditions whose pattern matches (almost) everything or should be last checked.
 		 */
-		PATTERN_MATCHES_EVERYTHING;
+		PATTERN_MATCHES_EVERYTHING(SyntaxInfo.PATTERN_MATCHES_EVERYTHING);
+
+		@ApiStatus.Experimental
+		private final Priority priority;
+
+		@ApiStatus.Experimental
+		ConditionType(Priority priority) {
+			this.priority = priority;
+		}
+
+		/**
+		 * @return The Priority equivalent of this ConditionType.
+		 */
+		@ApiStatus.Experimental
+		public Priority priority() {
+			return this.priority;
+		}
+
 	}
 
 	private boolean negated;

src/main/java/ch/njol/skript/lang/ExpressionType.java

@@ -61,8 +61,10 @@ public enum ExpressionType {
 	 */
 	PATTERN_MATCHES_EVERYTHING(SyntaxInfo.PATTERN_MATCHES_EVERYTHING);
 
+	@ApiStatus.Experimental
 	private final Priority priority;
 
+	@ApiStatus.Experimental
 	ExpressionType(Priority priority) {
 		this.priority = priority;
 	}
@@ -75,9 +77,8 @@ public Priority priority() {
 		return priority;
 	}
 
-	@Nullable
 	@ApiStatus.Experimental
-	public static ExpressionType fromModern(Priority priority) {
+	public static @Nullable ExpressionType fromModern(Priority priority) {
 		if (priority == SyntaxInfo.SIMPLE)
 			return ExpressionType.SIMPLE;
 		if (priority == EventValueExpression.DEFAULT_PRIORITY)