Skip to content
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.

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

api: Rename Title.Times.of #449

Merged
merged 3 commits into from Sep 25, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 17 additions & 1 deletion api/src/main/java/net/kyori/adventure/title/Title.java
Expand Up @@ -45,7 +45,7 @@ public interface Title extends Examinable {
*
* @since 4.0.0
*/
Times DEFAULT_TIMES = Times.of(Ticks.duration(10), Ticks.duration(70), Ticks.duration(20));
Times DEFAULT_TIMES = Times.times(Ticks.duration(10), Ticks.duration(70), Ticks.duration(20));

/**
* Creates a title.
Expand Down Expand Up @@ -120,8 +120,24 @@ interface Times extends Examinable {
* @param fadeOut the fade-out time
* @return times
* @since 4.0.0
* @deprecated for removal since 4.10.0, use {@link #times()}
*/
@ApiStatus.ScheduledForRemoval(inVersion = "5.0.0")
@Deprecated
NoahvdAa marked this conversation as resolved.
Show resolved Hide resolved
static @NotNull Times of(final @NotNull Duration fadeIn, final @NotNull Duration stay, final @NotNull Duration fadeOut) {
return times(fadeIn, stay, fadeOut);
}

/**
* Creates times.
*
* @param fadeIn the fade-in time
* @param stay the stay time
* @param fadeOut the fade-out time
* @return times
* @since 4.10.0
*/
static @NotNull Times times(final @NotNull Duration fadeIn, final @NotNull Duration stay, final @NotNull Duration fadeOut) {
return new TitleImpl.TimesImpl(fadeIn, stay, fadeOut);
}

Expand Down
Expand Up @@ -63,7 +63,7 @@ private TitleSerializer() {
final Duration fadeOut = value.getNode(TIMES, FADE_OUT).getValue(DurationSerializer.INSTANCE.type(), KEEP);

if (!Objects.equals(fadeIn, KEEP) || !Objects.equals(stay, KEEP) || !Objects.equals(fadeOut, KEEP)) {
return Title.title(title, subtitle, Title.Times.of(fadeIn, stay, fadeOut));
return Title.title(title, subtitle, Title.Times.times(fadeIn, stay, fadeOut));
} else {
return Title.title(title, subtitle);
}
Expand Down
Expand Up @@ -62,7 +62,7 @@ void testTitleWithTimes() {
});

final Title title = Title.title(Component.text("Title"), Component.text("Subtitle", NamedTextColor.DARK_PURPLE),
Title.Times.of(Duration.ofSeconds(50), Duration.ofSeconds(20), Duration.ofSeconds(50)));
Title.Times.times(Duration.ofSeconds(50), Duration.ofSeconds(20), Duration.ofSeconds(50)));

this.assertRoundtrippable(TitleSerializer.TYPE, title, node);
}
Expand Down
Expand Up @@ -61,7 +61,7 @@ private TitleSerializer() {
final Duration fadeOut = value.node(TIMES, FADE_OUT).get(Duration.class, KEEP);

if (!Objects.equals(fadeIn, KEEP) || !Objects.equals(stay, KEEP) || !Objects.equals(fadeOut, KEEP)) {
return Title.title(title, subtitle, Title.Times.of(fadeIn, stay, fadeOut));
return Title.title(title, subtitle, Title.Times.times(fadeIn, stay, fadeOut));
} else {
return Title.title(title, subtitle);
}
Expand Down
Expand Up @@ -62,7 +62,7 @@ void testTitleWithTimes() {
});

final Title title = Title.title(Component.text("Title"), Component.text("Subtitle", NamedTextColor.DARK_PURPLE),
Title.Times.of(Duration.ofSeconds(50), Duration.ofSeconds(20), Duration.ofSeconds(50)));
Title.Times.times(Duration.ofSeconds(50), Duration.ofSeconds(20), Duration.ofSeconds(50)));

this.assertRoundtrippable(Title.class, title, node);
}
Expand Down