Merge branch 'feature/consumer-registration-done' of https://github.c…

…om/TheLimeGlass/skript-parser into feature/consumer-registration-done

src/main/java/io/github/syst3ms/skriptparser/registration/SkriptRegistration.java

@@ -50,6 +50,7 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -60,20 +61,38 @@
  * @see #getRegisterer()
  */
 public class SkriptRegistration {
-    private final SkriptAddon registerer;
-    private final SkriptLogger logger = new SkriptLogger();
+
     private final MultiMap<Class<?>, ExpressionInfo<?, ?>> expressions = new MultiMap<>();
-    private final List<SyntaxInfo<? extends Effect>> effects = new ArrayList<>();
     private final List<SyntaxInfo<? extends CodeSection>> sections = new ArrayList<>();
-    private final List<SkriptEventInfo<?>> events = new ArrayList<>();
-    private final List<Type<?>> types = new ArrayList<>();
-    private final List<ConverterInfo<?, ?>> converters = new ArrayList<>();
+    private final List<SyntaxInfo<? extends Effect>> effects = new ArrayList<>();
+    private final List<Consumer<SkriptAddon>> finishConsumers = new ArrayList<>();
     private final List<ContextValue<?, ?>> contextValues = new ArrayList<>();
+    private final List<ConverterInfo<?, ?>> converters = new ArrayList<>();
     private final List<TagInfo<? extends Tag>> tags = new ArrayList<>();
-    private boolean newTypes = false;
+    private final List<SkriptEventInfo<?>> events = new ArrayList<>();
+    private final List<Type<?>> types = new ArrayList<>();
+    private final SkriptAddon registerer;
+    private final SkriptLogger logger;
+    private boolean newTypes;
 
+    /**
+     * Construct a SkriptRegistration around a SkriptAddon.
+     * 
+     * @param registerer The SkriptAddon that this SkriptRegistration will be referencing.
+     */
     public SkriptRegistration(SkriptAddon registerer) {
+        this(registerer, new SkriptLogger());
+    }
+
+    /**
+     * Construct a SkriptRegistration around a SkriptAddon and the defined SkriptLogger to use.
+     * 
+     * @param registerer The SkriptAddon that this SkriptRegistration will be referencing.
+     * @parm logger The SkriptLogger used in the registration process.
+     */
+    public SkriptRegistration(SkriptAddon registerer, SkriptLogger logger) {
         this.registerer = registerer;
+        this.logger = logger;
     }
 
     /**
@@ -96,6 +115,7 @@ public List<SyntaxInfo<? extends Effect>> getEffects() {
     public List<SyntaxInfo<? extends CodeSection>> getSections() {
         return sections;
     }
+
     /**
      * @return all currently registered events
      */
@@ -554,6 +574,7 @@ public List<LogEntry> register(boolean ignoreLogs) {
         TagManager.register(this);
         Converters.registerConverters(this);
         Converters.createMissingConverters();
+        finishConsumers.forEach(consumer -> consumer.accept(registerer));
         if (ignoreLogs) {
             logger.clearLogs();
             return new ArrayList<>();
@@ -836,6 +857,15 @@ public void register() {
         }
     }
 
+    /**
+     * Add a consumer to be called when this SkriptRegistration finishes registration.
+     * 
+     * @param consumer The consumer with the SkriptAddon reference.
+     */
+    public void onFinishRegistration(Consumer<SkriptAddon> consumer) {
+        finishConsumers.add(consumer);
+    }
+
     private void typeCheck() {
         if (newTypes) {
             TypeManager.register(this);