progress

core/src/mindustry/entities/Effects.java

@@ -42,7 +42,7 @@ public class Effects{
             Rect pos = Tmp.r2.setSize(effect.size).setCenter(x, y);
 
             if(view.overlaps(pos)){
-                Effectc entity = effect.ground ? GroundEffectEntity.create() : StandardEffectEntity.create();
+                Effectc entity = EffectEntity.create();
                 entity.effect(effect);
                 entity.rotation(rotation);
                 entity.data(data);

core/src/mindustry/entities/def/BuilderComp.java

@@ -23,7 +23,7 @@ import java.util.*;
 import static mindustry.Vars.*;
 
 @Component
-abstract class BuilderComp implements Unitc, DrawLayerFlyingc{
+abstract class BuilderComp implements Unitc{
     static final Vec2[] vecs = new Vec2[]{new Vec2(), new Vec2(), new Vec2(), new Vec2()};
 
     @Import float x, y, rotation;
@@ -197,8 +197,12 @@ abstract class BuilderComp implements Unitc, DrawLayerFlyingc{
     }
 
     @Override
-    public void drawFlying(){
+    public void draw(){
         if(!isBuilding()) return;
+
+        //TODO check correctness
+        Draw.z(Layer.flyingUnit);
+
         BuildRequest request = buildRequest();
         Tile tile = world.tile(request.x, request.y);
 

core/src/mindustry/entities/def/BulletComp.java

@@ -11,7 +11,7 @@ import static mindustry.Vars.*;
 
 @EntityDef(value = {Bulletc.class}, pooled = true)
 @Component
-abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Drawc, Shielderc, Ownerc, Velc, Bulletc, Timerc, DrawLayerBulletsc{
+abstract class BulletComp implements Timedc, Damagec, Hitboxc, Teamc, Posc, Drawc, Shielderc, Ownerc, Velc, Bulletc, Timerc{
     Object data;
     BulletType type;
     float damage;

core/src/mindustry/entities/def/EffectComp.java

@@ -5,13 +5,15 @@ import mindustry.annotations.Annotations.*;
 import mindustry.entities.*;
 import mindustry.gen.*;
 
+@EntityDef(value = {Effectc.class, Childc.class}, pooled = true)
 @Component
 abstract class EffectComp implements Posc, Drawc, Timedc, Rotc, Childc{
     Color color = new Color(Color.white);
     Effect effect;
     Object data;
 
-    void draw(){
+    @Override
+    public void draw(){
         effect.render(id(), color, time(), rotation(), x(), y(), data);
     }
 

core/src/mindustry/entities/def/GroundEffectComp.java

@@ -1,14 +0,0 @@
-package mindustry.entities.def;
-
-import mindustry.annotations.Annotations.*;
-import mindustry.gen.*;
-
-@EntityDef(value = {GroundEffectc.class, Childc.class}, pooled = true)
-@Component
-abstract class GroundEffectComp implements Effectc, DrawLayerFloorOverc{
-
-    @Override
-    public void drawFloorOver(){
-        draw();
-    }
-}

core/src/mindustry/entities/def/PuddleComp.java

@@ -10,6 +10,7 @@ import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.entities.*;
 import mindustry.gen.*;
+import mindustry.graphics.*;
 import mindustry.type.*;
 import mindustry.world.*;
 
@@ -18,7 +19,7 @@ import static mindustry.entities.Puddles.maxLiquid;
 
 @EntityDef(value = {Puddlec.class}, pooled = true)
 @Component
-abstract class PuddleComp implements Posc, DrawLayerFloorOverc, Puddlec{
+abstract class PuddleComp implements Posc, Puddlec{
     private static final int maxGeneration = 2;
     private static final Color tmp = new Color();
     private static final Rect rect = new Rect();
@@ -89,7 +90,9 @@ abstract class PuddleComp implements Posc, DrawLayerFloorOverc, Puddlec{
     }
 
     @Override
-    public void drawFloorOver(){
+    public void draw(){
+        Draw.z(Layer.debris - 1);
+
         seeds = id();
         boolean onLiquid = tile.floor().isLiquid;
         float f = Mathf.clamp(amount / (maxLiquid / 1.5f));

core/src/mindustry/entities/def/StandardEffectComp.java

@@ -1,14 +0,0 @@
-package mindustry.entities.def;
-
-import mindustry.annotations.Annotations.*;
-import mindustry.gen.*;
-
-@EntityDef(value = {StandardEffectc.class, Childc.class}, pooled = true)
-@Component
-abstract class StandardEffectComp implements Effectc, DrawLayerEffectsc{
-
-    @Override
-    public void drawEffects(){
-        draw();
-    }
-}