Rewrite Custom Syntax

build.gradle

@@ -34,6 +34,6 @@ tasks.withType(JavaCompile).configureEach {
 
 dependencies {
 	compileOnly "io.papermc.paper:paper-api:26.1.2.build.+"
-	compileOnly "com.github.SkriptLang:Skript:2.15.2"
-	compileOnly "org.ow2.asm:asm:9.9"
+	compileOnly "com.github.SkriptLang:Skript:2.15.3"
+	compileOnly "com.github.SkriptLang:Skript:dev~patch-SNAPSHOT"
 }

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

@@ -1,24 +1,11 @@
 package com.btk5h.skriptmirror;
 
-import ch.njol.skript.Skript;
-import ch.njol.skript.effects.EffReturn;
-import org.skriptlang.reflect.syntax.CustomSyntaxStructure;
-import org.skriptlang.reflect.syntax.condition.elements.CustomCondition;
-import org.skriptlang.reflect.syntax.condition.elements.StructCustomCondition;
-import org.skriptlang.reflect.syntax.effect.elements.CustomEffect;
-import org.skriptlang.reflect.syntax.effect.elements.StructCustomEffect;
-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.reflect.syntax.expression.elements.StructCustomExpression;
 import org.skriptlang.skript.bukkit.registration.BukkitSyntaxInfos;
 import org.skriptlang.skript.registration.SyntaxInfo;
 import org.skriptlang.skript.registration.SyntaxRegistry;
 import org.skriptlang.skript.util.Priority;
 
-import javax.naming.ServiceUnavailableException;
-import java.util.Collection;
 import java.util.Optional;
 import java.util.function.Predicate;
 
@@ -36,15 +23,10 @@ public class ParseOrderWorkarounds {
 
 	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",
 		"us.tlatoani.tablisknu.core.base.CondBoolean",
 		"com.pie.tlatoani.CustomEvent.EvtCustomEvent",
-		EffReturn.class.getCanonicalName(),
-		ExprMatchedPattern.class.getCanonicalName(),
 		"ch.njol.skript.effects.EffContinue",
 		"com.ankoki.skjade.elements.conditions.CondBoolean"
 	};
@@ -69,19 +51,6 @@ private static <T> void ensureLast(SyntaxRegistry.Key<? extends SyntaxInfo<? ext
 			syntaxRegistry.unregister((SyntaxRegistry.Key) elementKey, value);
 			var newInfo = value.toBuilder().priority(POSITION).build();
 			syntaxRegistry.register((SyntaxRegistry.Key) elementKey, newInfo);
-
-			// need to update custom syntax references
-			CustomSyntaxStructure.DataTracker<?> tracker = null;
-			if (elementKey == (SyntaxRegistry.Key) SyntaxRegistry.EFFECT) {
-				tracker = StructCustomEffect.dataTracker;
-			} else if (elementKey == (SyntaxRegistry.Key) SyntaxRegistry.CONDITION) {
-				tracker = StructCustomCondition.dataTracker;
-			} else if (elementKey == (SyntaxRegistry.Key) SyntaxRegistry.EXPRESSION) {
-				tracker = StructCustomExpression.dataTracker;
-			}
-			if (tracker != null && tracker.getInfo() == value) {
-				tracker.setInfo(newInfo);
-			}
 		});
 	}
 

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

@@ -1,10 +1,10 @@
 package com.btk5h.skriptmirror;
 
 import ch.njol.skript.Skript;
-import ch.njol.skript.SkriptAddon;
 import ch.njol.skript.classes.ClassInfo;
 import ch.njol.skript.registrations.Classes;
 import ch.njol.skript.util.Version;
+import org.skriptlang.reflect.syntax.custom.CustomSyntaxModule;
 import com.btk5h.skriptmirror.skript.CondExpressionStatement;
 import com.btk5h.skriptmirror.skript.EffExpressionStatement;
 import com.btk5h.skriptmirror.skript.reflect.ExprJavaCall;
@@ -13,15 +13,16 @@
 import com.btk5h.skriptmirror.util.SkriptReflection;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
-import org.skriptlang.reflect.syntax.condition.elements.StructCustomCondition;
-import org.skriptlang.reflect.syntax.effect.elements.StructCustomEffect;
-import org.skriptlang.reflect.syntax.event.elements.ExprCustomEventValue;
-import org.skriptlang.reflect.syntax.event.elements.StructCustomEvent;
-import org.skriptlang.reflect.syntax.expression.elements.StructCustomExpression;
+import org.skriptlang.reflect.syntax.custom.condition.elements.StructCustomCondition;
+import org.skriptlang.reflect.syntax.custom.effect.elements.StructCustomEffect;
+import org.skriptlang.reflect.syntax.custom.event.elements.StructCustomEvent;
+import org.skriptlang.reflect.syntax.custom.expression.elements.StructCustomExpression;
+import org.skriptlang.skript.addon.SkriptAddon;
 import org.skriptlang.skript.lang.comparator.Comparators;
 import org.skriptlang.skript.lang.comparator.Relation;
 import org.skriptlang.skript.registration.SyntaxInfo;
 import org.skriptlang.skript.registration.SyntaxRegistry;
+import org.skriptlang.skript.util.ClassLoader;
 import org.skriptlang.skript.util.Priority;
 
 import java.io.IOException;
@@ -65,12 +66,12 @@ public void onEnable() {
 		}
 
 		try {
-			getAddonInstance()
-				.loadClasses("com.btk5h.skriptmirror.skript")
-				.loadClasses("org.skriptlang.reflect", "syntax", "java.elements");
+			ClassLoader.loadClasses(SkriptMirror.class, getFile(), "com.btk5h.skriptmirror.skript");
+			ClassLoader.loadClasses(SkriptMirror.class, getFile(), "org.skriptlang.reflect", "java.elements");
+
+			getAddonInstance().loadModules(new CustomSyntaxModule());
 
 			SyntaxRegistry registry = addonInstance.syntaxRegistry();
-			ExprCustomEventValue.register(registry);
 			ExprJavaCall.register(registry);
 			CondExpressionStatement.register(registry);
 			EffExpressionStatement.register(registry);
@@ -131,7 +132,8 @@ public void onEnable() {
 
 	public static SkriptAddon getAddonInstance() {
 		if (addonInstance == null) {
-			addonInstance = Skript.registerAddon(getInstance()).setLanguageFileDirectory("lang");
+			addonInstance = Skript.instance().registerAddon(SkriptMirror.class, "skript-reflect");
+			addonInstance.localizer().setSourceDirectories("lang", null);
 		}
 		return addonInstance;
 	}