Internal refactoring & cleanup

core/src/mindustry/entities/comp/WaterMoveComp.java

@@ -4,17 +4,17 @@ import arc.graphics.*;
 import arc.graphics.g2d.*;
 import arc.math.*;
 import arc.util.*;
+import mindustry.ai.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.entities.*;
+import mindustry.entities.EntityCollisions.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.environment.*;
 
-import static mindustry.Vars.*;
-
 //just a proof of concept
 @Component
 abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
@@ -38,16 +38,8 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
 
     @Override
     @Replace
-    public void lookAt(float angle){
-        if(onLiquid()){
-            rotation = Angles.moveToward(rotation, angle, type.rotateSpeed * Time.delta);
-        }
-    }
-
-    @Override
-    @Replace
-    public boolean canShoot(){
-        return onLiquid();
+    public int pathType(){
+        return Pathfinder.costWater;
     }
 
     @Override
@@ -74,13 +66,8 @@ abstract class WaterMoveComp implements Posc, Velc, Hitboxc, Flyingc, Unitc{
 
     @Replace
     @Override
-    public void move(float cx, float cy){
-        if(isGrounded()){
-            collisions.moveCheck(this, cx, cy, EntityCollisions::waterSolid);
-        }else{
-            x += cx;
-            y += cy;
-        }
+    public SolidPred solidity(){
+        return isFlying() ? null : EntityCollisions::waterSolid;
     }
 
     @Replace