Function overloading fixes and improvements (#8032)

* init

* fix single list value functions, clamp

* fix dynamic functions

* update docs

* reviews

* skript parser strikes again

* enjoy your holiday pickle

* fix checkstyle

Author: Efnilite

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

@@ -1124,20 +1124,8 @@ private SkriptParser suppressMissingAndOrWarnings() {
 			ParserInstance parser = getParser();
 			Script currentScript = parser.isActive() ? parser.getCurrentScript() : null;
 			FunctionReference<T> functionReference = new FunctionReference<>(functionName, SkriptLogger.getNode(),
-					currentScript != null ? currentScript.getConfig().getFileName() : null, types, params);//.toArray(new Expression[params.size()]));
-			attempt_list_parse:
-			if (unaryArgument.get() && !functionReference.validateParameterArity(true)) {
-				try (ParseLogHandler ignored = SkriptLogger.startParseLogHandler()) {
-					SkriptParser alternative = new SkriptParser(args, flags | PARSE_LITERALS, context);
-					params = this.getFunctionArguments(() -> alternative.suppressMissingAndOrWarnings()
-								.parseExpressionList(ignored, Object.class), args, unaryArgument);
-					ignored.clear();
-					if (params == null)
-						break attempt_list_parse;
-				}
-				functionReference = new FunctionReference<>(functionName, SkriptLogger.getNode(),
-						currentScript != null ? currentScript.getConfig().getFileName() : null, types, params);
-			}
+					currentScript != null ? currentScript.getConfig().getFileName() : null, types, params);
+
 			if (!functionReference.validateFunction(true)) {
 				log.printError();
 				return null;

src/main/java/ch/njol/skript/lang/function/DynamicFunctionReference.java

@@ -1,7 +1,6 @@
 package ch.njol.skript.lang.function;
 
 import ch.njol.skript.ScriptLoader;
-import ch.njol.skript.Skript;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionList;
 import ch.njol.skript.lang.util.common.AnyNamed;
@@ -60,10 +59,10 @@ public DynamicFunctionReference(@NotNull String name, @Nullable Script source) {
 			// will return the first function found that matches name.
 			// TODO: add a way to specify param types
 			//noinspection unchecked
-			function = (Function<? extends Result>) FunctionRegistry.getRegistry().getFunction(source.getConfig().getFileName(), name).retrieved();
+			function = (Function<? extends Result>) Functions.getFunction(name, source.getConfig().getFileName());
 		} else {
 			//noinspection unchecked
-			function = (Function<? extends Result>) FunctionRegistry.getRegistry().getFunction(null, name).retrieved();
+			function = (Function<? extends Result>) Functions.getFunction(name, null);
 		}
 
 		this.resolved = function != null;

src/main/java/ch/njol/skript/lang/function/FunctionReference.java

@@ -20,6 +20,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.skriptlang.skript.lang.converter.Converters;
 import org.skriptlang.skript.util.Executable;
+
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -133,12 +134,24 @@ public boolean validateFunction(boolean first) {
 		Skript.debug("Validating function " + functionName);
 		Signature<?> sign = getRegisteredSignature();
 
+		StringJoiner args = new StringJoiner(", ");
+		for (Class<?> parameterType : parameterTypes) {
+			Class<?> searchType;
+			if (parameterType.isArray()) {
+				searchType = parameterType.componentType();
+			} else {
+				searchType = parameterType;
+			}
+			args.add(Classes.getSuperClassInfo(searchType).getCodeName());
+		}
+		String stringified = "%s(%s)".formatted(functionName, args);
+
 		// Check if the requested function exists
 		if (sign == null) {
 			if (first) {
-				Skript.error("The function '" + functionName + "' does not exist.");
+				Skript.error("The function '" + stringified + "' does not exist.");
 			} else {
-				Skript.error("The function '" + functionName + "' was deleted or renamed, but is still used in other script(s)."
+				Skript.error("The function '" + stringified + "' was deleted or renamed, but is still used in other script(s)."
 					+ " These will continue to use the old version of the function until Skript restarts.");
 				function = previousFunction;
 			}
@@ -151,19 +164,19 @@ public boolean validateFunction(boolean first) {
 			ClassInfo<?> rt = sign.returnType;
 			if (rt == null) {
 				if (first) {
-					Skript.error("The function '" + functionName + "' doesn't return any value.");
+					Skript.error("The function '" + stringified + "' doesn't return any value.");
 				} else {
-					Skript.error("The function '" + functionName + "' was redefined with no return value, but is still used in other script(s)."
+					Skript.error("The function '" + stringified + "' was redefined with no return value, but is still used in other script(s)."
 						+ " These will continue to use the old version of the function until Skript restarts.");
 					function = previousFunction;
 				}
 				return false;
 			}
 			if (!Converters.converterExists(rt.getC(), returnTypes)) {
 				if (first) {
-					Skript.error("The returned value of the function '" + functionName + "', " + sign.returnType + ", is " + SkriptParser.notOfType(returnTypes) + ".");
+					Skript.error("The returned value of the function '" + stringified + "', " + sign.returnType + ", is " + SkriptParser.notOfType(returnTypes) + ".");
 				} else {
-					Skript.error("The function '" + functionName + "' was redefined with a different, incompatible return type, but is still used in other script(s)."
+					Skript.error("The function '" + stringified + "' was redefined with a different, incompatible return type, but is still used in other script(s)."
 						+ " These will continue to use the old version of the function until Skript restarts.");
 					function = previousFunction;
 				}
@@ -186,15 +199,15 @@ public boolean validateFunction(boolean first) {
 			if (parameters.length > sign.getMaxParameters()) {
 				if (first) {
 					if (sign.getMaxParameters() == 0) {
-						Skript.error("The function '" + functionName + "' has no arguments, but " + parameters.length + " are given."
+						Skript.error("The function '" + stringified + "' has no arguments, but " + parameters.length + " are given."
 							+ " To call a function without parameters, just write the function name followed by '()', e.g. 'func()'.");
 					} else {
-						Skript.error("The function '" + functionName + "' has only " + sign.getMaxParameters() + " argument" + (sign.getMaxParameters() == 1 ? "" : "s") + ","
+						Skript.error("The function '" + stringified + "' has only " + sign.getMaxParameters() + " argument" + (sign.getMaxParameters() == 1 ? "" : "s") + ","
 							+ " but " + parameters.length + " are given."
 							+ " If you want to use lists in function calls, you have to use additional parentheses, e.g. 'give(player, (iron ore and gold ore))'");
 					}
 				} else {
-					Skript.error("The function '" + functionName + "' was redefined with a different, incompatible amount of arguments, but is still used in other script(s)."
+					Skript.error("The function '" + stringified + "' was redefined with a different, incompatible amount of arguments, but is still used in other script(s)."
 						+ " These will continue to use the old version of the function until Skript restarts.");
 					function = previousFunction;
 				}
@@ -205,10 +218,10 @@ public boolean validateFunction(boolean first) {
 		// Not enough parameters
 		if (parameters.length < sign.getMinParameters()) {
 			if (first) {
-				Skript.error("The function '" + functionName + "' requires at least " + sign.getMinParameters() + " argument" + (sign.getMinParameters() == 1 ? "" : "s") + ","
+				Skript.error("The function '" + stringified + "' requires at least " + sign.getMinParameters() + " argument" + (sign.getMinParameters() == 1 ? "" : "s") + ","
 					+ " but only " + parameters.length + " " + (parameters.length == 1 ? "is" : "are") + " given.");
 			} else {
-				Skript.error("The function '" + functionName + "' was redefined with a different, incompatible amount of arguments, but is still used in other script(s)."
+				Skript.error("The function '" + stringified + "' was redefined with a different, incompatible amount of arguments, but is still used in other script(s)."
 					+ " These will continue to use the old version of the function until Skript restarts.");
 				function = previousFunction;
 			}
@@ -227,12 +240,12 @@ public boolean validateFunction(boolean first) {
 						if (LiteralUtils.hasUnparsedLiteral(parameters[i])) {
 							Skript.error("Can't understand this expression: " + parameters[i].toString());
 						} else {
-							Skript.error("The " + StringUtils.fancyOrderNumber(i + 1) + " argument given to the function '" + functionName + "' is not of the required type " + p.type + "."
+							Skript.error("The " + StringUtils.fancyOrderNumber(i + 1) + " argument given to the function '" + stringified + "' is not of the required type " + p.type + "."
 								+ " Check the correct order of the arguments and put lists into parentheses if appropriate (e.g. 'give(player, (iron ore and gold ore))')."
 								+ " Please note that storing the value in a variable and then using that variable as parameter may suppress this error, but it still won't work.");
 						}
 					} else {
-						Skript.error("The function '" + functionName + "' was redefined with different, incompatible arguments, but is still used in other script(s)."
+						Skript.error("The function '" + stringified + "' was redefined with different, incompatible arguments, but is still used in other script(s)."
 							+ " These will continue to use the old version of the function until Skript restarts.");
 						function = previousFunction;
 					}
@@ -242,7 +255,7 @@ public boolean validateFunction(boolean first) {
 						Skript.error("The " + StringUtils.fancyOrderNumber(i + 1) + " argument given to the function '" + functionName + "' is plural, "
 							+ "but a single argument was expected");
 					} else {
-						Skript.error("The function '" + functionName + "' was redefined with different, incompatible arguments, but is still used in other script(s)."
+						Skript.error("The function '" + stringified + "' was redefined with different, incompatible arguments, but is still used in other script(s)."
 							+ " These will continue to use the old version of the function until Skript restarts.");
 						function = previousFunction;
 					}
@@ -294,13 +307,6 @@ private Signature<?> getRegisteredSignature() {
 			return attempt.retrieved();
 		}
 
-		// if we can't find a signature based on param types, try to match any function
-		attempt = FunctionRegistry.getRegistry().getSignature(script, functionName);
-
-		if (attempt.result() == RetrievalResult.EXACT) {
-			return attempt.retrieved();
-		}
-
 		if (attempt.result() == RetrievalResult.AMBIGUOUS) {
 			ambiguousError(attempt.conflictingArgs());
 		}
@@ -325,13 +331,6 @@ private Function<?> getRegisteredFunction() {
 			return attempt.retrieved();
 		}
 
-		// if we can't find a signature based on param types, try to match any function
-		attempt = FunctionRegistry.getRegistry().getFunction(script, functionName);
-
-		if (attempt.result() == RetrievalResult.EXACT) {
-			return attempt.retrieved();
-		}
-
 		if (attempt.result() == RetrievalResult.AMBIGUOUS) {
 			ambiguousError(attempt.conflictingArgs());
 		}