Add Timespan/Timespan=Number arithmetic and TimePeriod.MILLISECOND (#…

…6749) * add ts/ts = num operation + tests + TimePeriod.Milliseconds * Update src/main/resources/lang/default.lang Co-authored-by: _tud <[email protected]> --------- Co-authored-by: _tud <[email protected]>
SkriptLang · Jun 28, 2024 · ccc9373 · ccc9373
1 parent 8e67dcb
commit ccc9373
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/src/main/java/ch/njol/skript/classes/data/DefaultOperations.java b/src/main/java/ch/njol/skript/classes/data/DefaultOperations.java
@@ -20,6 +20,7 @@
 
 import ch.njol.skript.util.Date;
 import ch.njol.skript.util.Timespan;
+import ch.njol.skript.util.Timespan.TimePeriod;
 import ch.njol.skript.util.Utils;
 import ch.njol.util.Math2;
 import org.bukkit.util.Vector;
@@ -85,9 +86,9 @@ public class DefaultOperations {
 		});
 
 		// Timespan - Timespan
-		Arithmetics.registerOperation(Operator.ADDITION, Timespan.class, (left, right) -> new Timespan(Math2.addClamped(left.getMilliSeconds(), right.getMilliSeconds())));
-		Arithmetics.registerOperation(Operator.SUBTRACTION, Timespan.class, (left, right) -> new Timespan(Math.max(0, left.getMilliSeconds() - right.getMilliSeconds())));
-		Arithmetics.registerDifference(Timespan.class, (left, right) -> new Timespan(Math.abs(left.getMilliSeconds() - right.getMilliSeconds())));
+		Arithmetics.registerOperation(Operator.ADDITION, Timespan.class, (left, right) -> new Timespan(Math2.addClamped(left.getAs(TimePeriod.MILLISECOND), right.getAs(TimePeriod.MILLISECOND))));
+		Arithmetics.registerOperation(Operator.SUBTRACTION, Timespan.class, (left, right) -> new Timespan(Math.max(0, left.getAs(TimePeriod.MILLISECOND) - right.getAs(TimePeriod.MILLISECOND))));
+		Arithmetics.registerDifference(Timespan.class, (left, right) -> new Timespan(Math.abs(left.getAs(TimePeriod.MILLISECOND) - right.getAs(TimePeriod.MILLISECOND))));
 		Arithmetics.registerDefaultValue(Timespan.class, Timespan::new);
 
 		// Timespan - Number
@@ -96,20 +97,24 @@ public class DefaultOperations {
 			long scalar = right.longValue();
 			if (scalar < 0)
 				return null;
-			return new Timespan(Math2.multiplyClamped(left.getMilliSeconds(), scalar));
+			return new Timespan(Math2.multiplyClamped(left.getAs(TimePeriod.MILLISECOND), scalar));
 		}, (left, right) -> {
 			long scalar = left.longValue();
 			if (scalar < 0)
 				return null;
-			return new Timespan(scalar * right.getMilliSeconds());
+			return new Timespan(scalar * right.getAs(TimePeriod.MILLISECOND));
 		});
 		Arithmetics.registerOperation(Operator.DIVISION, Timespan.class, Number.class, (left, right) -> {
 			long scalar = right.longValue();
 			if (scalar <= 0)
 				return null;
-			return new Timespan(left.getMilliSeconds() / scalar);
+			return new Timespan(left.getAs(TimePeriod.MILLISECOND) / scalar);
 		});
 
+		// Timespan / Timespan = Number
+		Arithmetics.registerOperation(Operator.DIVISION, Timespan.class, Timespan.class, Number.class,
+				(left, right) -> left.getAs(TimePeriod.MILLISECOND) / (double) right.getAs(TimePeriod.MILLISECOND));
+
 		// Date - Timespan
 		Arithmetics.registerOperation(Operator.ADDITION, Date.class, Timespan.class, Date::plus);
 		Arithmetics.registerOperation(Operator.SUBTRACTION, Date.class, Timespan.class, Date::minus);

diff --git a/src/main/java/ch/njol/skript/util/Timespan.java b/src/main/java/ch/njol/skript/util/Timespan.java
@@ -44,6 +44,7 @@ public class Timespan implements YggdrasilSerializable, Comparable<Timespan> { /
 
 	public enum TimePeriod {
 
+		MILLISECOND(1L),
 		TICK(50L),
 		SECOND(1000L),
 		MINUTE(SECOND.time * 60L),

diff --git a/src/main/resources/lang/default.lang b/src/main/resources/lang/default.lang
@@ -344,6 +344,7 @@ tree types:
 
 # -- Time --
 time:
+	millisecond: millisecond¦s
 	tick: tick¦s
 	second: second¦s
 	minute: minute¦s

diff --git a/src/test/skript/tests/syntaxes/expressions/ExprArithmetic.sk b/src/test/skript/tests/syntaxes/expressions/ExprArithmetic.sk
@@ -224,7 +224,13 @@ test "timespan arithmetic":
     assert (2 * {_t1}) is (2 seconds) with "2 * 1 second is not 2 seconds"
     assert (2 / {_t1}) is not set with "number divided by timespan is set" 
 
-    assert ({_t1} + 2) is not set with "timespan plus number is set"    
+    assert ({_t1} + 2) is not set with "timespan plus number is set"
+
+    assert {_t1} / {_t2} is 0.5 with "timespan / timespan failed"
+    assert {_t1} / 1 tick is 20 with "timespan / timespan of different units failed"
+    assert 0 seconds / {_t2} is 0 with "0 timespan / timespan failed"
+    assert {_t1} / 0 seconds is infinity value with "timespan / 0 timespan failed"
+    assert isNaN(0 seconds / 0 ticks) is true with "0 timespan / 0 timespan failed", expected NaN value, got (0 seconds / 0 ticks)
 
 test "date arithmetic":
     set {_d1} to now