Update ExprRound Allowing Multiple Numbers + Patterns

src/main/java/ch/njol/skript/expressions/ExprRound.java

@@ -1,10 +1,6 @@
 package ch.njol.skript.expressions;
 
-import org.bukkit.event.Event;
-import org.jetbrains.annotations.Nullable;
-
 import ch.njol.skript.Skript;
-import org.skriptlang.skript.lang.converter.Converter;
 import ch.njol.skript.doc.Description;
 import ch.njol.skript.doc.Examples;
 import ch.njol.skript.doc.Name;
@@ -13,44 +9,70 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.SyntaxStringBuilder;
 import ch.njol.util.Kleenean;
 import ch.njol.util.Math2;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
 
-/**
- * @author Peter Güttinger
- */
 @Name("Rounding")
 @Description("Rounds numbers normally, up (ceiling) or down (floor) respectively.")
-@Examples({"set {var} to rounded health of player",
-		"set line 1 of the block to rounded \"%(1.5 * player's level)%\"",
-		"add rounded down argument to the player's health"})
+@Examples({
+	"set {var} to rounded health of player",
+	"set line 1 of the block to rounded \"%(1.5 * player's level)%\"",
+	"add rounded down argument to the player's health"
+})
 @Since("2.0")
 public class ExprRound extends PropertyExpression<Number, Long> {
+
+	private enum RoundType {
+		FLOOR("(round[ed] down|floored)"),
+		ROUND("round[ed]"),
+		CEIL("(round[ed] up|ceiled)");
+
+		private final String pattern;
+
+		RoundType(String pattern) {
+			this.pattern = pattern;
+		}
+	}
+
+	private static final RoundType[] ROUND_TYPES = RoundType.values();
+
 	static {
-		Skript.registerExpression(ExprRound.class, Long.class, ExpressionType.PROPERTY,
-				"(a|the|) round[ed] down %number%",
-				"(a|the|) round[ed] %number%",
-				"(a|the|) round[ed] up %number%");
+		String[] patterns = new String[ROUND_TYPES.length * 2];
+		for (RoundType roundType : ROUND_TYPES) {
+			patterns[2 * roundType.ordinal()] = "[a|the] " + roundType.pattern + " %numbers%";
+			patterns[(2 * roundType.ordinal()) + 1] = "%numbers% " + roundType.pattern;
+		}
+
+		Skript.registerExpression(ExprRound.class, Long.class, ExpressionType.PROPERTY, patterns);
 	}
-
-	int action;
-
-	@SuppressWarnings({"unchecked", "null"})
+
+	private RoundType roundType;
+
 	@Override
 	public boolean init(final Expression<?>[] exprs, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
+		//noinspection unchecked
 		setExpr((Expression<? extends Number>) exprs[0]);
-		action = matchedPattern - 1;
+		roundType = ROUND_TYPES[matchedPattern/2];
 		return true;
 	}
 
 	@Override
-	protected Long[] get(final Event e, final Number[] source) {
-		return get(source, n -> {
-			if (n instanceof Integer)
-				return n.longValue();
-			else if (n instanceof Long)
-				return (Long) n;
-			return action == -1 ? Math2.floor(n.doubleValue()) : action == 0 ? Math2.round(n.doubleValue()) : Math2.ceil(n.doubleValue());
+	protected Long @Nullable [] get(Event event, Number[] source) {
+		return get(source, number -> {
+			if (number instanceof Integer integer) {
+				return integer.longValue();
+			} else if  (number instanceof Long long1) {
+				return long1;
+			}
+
+			return switch (roundType) {
+				case FLOOR -> Math2.floor(number.doubleValue());
+				case ROUND -> Math2.round(number.doubleValue());
+				case CEIL -> Math2.ceil(number.doubleValue());
+			};
 		});
 	}
 
@@ -60,8 +82,15 @@ public Class<? extends Long> getReturnType() {
 	}
 
 	@Override
-	public String toString(final @Nullable Event e, final boolean debug) {
-		return (action == -1 ? "floor" : action == 0 ? "round" : "ceil") + "(" + getExpr().toString(e, debug) + ")";
+	public String toString(@Nullable Event event, boolean debug) {
+		SyntaxStringBuilder builder = new SyntaxStringBuilder(event, debug);
+		builder.append(switch (roundType) {
+			case FLOOR -> "floored";
+			case ROUND -> "rounded";
+			case CEIL -> "ceiled";
+		});
+		builder.append(getExpr());
+		return builder.toString();
 	}
 
 }

src/test/skript/tests/syntaxes/expressions/ExprRound.sk

@@ -0,0 +1,15 @@
+test "rounding":
+	assert floored 4.6 is 4 with "Floored 4.6 failed"
+	assert rounded 4.6 is 5 with "Rounded 4.6 failed"
+	assert rounded 4.4 is 4 with "Rounded 4.4 failed"
+	assert ceiled 4.4 is 5 with "Ceiled 4.4 failed"
+
+	assert 10.6 floored is 10 with "Floored 10.6 failed"
+	assert 10.6 rounded is 11 with "Rounded 10.6 failed"
+	assert 10.4 rounded is 10 with "Rounded 10.4 failed"
+	assert 10.4 ceiled is 11 with "Ceiled 10.4 failed"
+
+	set {_nums::*} to 67.3, 98.5, 105.7, 300.1 and 500
+	assert floored {_nums::*} is (67, 98, 105, 300 and 500) with "Failed to floor multiple numbers"
+	assert rounded {_nums::*} is (67, 99, 106, 300 and 500) with "Failed to round multiple numbers"
+	assert ceiled {_nums::*} is (68, 99, 106, 301 and 500) with "Failed to ceil multiple numbers"