From c52a71ee63c633d17d7a935c0aa92ddda904c750 Mon Sep 17 00:00:00 2001
From: hannibal2 <24389977+hannibal00212@users.noreply.github.com>
Date: Sat, 22 Jun 2024 09:20:18 +0200
Subject: do not use Supplier

---
 src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt  | 3 +--
 src/main/java/at/hannibal2/skyhanni/utils/shader/Uniform.kt | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/main/java/at/hannibal2/skyhanni/utils')

diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt
index 8bbe5bba3..c110d6d6e 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt
@@ -9,7 +9,6 @@ import net.minecraft.client.shader.ShaderLinkHelper
 import org.apache.commons.lang3.StringUtils
 import org.lwjgl.opengl.GL11
 import org.lwjgl.opengl.OpenGLException
-import java.util.function.Supplier
 
 /**
  * Superclass for shader objects to compile and attach vertex and fragment shaders to the shader program
@@ -106,7 +105,7 @@ abstract class Shader(val vertex: String, val fragment: String) {
      * to the uniform in the shader file.
      * @param uniformValuesSupplier The supplier that changes / sets the uniform's value
      */
-    fun <T> registerUniform(uniformType: Uniform.UniformType<T>, name: String, uniformValuesSupplier: Supplier<T>) {
+    fun <T> registerUniform(uniformType: Uniform.UniformType<T>, name: String, uniformValuesSupplier: () -> T) {
         uniforms.add(Uniform(this, uniformType, name, uniformValuesSupplier))
     }
 }
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/Uniform.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/Uniform.kt
index e3adf2b4d..139b2082c 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/shader/Uniform.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/Uniform.kt
@@ -1,7 +1,6 @@
 package at.hannibal2.skyhanni.utils.shader
 
 import java.util.Objects
-import java.util.function.Supplier
 
 /**
  * Class to handle shader uniform types
@@ -14,7 +13,7 @@ class Uniform<T>(
     shader: Shader,
     private val uniformType: UniformType<T>,
     val name: String,
-    private val uniformValuesSupplier: Supplier<T>,
+    private val uniformValuesSupplier: () -> T,
 ) {
 
     class UniformType<T> {
@@ -32,7 +31,7 @@ class Uniform<T>(
     private var previousUniformValue: T? = null
 
     fun update() {
-        val newUniformValue: T = uniformValuesSupplier.get()
+        val newUniformValue: T = uniformValuesSupplier()
         if (!Objects.deepEquals(previousUniformValue, newUniformValue)) {
             when (uniformType) {
                 UniformType.FLOAT -> {
-- 
cgit