cleanup and move lookupPropertyInfo to override of get(Class)

Author: sovdeeth

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

@@ -75,8 +75,6 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 			.toArray(size -> (Object[]) Array.newInstance(getReturnType(), size));
 	}
 
-	protected void preConvert(Event event) {}
-
 	protected abstract <T> @Nullable Object convert(Event event, Handler handler, T source);
 
 	@Override
@@ -130,15 +128,8 @@ public Class<?>[] getTypes(ChangeMode mode, PropertyInfo<Handler> propertyInfo)
 
 	@Override
 	public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
-		for (Object nameHaver : expr.getArray(event)) {
-			PropertyInfo<Handler> propertyInfo;
-			// check if we don't already know the right info for this class
-			if (properties.containsKey(nameHaver.getClass())) {
-				propertyInfo = properties.get(nameHaver.getClass());
-			} else {
-				// search for assignable property info
-				propertyInfo = properties.lookupPropertyInfo(nameHaver.getClass());
-			}
+		for (Object propertyHaver : expr.getArray(event)) {
+			PropertyInfo<Handler> propertyInfo = properties.get(propertyHaver.getClass());
 			if (propertyInfo == null) {
 				continue; // no property info found, skip
 			}
@@ -157,10 +148,10 @@ public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 				// single type, compare to delta[0]
 				if ((allowedType.isArray() && allowedType.isInstance(delta))
 					|| (delta != null && allowedType.isInstance(delta[0]))) {
-					// if the nameHaver is allowed, change
+					// if the propertyHaver is allowed, change
 					@SuppressWarnings("unchecked")
-					var handler = (Property.NameHandler<Object, ?>) propertyInfo.handler();
-					handler.change(nameHaver, delta, mode);
+					var handler = (ExpressionPropertyHandler<Object, ?>) propertyInfo.handler();
+					handler.change(propertyHaver, delta, mode);
 				}
 				// if allowed type is singular, take delta[0]
 			}

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

@@ -17,12 +17,7 @@ public static class PropertyMap<Handler> extends HashMap<Class<?>, PropertyInfo<
 		public @Nullable Handler getHandler(Class<?> inputClass) {
 			PropertyInfo<Handler> propertyInfo;
 			// check if we don't already know the right info for this class
-			if (containsKey(inputClass)) {
-				propertyInfo = get(inputClass);
-			} else {
-				// search for assignable property info
-				propertyInfo = lookupPropertyInfo(inputClass);
-			}
+			propertyInfo = get(inputClass);
 			if (propertyInfo == null) {
 				// no property info found, return null
 				return null;
@@ -31,7 +26,11 @@ public static class PropertyMap<Handler> extends HashMap<Class<?>, PropertyInfo<
 			return propertyInfo.handler();
 		}
 
-		public PropertyInfo<Handler> lookupPropertyInfo(Class<?> actualClass) {
+		public PropertyInfo<Handler> get(Class<?> actualClass) {
+			if (super.containsKey(actualClass)) {
+				return super.get(actualClass);
+			}
+
 			Class<?> closestClass = null;
 			for (Class<?> candidateClass : keySet()) {
 				// need to make sure we get the closest match
@@ -42,7 +41,7 @@ public PropertyInfo<Handler> lookupPropertyInfo(Class<?> actualClass) {
 				}
 			}
 
-			var propertyInfo = get(closestClass);
+			var propertyInfo = super.get(closestClass);
 			// add to properties so we don't have to search again
 			put(actualClass, propertyInfo);
 			return propertyInfo;