add base handler class

Author: sovdeeth

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

@@ -479,7 +479,7 @@ public String toString(final @Nullable Event event, final boolean debug) {
 
 	private final Map<Property<?>, PropertyInfo<?>> propertyInfos = new HashMap<>();
 
-	public <Handler> ClassInfo<T> property(Property<Handler> property, @NotNull Handler handler) {
+	public <Handler extends Property.PropertyHandler<T>> ClassInfo<T> property(Property<? super Handler> property, @NotNull Handler handler) {
 		if (propertyInfos.containsKey(property)) {
 			throw new IllegalStateException("Property " + property.name() + " is already registered for the " + c.getName() + " type.");
 		}
@@ -492,7 +492,7 @@ public boolean hasProperty(Property<?> property) {
 		return propertyInfos.containsKey(property);
 	}
 
-	public <Handler> @Nullable PropertyInfo<Handler> getPropertyInfo(Property<Handler> property) {
+	public <Handler extends Property.PropertyHandler<?>> @Nullable PropertyInfo<Handler> getPropertyInfo(Property<Handler> property) {
 		if (!propertyInfos.containsKey(property)) {
 			return null;
 		}

src/main/java/org/skriptlang/skript/lang/properties/Property.java

@@ -9,7 +9,7 @@
 
 import java.util.Locale;
 
-public record Property<Handler>(
+public record Property<Handler extends Property.PropertyHandler<?>>(
 		String name,
 		SkriptAddon provider,
 		@NotNull Class<? extends Handler> handler
@@ -20,7 +20,7 @@ public Property(@NotNull String name, SkriptAddon provider, @NotNull Class<? ext
 		this.handler = handler;
 	}
 
-	public static <HandlerClass, Handler extends HandlerClass> Property<Handler> of(
+	public static <HandlerClass extends PropertyHandler<?>, Handler extends HandlerClass> Property<Handler> of(
 			@NotNull String name,
 			@NotNull SkriptAddon provider,
 			@NotNull Class<HandlerClass> handler) {
@@ -52,7 +52,10 @@ public static void registerDefaultProperties() {
 		propertyRegistry.register(CONTAINS);
 	}
 
-	public interface ExpressionPropertyHandler<Type, ReturnType> {
+	@SuppressWarnings("unused")
+	public interface PropertyHandler<Type> {}
+
+	public interface ExpressionPropertyHandler<Type, ReturnType> extends PropertyHandler<Type> {
 		// Handler for the NAME property
 		default Class<?> @Nullable [] acceptChange(ChangeMode mode) {
 			return null;
@@ -72,7 +75,7 @@ public interface NameHandler<Named, Name> extends ExpressionPropertyHandler<Name
 		Name name(Named named);
 	}
 
-	public interface ContainsHandler<Container, Element> {
+	public interface ContainsHandler<Container, Element> extends PropertyHandler<Container> {
 		boolean contains(Container container, Element element);
 		Class<? extends Element>[] elementTypes();
 		default boolean canContain(Class<?> type) {

src/main/java/org/skriptlang/skript/lang/properties/PropertyInfo.java

@@ -1,4 +1,4 @@
 package org.skriptlang.skript.lang.properties;
 
-public record PropertyInfo<Handler>(Property<Handler> property, Handler handler) {
+public record PropertyInfo<Handler extends Property.PropertyHandler<?>>(Property<Handler> property, Handler handler) {
 }

src/main/java/org/skriptlang/skript/lang/properties/PropertyUtils.java

@@ -13,7 +13,7 @@ public class PropertyUtils {
 
 
 
-	public static class PropertyMap<Handler> extends HashMap<Class<?>, PropertyInfo<Handler>> {
+	public static class PropertyMap<Handler extends Property.PropertyHandler<?>> extends HashMap<Class<?>, PropertyInfo<Handler>> {
 		public @Nullable Handler getHandler(Class<?> inputClass) {
 			PropertyInfo<Handler> propertyInfo;
 			// check if we don't already know the right info for this class
@@ -63,7 +63,7 @@ public static Expression<?> asProperty(Property<?> property, Expression<?> expr)
 	}
 
 
-	public static <Handler> PropertyMap<Handler> getPossiblePropertyInfos(
+	public static <Handler extends Property.PropertyHandler<?>> PropertyMap<Handler> getPossiblePropertyInfos(
 		Property<Handler> property,
 		Expression<?> expr
 	) {