Tidy up code.

Author: Moderocky

pom.xml

@@ -74,7 +74,7 @@
         <dependency>
             <groupId>org.ow2.asm</groupId>
             <artifactId>asm</artifactId>
-            <version>9.2</version>
+            <version>9.3</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

src/main/java/org/byteskript/skript/api/SyntaxElement.java

@@ -112,7 +112,7 @@ default boolean isDelay() {
     default boolean requiresMainThread() {
         return false;
     }*/
-
+    
     @Ignore
     default void addSkipInstruction(Context context, Consumer<Context> consumer) {
         context.addSkipInstruction(consumer);

src/main/java/org/byteskript/skript/api/automatic/GeneratedEntryNode.java

@@ -25,12 +25,12 @@ public GeneratedEntryNode(Library provider, final RecordComponent target, String
         super(provider, StandardElements.NODE, patterns);
         this.target = target;
     }
-
+    
     @Override
     public Type getReturnType() {
         return CommonTypes.VOID;
     }
-
+    
     @Override
     public void preCompile(Context context, Pattern.Match match) throws Throwable {
         final ElementTree tree = context.getCompileCurrent().nested()[0];

src/main/java/org/byteskript/skript/api/automatic/GeneratedEntrySection.java

@@ -30,12 +30,12 @@ public GeneratedEntrySection(Library provider, final Class<Record> target, Strin
         super(provider, StandardElements.SECTION, patterns);
         this.target = target;
     }
-
+    
     @Override
     public Type getReturnType() {
         return CommonTypes.VOID;
     }
-
+    
     @Override
     public void compile(Context context, Pattern.Match match) throws Throwable {
         context.setState(CompileState.AREA_BODY);

src/main/java/org/byteskript/skript/api/syntax/Effect.java

@@ -26,12 +26,7 @@ public abstract class Effect extends Element implements SyntaxElement {
     public Effect(final Library provider, final LanguageElement type, final String... patterns) {
         super(provider, type, patterns);
     }
-
-    @Override
-    public Type getReturnType() {
-        return CommonTypes.VOID;
-    }
-
+    
     @Override
     public CompileState getSubState() {
         return CompileState.STATEMENT; // looking for expressions here
@@ -42,6 +37,11 @@ public boolean allowAsInputFor(Type type) {
         return true; // support meta-effects
     }
 
+    @Override
+    public Type getReturnType() {
+        return CommonTypes.VOID;
+    }
+    
     @Override
     public void preCompile(Context context, Pattern.Match match) throws Throwable {
         final Method target = handlers.get(StandardHandlers.RUN);

src/main/java/org/byteskript/skript/api/syntax/Member.java

@@ -31,15 +31,15 @@ public void onSectionExit(Context context, SectionMeta meta) {
         context.setField(null);
         context.setState(CompileState.ROOT);
     }
-
-    @Override
-    public Type getReturnType() {
-        return CommonTypes.VOID;
-    }
-
+    
     @Override
     public boolean allowAsInputFor(Type type) {
         return false;
     }
 
+    @Override
+    public Type getReturnType() {
+        return CommonTypes.VOID;
+    }
+    
 }

src/main/java/org/byteskript/skript/api/syntax/SectionEntry.java

@@ -23,12 +23,12 @@ public SectionEntry(Library provider, LanguageElement type, String... patterns)
     public CompileState getSubState() {
         return CompileState.MEMBER_BODY;
     }
-
+    
     @Override
     public Type getReturnType() {
         return CommonTypes.VOID;
     }
-
+    
     @Override
     public boolean allowedIn(State state, Context context) {
         return state == CompileState.MEMBER_BODY;

src/main/java/org/byteskript/skript/api/syntax/SimpleEntry.java

@@ -29,17 +29,17 @@ public Pattern.Match match(String thing, Context context) {
     public CompileState getSubState() {
         return CompileState.MEMBER_BODY;
     }
-
-    @Override
-    public Type getReturnType() {
-        return CommonTypes.VOID;
-    }
-
+    
     @Override
     public boolean allowAsInputFor(Type type) {
         return false;
     }
 
+    @Override
+    public Type getReturnType() {
+        return CommonTypes.VOID;
+    }
+    
     @Override
     public boolean allowedIn(State state, Context context) {
         return state == CompileState.MEMBER_BODY;

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

@@ -359,7 +359,6 @@ public MethodErasure useHandle(String property, HandlerType type) {
         final List<PropertyAccessGenerator> list = this.usedProperties.get(type);
         boolean unused = true;
         for (Library library : this.libraries) {
-            sub:
             for (PropertyHandler handler : library.getProperties()) {
                 if (!handler.name().equals(property)) continue;
                 if (!handler.type().equals(type)) continue;
@@ -389,7 +388,7 @@ public MethodErasure useHandle(String property, HandlerType type) {
             list.add(generator);
         }
         final Type ret = type.expectReturn() ? CommonTypes.OBJECT : new Type(void.class);
-        final Type[] params = type.expectInputs() ? new Type[]{CommonTypes.OBJECT, CommonTypes.OBJECT} : new Type[]{CommonTypes.OBJECT};
+        final Type[] params = type.expectInputs() ? new Type[] {CommonTypes.OBJECT, CommonTypes.OBJECT} : new Type[] {CommonTypes.OBJECT};
         return new MethodErasure(ret, "property_" + type.name() + "$" + property, params);
     }
 

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

@@ -228,7 +228,6 @@ public ElementTree assembleStatement(final String statement, final FileContext c
             context.setState(handler.getSubState()); // move state change to syntax
             context.currentEffect = handler;
             details.lineMatched = handler;
-            inner:
             for (int i = 0; i < types.length; i++) {
                 final String input = inputs[i];
                 final Type type = types[i];
@@ -268,7 +267,6 @@ public ElementTree assembleExpression(String expression, final Type expected, fi
                 if (inputs.length < types.length) continue;
                 context.setState(handler.getSubState()); // anticipate inner-effect state change
                 details.expressionMatched = handler;
-                inner:
                 for (int i = 0; i < types.length; i++) {
                     final String input = inputs[i];
                     final Type type = types[i];