more nulls

2 files changed, 7 insertions, 5 deletions

diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/ColorUtils.java b/src/main/java/cc/polyfrost/oneconfig/utils/ColorUtils.java
index 2e48bdc..165d201 100644
--- a/src/main/java/cc/polyfrost/oneconfig/utils/ColorUtils.java
+++ b/src/main/java/cc/polyfrost/oneconfig/utils/ColorUtils.java
@@ -1,7 +1,6 @@
 package cc.polyfrost.oneconfig.utils;
 
 import cc.polyfrost.oneconfig.config.OneConfigConfig;
-import cc.polyfrost.oneconfig.gui.OneConfigGui;
 
 import java.awt.*;
 
@@ -71,8 +70,7 @@ public class ColorUtils {
     }
 
     private static float smooth(float current, float min, float max, boolean moveToFinal, float speed) {
-        float deltaTime = OneConfigGui.INSTANCE == null ? 16 : OneConfigGui.INSTANCE.getDeltaTime();
-        current = MathUtils.easeOut(current, moveToFinal ? 1f : 0f, speed, deltaTime);
+        current = MathUtils.easeOut(current, moveToFinal ? 1f : 0f, speed);
         if (current <= min) {
             current = min;
         }
diff --git a/src/main/java/cc/polyfrost/oneconfig/utils/MathUtils.java b/src/main/java/cc/polyfrost/oneconfig/utils/MathUtils.java
index e86061a..a09b398 100644
--- a/src/main/java/cc/polyfrost/oneconfig/utils/MathUtils.java
+++ b/src/main/java/cc/polyfrost/oneconfig/utils/MathUtils.java
@@ -1,5 +1,7 @@
 package cc.polyfrost.oneconfig.utils;
 
+import cc.polyfrost.oneconfig.gui.OneConfigGui;
+
 public class MathUtils {
     public static float clamp(float number) {
         return number < 0f ? 0f : Math.min(number, 1f);
@@ -9,7 +11,8 @@ public class MathUtils {
         return number < min ? min : Math.min(number, max);
     }
 
-    public static float easeOut(float current, float goal, float speed, float deltaTime) {
+    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 {
@@ -24,7 +27,8 @@ public class MathUtils {
     /**
      * taken from <a href="https://github.com/jesusgollonet/processing-penner-easing">https://github.com/jesusgollonet/processing-penner-easing</a>
      */
-    public static float easeInOutCirc(float t, float b, float c, float d, float deltaTime) {
+    public static float easeInOutCirc(float t, float b, float c, float d) {
+        float deltaTime = OneConfigGui.INSTANCE == null ? 16 : OneConfigGui.INSTANCE.getDeltaTime();
         c *= deltaTime;
         if ((t /= d / 2) < 1) return -c / 2 * ((float) Math.sqrt(1 - t * t) - 1) + b;
         return c / 2 * ((float) Math.sqrt(1 - (t -= 2) * t) + 1) + b;