From adbe55b0db881856ae0bc5a6a173e18d7cf1d2e1 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 27 Jul 2021 09:08:09 -0400
Subject: [PATCH] Minor cloud bugfixes / Removed flow rate option

---
 core/assets/bundles/bundle.properties         |  1 -
 core/src/mindustry/core/Renderer.java         | 30 ++++++++++---------
 .../mindustry/entities/comp/BuildingComp.java |  2 +-
 .../ui/dialogs/SettingsMenuDialog.java        |  2 --
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index 303aae648f..099e1b7140 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -841,7 +841,6 @@ setting.blockreplace.name = Automatic Block Suggestions
 setting.linear.name = Linear Filtering
 setting.hints.name = Hints
 setting.logichints.name = Logic Hints
-setting.flow.name = Display Resource Flow Rate
 setting.backgroundpause.name = Pause In Background
 setting.buildautopause.name = Auto-Pause Building
 setting.doubletapmine.name = Double-Tap to Mine
diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java
index 24a5c6bf07..b0ba92f5ae 100644
--- a/core/src/mindustry/core/Renderer.java
+++ b/core/src/mindustry/core/Renderer.java
@@ -375,23 +375,25 @@ public class Renderer implements ApplicationListener{
 
             Draw.reset();
 
-            //clouds
-            float scaling = cloudScaling;
-            float sscl = Math.max(1f + Mathf.clamp(fin + cfinOffset)* cfinScl, 0f) * landscale;
+            if(state.rules.cloudColor.a > 0.0001f){
+                //clouds
+                float scaling = cloudScaling;
+                float sscl = Math.max(1f + Mathf.clamp(fin + cfinOffset)* cfinScl, 0f) * landscale;
 
-            Tmp.tr1.set(clouds);
-            Tmp.tr1.set(
-            (camera.position.x - camera.width/2f * sscl) / scaling,
-            (camera.position.y - camera.height/2f * sscl) / scaling,
-            (camera.position.x + camera.width/2f * sscl) / scaling,
-            (camera.position.y + camera.height/2f * sscl) / scaling);
+                Tmp.tr1.set(clouds);
+                Tmp.tr1.set(
+                (camera.position.x - camera.width/2f * sscl) / scaling,
+                (camera.position.y - camera.height/2f * sscl) / scaling,
+                (camera.position.x + camera.width/2f * sscl) / scaling,
+                (camera.position.y + camera.height/2f * sscl) / scaling);
 
-            Tmp.tr1.scroll(10f * cloudSeed, 10f * cloudSeed);
+                Tmp.tr1.scroll(10f * cloudSeed, 10f * cloudSeed);
 
-            Draw.alpha(Mathf.sample(cloudAlphas, fin + calphaFinOffset) * cloudAlpha);
-            Draw.mixcol(state.rules.cloudColor, state.rules.cloudColor.a);
-            Draw.rect(Tmp.tr1, camera.position.x, camera.position.y, camera.width, camera.height);
-            Draw.reset();
+                Draw.alpha(Mathf.sample(cloudAlphas, fin + calphaFinOffset) * cloudAlpha);
+                Draw.mixcol(state.rules.cloudColor, state.rules.cloudColor.a);
+                Draw.rect(Tmp.tr1, camera.position.x, camera.position.y, camera.width, camera.height);
+                Draw.reset();
+            }
         }
     }
 
diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java
index 47de632e6b..25e0114e23 100644
--- a/core/src/mindustry/entities/comp/BuildingComp.java
+++ b/core/src/mindustry/entities/comp/BuildingComp.java
@@ -1102,7 +1102,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
             table.row();
             table.table(this::displayConsumption).growX();
 
-            boolean displayFlow = (block.category == Category.distribution || block.category == Category.liquid) && Core.settings.getBool("flow") && block.displayFlow;
+            boolean displayFlow = (block.category == Category.distribution || block.category == Category.liquid) && block.displayFlow;
 
             if(displayFlow){
                 String ps = " " + StatUnit.perSecond.localized();
diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
index 64333796cf..f15693634e 100644
--- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
+++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
@@ -451,8 +451,6 @@ public class SettingsMenuDialog extends Dialog{
         if(!mobile){
             Core.settings.put("swapdiagonal", false);
         }
-
-        graphics.checkPref("flow", true);
     }
 
     public void exportData(Fi file) throws IOException{