From c474b082cd8dfa701125b9101cf65dca697de29e Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 7 Jan 2020 00:24:37 -0500
Subject: [PATCH] Cleanup

---
 core/src/mindustry/graphics/Bloom.java         |  4 ++--
 .../mindustry/graphics/IndexedRenderer.java    | 18 +++++++++---------
 gradle.properties                              |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/core/src/mindustry/graphics/Bloom.java b/core/src/mindustry/graphics/Bloom.java
index c3b4fd9bae..2c234dfdbd 100644
--- a/core/src/mindustry/graphics/Bloom.java
+++ b/core/src/mindustry/graphics/Bloom.java
@@ -403,8 +403,8 @@ public class Bloom{
     private static Mesh createFullScreenQuad(){
         float[] verts = {-1, -1, 0, 0, 1, -1, 1, 0, 1, 1, 1, 1, -1, 1, 0, 1};
         Mesh tmpMesh = new Mesh(true, 4, 0, new VertexAttribute(
-                Usage.Position, 2, "a_position"), new VertexAttribute(
-                Usage.TextureCoordinates, 2, "a_texCoord0"));
+                Usage.position, 2, "a_position"), new VertexAttribute(
+                Usage.textureCoordinates, 2, "a_texCoord0"));
 
         tmpMesh.setVertices(verts);
         return tmpMesh;
diff --git a/core/src/mindustry/graphics/IndexedRenderer.java b/core/src/mindustry/graphics/IndexedRenderer.java
index f396963b78..8a76348dd1 100644
--- a/core/src/mindustry/graphics/IndexedRenderer.java
+++ b/core/src/mindustry/graphics/IndexedRenderer.java
@@ -17,18 +17,18 @@ public class IndexedRenderer implements Disposable{
 
     private Shader program = new Shader(
     Strings.join("\n",
-    "attribute vec4 " + Shader.POSITION_ATTRIBUTE + ";",
-    "attribute vec4 " + Shader.COLOR_ATTRIBUTE + ";",
-    "attribute vec2 " + Shader.TEXCOORD_ATTRIBUTE + "0;",
+    "attribute vec4 " + Shader.positionAttribute + ";",
+    "attribute vec4 " + Shader.colorAttribute + ";",
+    "attribute vec2 " + Shader.texcoordAttribute + "0;",
     "uniform mat4 u_projTrans;",
     "varying vec4 v_color;",
     "varying vec2 v_texCoords;",
     "",
     "void main(){",
-    "   v_color = " + Shader.COLOR_ATTRIBUTE + ";",
+    "   v_color = " + Shader.colorAttribute + ";",
     "   v_color.a = v_color.a * (255.0/254.0);",
-    "   v_texCoords = " + Shader.TEXCOORD_ATTRIBUTE + "0;",
-    "   gl_Position = u_projTrans * " + Shader.POSITION_ATTRIBUTE + ";",
+    "   v_texCoords = " + Shader.texcoordAttribute + "0;",
+    "   gl_Position = u_projTrans * " + Shader.positionAttribute + ";",
     "}"),
     Strings.join("\n",
     "#ifdef GL_ES",
@@ -226,9 +226,9 @@ public class IndexedRenderer implements Disposable{
         if(mesh != null) mesh.dispose();
 
         mesh = new Mesh(true, 6 * sprites, 0,
-        new VertexAttribute(Usage.Position, 2, "a_position"),
-        new VertexAttribute(Usage.ColorPacked, 4, "a_color"),
-        new VertexAttribute(Usage.TextureCoordinates, 2, "a_texCoord0"));
+        new VertexAttribute(Usage.position, 2, "a_position"),
+        new VertexAttribute(Usage.colorPacked, 4, "a_color"),
+        new VertexAttribute(Usage.textureCoordinates, 2, "a_texCoord0"));
         vertices = new float[6 * sprites * vsize];
         mesh.setVertices(vertices);
     }
diff --git a/gradle.properties b/gradle.properties
index 4220bfc60f..c9da6feacf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=230db37c657820ae837eac9758307dd4b22c107d
+archash=a85dbe44f7fb7aa66a28755931efee5e2e294a29