Cleanup continues

core/src/mindustry/entities/effect/GroundEffectEntity.java

@@ -1,89 +0,0 @@
-package mindustry.entities.effect;
-
-import arc.math.Mathf;
-import arc.util.Time;
-import mindustry.Vars;
-import mindustry.entities.Effects;
-import mindustry.entities.*;
-import mindustry.entities.Effects.EffectRenderer;
-import mindustry.world.Tile;
-
-/**
- * A ground effect contains an effect that is rendered on the ground layer as opposed to the top layer.
- */
-public class GroundEffectEntity extends EffectEntity{
-    private boolean once;
-
-    @Override
-    public void update(){
-        GroundEffect effect = (GroundEffect)this.effect;
-
-        if(effect.isStatic){
-            time += Time.delta();
-
-            time = Mathf.clamp(time, 0, effect.staticLife);
-
-            if(!once && time >= lifetime()){
-                once = true;
-                time = 0f;
-                Tile tile = Vars.world.tileWorld(x, y);
-                if(tile != null && tile.floor().isLiquid){
-                    remove();
-                }
-            }else if(once && time >= effect.staticLife){
-                remove();
-            }
-        }else{
-            super.update();
-        }
-    }
-
-    @Override
-    public void draw(){
-        GroundEffect effect = (GroundEffect)this.effect;
-
-        if(once && effect.isStatic)
-            Effects.renderEffect(id, effect, color, lifetime(), rotation, x, y, data);
-        else
-            Effects.renderEffect(id, effect, color, time, rotation, x, y, data);
-    }
-
-    @Override
-    public void reset(){
-        super.reset();
-        once = false;
-    }
-
-    /**
-     * An effect that is rendered on the ground layer as opposed to the top layer.
-     */
-    public static class GroundEffect extends Effect{
-        /**
-         * How long this effect stays on the ground when static.
-         */
-        public final float staticLife;
-        /**
-         * If true, this effect will stop and lie on the ground for a specific duration,
-         * after its initial lifetime is over.
-         */
-        public final boolean isStatic;
-
-        public GroundEffect(float life, float staticLife, EffectRenderer draw){
-            super(life, draw);
-            this.staticLife = staticLife;
-            this.isStatic = true;
-        }
-
-        public GroundEffect(boolean isStatic, float life, EffectRenderer draw){
-            super(life, draw);
-            this.staticLife = 0f;
-            this.isStatic = isStatic;
-        }
-
-        public GroundEffect(float life, EffectRenderer draw){
-            super(life, draw);
-            this.staticLife = 0f;
-            this.isStatic = false;
-        }
-    }
-}

core/src/mindustry/entities/effect/Lightning.java

@@ -9,7 +9,7 @@ import arc.util.pooling.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.entities.*;
-import mindustry.entities.type.*;
+import mindustry.gen.*;
 import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;

core/src/mindustry/entities/effect/Puddle.java

@@ -201,7 +201,7 @@ public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrai
 
                 unit.applyEffect(liquid.effect, 60 * 2);
 
-                if(unit.velocity().len() > 0.1){
+                if(unit.vel().len() > 0.1){
                     Fx.ripple.at(liquid.color, unit.x, unit.y);
                 }
             });