lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restore Java 6 compatibility

Browse source
This commit is contained in:
Nicholas Ignoffo 2016-05-31 17:00:55 -07:00
parent f474c31bc9
commit ce6c014191
1 changed files with 1 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/WayofTime/bloodmagic/client/helper/ShaderHelper.java
View file

@ -21,7 +21,6 @@ import org.lwjgl.opengl.GL11;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.function.Consumer;
public final class ShaderHelper public final class ShaderHelper
{ {
@ -44,7 +43,7 @@ public final class ShaderHelper
psiBar = createProgram("/assets/bloodmagic/shaders/beam", FRAG); psiBar = createProgram("/assets/bloodmagic/shaders/beam", FRAG);
} }
public static void useShader(int shader, Consumer<Integer> callback, int ticks) public static void useShader(int shader, int ticks)
{ {
if (!useShaders()) if (!useShaders())
return; return;
@ -55,17 +54,9 @@ public final class ShaderHelper
{ {
int time = ARBShaderObjects.glGetUniformLocationARB(shader, "time"); int time = ARBShaderObjects.glGetUniformLocationARB(shader, "time");
ARBShaderObjects.glUniform1iARB(time, ticks); 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() public static void releaseShader()
{ {
useShader(0, 0); useShader(0, 0);