Skip to content

Update build.gradle and switch to jetbrains annotations #152

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
merged 2 commits into from
Nov 2, 2025
Merged

Update build.gradle and switch to jetbrains annotations #152

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
45d203d
Update build.gradle and switch to jetbrains annotations
UnderscoreTud Oct 27, 2025
a59dec3
Remove unused import and extra trailing line
UnderscoreTud Oct 27, 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
27 changes: 9 additions & 18 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,8 @@ apply plugin: 'java'

repositories {
mavenCentral()
maven {
url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
}
maven {
url 'https://oss.sonatype.org/content/groups/public/'
}
maven {
url 'https://repo.destroystokyo.com/repository/maven-public/'
}
maven {
url 'https://repo.skriptlang.org/releases'
}
maven { url 'https://repo.papermc.io/repository/maven-public/' }
maven { url 'https://repo.skriptlang.org/releases' }
}

processResources {
Expand All @@ -27,14 +17,15 @@ processResources {
]
}

compileJava {
sourceCompatibility = '17'
targetCompatibility = '17'
java {
toolchain.languageVersion.set(JavaLanguageVersion.of(21))
}

tasks.withType(JavaCompile).configureEach {
options.encoding = 'UTF-8'
}

dependencies {
implementation 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT'
implementation 'com.github.SkriptLang:Skript:2.10.0'
implementation 'org.eclipse.jdt:org.eclipse.jdt.annotation:1.1.0'
compileOnly group: 'io.papermc.paper', name: 'paper-api', version: '1.21.10-R0.1-SNAPSHOT'
compileOnly group: 'com.github.SkriptLang', name: 'Skript', version: '2.13.0'
}
3 changes: 1 addition & 2 deletions src/main/java/com/btk5h/skriptmirror/FunctionWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import ch.njol.skript.lang.function.Function;
import ch.njol.skript.lang.function.Functions;
import ch.njol.skript.lang.parser.ParserInstance;
import org.eclipse.jdt.annotation.Nullable;
import org.jetbrains.annotations.Nullable;

public class FunctionWrapper {

Expand Down Expand Up @@ -36,4 +36,3 @@ public Function<?> getFunction() {
}

}

6 changes: 3 additions & 3 deletions src/main/java/com/btk5h/skriptmirror/skript/ExprPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
import ch.njol.util.Kleenean;
import com.btk5h.skriptmirror.JavaType;
import com.btk5h.skriptmirror.ObjectWrapper;
import org.jetbrains.annotations.NotNull;
import org.skriptlang.reflect.java.elements.structures.StructImport;
import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;
import org.eclipse.jdt.annotation.NonNull;

public class ExprPlugin extends SimplePropertyExpression<Object, ObjectWrapper> {

Expand Down Expand Up @@ -64,13 +64,13 @@ public ObjectWrapper convert(Object plugin) {
}

@Override
@NonNull
@NotNull
public Class<? extends ObjectWrapper> getReturnType() {
return ObjectWrapper.class;
}

@Override
@NonNull
@NotNull
protected String getPropertyName() {
return "plugin instance";
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/btk5h/skriptmirror/skript/custom/ExprExpression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@
import ch.njol.util.Checker;
import ch.njol.util.Kleenean;
import ch.njol.util.coll.iterator.ArrayIterator;
import org.jetbrains.annotations.Nullable;
import org.skriptlang.reflect.syntax.condition.ConditionCheckEvent;
import org.skriptlang.reflect.syntax.effect.EffectTriggerEvent;
import org.skriptlang.reflect.syntax.event.EventTriggerEvent;
import org.skriptlang.reflect.syntax.expression.ExpressionChangeEvent;
import org.skriptlang.reflect.syntax.expression.ExpressionGetEvent;
import com.btk5h.skriptmirror.util.JavaUtil;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;
import org.skriptlang.skript.lang.converter.Converters;

import java.util.Iterator;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/btk5h/skriptmirror/skript/custom/ExprParseTags.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@
import ch.njol.skript.lang.SkriptParser.ParseResult;
import ch.njol.skript.lang.util.SimpleExpression;
import ch.njol.util.Kleenean;
import org.jetbrains.annotations.Nullable;
import org.skriptlang.reflect.syntax.condition.ConditionCheckEvent;
import org.skriptlang.reflect.syntax.effect.EffectTriggerEvent;
import org.skriptlang.reflect.syntax.event.EventTriggerEvent;
import org.skriptlang.reflect.syntax.expression.ExpressionChangeEvent;
import org.skriptlang.reflect.syntax.expression.ExpressionGetEvent;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;

public class ExprParseTags extends SimpleExpression<String> {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprClassReference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import com.btk5h.skriptmirror.ObjectWrapper;
import com.btk5h.skriptmirror.util.JavaTypeWrapper;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;
import org.jetbrains.annotations.Nullable;

public class ExprClassReference extends SimpleExpression<ObjectWrapper> {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprJavaCall.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import com.btk5h.skriptmirror.JavaType;
import com.btk5h.skriptmirror.Null;
import com.btk5h.skriptmirror.ObjectWrapper;
import org.jetbrains.annotations.Nullable;
import org.skriptlang.reflect.java.elements.structures.StructImport;
import com.btk5h.skriptmirror.util.JavaUtil;
import com.btk5h.skriptmirror.util.LRUCache;
Expand All @@ -23,7 +24,6 @@
import com.btk5h.skriptmirror.util.StringSimilarity;
import com.btk5h.skriptmirror.util.lookup.LookupGetter;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;
import org.skriptlang.skript.lang.converter.Converters;
import org.skriptlang.skript.lang.script.Script;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprNewArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import com.btk5h.skriptmirror.ObjectWrapper;
import com.btk5h.skriptmirror.util.JavaTypeWrapper;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;
import org.jetbrains.annotations.Nullable;

import java.lang.reflect.Array;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import com.btk5h.skriptmirror.util.JavaUtil;
import com.btk5h.skriptmirror.util.SkriptUtil;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;
import org.jetbrains.annotations.Nullable;

import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/btk5h/skriptmirror/skript/reflect/sections/EffRunSection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import com.btk5h.skriptmirror.util.SkriptUtil;
import org.bukkit.Bukkit;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;
import org.jetbrains.annotations.Nullable;

import java.util.ArrayList;
import java.util.Collections;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/btk5h/skriptmirror/skript/reflect/sections/SecSection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import ch.njol.util.Kleenean;
import com.btk5h.skriptmirror.util.SkriptUtil;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;
import org.jetbrains.annotations.Nullable;

import java.util.ArrayList;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/btk5h/skriptmirror/util/JavaTypeWrapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import ch.njol.skript.lang.Expression;
import com.btk5h.skriptmirror.JavaType;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;
import org.jetbrains.annotations.Nullable;

import java.util.List;
import java.util.regex.MatchResult;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/btk5h/skriptmirror/util/SkriptUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import ch.njol.skript.util.Utils;
import ch.njol.util.NonNullPair;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.NonNull;
import org.jetbrains.annotations.NotNull;
import org.skriptlang.skript.lang.script.Script;

import java.io.File;
Expand Down Expand Up @@ -124,7 +124,7 @@ public static Script getCurrentScript() {
* Gets the {@link ClassInfo} by first converting the given string to a singular.
* Returns {@code Object.class}'s if no {@link ClassInfo} can be found for the given type.
*/
@NonNull
@NotNull
public static ClassInfo<?> getUserClassInfo(String name) {
NonNullPair<String, Boolean> wordData = Utils.getEnglishPlural(name);

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/skriptlang/reflect/java/elements/structures/StructImport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import com.btk5h.skriptmirror.LibraryLoader;
import com.btk5h.skriptmirror.util.SkriptMirrorUtil;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import org.skriptlang.skript.lang.entry.EntryContainer;
import org.skriptlang.skript.lang.script.Script;
import org.skriptlang.skript.lang.structure.Structure;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/skriptlang/reflect/syntax/PatternsEntryData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import ch.njol.skript.ScriptLoader;
import ch.njol.skript.config.Node;
import ch.njol.skript.config.SectionNode;
import org.eclipse.jdt.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import org.skriptlang.skript.lang.entry.EntryData;

import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/skriptlang/reflect/syntax/event/EventValuesEntryData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import ch.njol.skript.config.Node;
import ch.njol.skript.config.SimpleNode;
import ch.njol.skript.registrations.Classes;
import org.eclipse.jdt.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import org.skriptlang.skript.lang.entry.KeyValueEntryData;

import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/skriptlang/reflect/syntax/event/elements/CustomEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import com.btk5h.skriptmirror.util.SkriptReflection;
import com.btk5h.skriptmirror.util.SkriptUtil;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import org.skriptlang.reflect.syntax.event.BukkitCustomEvent;
import org.skriptlang.reflect.syntax.event.EventSyntaxInfo;
import org.skriptlang.reflect.syntax.event.EventTriggerEvent;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/skriptlang/reflect/syntax/event/elements/EffCallEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import com.btk5h.skriptmirror.util.SkriptUtil;
import org.bukkit.Bukkit;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;
import org.jetbrains.annotations.Nullable;

public class EffCallEvent extends Effect {

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/skriptlang/reflect/syntax/event/elements/ExprCustomEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import ch.njol.util.Kleenean;
import com.btk5h.skriptmirror.util.SkriptUtil;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import org.skriptlang.reflect.syntax.event.BukkitCustomEvent;

public class ExprCustomEvent extends SimpleExpression<Event> {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/skriptlang/reflect/syntax/event/elements/ExprCustomEventValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import ch.njol.skript.registrations.Classes;
import ch.njol.util.Kleenean;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import org.skriptlang.reflect.syntax.event.BukkitCustomEvent;
import org.skriptlang.reflect.syntax.event.EventSyntaxInfo;
import org.skriptlang.reflect.syntax.event.EventTriggerEvent;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/skriptlang/reflect/syntax/event/elements/ExprEventData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import ch.njol.skript.lang.util.SimpleExpression;
import ch.njol.util.Kleenean;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import org.skriptlang.reflect.syntax.event.BukkitCustomEvent;
import org.skriptlang.reflect.syntax.event.EventTriggerEvent;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/skriptlang/reflect/syntax/event/elements/ExprReplacedEventValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import ch.njol.skript.expressions.base.EventValueExpression;
import ch.njol.skript.registrations.Classes;
import org.bukkit.event.Event;
import org.eclipse.jdt.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import org.skriptlang.reflect.syntax.event.BukkitCustomEvent;
import org.skriptlang.reflect.syntax.event.EventSyntaxInfo;
import org.skriptlang.reflect.syntax.event.EventTriggerEvent;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/skriptlang/reflect/syntax/expression/ChangerEntryData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import ch.njol.util.NonNullPair;
import ch.njol.util.coll.CollectionUtils;
import com.btk5h.skriptmirror.util.SkriptUtil;
import org.eclipse.jdt.annotation.Nullable;
import org.jetbrains.annotations.Nullable;
import org.skriptlang.skript.lang.entry.EntryData;

import java.util.Arrays;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/skriptlang/reflect/syntax/expression/elements/StructCustomExpression.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
import ch.njol.util.NonNullPair;
import ch.njol.util.StringUtils;
import com.btk5h.skriptmirror.SkriptMirror;
import org.jetbrains.annotations.Nullable;
import org.skriptlang.reflect.syntax.CustomSyntaxStructure;
import com.btk5h.skriptmirror.skript.custom.SyntaxParseEvent;
import com.btk5h.skriptmirror.util.SkriptUtil;
import org.eclipse.jdt.annotation.Nullable;
import org.skriptlang.reflect.syntax.expression.ChangerEntryData;
import org.skriptlang.reflect.syntax.expression.ExpressionChangeEvent;
import org.skriptlang.reflect.syntax.expression.ExpressionGetEvent;
Expand Down