Skip to content

Fix getting java functions causing casting errors #8213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Absolutionism merged 2 commits into from
Oct 1, 2025
Merged

Fix getting java functions causing casting errors #8213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2b9cd7
Fix #getJavaFunctions causing casting errors
Efnilite Oct 1, 2025
bd5d98c
Merge branch 'dev/feature' into feature/fix-get-java-functions
Absolutionism Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/main/java/ch/njol/skript/doc/Documentation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
import ch.njol.skript.lang.ExpressionInfo;
import ch.njol.skript.lang.SkriptEventInfo;
import ch.njol.skript.lang.SyntaxElementInfo;
import org.skriptlang.skript.common.function.DefaultFunction;
import ch.njol.skript.lang.function.Functions;
import ch.njol.skript.lang.function.JavaFunction;
import ch.njol.skript.lang.function.Parameter;
import ch.njol.skript.registrations.Classes;
import ch.njol.skript.util.Utils;
Expand Down Expand Up @@ -153,7 +151,7 @@ private static void asSql(final PrintWriter pw) {
"examples VARCHAR(2000) NOT NULL," +
"since VARCHAR(100) NOT NULL" +
");");
for (ch.njol.skript.lang.function.Function<?> func : Functions.getDefaultFunctions()) {
for (ch.njol.skript.lang.function.Function<?> func : Functions.getFunctions()) {
assert func != null;
insertFunction(pw, func);
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/doc/DocumentationIdProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ public static <T> String getId(SyntaxInfo<? extends T> syntaxInfo) {
* @return the documentation ID of the function
*/
public static String getId(Function<?> function) {
int collisionCount = calculateCollisionCount(Functions.getJavaFunctions().iterator(),
int collisionCount = calculateCollisionCount(Functions.getFunctions().iterator(),
javaFunction -> function.getName().equals(javaFunction.getName()),
javaFunction -> javaFunction == function);
return addCollisionSuffix(function.getName(), collisionCount);
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/ch/njol/skript/doc/HTMLGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import ch.njol.skript.lang.*;
import ch.njol.skript.lang.function.Function;
import ch.njol.skript.lang.function.Functions;
import ch.njol.skript.lang.function.JavaFunction;
import ch.njol.skript.registrations.Classes;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
Expand All @@ -18,7 +17,6 @@
import org.jetbrains.annotations.Nullable;
import org.skriptlang.skript.lang.entry.EntryData;
import org.skriptlang.skript.lang.entry.EntryValidator;
import org.skriptlang.skript.common.function.DefaultFunction;
import org.skriptlang.skript.lang.structure.StructureInfo;

import java.io.File;
Expand Down Expand Up @@ -333,7 +331,7 @@ else if (!filesInside.getName().matches("(?i)(.*)\\.(html?|js|css|json)")) {
}
}
if (genType.equals("functions") || isDocsPage) {
List<Function<?>> functions = new ArrayList<>(Functions.getDefaultFunctions());
List<Function<?>> functions = new ArrayList<>(Functions.getFunctions());
functions.sort(functionComparator);
for (Function<?> info : functions) {
assert info != null;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ch/njol/skript/doc/JSONGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ public void generate(@NotNull Path path) throws IOException {
jsonDocs.add("structures", generateStructureElementArray(source.syntaxRegistry().syntaxes(SyntaxRegistry.STRUCTURE)));
jsonDocs.add("sections", generateSyntaxElementArray(source.syntaxRegistry().syntaxes(SyntaxRegistry.SECTION)));
jsonDocs.add("types", generateClassInfoArray(Classes.getClassInfos().iterator()));
jsonDocs.add("functions", generateFunctionArray(Functions.getDefaultFunctions().iterator()));
jsonDocs.add("functions", generateFunctionArray(Functions.getFunctions().iterator()));

try {
Files.writeString(path, GSON.toJson(jsonDocs));
Expand Down
11 changes: 7 additions & 4 deletions src/main/java/ch/njol/skript/lang/function/Functions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.skriptlang.skript.lang.script.Script;

import java.util.*;
import java.util.stream.Collectors;

/**
* Static methods to work with functions.
Expand Down Expand Up @@ -445,21 +446,23 @@ public static void clearFunctions() {
}

/**
* @deprecated Use {@link #getDefaultFunctions()} instead.
* @deprecated Use {@link #getFunctions()} instead.
*/
@SuppressWarnings({"unchecked"})
@Deprecated(forRemoval = true, since = "INSERT VERSION")
public static Collection<JavaFunction<?>> getJavaFunctions() {
// We know there are only Java functions in that namespace
return (Collection<JavaFunction<?>>) (Object) javaNamespace.getFunctions();
return javaNamespace.getFunctions().stream()
.filter(it -> it instanceof JavaFunction<?>)
.map(it -> (JavaFunction<?>) it)
.collect(Collectors.toSet());
}

/**
* Returns all functions registered using Java.
*
* @return All {@link JavaFunction} or {@link DefaultFunction} functions.
*/
public static Collection<Function<?>> getDefaultFunctions() {
public static Collection<Function<?>> getFunctions() {
return javaNamespace.getFunctions();
}

Expand Down