Skip to content

Commit e01d9a5

Browse files
authored
Change world border timeToTargetDiameter to ticks (#2610)
* change worldborder timeToTargetDiameter to ticks * fixes * fix warning time
1 parent 70c01f5 commit e01d9a5

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

src/main/java/org/spongepowered/api/world/border/WorldBorder.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626

2727
import org.spongepowered.api.Sponge;
2828
import org.spongepowered.api.util.CopyableBuilder;
29+
import org.spongepowered.api.util.Ticks;
2930
import org.spongepowered.math.vector.Vector2d;
3031

31-
import java.time.Duration;
3232

3333
/**
3434
* A world border is a square boundary, extending through the entire y-axis.
@@ -103,15 +103,15 @@ default Builder toBuilder() {
103103
double targetDiameter();
104104

105105
/**
106-
* Gets the time remaining until the world border stops expanding or
106+
* Gets the remaining transition time in ticks until the world border stops expanding or
107107
* contracting to the {@link #targetDiameter()}.
108108
*
109109
* <p>If {@link #diameter()} and {@link #targetDiameter()} are the same,
110-
* this will be {@link Duration#ZERO}.</p>
110+
* this will be {@link Ticks#zero()}.</p>
111111
*
112-
* @return The time remaining
112+
* @return The ticks remaining
113113
*/
114-
Duration timeUntilTargetDiameter();
114+
Ticks timeUntilTargetDiameter();
115115

116116
/**
117117
* Gets the distance a player may be outside the world border before taking
@@ -131,14 +131,14 @@ default Builder toBuilder() {
131131

132132
/**
133133
* Gets the time when a contracting world border will warn a player for whom
134-
* the world border will reach in {@code time} seconds.
134+
* the world border will reach in {@code time} ticks.
135135
*
136136
* <p>In Minecraft, the warning is displayed in the form of a reddish
137137
* tint.</p>
138138
*
139139
* @return The warning time
140140
*/
141-
Duration warningTime();
141+
Ticks warningTime();
142142

143143
/**
144144
* Gets the distance when a contracting world border will warn a player for
@@ -189,7 +189,7 @@ interface Builder extends CopyableBuilder<WorldBorder, Builder>, org.spongepower
189189
* <p>If this differs from the the value supplied to
190190
* {@link #targetDiameter(double)}, then the border size starts at the
191191
* diameter specified here, growing or shrinking at a constant speed for
192-
* the time provided in {@link #timeToTargetDiameter(Duration)} where it
192+
* the time provided in {@link #timeToTargetDiameter(Ticks)} where it
193193
* will stop at the supplied target. If the supplied time is zero or not
194194
* given, then this value is ignored and the target diameter is used.</p>
195195
*
@@ -205,8 +205,8 @@ interface Builder extends CopyableBuilder<WorldBorder, Builder>, org.spongepower
205205
/**
206206
* Sets the final diameter of this world border.
207207
*
208-
* <p>If no {@link #timeToTargetDiameter(Duration)} is set, or it is set
209-
* to {@link Duration#ZERO}, then the {@link #initialDiameter(double)}
208+
* <p>If no {@link #timeToTargetDiameter(Ticks)} is set, or it is set
209+
* to {@link Ticks#zero()}, then the {@link #initialDiameter(double)}
210210
* is ignored and this is the only diameter used.</p>
211211
*
212212
* <p>If this is set but {@link #initialDiameter(double)} has not, then
@@ -222,10 +222,10 @@ interface Builder extends CopyableBuilder<WorldBorder, Builder>, org.spongepower
222222
* {@link #initialDiameter(double) the initial diameter} to
223223
* {@link #targetDiameter(double) its target diameter}.
224224
*
225-
* @param time The time, as a {@link Duration}
225+
* @param ticks The transition duration in ticks
226226
* @return The builder, for chaining.
227227
*/
228-
Builder timeToTargetDiameter(final Duration time);
228+
Builder timeToTargetDiameter(final Ticks ticks);
229229

230230
/**
231231
* Sets the distance beyond this world border that an entity may travel
@@ -250,7 +250,7 @@ interface Builder extends CopyableBuilder<WorldBorder, Builder>, org.spongepower
250250
* @param warningTime The warning time
251251
* @return The builder, for chaining
252252
*/
253-
Builder warningTime(final Duration warningTime);
253+
Builder warningTime(final Ticks warningTime);
254254

255255
/**
256256
* Sets the warning distance of this world border.

0 commit comments

Comments
 (0)