add TickUtil and utilize it in WrappedAnimatedButton

for frame-perfect animation

Author: HSGamer

src/main/java/me/hsgamer/bettergui/button/WrappedAnimatedButton.java

@@ -3,6 +3,7 @@
 import me.hsgamer.bettergui.api.button.BaseWrappedButton;
 import me.hsgamer.bettergui.api.button.WrappedButton;
 import me.hsgamer.bettergui.builder.ButtonBuilder;
+import me.hsgamer.bettergui.util.TickUtil;
 import me.hsgamer.hscore.collections.map.CaseInsensitiveStringMap;
 import me.hsgamer.hscore.common.CollectionUtils;
 import me.hsgamer.hscore.common.MapUtils;
@@ -22,10 +23,9 @@ protected AnimatedButton createButton(Map<String, Object> section) {
     Map<String, Object> keys = new CaseInsensitiveStringMap<>(section);
     long update = Optional.ofNullable(keys.get("update"))
       .map(String::valueOf)
-      .flatMap(Validate::getNumber)
-      .filter(bigDecimal -> bigDecimal.compareTo(BigDecimal.ZERO) > 0)
-      .map(BigDecimal::longValue)
-      .orElse(0L);
+      .flatMap(TickUtil::toMillis)
+      .filter(n -> n > 0)
+      .orElse(50L);
     int shift = Optional.ofNullable(keys.get("shift"))
       .map(String::valueOf)
       .flatMap(Validate::getNumber)
@@ -45,7 +45,7 @@ protected AnimatedButton createButton(Map<String, Object> section) {
       frames = CollectionUtils.reverse(frames);
     }
 
-    return new AnimatedButton().addButton(frames).setPeriodTicks(update);
+    return new AnimatedButton().addButton(frames).setPeriodMillis(update);
   }
 
   @Override

src/main/java/me/hsgamer/bettergui/util/TickUtil.java

@@ -0,0 +1,69 @@
+package me.hsgamer.bettergui.util;
+
+import me.hsgamer.hscore.common.Validate;
+import me.hsgamer.hscore.minecraft.gui.GUIProperties;
+
+import java.util.Locale;
+import java.util.Optional;
+import java.util.function.Function;
+
+/**
+ * The utility class for ticks and milliseconds
+ */
+public class TickUtil {
+  /**
+   * Convert ticks to milliseconds
+   *
+   * @param ticks the ticks
+   *
+   * @return the milliseconds
+   */
+  public static long ticksToMillis(long ticks) {
+    return ticks * GUIProperties.getMillisPerTick();
+  }
+
+  /**
+   * Convert FPS (Frame-per-second) to milliseconds
+   *
+   * @param fps the FPS
+   *
+   * @return the milliseconds
+   */
+  public static long fpsToMillis(double fps) {
+    return (long) (1000L / fps);
+  }
+
+  /**
+   * Get the milliseconds from the input.
+   * The input can be:
+   * - A number (in ticks)
+   * - A number with "t" at the end (in ticks)
+   * - A number with "ms" at the end (in milliseconds)
+   * - A number with "fps" at the end (in FPS)
+   *
+   * @param input the input
+   *
+   * @return the milliseconds
+   */
+  public static Optional<Long> toMillis(String input) {
+    String lowerCase = input.toLowerCase(Locale.ROOT);
+
+    String number;
+    Function<Number, Long> function;
+    if (lowerCase.endsWith("t")) {
+      number = input.substring(0, input.length() - 1);
+      function = n -> ticksToMillis(n.longValue());
+    } else if (lowerCase.endsWith("ms")) {
+      number = input.substring(0, input.length() - 2);
+      function = Number::longValue;
+    } else if (lowerCase.endsWith("fps")) {
+      number = input.substring(0, input.length() - 3);
+      function = n -> fpsToMillis(n.doubleValue());
+    } else {
+      number = input;
+      function = n -> ticksToMillis(n.longValue());
+    }
+
+    return Validate.getNumber(number).map(function);
+  }
+}