Clean up some changes.

Author: Moderocky

src/main/java/org/byteskript/skript/compiler/Context.java

@@ -65,10 +65,10 @@ public void setStoredVariableName(String storedVariableName) {
 
     public abstract MethodBuilder getMethod();
 
-    public abstract MethodBuilder getTriggerMethod();
-    
     public abstract void setMethod(MethodBuilder method);
 
+    public abstract MethodBuilder getTriggerMethod();
+    
     public abstract void setMethod(MethodBuilder method, boolean trigger);
 
     public abstract FieldBuilder getField();

src/main/java/org/byteskript/skript/compiler/ElementTree.java

@@ -18,6 +18,7 @@
 import java.util.*;
 
 public final class ElementTree {
+    public final Map<String, Object> metadata = new HashMap<>();
     private final SyntaxElement current;
     private final Pattern.Match match;
     public boolean compile = true;
@@ -26,7 +27,6 @@ public final class ElementTree {
     public Type wanted = null;
     public HandlerType type = StandardHandlers.GET;
     private ElementTree[] nested;
-    public final Map<String, Object> metadata = new HashMap<>();
 
     public ElementTree(SyntaxElement current, Pattern.Match match, ElementTree... nested) {
         this.current = current;

src/main/java/org/byteskript/skript/compiler/FileContext.java

@@ -196,13 +196,13 @@ public MethodBuilder getMethod() {
     }
 
     @Override
-    public MethodBuilder getTriggerMethod() {
-        return triggerMethod;
+    public void setMethod(MethodBuilder method) {
+        this.setMethod(method, false);
     }
 
     @Override
-    public void setMethod(MethodBuilder method) {
-        this.setMethod(method, false);
+    public MethodBuilder getTriggerMethod() {
+        return triggerMethod;
     }
 
     @Override

src/main/java/org/byteskript/skript/compiler/SimpleSkriptCompiler.java

@@ -244,7 +244,8 @@ public ElementTree assembleStatement(final String statement, final FileContext c
         if (current == null) {
             if (details.expression != null)
                 throw new ScriptParseError(context.lineNumber(), details.clone(), "No syntax match found for expression '" + details.expression + "'", null);
-            else throw new ScriptParseError(context.lineNumber(), details.clone(), "No syntax match found for statement '" + statement + "'", null);
+            else
+                throw new ScriptParseError(context.lineNumber(), details.clone(), "No syntax match found for statement '" + statement + "'", null);
         }
         return current;
     }

src/main/java/org/byteskript/skript/lang/syntax/flow/execute/RunAsyncEffect.java

@@ -92,8 +92,6 @@ public void compile(Context context, Pattern.Match match) throws Throwable {
                 .parameterTypes());
             final MethodErasure bootstrap = new MethodErasure(LambdaMetafactory.class.getMethod("metafactory", MethodHandles.Lookup.class, String.class, MethodType.class, MethodType.class, MethodHandle.class, MethodType.class));
             method.writeCode((writer, visitor) -> visitor.visitInvokeDynamicInsn("run", creator.getDescriptor(), new Handle(Opcodes.H_INVOKESTATIC, "java/lang/invoke/LambdaMetafactory", bootstrap.name(), bootstrap.getDescriptor(), false), org.objectweb.asm.Type.getType("()V"), new Handle(6, internal, runnable.name(), runnable.getDescriptor(), false), org.objectweb.asm.Type.getType("()V")));
-            // todo hold synchronicity to following sleep
-            // todo error protection?
         }
         final Method target = ExtractedSyntaxCalls.class.getMethod("runOnAsyncThread", Runnable.class);
         this.writeCall(method, target, context);

src/main/java/org/byteskript/skript/lang/syntax/flow/execute/WaitForEffect.java

@@ -132,7 +132,6 @@ public void compile(Context context, Pattern.Match match) throws Throwable {
                 visitor.visitVarInsn(25, error);
                 visitor.visitInsn(Opcodes.ATHROW);
                 visitor.visitInsn(Opcodes.RETURN);
-            
             });
             child.writeCode(WriteInstruction.returnEmpty());
             final String internal = context.getType().internalName();

src/main/java/org/byteskript/skript/lang/syntax/generic/PrintEffect.java

@@ -17,8 +17,6 @@
 import org.byteskript.skript.lang.element.StandardElements;
 import org.byteskript.skript.runtime.internal.ExtractedSyntaxCalls;
 
-import java.io.PrintStream;
-
 @Documentation(
     name = "Print",
     description = """

src/main/java/org/byteskript/skript/runtime/Skript.java

@@ -455,22 +455,6 @@ public Future<?> runScript(final ScriptRunner runner, final Event event) {
         return future;
     }
 
-    @Description("""
-        Trigger all event handlers that can deal with this event.
-        Each handler will spawn its own process.
-        """)
-    @GenerateExample
-    public boolean runEvent(final Event event) {
-        boolean run = false;
-        for (Map.Entry<Class<? extends Event>, EventHandler> entry : events.entrySet()) {
-            final Class<? extends Event> key = entry.getKey();
-            if (!key.isAssignableFrom(event.getClass())) continue;
-            run = true;
-            entry.getValue().run(this, event);
-        }
-        return run;
-    }
-    
     @Description("""
         Trigger all event handlers that can deal with this event.
         Each handler will spawn its own process.
@@ -764,6 +748,22 @@ public void unloadScript(Script script) {
         this.runEvent(unload);
     }
 
+    @Description("""
+        Trigger all event handlers that can deal with this event.
+        Each handler will spawn its own process.
+        """)
+    @GenerateExample
+    public boolean runEvent(final Event event) {
+        boolean run = false;
+        for (Map.Entry<Class<? extends Event>, EventHandler> entry : events.entrySet()) {
+            final Class<? extends Event> key = entry.getKey();
+            if (!key.isAssignableFrom(event.getClass())) continue;
+            run = true;
+            entry.getValue().run(this, event);
+        }
+        return run;
+    }
+    
     @Description("""
         This is designed for internal use.
         """)
@@ -784,18 +784,6 @@ public Script compileLoad(InputStream stream, String name) {
         return loadScript(compileScript(stream, name));
     }
 
-    @Description("""
-        Loads a script from compiled source code.
-        """)
-    @GenerateExample
-    public Script loadScript(final PostCompileClass[] data) {
-        final Class<?>[] classes = new Class[data.length];
-        for (int i = 0; i < data.length; i++) {
-            classes[i] = this.loadClass(data[i].name(), data[i].code());
-        }
-        return this.loadScript(classes);
-    }
-    
     @Description("""
         Loads a script from compiled source code.
         """)
@@ -804,16 +792,6 @@ public Script loadScript(final PostCompileClass datum) {
         return this.loadScript(this.loadClass(datum.name(), datum.code()));
     }
 
-    @Description("""
-        Loads a script from defined classes.
-        """)
-    @GenerateExample
-    public Script loadScript(final Class<?>[] loaded) {
-        final Script script = new Script(this, null, loaded);
-        this.scripts.add(script);
-        return script;
-    }
-    
     @Description("""
         Loads a script from a defined class.
         """)
@@ -834,6 +812,28 @@ private SkriptMirror createLoader() {
         return new SkriptMirror(loader);
     }
 
+    @Description("""
+        Loads a script from compiled source code.
+        """)
+    @GenerateExample
+    public Script loadScript(final PostCompileClass[] data) {
+        final Class<?>[] classes = new Class[data.length];
+        for (int i = 0; i < data.length; i++) {
+            classes[i] = this.loadClass(data[i].name(), data[i].code());
+        }
+        return this.loadScript(classes);
+    }
+    
+    @Description("""
+        Loads a script from defined classes.
+        """)
+    @GenerateExample
+    public Script loadScript(final Class<?>[] loaded) {
+        final Script script = new Script(this, null, loaded);
+        this.scripts.add(script);
+        return script;
+    }
+    
     public Script getScript(final Class<?> part) {
         for (final Script script : this.scripts) {
             if (script.ownsClass(part)) return script;
@@ -989,6 +989,7 @@ public Script loadScript(final File source, final String name)
     }
 
     //region Output
+    
     /**
      * Set the current print stream used by the `print` effect.
      * This can be used to redirect output in a particular state.