Better entity code generation + minor refactoring

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

@@ -1,11 +1,23 @@
 package mindustry.entities.def;
 
+import arc.graphics.*;
 import arc.math.geom.*;
+import arc.struct.Bits;
+import arc.struct.*;
+import arc.util.*;
+import arc.util.pooling.*;
 import mindustry.annotations.Annotations.*;
+import mindustry.content.*;
+import mindustry.ctype.*;
 import mindustry.entities.bullet.*;
 import mindustry.entities.units.*;
 import mindustry.gen.*;
 import mindustry.net.*;
+import mindustry.type.*;
+
+import java.io.*;
+
+import static mindustry.Vars.content;
 
 class EntityDefs{
 
@@ -64,11 +76,117 @@ class EntityDefs{
         }
     }
 
+    @Depends(PosComp.class)
     class StatusComp{
-        final Statuses statuses = new Statuses();
+        private Array<StatusEntry> statuses = new Array<>();
+        private Bits applied = new Bits(content.getBy(ContentType.status).size);
+
+        private float speedMultiplier;
+        private float damageMultiplier;
+        private float armorMultiplier;
+
+        void apply(StatusEffect effect, float duration){
+            if(effect == StatusEffects.none || effect == null || isImmune(effect)) return; //don't apply empty or immune effects
+
+            if(statuses.size > 0){
+                //check for opposite effects
+                for(StatusEntry entry : statuses){
+                    //extend effect
+                    if(entry.effect == effect){
+                        entry.time = Math.max(entry.time, duration);
+                        return;
+                    }else if(entry.effect.reactsWith(effect)){ //find opposite
+                        StatusEntry.tmp.effect = entry.effect;
+                        //TODO unit cannot be null here
+                        entry.effect.getTransition(null, effect, entry.time, duration, StatusEntry.tmp);
+                        entry.time = StatusEntry.tmp.time;
+
+                        if(StatusEntry.tmp.effect != entry.effect){
+                            entry.effect = StatusEntry.tmp.effect;
+                        }
+
+                        //stop looking when one is found
+                        return;
+                    }
+                }
+            }
+
+            //otherwise, no opposites found, add direct effect
+            StatusEntry entry = Pools.obtain(StatusEntry.class, StatusEntry::new);
+            entry.set(effect, duration);
+            statuses.add(entry);
+        }
+
+        boolean isImmune(StatusEffect effect){
+            return false;
+        }
+
+        Color getStatusColor(){
+            if(statuses.size == 0){
+                return Tmp.c1.set(Color.white);
+            }
+
+            float r = 0f, g = 0f, b = 0f;
+            for(StatusEntry entry : statuses){
+                r += entry.effect.color.r;
+                g += entry.effect.color.g;
+                b += entry.effect.color.b;
+            }
+            return Tmp.c1.set(r / statuses.size, g / statuses.size, b / statuses.size, 1f);
+        }
 
         void update(){
-            statuses.update(null);
+            applied.clear();
+            speedMultiplier = damageMultiplier = armorMultiplier = 1f;
+
+            if(statuses.isEmpty()) return;
+
+            statuses.eachFilter(entry -> {
+                entry.time = Math.max(entry.time - Time.delta(), 0);
+                applied.set(entry.effect.id);
+
+                if(entry.time <= 0){
+                    Pools.free(entry);
+                    return true;
+                }else{
+                    speedMultiplier *= entry.effect.speedMultiplier;
+                    armorMultiplier *= entry.effect.armorMultiplier;
+                    damageMultiplier *= entry.effect.damageMultiplier;
+                    //TODO unit can't be null
+                    entry.effect.update(null, entry.time);
+                }
+
+                return false;
+            });
+        }
+
+        boolean hasEffect(StatusEffect effect){
+            return applied.get(effect.id);
+        }
+
+        void writeSave(DataOutput stream) throws IOException{
+            stream.writeByte(statuses.size);
+            for(StatusEntry entry : statuses){
+                stream.writeByte(entry.effect.id);
+                stream.writeFloat(entry.time);
+            }
+        }
+
+        void readSave(DataInput stream, byte version) throws IOException{
+            for(StatusEntry effect : statuses){
+                Pools.free(effect);
+            }
+
+            statuses.clear();
+
+            byte amount = stream.readByte();
+            for(int i = 0; i < amount; i++){
+                byte id = stream.readByte();
+                float time = stream.readFloat();
+                StatusEntry entry = Pools.obtain(StatusEntry.class, StatusEntry::new);
+                entry.set(content.getByID(ContentType.status, id), time);
+                statuses.add(entry);
+            }
         }
     }
 

core/src/mindustry/entities/units/StatusEntry.java

@@ -0,0 +1,16 @@
+package mindustry.entities.units;
+
+import mindustry.type.*;
+
+public class StatusEntry{
+    public static final StatusEntry tmp = new StatusEntry();
+
+    public StatusEffect effect;
+    public float time;
+
+    public StatusEntry set(StatusEffect effect, float time){
+        this.effect = effect;
+        this.time = time;
+        return this;
+    }
+}

core/src/mindustry/entities/units/Statuses.java

@@ -147,14 +147,4 @@ public class Statuses implements Saveable{
         }
     }
 
-    public static class StatusEntry{
-        public StatusEffect effect;
-        public float time;
-
-        public StatusEntry set(StatusEffect effect, float time){
-            this.effect = effect;
-            this.time = time;
-            return this;
-        }
-    }
 }

core/src/mindustry/type/StatusEffect.java

@@ -10,7 +10,7 @@ import mindustry.ctype.ContentType;
 import mindustry.entities.*;
 import mindustry.entities.Effects.*;
 import mindustry.entities.type.*;
-import mindustry.entities.units.Statuses.*;
+import mindustry.entities.units.*;
 
 public class StatusEffect extends MappableContent{
     /** Damage dealt by the unit with the effect. */