Rework number parser and angle support

src/main/java/ch/njol/skript/effects/EffContinue.java

@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
@@ -60,7 +42,7 @@ public class EffContinue extends Effect {
 	static {
 		Skript.registerEffect(EffContinue.class,
 			"continue [this loop|[the] [current] loop]",
-			"continue [the] <" + JavaClasses.INTEGER_PATTERN + ">(st|nd|rd|th) loop"
+			"continue [the] <" + JavaClasses.INTEGER_NUMBER_PATTERN + ">(st|nd|rd|th) loop"
 		);
 	}
 

src/main/java/ch/njol/skript/effects/EffExit.java

@@ -1,21 +1,3 @@
-/**
- *   This file is part of Skript.
- *
- *  Skript is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  Skript is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with Skript.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Copyright Peter Güttinger, SkriptLang team and contributors
- */
 package ch.njol.skript.effects;
 
 import ch.njol.skript.Skript;
@@ -33,19 +15,18 @@
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.UnknownNullability;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Name("Exit")
 @Description("Exits a given amount of loops and conditionals, or the entire trigger.")
 @Examples({
 	"if player has any ore:",
-	"\tstop",
+		"\tstop",
 	"message \"%player% has no ores!\"",
 	"loop blocks above the player:",
-	"\tloop-block is not air:",
-	"\t\texit 2 sections",
-	"\tset loop-block to water"
+		"\tloop-block is not air:",
+			"\t\texit 2 sections",
+		"\tset loop-block to water"
 })
 @Since("<i>unknown</i> (before 2.1)")
 public class EffExit extends Effect {
@@ -54,7 +35,7 @@ public class EffExit extends Effect {
 		Skript.registerEffect(EffExit.class,
 			"(exit|stop) [trigger]",
 			"(exit|stop) [1|a|the|this] (section|1:loop|2:conditional)",
-			"(exit|stop) <" + JavaClasses.INTEGER_PATTERN + "> (section|1:loop|2:conditional)s",
+			"(exit|stop) <" + JavaClasses.INTEGER_NUMBER_PATTERN + "> (section|1:loop|2:conditional)s",
 			"(exit|stop) all (section|1:loop|2:conditional)s");
 	}
 

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

@@ -0,0 +1,77 @@
+package ch.njol.skript.expressions;
+
+import ch.njol.skript.Skript;
+import ch.njol.skript.doc.Description;
+import ch.njol.skript.doc.Examples;
+import ch.njol.skript.doc.Name;
+import ch.njol.skript.doc.Since;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.ExpressionType;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.util.Kleenean;
+import org.bukkit.event.Event;
+import org.jetbrains.annotations.Nullable;
+
+@Name("Angle")
+@Description({
+	"Represents the passed number value in degrees.",
+	"If radians is specified, converts the passed value to degrees. This conversion may not be entirely accurate, " +
+	"due to floating point precision.",
+})
+@Examples({
+	"set {_angle} to 90 degrees",
+	"{_angle} is 90 # true",
+	"180 degrees is pi # true",
+	"pi radians is 180 degrees # true"
+})
+@Since("INSERT VERSION")
+public class ExprAngle extends SimpleExpression<Number> {
+
+	static {
+		Skript.registerExpression(ExprAngle.class, Number.class, ExpressionType.SIMPLE,
+			"%number% [in] deg[ree][s]",
+			"%number% [in] rad[ian][s]",
+			"%numbers% in deg[ree][s]",
+			"%numbers% in rad[ian][s]");
+	}
+
+	private Expression<Number> angle;
+	private boolean isRadians;
+
+	@Override
+	public boolean init(Expression<?>[] expressions, int matchedPattern,
+						Kleenean isDelayed, ParseResult parseResult) {
+		//noinspection unchecked
+		angle = (Expression<Number>) expressions[0];
+		isRadians = matchedPattern % 2 != 0;
+		return true;
+	}
+
+	@Override
+	protected Number @Nullable [] get(Event event) {
+		Number[] numbers = angle.getArray(event);
+
+		if (isRadians)
+			for (int i = 0; i < numbers.length; i++)
+            	numbers[i] = Math.toDegrees(numbers[i].doubleValue());
+
+		return numbers;
+	}
+
+	@Override
+	public boolean isSingle() {
+		return angle.isSingle();
+	}
+
+	@Override
+	public Class<? extends Number> getReturnType() {
+		return Number.class;
+	}
+
+	@Override
+	public String toString(@Nullable Event event, boolean debug) {
+		return angle.toString(event, debug) + " in " + (isRadians ? "degrees" : "radians");
+	}
+
+}

src/main/java/ch/njol/skript/hooks/economy/classes/Money.java

@@ -158,7 +158,7 @@ private static Money parseMoney(String s, String addition) {
 
 	@Nullable
 	private static Double parseDouble(String s) {
-		if (!JavaClasses.NUMBER_PATTERN.matcher(s).matches())
+		if (!JavaClasses.DECIMAL_PATTERN.matcher(s).matches())
 			return null;
 		try {
 			return Double.parseDouble(s);

src/main/java/org/skriptlang/skript/bukkit/misc/effects/EffRotate.java

@@ -50,9 +50,9 @@ public class EffRotate extends Effect {
 
 	static {
 		Skript.registerEffect(EffRotate.class,
-			"rotate %vectors/quaternions/displays% around [the] [global] (:x|:y|:z)(-| )axis by %number% [degrees]",
-			"rotate %quaternions/displays% around [the|its|their] local (:x|:y|:z)(-| )ax(i|e)s by %number% [degrees]",
-			"rotate %vectors/quaternions/displays% around [the] %vector% by %number% [degrees]",
+			"rotate %vectors/quaternions/displays% around [the] [global] (:x|:y|:z)(-| )axis by %number%",
+			"rotate %quaternions/displays% around [the|its|their] local (:x|:y|:z)(-| )ax(i|e)s by %number%",
+			"rotate %vectors/quaternions/displays% around [the] %vector% by %number%",
 			"rotate %quaternions/displays% by x %number%, y %number%(, [and]| and) z %number%"
 		);
 	}

src/main/java/org/skriptlang/skript/bukkit/misc/expressions/ExprRotate.java

@@ -46,9 +46,9 @@ public class ExprRotate extends SimpleExpression<Object> {
 
 	static {
 		Skript.registerExpression(ExprRotate.class, Object.class, ExpressionType.SIMPLE,
-				"%quaternions/vectors% rotated around [the] [global] (:x|:y|:z)(-| )axis by %number% [degrees]",
-				"%quaternions% rotated around [the|its|their] local (:x|:y|:z)(-| )ax(i|e)s by %number% [degrees]",
-				"%quaternions/vectors% rotated around [the] %vector% by %number% [degrees]",
+				"%quaternions/vectors% rotated around [the] [global] (:x|:y|:z)(-| )axis by %number%",
+				"%quaternions% rotated around [the|its|their] local (:x|:y|:z)(-| )ax(i|e)s by %number%",
+				"%quaternions/vectors% rotated around [the] %vector% by %number%",
 				"%quaternions% rotated by x %number%, y %number%(, [and]| and) z %number%");
 	}
 
@@ -157,6 +157,11 @@ public Class<?> getReturnType() {
 		return (matchedPattern == 1 || matchedPattern == 3) ? Quaternionf.class : toRotate.getReturnType();
 	}
 
+	@Override
+	public Class<?>[] possibleReturnTypes() {
+		return new Class<?>[]{Quaternionf.class, Vector.class};
+	}
+
 	@Override
 	public String toString(@Nullable Event event, boolean debug) {
 		return switch (matchedPattern) {

src/test/skript/tests/misc/angle.sk

@@ -0,0 +1,33 @@
+test "angle":
+	assert 90 degrees is 90 with "90 degrees is not 90"
+	assert -10.5 degrees is -10.5 with "-10.5 degrees is not -10.5"
+	assert 354698306983560 degrees is 354698306983560 with "354698306983560 degrees is not 354698306983560"
+
+	assert pi radians is 180.0 degrees with "pi radians is not 180 degrees"
+	assert 2 * pi in radians is 360.0 degrees with "2pi radians is not 360 degrees"
+
+	assert 180.0 degrees is pi radians with "180 degrees is not pi radians"
+	assert 360.0 in degrees is 2 * pi radians with "360 degrees is not 2pi radians"
+
+	assert infinity value degrees is infinity value with "infinity degrees is not infinity"
+	assert -infinity value degrees is -infinity value with "-infinity degrees is not -infinity"
+	assert infinity value radians is infinity value with "infinity radians is not infinity"
+	assert -infinity value radians is -infinity value with "-infinity radians is not -infinity"
+
+	assert ("90 degrees" parsed as number) is 90 with "90 degrees parsed as number is not 90"
+	assert ("3.141592653589793 radians" parsed as number) is 180.0 with "pi radians parsed as number is not 180 degrees"
+	assert ("90 degrees" parsed as number) is 90 degrees with "90 degrees parsed as number is not 90 degrees"
+	assert ("3.141592653589793 radians" parsed as number) is 180.0 degrees with "pi radians parsed as number is not 180 degrees"
+	assert ("90 degrees" parsed as number) is 0.5 * pi radians with "90 degrees parsed as number is not 0.5pi radians"
+	assert ("3.141592653589793 radians" parsed as number) is pi radians with "pi radians parsed as number is not pi radians"
+
+	assert 90, 180 and 270 in degrees is 90, 180 and 270 with "90, 180 and 270 degrees is not 90, 180 and 270"
+	assert 0.5 * pi, pi and 1.5 * pi in radians is 90.0, 180.0 and 270.0 with "0.5pi, pi and 1.5pi radians is not 90, 180 and 270"
+
+	assert ("n" parsed as number) degrees is not set with "'n' parsed as number degrees is set"
+	assert ("n" parsed as number) radians is not set with "'n' parsed as number radians is set"
+	assert ("n degrees" parsed as number) is not set with "'n' parsed as number degrees is set"
+	assert ("n radians" parsed as number) is not set with "'n' parsed as number radians is set"
+
+	assert isNaN(NaN value degrees) is true with "NaN degrees is not NaN"
+	assert isNaN(NaN value radians) is true with "NaN radians is not NaN"