From 8550995c4e9f886e702aad35c0689cf268b20fd1 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 10 Mar 2020 19:51:31 -0400
Subject: [PATCH] Fixed compilation

---
 .../{alpha_bloom.fragment.glsl => alpha_bloom.frag}          | 0
 .../{alpha_gaussian.fragment.glsl => alpha_gaussian.frag}    | 0
 .../{alpha_threshold.fragment.glsl => alpha_threshold.frag}  | 0
 core/assets/bloomshaders/{bloom.fragment.glsl => bloom.frag} | 0
 .../bloomshaders/{blurspace.vertex.glsl => blurspace.vert}   | 0
 .../bloomshaders/{gaussian.fragment.glsl => gaussian.frag}   | 0
 .../{maskedtreshold.fragment.glsl => maskedtreshold.frag}    | 0
 .../{screenspace.vertex.glsl => screenspace.vert}            | 0
 .../bloomshaders/{threshold.fragment.glsl => threshold.frag} | 0
 core/src/mindustry/graphics/IndexedRenderer.java             | 5 +----
 gradle.properties                                            | 2 +-
 11 files changed, 2 insertions(+), 5 deletions(-)
 rename core/assets/bloomshaders/{alpha_bloom.fragment.glsl => alpha_bloom.frag} (100%)
 rename core/assets/bloomshaders/{alpha_gaussian.fragment.glsl => alpha_gaussian.frag} (100%)
 rename core/assets/bloomshaders/{alpha_threshold.fragment.glsl => alpha_threshold.frag} (100%)
 rename core/assets/bloomshaders/{bloom.fragment.glsl => bloom.frag} (100%)
 rename core/assets/bloomshaders/{blurspace.vertex.glsl => blurspace.vert} (100%)
 rename core/assets/bloomshaders/{gaussian.fragment.glsl => gaussian.frag} (100%)
 rename core/assets/bloomshaders/{maskedtreshold.fragment.glsl => maskedtreshold.frag} (100%)
 rename core/assets/bloomshaders/{screenspace.vertex.glsl => screenspace.vert} (100%)
 rename core/assets/bloomshaders/{threshold.fragment.glsl => threshold.frag} (100%)

diff --git a/core/assets/bloomshaders/alpha_bloom.fragment.glsl b/core/assets/bloomshaders/alpha_bloom.frag
similarity index 100%
rename from core/assets/bloomshaders/alpha_bloom.fragment.glsl
rename to core/assets/bloomshaders/alpha_bloom.frag
diff --git a/core/assets/bloomshaders/alpha_gaussian.fragment.glsl b/core/assets/bloomshaders/alpha_gaussian.frag
similarity index 100%
rename from core/assets/bloomshaders/alpha_gaussian.fragment.glsl
rename to core/assets/bloomshaders/alpha_gaussian.frag
diff --git a/core/assets/bloomshaders/alpha_threshold.fragment.glsl b/core/assets/bloomshaders/alpha_threshold.frag
similarity index 100%
rename from core/assets/bloomshaders/alpha_threshold.fragment.glsl
rename to core/assets/bloomshaders/alpha_threshold.frag
diff --git a/core/assets/bloomshaders/bloom.fragment.glsl b/core/assets/bloomshaders/bloom.frag
similarity index 100%
rename from core/assets/bloomshaders/bloom.fragment.glsl
rename to core/assets/bloomshaders/bloom.frag
diff --git a/core/assets/bloomshaders/blurspace.vertex.glsl b/core/assets/bloomshaders/blurspace.vert
similarity index 100%
rename from core/assets/bloomshaders/blurspace.vertex.glsl
rename to core/assets/bloomshaders/blurspace.vert
diff --git a/core/assets/bloomshaders/gaussian.fragment.glsl b/core/assets/bloomshaders/gaussian.frag
similarity index 100%
rename from core/assets/bloomshaders/gaussian.fragment.glsl
rename to core/assets/bloomshaders/gaussian.frag
diff --git a/core/assets/bloomshaders/maskedtreshold.fragment.glsl b/core/assets/bloomshaders/maskedtreshold.frag
similarity index 100%
rename from core/assets/bloomshaders/maskedtreshold.fragment.glsl
rename to core/assets/bloomshaders/maskedtreshold.frag
diff --git a/core/assets/bloomshaders/screenspace.vertex.glsl b/core/assets/bloomshaders/screenspace.vert
similarity index 100%
rename from core/assets/bloomshaders/screenspace.vertex.glsl
rename to core/assets/bloomshaders/screenspace.vert
diff --git a/core/assets/bloomshaders/threshold.fragment.glsl b/core/assets/bloomshaders/threshold.frag
similarity index 100%
rename from core/assets/bloomshaders/threshold.fragment.glsl
rename to core/assets/bloomshaders/threshold.frag
diff --git a/core/src/mindustry/graphics/IndexedRenderer.java b/core/src/mindustry/graphics/IndexedRenderer.java
index cb42b6fe0b..96194c0883 100644
--- a/core/src/mindustry/graphics/IndexedRenderer.java
+++ b/core/src/mindustry/graphics/IndexedRenderer.java
@@ -60,16 +60,13 @@ public class IndexedRenderer implements Disposable{
 
         updateMatrix();
 
-        program.begin();
-
+        program.bind();
         texture.bind();
 
         program.setUniformMatrix4("u_projTrans", BatchShader.copyTransform(combined));
         program.setUniformi("u_texture", 0);
 
         mesh.render(program, Gl.triangles, 0, vertices.length / vsize);
-
-        program.end();
     }
 
     public void setColor(Color color){
diff --git a/gradle.properties b/gradle.properties
index 1aeb38a829..1bbf7facaa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=b8f094ba9916ba5a0ce5b4c9dc0fc3d2d0cf89fd
+archash=3c2fae9b66b6affc1ba6701cce19ca9625c5e1b1