Actual updating and rendering

core/src/mindustry/entities/EntityGroup.java

@@ -13,6 +13,8 @@ import static mindustry.Vars.collisions;
 /** Represents a group of a certain type of entity.*/
 @SuppressWarnings("unchecked")
 public class EntityGroup<T extends Entityc> implements Iterable<T>{
+    private static int lastId = 0;
+
     private final Array<T> array;
     private final Array<T> intersectArray = new Array<>();
     private final Rect viewport = new Rect();
@@ -23,6 +25,10 @@ public class EntityGroup<T extends Entityc> implements Iterable<T>{
 
     private int index;
 
+    public static int nextId(){
+        return lastId++;
+    }
+
     public EntityGroup(Class<T> type, boolean spatial, boolean mapping){
         array = new Array<>(false, 32, type);
 

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

@@ -6,7 +6,7 @@ import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
 
 @Component
-abstract class DrawShadowComp implements Drawc, Rotc, Flyingc, DrawLayerFlyingShadowsc, DrawLayerGroundShadowsc{
+abstract class DrawShadowComp implements Drawc, Rotc, Flyingc, DrawLayerFlyingShadowsc{
     static final float shadowTX = -12, shadowTY = -13, shadowColor = Color.toFloatBits(0, 0, 0, 0.22f);
 
     transient float x, y, rotation;
@@ -16,19 +16,6 @@ abstract class DrawShadowComp implements Drawc, Rotc, Flyingc, DrawLayerFlyingSh
     @Override
     public void drawFlyingShadows(){
         if(isFlying()){
-            drawShadow();
-        }
-    }
-
-    @Override
-    public void drawGroundShadows(){
-        if(isGrounded()){
-            drawShadow();
-        }
-    }
-
-    void drawShadow(){
-        if(!isGrounded()){
             Draw.color(shadowColor);
             Draw.rect(getShadowRegion(), x + shadowTX * elevation(), y + shadowTY * elevation(), rotation - 90);
             Draw.color();

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

@@ -2,6 +2,7 @@ package mindustry.entities.def;
 
 import arc.func.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.entities.*;
 import mindustry.gen.*;
 
 import java.io.*;
@@ -12,7 +13,7 @@ import static mindustry.Vars.player;
 @BaseComponent
 abstract class EntityComp{
     private boolean added;
-    int id;
+    int id = EntityGroup.nextId();
 
     boolean isAdded(){
         return added;

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

@@ -19,6 +19,10 @@ abstract class PosComp implements Position{
         this.y = y;
     }
 
+    void set(Position pos){
+        set(pos.getX(), pos.getY());
+    }
+
     void trns(float x, float y){
         set(this.x + x, this.y + y);
     }