Merge pull request #449 from NoahvdAa/feature/rename-times-of

api: Rename Title.Times.of
KyoriPowered · Sep 25, 2021 · 71061df · 71061df
2 parents c324532 + 448167a
commit 71061df
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 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
@@ -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.
@@ -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
     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);
     }
 

diff --git a/...nfigurate3/src/main/java/net/kyori/adventure/serializer/configurate3/TitleSerializer.java b/...nfigurate3/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/...urate3/src/test/java/net/kyori/adventure/serializer/configurate3/TitleSerializerTest.java b/...urate3/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/...nfigurate4/src/main/java/net/kyori/adventure/serializer/configurate4/TitleSerializer.java b/...nfigurate4/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/...urate4/src/test/java/net/kyori/adventure/serializer/configurate4/TitleSerializerTest.java b/...urate4/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);
   }