From 71e8c088a6dec66eff03e99daf2424a38e0a41b5 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 23 Apr 2020 11:01:14 -0400
Subject: [PATCH] progress

---
 core/src/mindustry/core/Renderer.java           | 6 +++++-
 core/src/mindustry/entities/def/BulletComp.java | 3 +++
 core/src/mindustry/entities/def/EffectComp.java | 3 +++
 gradle.properties                               | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/core/Renderer.java b/core/src/mindustry/core/Renderer.java
index f32b3fab04..c6e46c00ee 100644
--- a/core/src/mindustry/core/Renderer.java
+++ b/core/src/mindustry/core/Renderer.java
@@ -217,6 +217,10 @@ public class Renderer implements ApplicationListener{
             Draw.draw(Layer.effect + 0.001f, bloom::render);
         }
 
+        Draw.draw(Layer.plans, overlays::drawBottom);
+        Draw.draw(Layer.overlayUI, overlays::drawTop);
+        Draw.draw(Layer.space, this::drawLanding);
+
         blocks.drawBlocks();
 
         Groups.draw.draw(Drawc::draw);
@@ -224,8 +228,8 @@ public class Renderer implements ApplicationListener{
         Draw.reset();
         Draw.flush();
         Draw.sort(false);
-        /*
 
+        /*
         blocks.drawBlocks(Layer.block);
         if(state.rules.drawFog){
             blocks.drawFog();
diff --git a/core/src/mindustry/entities/def/BulletComp.java b/core/src/mindustry/entities/def/BulletComp.java
index db5b3b3b77..abd68a7128 100644
--- a/core/src/mindustry/entities/def/BulletComp.java
+++ b/core/src/mindustry/entities/def/BulletComp.java
@@ -1,5 +1,6 @@
 package mindustry.entities.def;
 
+import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.util.*;
 import mindustry.annotations.Annotations.*;
@@ -109,6 +110,8 @@ abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Draw
 
     @Override
     public void draw(){
+        Draw.z(Layer.bullet);
+
         type.draw(this);
         //TODO refactor
         renderer.lights.add(x(), y(), 16f, Pal.powerLight, 0.3f);
diff --git a/core/src/mindustry/entities/def/EffectComp.java b/core/src/mindustry/entities/def/EffectComp.java
index 52ba2e7c66..38d28caa4c 100644
--- a/core/src/mindustry/entities/def/EffectComp.java
+++ b/core/src/mindustry/entities/def/EffectComp.java
@@ -1,9 +1,11 @@
 package mindustry.entities.def;
 
 import arc.graphics.*;
+import arc.graphics.g2d.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.entities.*;
 import mindustry.gen.*;
+import mindustry.graphics.*;
 
 @EntityDef(value = {Effectc.class, Childc.class}, pooled = true)
 @Component
@@ -14,6 +16,7 @@ abstract class EffectComp implements Posc, Drawc, Timedc, Rotc, Childc{
 
     @Override
     public void draw(){
+        Draw.z(Layer.effect);
         effect.render(id(), color, time(), rotation(), x(), y(), data);
     }
 
diff --git a/gradle.properties b/gradle.properties
index 113d824028..70e90dfdba 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +1,3 @@
 org.gradle.daemon=true
 org.gradle.jvmargs=-Xms256m -Xmx1024m
-archash=fc9a0ba82bb8e6c3a1640b57622b1ed6a1c1f9fe
+archash=3c3c7f6d70e98d51d96412763d3c3a0724ca6751