A lot of stuff, should've worked on one thing at a time.

Fixed:
#21
#19
#7
btk5h/skript-mirror#122 (the warning, but that was the only thing wrong with it)
btk5h/skript-mirror#154 (partly, see #22)
Added:
warnings for using features that require consent when no consent is given
cancellability for custom events (see https://skript-mirror-tp.gitbook.io/skript-mirror-tp/advanced/custom-syntax/events#calling-the-event)

Author: TPGamesNL

README.md

@@ -1,4 +1,4 @@
-# skript-mirror(-tp)
+# skript-mirror-tp
 
 This fork of [skript-mirror](https://github.com/btk5h/skript-mirror) aims to fix multiple issues that I believe have been present for too long, and implement some long-wanted features.
 

docs/advanced/custom-syntax/events.md

@@ -87,17 +87,24 @@ If this section is included, you must also [`continue`](./#continue) if you want
 
 ### Calling the event
 
-{% code-tabs %}
-{% code-tabs-item title="Syntax" %}
+You can get an instance of a custom event using the following expression:
 ```text
-call custom event %string% [(with|using) [[event-]values] %-objects%] [[and] [(with|using)] data %-objects%]
+[a] [new] custom event %string% [(with|using) [[event-]values] %-objects%] [[and] [(with|using)] data %-objects%]
 ```
-{% endcode-tabs-item %}
-{% endcode-tabs %}
-
 The first argument should contain the name of the event you want to call. The second argument is a list variable, with each element of the following format: `{list::%type%} = %value%`. The third argument is almost the same, the only difference is that `%type%` is replaced with a string, which is just the index.
 The first list variable is for [the event-values](#option-event-values), while the second is for [the extra data](#extra-data).
 
+You can then call it using the following effect:
+```text
+call [event] %events%
+```
+
+If you want to check if an event has been cancelled, after you've called it, you can use the following condition:
+```text
+%events% (is|are) cancelled
+%events% (isn't|is not|aren't|are not) cancelled
+```
+
 ### Extra data
 
 If the event-values aren't enough for your desire, you can make use of the extra data feature.

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

@@ -1,21 +1,11 @@
 package com.btk5h.skriptmirror;
 
-import ch.njol.skript.Skript;
-import ch.njol.skript.lang.function.*;
-import ch.njol.skript.registrations.Classes;
+import ch.njol.skript.lang.function.Function;
+import ch.njol.skript.lang.function.Functions;
 import org.eclipse.jdt.annotation.Nullable;
 
 public class FunctionWrapper {
 
-  private static final Function<?> NO_OP_FUNCTION = new JavaFunction<Object>("$noop", new Parameter[0],
-    Classes.getExactClassInfo(Object.class), true) {
-    @Nullable
-    @Override
-    public Object[] execute(FunctionEvent e, Object[][] params) {
-      return null;
-    }
-  };
-
   private final String name;
   private final Object[] arguments;
 
@@ -32,13 +22,9 @@ public Object[] getArguments() {
     return arguments;
   }
 
+  @Nullable
   public Function<?> getFunction() {
-    Function<?> function = Functions.getFunction(name);
-    if (function == null) {
-      Skript.warning(String.format("The function '%s' could not be resolved.", name));
-      return NO_OP_FUNCTION;
-    }
-    return function;
+    return Functions.getFunction(name);
   }
 
 }

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

@@ -2,9 +2,12 @@
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.SkriptAddon;
+import ch.njol.skript.SkriptConfig;
+import ch.njol.skript.config.Option;
 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 {
@@ -28,6 +31,18 @@ public void onEnable() {
       LibraryLoader.loadLibraries(dataFolder);
 
       ParseOrderWorkarounds.reorderSyntax();
+
+      // Disable *all* and/or warnings
+      Option<Boolean> option = SkriptConfig.disableMissingAndOrWarnings;
+      if (!option.value()) {
+        try {
+          Field field = Option.class.getDeclaredField("parsedValue");
+          field.setAccessible(true);
+          field.set(option, true);
+        } catch (NoSuchFieldException | IllegalAccessException e) {
+          e.printStackTrace();
+        }
+      }
     } catch (IOException e) {
       e.printStackTrace();
     }

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

@@ -1,13 +1,13 @@
 package com.btk5h.skriptmirror.skript;
 
+import ch.njol.skript.ScriptLoader;
 import ch.njol.skript.Skript;
 import ch.njol.skript.config.SectionNode;
 import ch.njol.skript.lang.Condition;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.TriggerItem;
 import ch.njol.skript.log.SkriptLogger;
-import ch.njol.skript.variables.Variables;
 import ch.njol.util.Kleenean;
 import com.btk5h.skriptmirror.ObjectWrapper;
 import com.btk5h.skriptmirror.SkriptMirror;
@@ -48,15 +48,16 @@ private boolean isTruthy(Object o) {
   @Override
   protected TriggerItem walk(Event e) {
     if (isAsynchronous) {
-      Object localVariables = Variables.removeLocals(e);
+      Object localVariables = SkriptReflection.getLocals(e);
       CompletableFuture.runAsync(() -> {
         SkriptReflection.copyVariablesMapFromMap(localVariables, e);
         check(e);
       }, threadPool)
         .thenAccept(res -> Bukkit.getScheduler().runTask(SkriptMirror.getInstance(), () -> {
-          if (getNext() != null) {
+          if (getNext() != null)
             TriggerItem.walk(getNext(), e);
-          }
+
+          SkriptReflection.removeLocals(e);
         }));
       return null;
     }
@@ -85,6 +86,8 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
       Skript.error("Asynchronous java calls may not be used as conditions.");
       return false;
     }
+    if (isAsynchronous)
+      ScriptLoader.hasDelayBefore = Kleenean.TRUE;
 
     return SkriptUtil.canInitSafely(arg);
   }

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

@@ -53,6 +53,7 @@ public String toString(Event e, boolean debug) {
   public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed,
                       SkriptParser.ParseResult parseResult) {
     if (!Consent.Feature.DEFERRED_PARSING.hasConsent(SkriptUtil.getCurrentScript())) {
+      Skript.error("This feature requires consent, because it is experimental.");
       return false;
     }
 
@@ -83,7 +84,7 @@ private Condition getParsedCondition() {
       scriptLoaderState.applyToCurrentState();
       parsedStatement = Condition.parse(statement,
           String.format("Could not parse condition at runtime: %s", statement));
-      
+
       if (parsedStatement == null) {
         return null;
       }

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

@@ -1,11 +1,11 @@
 package com.btk5h.skriptmirror.skript;
 
+import ch.njol.skript.ScriptLoader;
 import ch.njol.skript.Skript;
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.TriggerItem;
-import ch.njol.skript.variables.Variables;
 import ch.njol.util.Kleenean;
 import com.btk5h.skriptmirror.SkriptMirror;
 import com.btk5h.skriptmirror.skript.reflect.ExprJavaCall;
@@ -37,16 +37,17 @@ protected void execute(Event e) {
   @Override
   protected TriggerItem walk(Event e) {
     if (isAsynchronous) {
-      Object localVariables = Variables.removeLocals(e);
+      Object localVariables = SkriptReflection.getLocals(e);
       CompletableFuture.runAsync(() -> {
         SkriptReflection.copyVariablesMapFromMap(localVariables, e);
         execute(e);
       }, threadPool)
-          .thenAccept(res -> Bukkit.getScheduler().runTask(SkriptMirror.getInstance(), () -> {
-            if (getNext() != null) {
-              TriggerItem.walk(getNext(), e);
-            }
-          }));
+        .thenAccept(res -> Bukkit.getScheduler().runTask(SkriptMirror.getInstance(), () -> {
+          if (getNext() != null)
+            TriggerItem.walk(getNext(), e);
+
+          SkriptReflection.removeLocals(e);
+        }));
       return null;
     }
     return super.walk(e);
@@ -67,6 +68,8 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
     }
 
     isAsynchronous = (parseResult.mark & 1) == 1;
+    if (isAsynchronous)
+      ScriptLoader.hasDelayBefore = Kleenean.TRUE;
     return SkriptUtil.canInitSafely(arg);
   }
 }

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

@@ -1,9 +1,7 @@
 package com.btk5h.skriptmirror.skript.custom;
 
 import ch.njol.skript.Skript;
-import ch.njol.skript.config.EntryNode;
-import ch.njol.skript.config.Node;
-import ch.njol.skript.config.SectionNode;
+import ch.njol.skript.config.*;
 import ch.njol.skript.lang.*;
 import ch.njol.skript.log.SkriptLogger;
 import com.btk5h.skriptmirror.util.SkriptReflection;
@@ -187,7 +185,7 @@ protected static boolean handleEntriesAndSections(SectionNode node,
                                                     Predicate<SectionNode> sectionHandler) {
     boolean ok = true;
 
-    for (Node subNode : node) {
+    for (Node subNode : SkriptReflection.getNodes(node)) {
       SkriptLogger.setNode(subNode);
 
       if (subNode instanceof EntryNode) {
@@ -202,8 +200,8 @@ protected static boolean handleEntriesAndSections(SectionNode node,
               subNode.getKey()));
           ok = false;
         }
-      } else {
-        throw new IllegalStateException();
+      } else if (subNode instanceof InvalidNode || !(subNode instanceof VoidNode )) {
+        ok = false;
       }
 
       SkriptLogger.setNode(null);

src/main/java/com/btk5h/skriptmirror/skript/custom/condition/CustomCondition.java

@@ -5,7 +5,6 @@
 import ch.njol.skript.Skript;
 import ch.njol.skript.lang.*;
 import ch.njol.skript.lang.util.SimpleLiteral;
-import ch.njol.skript.variables.Variables;
 import ch.njol.util.Kleenean;
 import com.btk5h.skriptmirror.skript.custom.SyntaxParseEvent;
 import com.btk5h.skriptmirror.util.SkriptReflection;
@@ -90,7 +89,7 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
       // Because of link below, Trigger#execute removes local variables
       // https://github.com/SkriptLang/Skript/commit/a6661c863bae65e96113b69bebeaab51d814e2b9
       TriggerItem.walk(parseHandler, event);
-      variablesMap = Variables.removeLocals(event);
+      variablesMap = SkriptReflection.removeLocals(event);
 
       return event.isMarkedContinue();
     }

src/main/java/com/btk5h/skriptmirror/skript/custom/effect/CustomEffect.java

@@ -3,7 +3,6 @@
 import ch.njol.skript.ScriptLoader;
 import ch.njol.skript.Skript;
 import ch.njol.skript.lang.*;
-import ch.njol.skript.variables.Variables;
 import ch.njol.util.Kleenean;
 import com.btk5h.skriptmirror.skript.custom.SyntaxParseEvent;
 import com.btk5h.skriptmirror.util.SkriptReflection;
@@ -80,7 +79,7 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
       // Because of link below, Trigger#execute removes local variables
       // https://github.com/SkriptLang/Skript/commit/a6661c863bae65e96113b69bebeaab51d814e2b9
       TriggerItem.walk(parseHandler, event);
-      variablesMap = Variables.removeLocals(event);
+      variablesMap = SkriptReflection.removeLocals(event);
 
       return event.isMarkedContinue();
     }