Registration API Compatibility

.github/workflows/gradle.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Set up JDK 11
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle
@@ -36,7 +36,7 @@ jobs:
           path: extra-plugins/
           merge-multiple: true
       - name: Run tests
-        uses: SkriptLang/skript-test-action@v1.1
+        uses: SkriptLang/skript-test-action@v1.2
         with:
           test_script_directory: src/test/scripts
           extra_plugins_directory: extra-plugins/

build.gradle

@@ -28,13 +28,13 @@ processResources {
 }
 
 compileJava   {
-  sourceCompatibility = '11'
-  targetCompatibility = '11'
+  sourceCompatibility = '17'
+  targetCompatibility = '17'
   options.encoding = 'UTF-8'
 }
 
 dependencies {
   implementation 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT'
-  implementation 'com.github.SkriptLang:Skript:2.9.0'
+  implementation 'com.github.SkriptLang:Skript:2.10.0'
   implementation 'org.eclipse.jdt:org.eclipse.jdt.annotation:1.1.0'
 }

src/main/java/com/btk5h/skriptmirror/ParseOrderWorkarounds.java

@@ -2,16 +2,20 @@
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.effects.EffReturn;
-import ch.njol.util.Checker;
 import org.skriptlang.reflect.syntax.condition.elements.CustomCondition;
 import org.skriptlang.reflect.syntax.effect.elements.CustomEffect;
 import org.skriptlang.reflect.syntax.expression.elements.CustomExpression;
 import com.btk5h.skriptmirror.skript.EffExpressionStatement;
 import com.btk5h.skriptmirror.skript.custom.ExprMatchedPattern;
 import com.btk5h.skriptmirror.util.SkriptReflection;
+import org.skriptlang.skript.bukkit.registration.BukkitRegistryKeys;
+import org.skriptlang.skript.registration.SyntaxInfo;
+import org.skriptlang.skript.registration.SyntaxRegistry;
 
+import javax.naming.ServiceUnavailableException;
 import java.util.Collection;
 import java.util.Optional;
+import java.util.function.Predicate;
 
 /**
  * Explicitly declares the relative parse orders of different statement types. Classes at the start of the list should
@@ -38,22 +42,24 @@ public class ParseOrderWorkarounds {
 
   public static void reorderSyntax() {
     for (String c : PARSE_ORDER) {
-      ensureLast(Skript.getStatements(), o -> o.getElementClass().getName().equals(c));
-      ensureLast(Skript.getConditions(), o -> o.getElementClass().getName().equals(c));
-      ensureLast(Skript.getEffects(), o -> o.getElementClass().toString().equals(c));
-      ensureLast(SkriptReflection.getExpressions(), o -> o.getElementClass().getName().equals(c));
-      ensureLast(Skript.getEvents(), o -> o.getElementClass().getName().equals(c));
+      ensureLast(SyntaxRegistry.STATEMENT, o -> o.type().getName().equals(c));
+      ensureLast(SyntaxRegistry.CONDITION, o -> o.type().getName().equals(c));
+      ensureLast(SyntaxRegistry.EFFECT, o -> o.type().equals(c));
+      ensureLast(SyntaxRegistry.EXPRESSION, o -> o.type().getName().equals(c));
+      ensureLast(BukkitRegistryKeys.EVENT, o -> o.type().getName().equals(c));
+      ensureLast(SyntaxRegistry.STRUCTURE, o -> o.type().getName().equals(c));
     }
   }
 
-  private static <E> void ensureLast(Collection<E> elements, Checker<E> checker) {
-    Optional<E> optionalE = elements.stream()
-      .filter(checker::check)
+  private static <T> void ensureLast(SyntaxRegistry.Key<? extends SyntaxInfo<? extends T>> elementKey, Predicate<SyntaxInfo<? extends T>> checker) {
+    SyntaxRegistry syntaxRegistry = SkriptMirror.getAddonInstance().syntaxRegistry();
+    Optional<? extends SyntaxInfo<? extends T>> optionalE = syntaxRegistry.syntaxes(elementKey).stream()
+      .filter(checker::test)
       .findFirst();
 
     optionalE.ifPresent(value -> {
-      elements.remove(value);
-      elements.add(value);
+      syntaxRegistry.unregister((SyntaxRegistry.Key) elementKey, value);
+      syntaxRegistry.register((SyntaxRegistry.Key) elementKey, value);
     });
   }
 

src/main/java/com/btk5h/skriptmirror/skript/ExprArrayAccess.java

@@ -17,6 +17,7 @@
 
 import java.lang.reflect.Array;
 import java.util.Iterator;
+import java.util.function.Predicate;
 
 public class ExprArrayAccess<T> implements Expression<T> {
 
@@ -106,12 +107,12 @@ public boolean isSingle() {
   }
 
   @Override
-  public boolean check(Event e, Checker<? super T> c, boolean negated) {
+  public boolean check(Event e, Predicate<? super T> c, boolean negated) {
     return SimpleExpression.check(getAll(e), c, negated, getAnd());
   }
 
   @Override
-  public boolean check(Event e, Checker<? super T> c) {
+  public boolean check(Event e, Predicate<? super T> c) {
     return SimpleExpression.check(getAll(e), c, false, getAnd());
   }
 

src/main/java/com/btk5h/skriptmirror/skript/ExprPlugin.java

@@ -4,6 +4,7 @@
 import ch.njol.skript.expressions.base.SimplePropertyExpression;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.util.Kleenean;
 import com.btk5h.skriptmirror.JavaType;
@@ -22,25 +23,26 @@ public class ExprPlugin extends SimplePropertyExpression<Object, ObjectWrapper>
 
   @Override
   public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
-    super.init(exprs, matchedPattern, isDelayed, parseResult);
+    boolean superInitResult = super.init(exprs, matchedPattern, isDelayed, parseResult);
 
-    if (exprs[0] instanceof StructImport.ImportHandler) {
-      JavaType javaType = ((StructImport.ImportHandler) exprs[0]).getJavaType();
-      Class<?> clazz = javaType.getJavaClass();
+    if (getExpr() instanceof Literal<?> literal) {
+      Object literalValue = literal.getSingle();
+      if (literalValue instanceof JavaType javaType) {
+        Class<?> clazz = javaType.getJavaClass();
 
-      if (!JavaPlugin.class.isAssignableFrom(clazz) || JavaPlugin.class.equals(clazz)) {
-        Skript.error("The class " + clazz.getSimpleName() + " is not a plugin class");
-        return false;
+        if (!JavaPlugin.class.isAssignableFrom(clazz) || JavaPlugin.class.equals(clazz)) {
+          Skript.error("The class " + clazz.getSimpleName() + " is not a plugin class");
+          return false;
+        }
       }
     }
 
-    return true;
+    return superInitResult;
   }
 
   @Override
   public ObjectWrapper convert(Object plugin) {
-    if (plugin instanceof String) {
-      String pluginName = (String) plugin;
+    if (plugin instanceof String pluginName) {
       for (Plugin pluginInstance : Bukkit.getPluginManager().getPlugins()) {
         if (pluginInstance.getName().equalsIgnoreCase(pluginName)) {
           return ObjectWrapper.create(pluginInstance);

src/main/java/com/btk5h/skriptmirror/skript/ExprSpread.java

@@ -20,6 +20,7 @@
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
+import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 public class ExprSpread<T> implements Expression<T> {
@@ -97,12 +98,12 @@ public boolean isSingle() {
   }
 
   @Override
-  public boolean check(Event e, Checker<? super T> c, boolean negated) {
+  public boolean check(Event e, Predicate<? super T> c, boolean negated) {
     return SimpleExpression.check(getAll(e), c, negated, getAnd());
   }
 
   @Override
-  public boolean check(Event e, Checker<? super T> c) {
+  public boolean check(Event e, Predicate<? super T> c) {
     return SimpleExpression.check(getAll(e), c, false, getAnd());
   }
 

src/main/java/com/btk5h/skriptmirror/skript/Types.java

@@ -63,8 +63,7 @@ public JavaType parse(String s, ParseContext context) {
 
           @Override
           public boolean canParse(ParseContext context) {
-            // default context handled in StructImport$ImportHandler
-            return context != ParseContext.DEFAULT;
+            return true;
           }
 
           @Override

src/main/java/com/btk5h/skriptmirror/skript/custom/ExprExpression.java

@@ -22,6 +22,7 @@
 import org.skriptlang.skript.lang.converter.Converters;
 
 import java.util.Iterator;
+import java.util.function.Predicate;
 
 public class ExprExpression<T> implements Expression<T> {
   static {
@@ -123,12 +124,12 @@ public boolean isSingle() {
   }
 
   @Override
-  public boolean check(Event e, Checker<? super T> c, boolean negated) {
+  public boolean check(Event e, Predicate<? super T> c, boolean negated) {
     return SimpleExpression.check(getAll(e), c, negated, getAnd());
   }
 
   @Override
-  public boolean check(Event e, Checker<? super T> c) {
+  public boolean check(Event e, Predicate<? super T> c) {
     return SimpleExpression.check(getAll(e), c, false, getAnd());
   }
 

src/main/java/com/btk5h/skriptmirror/skript/custom/ExprRawExpression.java

@@ -15,7 +15,7 @@
 public class ExprRawExpression extends SimpleExpression<Expression> {
   static {
     Skript.registerExpression(ExprRawExpression.class, Expression.class, ExpressionType.COMBINED,
-        "[the] raw %objects%");
+        "[the] raw [expression] %objects%");
   }
 
   private Expression<?> expr;

src/main/java/com/btk5h/skriptmirror/skript/reflect/ExprJavaCall.java

@@ -2,10 +2,7 @@
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.classes.Changer;
-import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.ExpressionList;
-import ch.njol.skript.lang.ExpressionType;
-import ch.njol.skript.lang.SkriptParser;
+import ch.njol.skript.lang.*;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.skript.registrations.Classes;
 import ch.njol.skript.util.Utils;
@@ -49,6 +46,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -165,10 +163,11 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
         }
 
         if (staticDescriptor.getJavaClass() == null
-          && rawTarget instanceof StructImport.ImportHandler) {
-          staticDescriptor = staticDescriptor.orDefaultClass(
-            ((StructImport.ImportHandler) rawTarget).getJavaType().getJavaClass()
-          );
+          && rawTarget instanceof Literal<?> literal) {
+          Object rawTargetValue = literal.getSingle();
+          if (rawTargetValue instanceof JavaType) {
+            staticDescriptor = staticDescriptor.orDefaultClass(((JavaType) rawTargetValue).getJavaClass());
+          }
         }
 
         if (staticDescriptor.getParameterTypes() != null && type.equals(CallType.FIELD)) {
@@ -253,12 +252,12 @@ public boolean isSingle() {
   }
 
   @Override
-  public boolean check(Event e, Checker<? super T> c, boolean negated) {
+  public boolean check(Event e, Predicate<? super T> c, boolean negated) {
     return SimpleExpression.check(getAll(e), c, negated, getAnd());
   }
 
   @Override
-  public boolean check(Event e, Checker<? super T> c) {
+  public boolean check(Event e, Predicate<? super T> c) {
     return SimpleExpression.check(getAll(e), c, false, getAnd());
   }
 

src/main/java/com/btk5h/skriptmirror/util/SkriptReflection.java

@@ -15,8 +15,11 @@
 import ch.njol.skript.variables.Variables;
 import com.btk5h.skriptmirror.SkriptMirror;
 import org.bukkit.event.Event;
+import org.skriptlang.reflect.syntax.CustomSyntaxStructure;
 import org.skriptlang.reflect.syntax.event.elements.ExprReplacedEventValue;
 import org.skriptlang.skript.lang.script.Script;
+import org.skriptlang.skript.registration.SyntaxInfo;
+import org.skriptlang.skript.registration.SyntaxRegistry;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -29,28 +32,17 @@
 @SuppressWarnings("unchecked")
 public class SkriptReflection {
 
-  private static Field PATTERNS;
   private static Field LOCAL_VARIABLES;
   private static Field NODES;
   private static Method VARIABLES_MAP_COPY;
   private static Field DEFAULT_EXPRESSION;
   private static Field PARSED_VALUE;
-  private static Field EXPRESSIONS;
   private static Field OPTIONS;
 
   static {
     Field _FIELD;
     Method _METHOD;
 
-    try {
-      _FIELD = SyntaxElementInfo.class.getDeclaredField("patterns");
-      _FIELD.setAccessible(true);
-      PATTERNS = _FIELD;
-    } catch (NoSuchFieldException e) {
-      warning("Skript's pattern info field could not be resolved. " +
-          "Custom syntax and imports will not work.");
-    }
-
     try {
       _FIELD = Variables.class.getDeclaredField("localVariables");
       _FIELD.setAccessible(true);
@@ -99,15 +91,6 @@ public class SkriptReflection {
           "therefore and/or warnings won't be suppressed");
     }
 
-    try {
-      _FIELD = Skript.class.getDeclaredField("expressions");
-      _FIELD.setAccessible(true);
-      EXPRESSIONS = _FIELD;
-    } catch (NoSuchFieldException e) {
-      warning("Skript's expressions field could not be resolved, " +
-          "therefore you might get syntax conflict problems");
-    }
-
     try {
       _FIELD = StructOptions.OptionsData.class.getDeclaredField("options");
       _FIELD.setAccessible(true);
@@ -121,17 +104,6 @@ private static void warning(String message) {
     SkriptMirror.getInstance().getLogger().warning(message);
   }
 
-  public static void setPatterns(SyntaxElementInfo<?> info, String[] patterns) {
-    if (PATTERNS == null)
-      return;
-
-    try {
-      PATTERNS.set(info, patterns);
-    } catch (IllegalAccessException e) {
-      e.printStackTrace();
-    }
-  }
-
   /**
    * Sets the local variables of an {@link Event} to the given local variables.
    */
@@ -271,20 +243,6 @@ public static void disableAndOrWarnings() {
     }
   }
 
-  /**
-   * {@return} a list of all of Skript's registered {@link ch.njol.skript.lang.Expression}s.
-   */
-  public static List<ExpressionInfo<?, ?>> getExpressions() {
-    if (EXPRESSIONS == null)
-      return new ArrayList<>();
-
-    try {
-      return (List<ExpressionInfo<?, ?>>) EXPRESSIONS.get(null);
-    } catch (IllegalAccessException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
   /**
    * Gets the modifiable options map from an options data object.
    *