Skip to content

Add Timespan add/subtract/diff methods #7883

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 28, 2025
Merged

Add Timespan add/subtract/diff methods #7883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4811913
add/subtract methods
erenkarakal May 20, 2025
a2d352a
return a new timespan instead
erenkarakal May 20, 2025
e1fb946
method reference
erenkarakal May 20, 2025
a846af1
split the code
erenkarakal May 22, 2025
9630650
Merge branch 'dev/patch' into patch/add-timestamp-methods
sovdeeth May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/main/java/ch/njol/skript/classes/data/DefaultOperations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
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;
import org.skriptlang.skript.lang.arithmetic.Arithmetics;
import org.skriptlang.skript.lang.arithmetic.Operator;
Expand Down Expand Up @@ -91,9 +90,9 @@ public class DefaultOperations {
});

// Timespan - Timespan
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.registerOperation(Operator.ADDITION, Timespan.class, Timespan::add);
Arithmetics.registerOperation(Operator.SUBTRACTION, Timespan.class, Timespan::subtract);
Arithmetics.registerDifference(Timespan.class, Timespan::difference);
Arithmetics.registerDefaultValue(Timespan.class, Timespan::new);

// Timespan - Number
Expand Down
31 changes: 31 additions & 0 deletions src/main/java/ch/njol/skript/util/Timespan.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import ch.njol.skript.localization.GeneralWords;
import ch.njol.skript.localization.Language;
import ch.njol.skript.localization.Noun;
import ch.njol.util.Math2;
import ch.njol.util.NonNullPair;
import ch.njol.util.coll.CollectionUtils;
import ch.njol.yggdrasil.YggdrasilSerializable;
Expand Down Expand Up @@ -254,6 +255,36 @@ public Duration getDuration() {
return Duration.ofMillis(millis);
}

/**
* Safely adds the specified timespan to this timespan, handling potential overflow.
* @param timespan The timespan to add to this timespan
* @return a new Timespan object
*/
public Timespan add(Timespan timespan) {
long millis = Math2.addClamped(this.millis, timespan.getAs(TimePeriod.MILLISECOND));
return new Timespan(millis);
}

/**
* Safely subtracts the specified timespan from this timespan, handling potential underflow.
* @param timespan The timespan to subtract from this timespan
* @return a new Timespan object
*/
public Timespan subtract(Timespan timespan) {
long millis = Math.max(0, this.millis - timespan.getAs(TimePeriod.MILLISECOND));
return new Timespan(millis);
}

/**
* Calculates the difference between the specified timespan and this timespan.
* @param timespan The timespan to get the difference of
* @return a new Timespan object
*/
public Timespan difference(Timespan timespan) {
long millis = Math.abs(this.millis - timespan.getAs(TimePeriod.MILLISECOND));
return new Timespan(millis);
}

@Override
public long get(TemporalUnit unit) {
if (unit instanceof TimePeriod period)
Expand Down