From 4fb74d1e39438540fd2eef000d49c9e2393dd903 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 25 Mar 2020 00:18:40 -0400
Subject: [PATCH] Cleanup

---
 core/src/mindustry/game/Schematics.java       |  8 ++--
 .../src/mindustry/graphics/LightRenderer.java |  4 +-
 core/src/mindustry/graphics/MenuRenderer.java |  4 +-
 .../world/blocks/defense/turrets/Turret.java  |  5 +--
 settings.gradle                               | 38 ++++++++++---------
 5 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/core/src/mindustry/game/Schematics.java b/core/src/mindustry/game/Schematics.java
index 55660c6cfe..1a0a58abfa 100644
--- a/core/src/mindustry/game/Schematics.java
+++ b/core/src/mindustry/game/Schematics.java
@@ -191,7 +191,7 @@ public class Schematics implements Loadable{
             Tmp.m2.set(Draw.trans());
             FrameBuffer buffer = new FrameBuffer((schematic.width + padding) * resolution, (schematic.height + padding) * resolution);
 
-            shadowBuffer.beginDraw(Color.clear);
+            shadowBuffer.begin(Color.clear);
 
             Draw.trans().idt();
             Draw.proj().setOrtho(0, 0, shadowBuffer.getWidth(), shadowBuffer.getHeight());
@@ -210,9 +210,9 @@ public class Schematics implements Loadable{
                 }
             });
 
-            shadowBuffer.endDraw();
+            shadowBuffer.end();
 
-            buffer.beginDraw(Color.clear);
+            buffer.begin(Color.clear);
 
             Draw.proj().setOrtho(0, buffer.getHeight(), buffer.getWidth(), -buffer.getHeight());
 
@@ -239,7 +239,7 @@ public class Schematics implements Loadable{
             Draw.flush();
             Draw.trans().idt();
 
-            buffer.endDraw();
+            buffer.end();
 
             Draw.proj(Tmp.m1);
             Draw.trans(Tmp.m2);
diff --git a/core/src/mindustry/graphics/LightRenderer.java b/core/src/mindustry/graphics/LightRenderer.java
index 58c91b4f30..4867200a3e 100644
--- a/core/src/mindustry/graphics/LightRenderer.java
+++ b/core/src/mindustry/graphics/LightRenderer.java
@@ -183,14 +183,14 @@ public class LightRenderer{
         }
 
         Draw.color();
-        buffer.beginDraw(Color.clear);
+        buffer.begin(Color.clear);
         Gl.blendEquationSeparate(Gl.funcAdd, Gl.max);
 
         for(Runnable run : lights){
             run.run();
         }
         Draw.reset();
-        buffer.endDraw();
+        buffer.end();
         Gl.blendEquationSeparate(Gl.funcAdd, Gl.funcAdd);
 
         Draw.color();
diff --git a/core/src/mindustry/graphics/MenuRenderer.java b/core/src/mindustry/graphics/MenuRenderer.java
index 6c874a51f8..933c0de329 100644
--- a/core/src/mindustry/graphics/MenuRenderer.java
+++ b/core/src/mindustry/graphics/MenuRenderer.java
@@ -168,7 +168,7 @@ public class MenuRenderer implements Disposable{
 
         //draw shadows
         Draw.proj().setOrtho(0, 0, shadows.getWidth(), shadows.getHeight());
-        shadows.beginDraw(Color.clear);
+        shadows.begin(Color.clear);
         Draw.color(Color.black);
 
         for(Tile tile : world.tiles){
@@ -178,7 +178,7 @@ public class MenuRenderer implements Disposable{
         }
 
         Draw.color();
-        shadows.endDraw();
+        shadows.end();
 
         SpriteBatch prev = Core.batch;
 
diff --git a/core/src/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
index 38c4e2381c..a5ceee4e05 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/Turret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/Turret.java
@@ -119,10 +119,7 @@ public abstract class Turret extends Block{
     public class TurretEntity extends TileEntity{
         public Array<AmmoEntry> ammo = new Array<>();
         public int totalAmmo;
-        public float reload;
-        public float rotation = 90;
-        public float recoil = 0f;
-        public float heat;
+        public float reload, rotation = 90, recoil, heat;
         public int shotCounter;
         public Posc target;
 
diff --git a/settings.gradle b/settings.gradle
index 141230da76..8f7f936222 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,8 +1,10 @@
 include 'desktop', 'core', 'server', 'ios', 'annotations', 'tools', 'tests'
 
-def use = { String name ->
-    include(name)
-    project(name).projectDir = new File(settingsDir, "../${name.substring(1).replace(":", "/")}")
+def use = { ... names ->
+    for(String name : names){
+        include(name)
+        project(name).projectDir = new File(settingsDir, "../${name.substring(1).replace(":", "/")}")
+    }
 }
 
 def properties = new Properties()
@@ -21,20 +23,22 @@ if(new File(settingsDir, 'local.properties').exists() && System.getenv("JITPACK"
 
 if(!hasProperty("release")){
     if(new File(settingsDir, '../Arc').exists()){
-        use(':Arc')
-        use(':Arc:arc-core')
-        use(':Arc:extensions')
-        use(':Arc:extensions:freetype')
-        use(':Arc:extensions:recorder')
-        use(':Arc:extensions:arcnet')
-        use(':Arc:extensions:packer')
-        use(':Arc:extensions:g3d')
-        use(':Arc:extensions:fx')
-        use(':Arc:backends')
-        use(':Arc:backends:backend-sdl')
-        use(':Arc:backends:backend-android')
-        use(':Arc:backends:backend-robovm')
-        use(':Arc:backends:backend-headless')
+        use(
+        ':Arc', 
+        ':Arc:arc-core', 
+        ':Arc:extensions', 
+        ':Arc:extensions:freetype', 
+        ':Arc:extensions:recorder', 
+        ':Arc:extensions:arcnet', 
+        ':Arc:extensions:packer',
+        ':Arc:extensions:g3d',
+        ':Arc:extensions:fx', 
+        ':Arc:backends', 
+        ':Arc:backends:backend-sdl', 
+        ':Arc:backends:backend-android',
+        ':Arc:backends:backend-robovm',
+        ':Arc:backends:backend-headless'
+        )
     }
     
     if(new File(settingsDir, '../Mindustry-Debug').exists()){