New Registration API

src/main/java/ch/njol/skript/SkriptAddon.java

@@ -29,11 +29,16 @@
 import ch.njol.skript.localization.Language;
 import ch.njol.skript.util.Utils;
 import ch.njol.skript.util.Version;
+import org.jetbrains.annotations.ApiStatus;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * Utility class for Skript addons. Use {@link Skript#registerAddon(JavaPlugin)} to create a SkriptAddon instance for your plugin.
+ * @deprecated Use {@link org.skriptlang.skript.addon.SkriptAddon}.
  */
-public final class SkriptAddon {
+@Deprecated
+@ApiStatus.NonExtendable
+public class SkriptAddon implements org.skriptlang.skript.addon.SkriptAddon {
 
 	public final JavaPlugin plugin;
 	public final Version version;
@@ -126,4 +131,21 @@ public File getFile() {
 		return file;
 	}
 
+	@Override
+	public String name() {
+		return getName();
+	}
+
+	@Override
+	@NotNull
+	public String dataFileDirectory() {
+		return plugin.getDataFolder().getAbsolutePath();
+	}
+
+	@Override
+	@Nullable
+	public String languageFileDirectory() {
+		return getLanguageFileDirectory();
+	}
+
 }

src/main/java/ch/njol/skript/SkriptCommand.java

@@ -41,7 +41,9 @@
 import org.bukkit.command.CommandSender;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.PluginDescriptionFile;
+import org.bukkit.plugin.java.JavaPlugin;
 import org.eclipse.jdt.annotation.Nullable;
+import org.skriptlang.skript.addon.SkriptAddon;
 import org.skriptlang.skript.lang.script.Script;
 
 import java.io.File;
@@ -369,10 +371,10 @@ else if (args[0].equalsIgnoreCase("info")) {
 					info(sender, "info.version", Skript.getVersion());
 				}
 
-				Collection<SkriptAddon> addons = Skript.getAddons();
+				Collection<SkriptAddon> addons = Skript.instance().addons();
 				info(sender, "info.addons", addons.isEmpty() ? "None" : "");
 				for (SkriptAddon addon : addons) {
-					PluginDescriptionFile desc = addon.plugin.getDescription();
+					PluginDescriptionFile desc = JavaPlugin.getProvidingPlugin(addon.getClass()).getDescription();
 					String web = desc.getWebsite();
 					Skript.info(sender, " - " + desc.getFullName() + (web != null ? " (" + web + ")" : ""));
 				}

src/main/java/ch/njol/skript/lang/ExpressionInfo.java

@@ -52,4 +52,5 @@ public Class<T> getReturnType() {
 	public ExpressionType getExpressionType() {
 		return expressionType;
 	}
+
 }

src/main/java/ch/njol/skript/lang/SkriptEvent.java

@@ -26,12 +26,13 @@
 import ch.njol.skript.events.EvtClick;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.structures.StructEvent.EventData;
-import org.skriptlang.skript.lang.script.Script;
-import org.skriptlang.skript.lang.entry.EntryContainer;
-import org.skriptlang.skript.lang.structure.Structure;
 import org.bukkit.event.Event;
 import org.bukkit.event.EventPriority;
 import org.eclipse.jdt.annotation.Nullable;
+import org.skriptlang.skript.bukkit.registration.BukkitInfos;
+import org.skriptlang.skript.lang.entry.EntryContainer;
+import org.skriptlang.skript.lang.script.Script;
+import org.skriptlang.skript.lang.structure.Structure;
 
 import java.util.List;
 import java.util.Locale;
@@ -209,31 +210,12 @@ public boolean canExecuteAsynchronously() {
 	/**
 	 * Fixes patterns in event by modifying every {@link ch.njol.skript.patterns.TypePatternElement}
 	 * to be nullable.
+	 * 
+	 * @deprecated Use {@link BukkitInfos#fixPattern(String)}
 	 */
+	@Deprecated
 	public static String fixPattern(String pattern) {
-		char[] chars = pattern.toCharArray();
-		StringBuilder stringBuilder = new StringBuilder();
-
-		boolean inType = false;
-		for (int i = 0; i < chars.length; i++) {
-			char c = chars[i];
-			stringBuilder.append(c);
-
-			if (c == '%') {
-				// toggle inType
-				inType = !inType;
-
-				// add the dash character if it's not already present
-				// a type specification can have two prefix characters for modification
-				if (inType && i + 2 < chars.length && chars[i + 1] != '-' && chars[i + 2] != '-')
-					stringBuilder.append('-');
-			} else if (c == '\\' && i + 1 < chars.length) {
-				// Make sure we don't toggle inType for escape percentage signs
-				stringBuilder.append(chars[i + 1]);
-				i++;
-			}
-		}
-		return stringBuilder.toString();
+		return BukkitInfos.fixPattern(pattern);
 	}
 
 	@Nullable

src/main/java/ch/njol/skript/lang/SkriptEventInfo.java

@@ -18,14 +18,13 @@
  */
 package ch.njol.skript.lang;
 
-import java.util.Locale;
-
-import org.skriptlang.skript.lang.structure.StructureInfo;
+import ch.njol.skript.SkriptAPIException;
 import org.bukkit.event.Event;
 import org.bukkit.event.player.PlayerInteractAtEntityEvent;
 import org.eclipse.jdt.annotation.Nullable;
+import org.skriptlang.skript.lang.structure.StructureInfo;
 
-import ch.njol.skript.SkriptAPIException;
+import java.util.Locale;
 
 public final class SkriptEventInfo<E extends SkriptEvent> extends StructureInfo<E> {
 
@@ -205,4 +204,5 @@ public String[] getRequiredPlugins() {
 	public String getDocumentationID() {
 		return documentationID;
 	}
+
 }

src/main/java/ch/njol/skript/lang/SyntaxElementInfo.java

@@ -18,29 +18,39 @@
  */
 package ch.njol.skript.lang;
 
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Contract;
+import org.skriptlang.skript.bukkit.registration.BukkitInfos;
+import org.skriptlang.skript.registration.SyntaxInfo;
+import org.skriptlang.skript.lang.structure.StructureInfo;
+
 import java.util.Arrays;
 
 /**
- * @author Peter Güttinger
+ * @deprecated Use {@link SyntaxInfo}
  * @param <E> the syntax element this info is for
  */
+@Deprecated
 public class SyntaxElementInfo<E extends SyntaxElement> {
 
+	@Deprecated
 	public final Class<E> c;
+	@Deprecated
 	public final String[] patterns;
+	@Deprecated
 	public final String originClassPath;
 
-	public SyntaxElementInfo(final String[] patterns, final Class<E> c, final String originClassPath) throws IllegalArgumentException {
+	public SyntaxElementInfo(String[] patterns, Class<E> elementClass, String originClassPath) throws IllegalArgumentException {
 		this.patterns = patterns;
-		this.c = c;
+		this.c = elementClass;
 		this.originClassPath = originClassPath;
 		try {
-			c.getConstructor();
+			elementClass.getConstructor();
 //			if (!c.getDeclaredConstructor().isAccessible())
 //				throw new IllegalArgumentException("The nullary constructor of class "+c.getName()+" is not public");
 		} catch (final NoSuchMethodException e) {
 			// throwing an Exception throws an (empty) ExceptionInInitializerError instead, thus an Error is used
-			throw new Error(c + " does not have a public nullary constructor", e);
+			throw new Error(elementClass + " does not have a public nullary constructor", e);
 		} catch (final SecurityException e) {
 			throw new IllegalStateException("Skript cannot run properly because a security manager is blocking it!");
 		}
@@ -69,4 +79,46 @@ public String[] getPatterns() {
 	public String getOriginClassPath() {
 		return originClassPath;
 	}
+
+	@SuppressWarnings("unchecked")
+	@Contract("_ -> new")
+	public static <I extends SyntaxElementInfo<E>, E extends SyntaxElement> I fromModern(SyntaxInfo<? extends E> info) {
+		if (info instanceof BukkitInfos.Event) {
+			BukkitInfos.Event<?> event = (BukkitInfos.Event<?>) info;
+
+			// We must first go back to the raw input
+			String rawName = event.name().startsWith("On ")
+					? event.name().substring(3)
+					: "*" + event.name();
+			SkriptEventInfo<?> eventInfo = new SkriptEventInfo<>(
+					rawName, event.patterns().toArray(new String[0]),
+					event.type(), event.origin().name(),
+					(Class<? extends Event>[]) event.events().toArray(new Class<?>[0])
+			).since(event.since())
+					.documentationID(event.documentationId())
+					.description(event.description().toArray(new String[0]))
+					.examples(event.examples().toArray(new String[0]))
+					.keywords(event.keywords().toArray(new String[0]))
+					.requiredPlugins(event.requiredPlugins().toArray(new String[0]));
+
+			return (I) eventInfo;
+		} else if (info instanceof SyntaxInfo.Structure) {
+			SyntaxInfo.Structure<?> structure = (SyntaxInfo.Structure<?>) info;
+			return (I) new StructureInfo<>(structure.patterns().toArray(new String[0]), structure.type(),
+					structure.origin().name(), structure.entryValidator());
+		} else if (info instanceof SyntaxInfo.Expression) {
+			return (I) fromModernExpression((SyntaxInfo.Expression<?, ?>) info);
+		}
+
+		return (I) new SyntaxElementInfo<>(info.patterns().toArray(new String[0]), info.type(), info.origin().name());
+	}
+
+	@Contract("_ -> new")
+	private static <E extends Expression<R>, R> ExpressionInfo<E, R> fromModernExpression(SyntaxInfo.Expression<E, R> info) {
+		return new ExpressionInfo<>(
+				info.patterns().toArray(new String[0]), info.returnType(),
+				info.type(), info.origin().name(), info.expressionType()
+		);
+	}
+
 }