From 29e086f23b7310ba7f9bac171f8b0a0a4778b50b Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 30 May 2022 12:05:10 -0400
Subject: [PATCH] Removed some unnecessary uniform setting

---
 core/src/mindustry/graphics/BlockRenderer.java   | 6 ++++--
 core/src/mindustry/graphics/FloorRenderer.java   | 1 -
 core/src/mindustry/graphics/IndexedRenderer.java | 1 -
 core/src/mindustry/world/Block.java              | 2 ++
 gradle.properties                                | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/core/src/mindustry/graphics/BlockRenderer.java b/core/src/mindustry/graphics/BlockRenderer.java
index c477095f3a..2e58f125f8 100644
--- a/core/src/mindustry/graphics/BlockRenderer.java
+++ b/core/src/mindustry/graphics/BlockRenderer.java
@@ -437,8 +437,10 @@ public class BlockRenderer{
                     }
 
                     if(build.team != pteam){
-                        build.drawTeam();
-                        Draw.z(Layer.block);
+                        if(build.block.drawTeamOverlay){
+                            build.drawTeam();
+                            Draw.z(Layer.block);
+                        }
                     }else if(renderer.drawStatus && block.hasConsumers){
                         build.drawStatus();
                     }
diff --git a/core/src/mindustry/graphics/FloorRenderer.java b/core/src/mindustry/graphics/FloorRenderer.java
index 6c67f3a2c2..872c71953c 100644
--- a/core/src/mindustry/graphics/FloorRenderer.java
+++ b/core/src/mindustry/graphics/FloorRenderer.java
@@ -164,7 +164,6 @@ public class FloorRenderer{
     public void beginc(){
         shader.bind();
         shader.setUniformMatrix4("u_projectionViewMatrix", Core.camera.mat);
-        shader.setUniformi("u_texture", 0);
 
         //only ever use the base environment texture
         texture.bind(0);
diff --git a/core/src/mindustry/graphics/IndexedRenderer.java b/core/src/mindustry/graphics/IndexedRenderer.java
index 4353279355..15185fdfac 100644
--- a/core/src/mindustry/graphics/IndexedRenderer.java
+++ b/core/src/mindustry/graphics/IndexedRenderer.java
@@ -56,7 +56,6 @@ public class IndexedRenderer implements Disposable{
         texture.bind();
 
         program.setUniformMatrix4("u_projTrans", combined);
-        program.setUniformi("u_texture", 0);
 
         mesh.render(program, Gl.triangles, 0, vertices.length / vsize);
     }
diff --git a/core/src/mindustry/world/Block.java b/core/src/mindustry/world/Block.java
index 1cfea37017..827782cd85 100644
--- a/core/src/mindustry/world/Block.java
+++ b/core/src/mindustry/world/Block.java
@@ -112,6 +112,8 @@ public class Block extends UnlockableContent implements Senseable{
     public int variants = 0;
     /** whether to draw a rotation arrow - this does not apply to lines of blocks */
     public boolean drawArrow = true;
+    /** whether to draw the team corner by default */
+    public boolean drawTeamOverlay = true;
     /** for static blocks only: if true, tile data() is saved in world data. */
     public boolean saveData;
     /** whether you can break this with rightclick */
diff --git a/gradle.properties b/gradle.properties
index 77904d0df6..4eb061e4af 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,4 @@ org.gradle.caching=true
 #used for slow jitpack builds; TODO see if this actually works
 org.gradle.internal.http.socketTimeout=100000
 org.gradle.internal.http.connectionTimeout=100000
-archash=e7c161da88
+archash=a02840762b