Refractor of TimeUtil

src/main/java/me/clip/placeholderapi/util/Format.java

@@ -40,7 +40,7 @@ public final class Format {
 
   @NotNull
   public static Optional<List<String>> tablify(@NotNull final Align align,
-      @NotNull final List<List<String>> rows) {
+                                               @NotNull final List<List<String>> rows) {
     return findSpacing(rows)
         .map(spacing -> buildFormat(align, spacing))
         .map(format -> rows.stream()

src/main/java/me/clip/placeholderapi/util/TimeFormat.java

@@ -1,28 +1,49 @@
-/*
- * This file is part of PlaceholderAPI
- *
- * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
- *
- * PlaceholderAPI free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * PlaceholderAPI is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
 package me.clip.placeholderapi.util;
 
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
+import java.util.StringJoiner;
+import java.util.function.IntUnaryOperator;
+
 public enum TimeFormat {
-  DAYS,
+
-  HOURS,
+  DAYS(seconds -> seconds / 86400),
-  MINUTES,
+  HOURS(seconds -> (seconds / 3600) % 24),
-  SECONDS
+  MINUTES(seconds -> (seconds / 60) % 60),
+  SECONDS(seconds -> seconds % 60);
+
+  private final IntUnaryOperator convert;
+
+  TimeFormat(IntUnaryOperator convert) {
+    this.convert = convert;
+  }
+
+  public int convert(int seconds) {
+    return convert.applyAsInt(seconds);
+  }
+
+  public String formatTime(Duration duration) {
+    return formatTime((int) duration.getSeconds());
+  }
+
+  public String formatTime(int seconds) {
+    final StringJoiner joiner = new StringJoiner(" ");
+
+    int remainingSeconds = seconds;
+    int days = DAYS.convert(remainingSeconds);
+    remainingSeconds -= days * 86400;
+
+    int hours = HOURS.convert(remainingSeconds);
+    remainingSeconds -= hours * 3600;
+
+    int minutes = MINUTES.convert(remainingSeconds);
+    remainingSeconds -= minutes * 60;
+
+    if (days > 0) joiner.add(days + "d");
+    if (hours > 0) joiner.add(hours + "h");
+    if (minutes > 0) joiner.add(minutes + "m");
+    if (remainingSeconds > 0) joiner.add(remainingSeconds + "s");
+
+    return joiner.toString();
+  }
 }

src/main/java/me/clip/placeholderapi/util/TimeUtil.java

@@ -1,85 +1,47 @@
-/*
- * This file is part of PlaceholderAPI
- *
- * PlaceholderAPI
- * Copyright (c) 2015 - 2024 PlaceholderAPI Team
- *
- * PlaceholderAPI free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * PlaceholderAPI is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
 package me.clip.placeholderapi.util;
 
 import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.StringJoiner;
 
 public class TimeUtil {
 
+  /**
+   * Retrieves the remaining time in the specified format.
+   *
+   * @param seconds the total number of seconds to convert
+   * @param type    the desired time format (DAYS, HOURS, MINUTES, SECONDS)
+   * @return a string representing the remaining value in the specified format
+   */
   public static String getRemaining(final int seconds, final TimeFormat type) {
-    return getRemaining((long) seconds, type);
+    return String.valueOf(type.convert(seconds));
-  }
-
-  public static String getRemaining(final long seconds, final TimeFormat type) {
-    switch (type) {
-      default:
-        return String.valueOf(seconds);
-
-      case SECONDS:
-        return String.valueOf(seconds % 60);
-
-      case MINUTES:
-        return String.valueOf((seconds / 60) % 60);
-
-      case HOURS:
-        return String.valueOf((seconds / 3600) % 24);
-
-      case DAYS:
-        return String.valueOf(seconds / 86400);
-    }
   }
 
   /**
-   * Format the given value with s, m, h and d (seconds, minutes, hours and days)
+   * Formats the given duration into a human-readable string.
    *
-   * @param duration {@link Duration} (eg, Duration.of(20, {@link ChronoUnit#SECONDS}) for 20
+   * @param duration the {@link Duration} to be formatted (e.g., Duration.of(20, ChronoUnit.SECONDS))
-   *                 seconds)
+   * @return a formatted string representing the duration (e.g., "1d 3h 20m 15s")
-   * @return formatted time
    */
   public static String getTime(final Duration duration) {
-    return getTime(duration.getSeconds());
+    return TimeFormat.DAYS.formatTime(duration);
   }
 
+  /**
+   * Formats the given number of seconds into a human-readable string.
+   *
+   * @param seconds the total number of seconds to format
+   * @return a formatted string representing the time (e.g., "1d 3h 20m 15s")
+   */
   public static String getTime(final int seconds) {
-    return getTime((long) seconds);
+    return TimeFormat.DAYS.formatTime(seconds);
   }
 
-  public static String getTime(long seconds) {
+  /**
-    final StringJoiner joiner = new StringJoiner(" ");
+   * Formats the given number of seconds into a human-readable string.
-
+   *
-    long minutes = seconds / 60;
+   * @param seconds the total number of seconds to format
-    long hours = minutes / 60;
+   * @return a formatted string representing the time (e.g., "1d 3h 20m 15s")
-    final long days = hours / 24;
+   */
-
+  public static String getTime(final long seconds) {
-    seconds %= 60;
+    return TimeFormat.DAYS.formatTime((int) seconds);
-    minutes %= 60;
-    hours %= 24;
-
-    if (days > 0) joiner.add(days + "d");
-    if (hours > 0) joiner.add(hours + "h");
-    if (minutes > 0) joiner.add(minutes + "m");
-    if (seconds > 0) joiner.add(seconds + "s");
-
-    return joiner.toString();
   }
 }