From ce6c014191de80949fd33a1e160bce5c0cf35a34 Mon Sep 17 00:00:00 2001 From: Nicholas Ignoffo Date: Tue, 31 May 2016 17:00:55 -0700 Subject: [PATCH] Restore Java 6 compatibility --- .../bloodmagic/client/helper/ShaderHelper.java | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java b/src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java index 39e2ed73..501958a6 100644 --- a/src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java +++ b/src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java @@ -21,7 +21,6 @@ import org.lwjgl.opengl.GL11; import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; -import java.util.function.Consumer; public final class ShaderHelper { @@ -44,7 +43,7 @@ public final class ShaderHelper psiBar = createProgram("/assets/bloodmagic/shaders/beam", FRAG); } - public static void useShader(int shader, Consumer callback, int ticks) + public static void useShader(int shader, int ticks) { if (!useShaders()) return; @@ -55,17 +54,9 @@ public final class ShaderHelper { int time = ARBShaderObjects.glGetUniformLocationARB(shader, "time"); ARBShaderObjects.glUniform1iARB(time, ticks); - - if (callback != null) - callback.accept(shader); } } - public static void useShader(int shader, int ticks) - { - useShader(shader, null, ticks); - } - public static void releaseShader() { useShader(0, 0);