From 3e043b08bc8ac74c1f724790c1af35f32d880967 Mon Sep 17 00:00:00 2001 From: Noah van der Aa Date: Tue, 21 Sep 2021 16:47:04 +0200 Subject: [PATCH 1/3] api: Rename Title.Times.of (#448) --- .../java/net/kyori/adventure/title/Title.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/api/src/main/java/net/kyori/adventure/title/Title.java b/api/src/main/java/net/kyori/adventure/title/Title.java index e46bd3326..e4140b808 100644 --- a/api/src/main/java/net/kyori/adventure/title/Title.java +++ b/api/src/main/java/net/kyori/adventure/title/Title.java @@ -120,8 +120,23 @@ 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()} */ + @Deprecated 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); } From f06bc15cc5a97c5b806b7df3823cd5a5ddf4b686 Mon Sep 17 00:00:00 2001 From: Noah van der Aa Date: Tue, 21 Sep 2021 17:02:16 +0200 Subject: [PATCH 2/3] Update codebase to use new, non-deprecated name --- api/src/main/java/net/kyori/adventure/title/Title.java | 3 ++- .../adventure/serializer/configurate3/TitleSerializer.java | 2 +- .../adventure/serializer/configurate3/TitleSerializerTest.java | 2 +- .../adventure/serializer/configurate4/TitleSerializer.java | 2 +- .../adventure/serializer/configurate4/TitleSerializerTest.java | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/api/src/main/java/net/kyori/adventure/title/Title.java b/api/src/main/java/net/kyori/adventure/title/Title.java index e4140b808..3bfd99abc 100644 --- a/api/src/main/java/net/kyori/adventure/title/Title.java +++ b/api/src/main/java/net/kyori/adventure/title/Title.java @@ -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. @@ -122,6 +122,7 @@ interface Times extends Examinable { * @since 4.0.0 * @deprecated for removal since 4.10.0, use {@link #times()} */ + @ApiStatus.ScheduledForRemoval @Deprecated static @NotNull Times of(final @NotNull Duration fadeIn, final @NotNull Duration stay, final @NotNull Duration fadeOut) { return times(fadeIn, stay, fadeOut); diff --git a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/TitleSerializer.java b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/TitleSerializer.java index 62930d163..6912374cb 100644 --- a/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/TitleSerializer.java +++ b/serializer-configurate3/src/main/java/net/kyori/adventure/serializer/configurate3/TitleSerializer.java @@ -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); } diff --git a/serializer-configurate3/src/test/java/net/kyori/adventure/serializer/configurate3/TitleSerializerTest.java b/serializer-configurate3/src/test/java/net/kyori/adventure/serializer/configurate3/TitleSerializerTest.java index aec69d4ee..989820a63 100644 --- a/serializer-configurate3/src/test/java/net/kyori/adventure/serializer/configurate3/TitleSerializerTest.java +++ b/serializer-configurate3/src/test/java/net/kyori/adventure/serializer/configurate3/TitleSerializerTest.java @@ -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); } diff --git a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/TitleSerializer.java b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/TitleSerializer.java index 86eb48c8a..393c639e5 100644 --- a/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/TitleSerializer.java +++ b/serializer-configurate4/src/main/java/net/kyori/adventure/serializer/configurate4/TitleSerializer.java @@ -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); } diff --git a/serializer-configurate4/src/test/java/net/kyori/adventure/serializer/configurate4/TitleSerializerTest.java b/serializer-configurate4/src/test/java/net/kyori/adventure/serializer/configurate4/TitleSerializerTest.java index a1bb7bce0..cd1d8831d 100644 --- a/serializer-configurate4/src/test/java/net/kyori/adventure/serializer/configurate4/TitleSerializerTest.java +++ b/serializer-configurate4/src/test/java/net/kyori/adventure/serializer/configurate4/TitleSerializerTest.java @@ -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); } From 448167ab9cd47f5017c170b7244feabe6f157055 Mon Sep 17 00:00:00 2001 From: Noah van der Aa Date: Tue, 21 Sep 2021 18:44:40 +0200 Subject: [PATCH 3/3] Add inVersion --- api/src/main/java/net/kyori/adventure/title/Title.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/java/net/kyori/adventure/title/Title.java b/api/src/main/java/net/kyori/adventure/title/Title.java index 3bfd99abc..5b0625388 100644 --- a/api/src/main/java/net/kyori/adventure/title/Title.java +++ b/api/src/main/java/net/kyori/adventure/title/Title.java @@ -122,7 +122,7 @@ interface Times extends Examinable { * @since 4.0.0 * @deprecated for removal since 4.10.0, use {@link #times()} */ - @ApiStatus.ScheduledForRemoval + @ApiStatus.ScheduledForRemoval(inVersion = "5.0.0") @Deprecated static @NotNull Times of(final @NotNull Duration fadeIn, final @NotNull Duration stay, final @NotNull Duration fadeOut) { return times(fadeIn, stay, fadeOut);