preloading, see docs (advanced > experiments)

remove bugs
add bugs

Author: TPGamesNL

.github/workflows/gradle.yml

@@ -22,4 +22,4 @@ jobs:
         run: ./gradlew build
       - uses: actions/upload-artifact@master
         with:
-          path: build/libs/skript-reflect-2.1.0.jar
+          path: build/libs/skript-reflect-2.2-alpha1.jar

build.gradle

@@ -1,12 +1,10 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
 group 'com.btk5h.skript-mirror'
-version '2.1.0'
+version '2.2-alpha1'
 
 apply plugin: 'java'
 
-sourceCompatibility = 1.8
-
 repositories {
   mavenCentral()
   maven {

docs/advanced/experiments.md

@@ -26,3 +26,21 @@ Deferred parsing allows you to prefix any line with `(parse[d] later)` to defer
 This should only be used when two custom syntaxes refer to each other. Other issues should be resolved by reordering custom syntax definitions and ensuring that libraries containing custom syntax load before other scripts.
 {% endhint %}
 
+
+## Preloading
+When preloading is enabled in `config.yml`, custom syntax will be available from any scripts, independent of file names.
+Preloading is only available from Skript 2.5-alpha6+, using skript-reflect 2.2-alpha1 or above.
+
+There is one case for which custom syntax can't be preloaded, that is when it has a `parse` section. `parse` sections
+can't be used in preloadable syntax, so to still allow for custom syntax to run code when being parsed, there are the
+`safe parse` sections. These sections have the same purpose as normal `parse` sections, with a few differences:
+- In safe parse sections
+  - Functions can't be used.
+  - Options (including computed options) can't be used.
+  - Some imports can't be used (if they contain options for example).
+
+Because of these differences, custom syntax with `safe parse` sections are preloadable.
+
+{% hint style="warning" %}
+Be careful when using custom syntax in `on script load` events, as the custom syntax might not have been fully parsed yet.
+{% endhint %}

docs/basics/reading-javadocs.md

@@ -3,8 +3,7 @@
 Most public APIs and libraries offer documentation in the form of Javadocs. Javadocs outline what features of a library are publicly accessible to developers.
 
 Here are a few links to some commonly referenced Javadocs:
-[Java SE 8 Javadocs](https://docs.oracle.com/javase/8/docs/api/overview-summary.html)
-[Spigot Javadocs]https://hub.spigotmc.org/javadocs/spigot/overview-summary.html)
+[Java SE 8 Javadocs](https://docs.oracle.com/javase/8/docs/api/overview-summary.html), [Spigot Javadocs](https://hub.spigotmc.org/javadocs/spigot/overview-summary.html)
 
 ## Fully qualified names
 

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

@@ -2,14 +2,19 @@
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.effects.EffReturn;
+import ch.njol.skript.lang.ExpressionInfo;
 import ch.njol.skript.lang.SyntaxElement;
 import ch.njol.skript.lang.SyntaxElementInfo;
 import com.btk5h.skriptmirror.skript.EffExpressionStatement;
+import com.btk5h.skriptmirror.skript.custom.ExprMatchedPattern;
 import com.btk5h.skriptmirror.skript.custom.condition.CustomCondition;
 import com.btk5h.skriptmirror.skript.custom.effect.CustomEffect;
+import com.btk5h.skriptmirror.skript.custom.expression.CustomExpression;
+import com.btk5h.skriptmirror.util.SkriptReflection;
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
 import java.util.Optional;
 
 /**
@@ -20,13 +25,18 @@
  * guarantee that another addon's syntax will be parsed before skript-reflect.
  */
 public class ParseOrderWorkarounds {
-  private static String[] PARSE_ORDER = {
+  private static final String[] PARSE_ORDER = {
     EffExpressionStatement.class.getCanonicalName(),
     CustomEffect.class.getCanonicalName(),
     CustomCondition.class.getCanonicalName(),
+    CustomExpression.class.getCanonicalName(),
     "com.w00tmast3r.skquery.elements.conditions.CondBoolean",
     "com.pie.tlatoani.Miscellaneous.CondBoolean",
-    EffReturn.class.getCanonicalName()
+    "us.tlatoani.tablisknu.core.base.CondBoolean",
+    "com.pie.tlatoani.CustomEvent.EvtCustomEvent",
+    EffReturn.class.getCanonicalName(),
+    ExprMatchedPattern.class.getCanonicalName(),
+    "ch.njol.skript.effects.EffContinue"
   };
 
   public static void reorderSyntax() {
@@ -35,6 +45,7 @@ public static void reorderSyntax() {
         ensureLast(Skript.getStatements(), c);
         ensureLast(Skript.getConditions(), c);
         ensureLast(Skript.getEffects(), c);
+        ensureLastExpression(c);
       });
   }
 
@@ -49,4 +60,20 @@ private static <E extends SyntaxElement> void ensureLast(Collection<SyntaxElemen
       elements.add(elementInfo);
     });
   }
+
+  private static void ensureLastExpression(String element) {
+    List<ExpressionInfo<?, ?>> elements = SkriptReflection.getExpressions();
+    if (elements == null)
+      return;
+
+    Optional<ExpressionInfo<?, ?>> optionalExpressionInfo = elements.stream()
+      .filter(info -> info.c.getName().equals(element))
+      .findFirst();
+
+    optionalExpressionInfo.ifPresent(elementInfo -> {
+      elements.remove(elementInfo);
+      elements.add(elementInfo);
+    });
+  }
+
 }

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

@@ -2,13 +2,10 @@
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.SkriptAddon;
-import ch.njol.skript.SkriptConfig;
-import ch.njol.skript.config.Option;
 import com.btk5h.skriptmirror.util.SkriptReflection;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.IOException;
-import java.lang.reflect.Field;
 import java.nio.file.Path;
 
 public class SkriptMirror extends JavaPlugin {
@@ -25,25 +22,26 @@ public SkriptMirror() {
 
   @Override
   public void onEnable() {
+    saveDefaultConfig();
+
     try {
       getAddonInstance().loadClasses("com.btk5h.skriptmirror.skript");
 
       Path dataFolder = SkriptMirror.getInstance().getDataFolder().toPath();
       LibraryLoader.loadLibraries(dataFolder);
-
-      ParseOrderWorkarounds.reorderSyntax();
-
-      // Disable *all* and/or warnings
-      SkriptReflection.disableAndOrWarnings();
     } catch (IOException e) {
       e.printStackTrace();
     }
+
+    ParseOrderWorkarounds.reorderSyntax();
+
+    // Disable *all* and/or warnings
+    SkriptReflection.disableAndOrWarnings();
   }
 
   public static SkriptAddon getAddonInstance() {
     if (addonInstance == null) {
-      addonInstance = Skript.registerAddon(getInstance())
-          .setLanguageFileDirectory("lang");
+      addonInstance = Skript.registerAddon(getInstance()).setLanguageFileDirectory("lang");
     }
     return addonInstance;
   }
@@ -54,4 +52,5 @@ public static SkriptMirror getInstance() {
     }
     return instance;
   }
+
 }

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

@@ -37,6 +37,7 @@ protected void execute(Event e) {
   @Override
   protected TriggerItem walk(Event e) {
     if (isAsynchronous) {
+      // TODO how to implement async, Bukkit or just other Java (CondExpressionStatement#walk(Event))
       Object localVariables = SkriptReflection.getLocals(e);
       CompletableFuture.runAsync(() -> {
         SkriptReflection.putLocals(localVariables, e);

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

@@ -1,15 +1,14 @@
 package com.btk5h.skriptmirror.skript;
 
-import org.bukkit.event.Event;
-
-import java.util.Arrays;
-
 import ch.njol.skript.classes.Changer;
 import ch.njol.skript.expressions.base.PropertyExpression;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+
+import java.util.Arrays;
 
 public class ExprBits extends SimpleExpression<Number> {
   static {

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

@@ -8,7 +8,10 @@
 import ch.njol.skript.registrations.Classes;
 import ch.njol.skript.registrations.Converters;
 import ch.njol.yggdrasil.Fields;
-import com.btk5h.skriptmirror.*;
+import com.btk5h.skriptmirror.JavaType;
+import com.btk5h.skriptmirror.LibraryLoader;
+import com.btk5h.skriptmirror.Null;
+import com.btk5h.skriptmirror.ObjectWrapper;
 import com.btk5h.skriptmirror.skript.custom.CustomImport;
 import com.btk5h.skriptmirror.skript.reflect.sections.Section;
 import com.btk5h.skriptmirror.util.SkriptUtil;

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

@@ -0,0 +1,7 @@
+package com.btk5h.skriptmirror.skript.custom;
+
+public interface Continuable {
+
+  void markContinue();
+
+}