diff --git a/build.gradle b/build.gradle index f881c353..11da0be4 100644 --- a/build.gradle +++ b/build.gradle @@ -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 { @@ -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' } diff --git a/src/main/java/com/btk5h/skriptmirror/FunctionWrapper.java b/src/main/java/com/btk5h/skriptmirror/FunctionWrapper.java index 07f54760..f263f514 100644 --- a/src/main/java/com/btk5h/skriptmirror/FunctionWrapper.java +++ b/src/main/java/com/btk5h/skriptmirror/FunctionWrapper.java @@ -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 { @@ -36,4 +36,3 @@ public Function getFunction() { } } - diff --git a/src/main/java/com/btk5h/skriptmirror/skript/ExprPlugin.java b/src/main/java/com/btk5h/skriptmirror/skript/ExprPlugin.java index 98b4f23d..b85a2b1f 100644 --- a/src/main/java/com/btk5h/skriptmirror/skript/ExprPlugin.java +++ b/src/main/java/com/btk5h/skriptmirror/skript/ExprPlugin.java @@ -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 { @@ -64,13 +64,13 @@ public ObjectWrapper convert(Object plugin) { } @Override - @NonNull + @NotNull public Class getReturnType() { return ObjectWrapper.class; } @Override - @NonNull + @NotNull protected String getPropertyName() { return "plugin instance"; } diff --git a/src/main/java/com/btk5h/skriptmirror/skript/custom/ExprExpression.java b/src/main/java/com/btk5h/skriptmirror/skript/custom/ExprExpression.java index 7af2e05c..cfd8059a 100644 --- a/src/main/java/com/btk5h/skriptmirror/skript/custom/ExprExpression.java +++ b/src/main/java/com/btk5h/skriptmirror/skript/custom/ExprExpression.java @@ -11,6 +11,7 @@ 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; @@ -18,7 +19,6 @@ 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; diff --git a/src/main/java/com/btk5h/skriptmirror/skript/custom/ExprParseTags.java b/src/main/java/com/btk5h/skriptmirror/skript/custom/ExprParseTags.java index 0f1385b7..c5d25935 100644 --- a/src/main/java/com/btk5h/skriptmirror/skript/custom/ExprParseTags.java +++ b/src/main/java/com/btk5h/skriptmirror/skript/custom/ExprParseTags.java @@ -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 { diff --git a/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprClassReference.java b/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprClassReference.java index e3e20a41..338ec83d 100644 --- a/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprClassReference.java +++ b/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprClassReference.java @@ -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 { diff --git a/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprJavaCall.java b/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprJavaCall.java index 16cfe10a..53c00170 100644 --- a/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprJavaCall.java +++ b/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprJavaCall.java @@ -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; @@ -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; diff --git a/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprNewArray.java b/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprNewArray.java index 47b40cc8..7beaa01c 100644 --- a/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprNewArray.java +++ b/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprNewArray.java @@ -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; diff --git a/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprProxy.java b/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprProxy.java index 6bceca8c..7d0d12e6 100644 --- a/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprProxy.java +++ b/src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprProxy.java @@ -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; diff --git a/src/main/java/com/btk5h/skriptmirror/skript/reflect/sections/EffRunSection.java b/src/main/java/com/btk5h/skriptmirror/skript/reflect/sections/EffRunSection.java index 0845ef1d..03d3e1c3 100644 --- a/src/main/java/com/btk5h/skriptmirror/skript/reflect/sections/EffRunSection.java +++ b/src/main/java/com/btk5h/skriptmirror/skript/reflect/sections/EffRunSection.java @@ -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; diff --git a/src/main/java/com/btk5h/skriptmirror/skript/reflect/sections/SecSection.java b/src/main/java/com/btk5h/skriptmirror/skript/reflect/sections/SecSection.java index 5d821822..d5afcf5b 100644 --- a/src/main/java/com/btk5h/skriptmirror/skript/reflect/sections/SecSection.java +++ b/src/main/java/com/btk5h/skriptmirror/skript/reflect/sections/SecSection.java @@ -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; diff --git a/src/main/java/com/btk5h/skriptmirror/util/JavaTypeWrapper.java b/src/main/java/com/btk5h/skriptmirror/util/JavaTypeWrapper.java index 07fdb1ba..1f792d39 100644 --- a/src/main/java/com/btk5h/skriptmirror/util/JavaTypeWrapper.java +++ b/src/main/java/com/btk5h/skriptmirror/util/JavaTypeWrapper.java @@ -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; diff --git a/src/main/java/com/btk5h/skriptmirror/util/SkriptUtil.java b/src/main/java/com/btk5h/skriptmirror/util/SkriptUtil.java index e4055665..6808a3c3 100644 --- a/src/main/java/com/btk5h/skriptmirror/util/SkriptUtil.java +++ b/src/main/java/com/btk5h/skriptmirror/util/SkriptUtil.java @@ -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; @@ -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 wordData = Utils.getEnglishPlural(name); diff --git a/src/main/java/org/skriptlang/reflect/java/elements/structures/StructImport.java b/src/main/java/org/skriptlang/reflect/java/elements/structures/StructImport.java index 17513f9a..dd798e51 100644 --- a/src/main/java/org/skriptlang/reflect/java/elements/structures/StructImport.java +++ b/src/main/java/org/skriptlang/reflect/java/elements/structures/StructImport.java @@ -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; diff --git a/src/main/java/org/skriptlang/reflect/syntax/PatternsEntryData.java b/src/main/java/org/skriptlang/reflect/syntax/PatternsEntryData.java index 861deecf..e3936c97 100644 --- a/src/main/java/org/skriptlang/reflect/syntax/PatternsEntryData.java +++ b/src/main/java/org/skriptlang/reflect/syntax/PatternsEntryData.java @@ -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; diff --git a/src/main/java/org/skriptlang/reflect/syntax/event/EventValuesEntryData.java b/src/main/java/org/skriptlang/reflect/syntax/event/EventValuesEntryData.java index 4b6441dc..de97d1f0 100644 --- a/src/main/java/org/skriptlang/reflect/syntax/event/EventValuesEntryData.java +++ b/src/main/java/org/skriptlang/reflect/syntax/event/EventValuesEntryData.java @@ -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; diff --git a/src/main/java/org/skriptlang/reflect/syntax/event/elements/CustomEvent.java b/src/main/java/org/skriptlang/reflect/syntax/event/elements/CustomEvent.java index 8b6bf9e6..eff04f38 100644 --- a/src/main/java/org/skriptlang/reflect/syntax/event/elements/CustomEvent.java +++ b/src/main/java/org/skriptlang/reflect/syntax/event/elements/CustomEvent.java @@ -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; diff --git a/src/main/java/org/skriptlang/reflect/syntax/event/elements/EffCallEvent.java b/src/main/java/org/skriptlang/reflect/syntax/event/elements/EffCallEvent.java index e97f15c6..e56ba091 100644 --- a/src/main/java/org/skriptlang/reflect/syntax/event/elements/EffCallEvent.java +++ b/src/main/java/org/skriptlang/reflect/syntax/event/elements/EffCallEvent.java @@ -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 { diff --git a/src/main/java/org/skriptlang/reflect/syntax/event/elements/ExprCustomEvent.java b/src/main/java/org/skriptlang/reflect/syntax/event/elements/ExprCustomEvent.java index a98dd51d..fb87df4c 100644 --- a/src/main/java/org/skriptlang/reflect/syntax/event/elements/ExprCustomEvent.java +++ b/src/main/java/org/skriptlang/reflect/syntax/event/elements/ExprCustomEvent.java @@ -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 { diff --git a/src/main/java/org/skriptlang/reflect/syntax/event/elements/ExprCustomEventValue.java b/src/main/java/org/skriptlang/reflect/syntax/event/elements/ExprCustomEventValue.java index e9262827..d10a4e2f 100644 --- a/src/main/java/org/skriptlang/reflect/syntax/event/elements/ExprCustomEventValue.java +++ b/src/main/java/org/skriptlang/reflect/syntax/event/elements/ExprCustomEventValue.java @@ -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; diff --git a/src/main/java/org/skriptlang/reflect/syntax/event/elements/ExprEventData.java b/src/main/java/org/skriptlang/reflect/syntax/event/elements/ExprEventData.java index f46d5589..3b52cff1 100644 --- a/src/main/java/org/skriptlang/reflect/syntax/event/elements/ExprEventData.java +++ b/src/main/java/org/skriptlang/reflect/syntax/event/elements/ExprEventData.java @@ -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; diff --git a/src/main/java/org/skriptlang/reflect/syntax/event/elements/ExprReplacedEventValue.java b/src/main/java/org/skriptlang/reflect/syntax/event/elements/ExprReplacedEventValue.java index f6df7578..f18931f7 100644 --- a/src/main/java/org/skriptlang/reflect/syntax/event/elements/ExprReplacedEventValue.java +++ b/src/main/java/org/skriptlang/reflect/syntax/event/elements/ExprReplacedEventValue.java @@ -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; diff --git a/src/main/java/org/skriptlang/reflect/syntax/expression/ChangerEntryData.java b/src/main/java/org/skriptlang/reflect/syntax/expression/ChangerEntryData.java index 577ce4a0..04e9b3d7 100644 --- a/src/main/java/org/skriptlang/reflect/syntax/expression/ChangerEntryData.java +++ b/src/main/java/org/skriptlang/reflect/syntax/expression/ChangerEntryData.java @@ -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; diff --git a/src/main/java/org/skriptlang/reflect/syntax/expression/elements/StructCustomExpression.java b/src/main/java/org/skriptlang/reflect/syntax/expression/elements/StructCustomExpression.java index 3dd6cf1e..81221d91 100644 --- a/src/main/java/org/skriptlang/reflect/syntax/expression/elements/StructCustomExpression.java +++ b/src/main/java/org/skriptlang/reflect/syntax/expression/elements/StructCustomExpression.java @@ -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;