From 81265500a540edb88672d173956040c7c7a6725c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 28 Jul 2020 17:19:57 -0400
Subject: [PATCH] Bugfixes

---
 core/src/mindustry/content/Blocks.java                 |  4 ++--
 core/src/mindustry/editor/WaveGraph.java               |  2 +-
 .../mindustry/world/blocks/power/SolarGenerator.java   | 10 ++++++----
 gradle.properties                                      |  2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java
index fcba533e1e..000830230a 100644
--- a/core/src/mindustry/content/Blocks.java
+++ b/core/src/mindustry/content/Blocks.java
@@ -1150,13 +1150,13 @@ public class Blocks implements ContentList{
 
         solarPanel = new SolarGenerator("solar-panel"){{
             requirements(Category.power, with(Items.lead, 10, Items.silicon, 15));
-            powerProduction = 0.06f;
+            powerProduction = 0.07f;
         }};
 
         largeSolarPanel = new SolarGenerator("solar-panel-large"){{
             requirements(Category.power, with(Items.lead, 100, Items.silicon, 145, Items.phasefabric, 15));
             size = 3;
-            powerProduction = 0.9f;
+            powerProduction = 0.95f;
         }};
 
         thoriumReactor = new NuclearReactor("thorium-reactor"){{
diff --git a/core/src/mindustry/editor/WaveGraph.java b/core/src/mindustry/editor/WaveGraph.java
index c6e7a9cac6..c1c65cbb62 100644
--- a/core/src/mindustry/editor/WaveGraph.java
+++ b/core/src/mindustry/editor/WaveGraph.java
@@ -139,7 +139,7 @@ public class WaveGraph extends Table{
             for(Mode m : Mode.all){
                 t.button("$wavemode." + m.name(), Styles.fullTogglet, () -> {
                     mode = m;
-                }).group(group).height(32f).update(b -> b.setChecked(m == mode)).width(130f);
+                }).group(group).height(35f).update(b -> b.setChecked(m == mode)).width(130f);
             }
         }).growX();
     }
diff --git a/core/src/mindustry/world/blocks/power/SolarGenerator.java b/core/src/mindustry/world/blocks/power/SolarGenerator.java
index 2ca0030e1e..751df61ad2 100644
--- a/core/src/mindustry/world/blocks/power/SolarGenerator.java
+++ b/core/src/mindustry/world/blocks/power/SolarGenerator.java
@@ -4,7 +4,7 @@ import arc.math.*;
 import arc.struct.*;
 import mindustry.world.meta.*;
 
-import static mindustry.Vars.state;
+import static mindustry.Vars.*;
 
 public class SolarGenerator extends PowerGenerator{
 
@@ -25,9 +25,11 @@ public class SolarGenerator extends PowerGenerator{
         @Override
         public void updateTile(){
             productionEfficiency =
-                Mathf.maxZero(Attribute.light.env() + state.rules.solarPowerMultiplier < 0 ?
-                (state.rules.lighting ? 1f - state.rules.ambientLight.a : 1f) :
-                state.rules.solarPowerMultiplier);
+                Mathf.maxZero(Attribute.light.env() +
+                (state.rules.solarPowerMultiplier < 0 ?
+                    (state.rules.lighting ? 1f - state.rules.ambientLight.a : 1f) :
+                    state.rules.solarPowerMultiplier
+                ));
         }
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 5323a204b9..3c91513965 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=e731db5f9be2004fab0b3b23206f6c2211d01176
+archash=d2dcaa6c88e82ee1958b1e019f63f6c64d3f843b