Move isSingle before getReturnType

Author: UnderscoreTud

src/main/java/org/skriptlang/reflect/syntax/custom/event/elements/ExprCustomEvent.java

@@ -83,13 +83,13 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 	}
 
 	@Override
-	public Class<? extends Event> getReturnType() {
-		return BukkitCustomEvent.class;
+	public boolean isSingle() {
+		return true;
 	}
 
 	@Override
-	public boolean isSingle() {
-		return true;
+	public Class<? extends Event> getReturnType() {
+		return BukkitCustomEvent.class;
 	}
 
 	@Override

src/main/java/org/skriptlang/reflect/syntax/custom/event/elements/ExprEventData.java

@@ -50,18 +50,18 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 	}
 
 	@Override
-	public Class<?> getReturnType() {
-		return Object.class;
+	public boolean isSingle() {
+		return true;
 	}
 
 	@Override
-	public boolean isSingle() {
-		return true;
+	public Class<?> getReturnType() {
+		return Object.class;
 	}
 
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
-		return "event data" + key.toString(event, debug);
+		return "event data " + key.toString(event, debug);
 	}
 
 }

src/main/java/org/skriptlang/reflect/syntax/custom/expression/elements/ExprChangeValue.java

@@ -51,6 +51,11 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 		return changeEvent.delta();
 	}
 
+	@Override
+	public boolean isSingle() {
+		return !plural;
+	}
+
 	@Override
 	public Class<?> getReturnType() {
 		return Utils.getSuperType(types);
@@ -61,11 +66,6 @@ public Class<?>[] possibleReturnTypes() {
 		return types;
 	}
 
-	@Override
-	public boolean isSingle() {
-		return !plural;
-	}
-
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
 		return "change value" + (plural ? "s" : "");

src/main/java/org/skriptlang/reflect/syntax/custom/shared/elements/expressions/ExprExpression.java

@@ -72,6 +72,11 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 		return all ? expressions[index].getAll(event) : expressions[index].getArray(event);
 	}
 
+	@Override
+	public boolean isSingle() {
+		return !plural;
+	}
+
 	@Override
 	public Class<?> getReturnType() {
 		return Utils.getSuperType(possibleReturnTypes);
@@ -82,11 +87,6 @@ public Class<?>[] possibleReturnTypes() {
 		return possibleReturnTypes;
 	}
 
-	@Override
-	public boolean isSingle() {
-		return !plural;
-	}
-
 	public int index() {
 		return index;
 	}

src/main/java/org/skriptlang/reflect/syntax/custom/shared/elements/expressions/ExprMatchedPattern.java

@@ -40,13 +40,13 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 	}
 
 	@Override
-	public Class<? extends Integer> getReturnType() {
-		return Integer.class;
+	public boolean isSingle() {
+		return true;
 	}
 
 	@Override
-	public boolean isSingle() {
-		return true;
+	public Class<? extends Integer> getReturnType() {
+		return Integer.class;
 	}
 
 	@Override

src/main/java/org/skriptlang/reflect/syntax/custom/shared/elements/expressions/ExprParseMark.java

@@ -40,13 +40,13 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 	}
 
 	@Override
-	public Class<? extends Integer> getReturnType() {
-		return Integer.class;
+	public boolean isSingle() {
+		return true;
 	}
 
 	@Override
-	public boolean isSingle() {
-		return true;
+	public Class<? extends Integer> getReturnType() {
+		return Integer.class;
 	}
 
 	@Override

src/main/java/org/skriptlang/reflect/syntax/custom/shared/elements/expressions/ExprParseRegexes.java

@@ -59,13 +59,13 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 	}
 
 	@Override
-	public Class<? extends String> getReturnType() {
-		return String.class;
+	public boolean isSingle() {
+		return false;
 	}
 
 	@Override
-	public boolean isSingle() {
-		return false;
+	public Class<? extends String> getReturnType() {
+		return String.class;
 	}
 
 	@Override

src/main/java/org/skriptlang/reflect/syntax/custom/shared/elements/expressions/ExprParseTags.java

@@ -40,13 +40,13 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 	}
 
 	@Override
-	public Class<? extends String> getReturnType() {
-		return String.class;
+	public boolean isSingle() {
+		return false;
 	}
 
 	@Override
-	public boolean isSingle() {
-		return false;
+	public Class<? extends String> getReturnType() {
+		return String.class;
 	}
 
 	@Override

src/main/java/org/skriptlang/reflect/syntax/custom/shared/elements/expressions/ExprRawExpression.java

@@ -68,13 +68,13 @@ public void change(Event event, Object @Nullable [] delta, ChangeMode mode) {
 	}
 
 	@Override
-	public Class<? extends Expression> getReturnType() {
-		return Expression.class;
+	public boolean isSingle() {
+		return true;
 	}
 
 	@Override
-	public boolean isSingle() {
-		return true;
+	public Class<? extends Expression> getReturnType() {
+		return Expression.class;
 	}
 
 	@Override

src/main/java/org/skriptlang/reflect/syntax/custom/shared/elements/expressions/ExprSelf.java

@@ -36,13 +36,13 @@ public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean is
 	}
 
 	@Override
-	public Class<? extends SyntaxElement> getReturnType() {
-		return SyntaxElement.class;
+	public boolean isSingle() {
+		return true;
 	}
 
 	@Override
-	public boolean isSingle() {
-		return true;
+	public Class<? extends SyntaxElement> getReturnType() {
+		return SyntaxElement.class;
 	}
 
 	@Override