Fix issue with matched pattern, parse mark, expr-n and regex

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.2.0.jar
+          path: build/libs/skript-reflect-2.2.1-alpha1.jar

build.gradle

@@ -1,7 +1,7 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
 group 'com.btk5h.skript-mirror'
-version '2.2.0'
+version '2.2.1-alpha1'
 
 apply plugin: 'java'
 

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

@@ -175,12 +175,12 @@ public String toString(Event e, boolean debug) {
   public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed,
                       SkriptParser.ParseResult parseResult) {
     if (!ScriptLoader.isCurrentEvent(
-        EffectTriggerEvent.class,
-        ExpressionGetEvent.class,
-        ExpressionChangeEvent.class,
-        ConditionCheckEvent.class,
-        SyntaxParseEvent.class,
-        EventTriggerEvent.class
+      SyntaxParseEvent.class,
+      ConditionCheckEvent.class,
+      EffectTriggerEvent.class,
+      EventTriggerEvent.class,
+      ExpressionChangeEvent.class,
+      ExpressionGetEvent.class
     )) {
       Skript.error("The expression 'expression' may only be used in a custom syntax.",
           ErrorQuality.SEMANTIC_ERROR);

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

@@ -10,6 +10,7 @@
 import ch.njol.util.Kleenean;
 import com.btk5h.skriptmirror.skript.custom.condition.ConditionCheckEvent;
 import com.btk5h.skriptmirror.skript.custom.effect.EffectTriggerEvent;
+import com.btk5h.skriptmirror.skript.custom.event.EventTriggerEvent;
 import com.btk5h.skriptmirror.skript.custom.expression.ExpressionChangeEvent;
 import com.btk5h.skriptmirror.skript.custom.expression.ExpressionGetEvent;
 import org.bukkit.event.Event;
@@ -43,10 +44,12 @@ public String toString(Event e, boolean debug) {
   public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed,
                       SkriptParser.ParseResult parseResult) {
     if (!ScriptLoader.isCurrentEvent(
-        EffectTriggerEvent.class,
-        ExpressionGetEvent.class,
-        ExpressionChangeEvent.class,
-        ConditionCheckEvent.class
+      SyntaxParseEvent.class,
+      ConditionCheckEvent.class,
+      EffectTriggerEvent.class,
+      EventTriggerEvent.class,
+      ExpressionChangeEvent.class,
+      ExpressionGetEvent.class
     )) {
       Skript.error("The matched pattern may only be used in custom syntax.", ErrorQuality.SEMANTIC_ERROR);
       return false;

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

@@ -10,10 +10,13 @@
 import ch.njol.util.Kleenean;
 import com.btk5h.skriptmirror.skript.custom.condition.ConditionCheckEvent;
 import com.btk5h.skriptmirror.skript.custom.effect.EffectTriggerEvent;
+import com.btk5h.skriptmirror.skript.custom.event.EventTriggerEvent;
 import com.btk5h.skriptmirror.skript.custom.expression.ExpressionChangeEvent;
 import com.btk5h.skriptmirror.skript.custom.expression.ExpressionGetEvent;
 import org.bukkit.event.Event;
 
+import java.util.Arrays;
+
 public class ExprParseMark extends SimpleExpression<Number> {
   static {
     Skript.registerExpression(ExprParseMark.class, Number.class, ExpressionType.SIMPLE,
@@ -44,13 +47,14 @@ public String toString(Event e, boolean debug) {
   public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed,
                       SkriptParser.ParseResult parseResult) {
     if (!ScriptLoader.isCurrentEvent(
-        EffectTriggerEvent.class,
-        ExpressionGetEvent.class,
-        ExpressionChangeEvent.class,
-        ConditionCheckEvent.class
+      SyntaxParseEvent.class,
+      ConditionCheckEvent.class,
+      EffectTriggerEvent.class,
+      EventTriggerEvent.class,
+      ExpressionChangeEvent.class,
+      ExpressionGetEvent.class
     )) {
-      Skript.error("The parser mark may only be used in custom syntax.",
-          ErrorQuality.SEMANTIC_ERROR);
+      Skript.error("The parser mark may only be used in custom syntax.", ErrorQuality.SEMANTIC_ERROR);
       return false;
     }
     return true;

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

@@ -11,6 +11,7 @@
 import ch.njol.util.Kleenean;
 import com.btk5h.skriptmirror.skript.custom.condition.ConditionCheckEvent;
 import com.btk5h.skriptmirror.skript.custom.effect.EffectTriggerEvent;
+import com.btk5h.skriptmirror.skript.custom.event.EventTriggerEvent;
 import com.btk5h.skriptmirror.skript.custom.expression.ExpressionChangeEvent;
 import com.btk5h.skriptmirror.skript.custom.expression.ExpressionGetEvent;
 import org.bukkit.event.Event;
@@ -62,10 +63,12 @@ public String toString(Event e, boolean debug) {
   public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed,
                       SkriptParser.ParseResult parseResult) {
     if (!ScriptLoader.isCurrentEvent(
+      SyntaxParseEvent.class,
+      ConditionCheckEvent.class,
       EffectTriggerEvent.class,
-      ExpressionGetEvent.class,
+      EventTriggerEvent.class,
       ExpressionChangeEvent.class,
-      ConditionCheckEvent.class
+      ExpressionGetEvent.class
     )) {
       Skript.error("The parsed regular expression may only be used in custom syntax.",
         ErrorQuality.SEMANTIC_ERROR);