From 3e472ea407d128de61820fc167e08b8fe24186c9 Mon Sep 17 00:00:00 2001
From: Wyvest <45589059+Wyvest@users.noreply.github.com>
Date: Sat, 4 Jun 2022 22:34:51 +0700
Subject: move deltaTicks to GuiUtils (#33)

* move from mod events to mixin

* packet events

* move deltaTicks to GuiUtils

* delete easeOut
---
 .../cc/polyfrost/oneconfig/utils/GuiUtils.java     | 35 ++++++++++++++++++++++
 .../cc/polyfrost/oneconfig/utils/MathUtils.java    | 12 --------
 2 files changed, 35 insertions(+), 12 deletions(-)

(limited to 'src/main/java/cc/polyfrost/oneconfig/utils')

diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/GuiUtils.java b/src/main/java/cc/polyfrost/oneconfig/utils/GuiUtils.java
index 92df1b1..c6afb00 100644
--- a/src/main/java/cc/polyfrost/oneconfig/utils/GuiUtils.java
+++ b/src/main/java/cc/polyfrost/oneconfig/utils/GuiUtils.java
@@ -1,5 +1,10 @@
 package cc.polyfrost.oneconfig.utils;
 
+import cc.polyfrost.oneconfig.events.EventManager;
+import cc.polyfrost.oneconfig.events.event.RenderEvent;
+import cc.polyfrost.oneconfig.events.event.Stage;
+import cc.polyfrost.oneconfig.libs.eventbus.Subscribe;
+import cc.polyfrost.oneconfig.libs.universal.UMinecraft;
 import cc.polyfrost.oneconfig.libs.universal.UScreen;
 import net.minecraft.client.gui.GuiScreen;
 
@@ -7,6 +12,11 @@ import net.minecraft.client.gui.GuiScreen;
  * A class containing utility methods for working with GuiScreens.
  */
 public final class GuiUtils {
+    static {
+        EventManager.INSTANCE.register(new GuiUtils());
+    }
+    private static long time = -1L;
+    private static long deltaTime = 17L;
 
     /**
      * Displays a screen after a tick, preventing mouse sync issues.
@@ -21,4 +31,29 @@ public final class GuiUtils {
     public static void closeScreen() {
         UScreen.displayScreen(null);
     }
+
+    /**
+     * Gets the delta time (in milliseconds) between frames.
+     * <p><b>
+     *     Not to be confused with Minecraft deltaTicks / renderPartialTicks, which can be gotten via
+     *     {@link cc.polyfrost.oneconfig.events.event.TimerUpdateEvent}
+     * </b></p>
+     *
+     * @return the delta time.
+     */
+    public static float getDeltaTime() {
+        return deltaTime;
+    }
+
+    @Subscribe
+    private void onRenderEvent(RenderEvent event) {
+        if (event.stage == Stage.START) {
+            if (time == -1) time = UMinecraft.getTime();
+            else {
+                long currentTime = UMinecraft.getTime();
+                deltaTime = currentTime - time;
+                time = currentTime;
+            }
+        }
+    }
 }
diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/MathUtils.java b/src/main/java/cc/polyfrost/oneconfig/utils/MathUtils.java
index 630390b..4589925 100644
--- a/src/main/java/cc/polyfrost/oneconfig/utils/MathUtils.java
+++ b/src/main/java/cc/polyfrost/oneconfig/utils/MathUtils.java
@@ -1,7 +1,5 @@
 package cc.polyfrost.oneconfig.utils;
 
-import cc.polyfrost.oneconfig.gui.OneConfigGui;
-
 public final class MathUtils {
     public static float clamp(float number) {
         return clamp(number, 0, 1);
@@ -11,16 +9,6 @@ public final class MathUtils {
         return number < min ? min : Math.min(number, max);
     }
 
-    @Deprecated
-    public static float easeOut(float current, float goal, float speed) {
-        float deltaTime = OneConfigGui.INSTANCE == null ? 16 : OneConfigGui.INSTANCE.getDeltaTime();
-        if (Math.round(Math.abs(goal - current) * 100) > 0) {
-            return current + (goal - current) / speed * deltaTime;
-        } else {
-            return goal;
-        }
-    }
-
     public static float map(float value, float start1, float stop1, float start2, float stop2) {
         return start2 + (stop2 - start2) * ((value - start1) / (stop1 - start1));
     }
-- 
cgit