Unit prefRotation / Class unification (monos will vanish)

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

@@ -16,8 +16,8 @@ import mindustry.world.*;
 import static mindustry.Vars.*;
 
 @Component
-abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc, Unitc{
-    @Import float x, y, rotation;
+abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc{
+    @Import float x, y, rotation, hitSize;
     @Import UnitType type;
 
     transient float mineTimer;
@@ -28,7 +28,7 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc, Unitc{
     }
 
     public boolean offloadImmediately(){
-        return isPlayer();
+        return this.<Unit>self().isPlayer();
     }
 
     boolean mining(){
@@ -87,13 +87,17 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc, Unitc{
                     mineTimer = 0f;
                 }
             }
+
+            if(!headless){
+                loops.play(type.mineSound, this, type.mineSoundVolume);
+            }
         }
     }
 
     @Override
     public void draw(){
         if(!mining()) return;
-        float focusLen = hitSize() / 2f + Mathf.absin(Time.time(), 1.1f, 0.5f);
+        float focusLen = hitSize / 2f + Mathf.absin(Time.time(), 1.1f, 0.5f);
         float swingScl = 12f, swingMag = tilesize / 8f;
         float flashScl = 0.3f;
 

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

@@ -31,7 +31,7 @@ import mindustry.world.blocks.payloads.*;
 import static mindustry.Vars.*;
 
 @Component(base = true)
-abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, Itemsc, Rotc, Unitc, Weaponsc, Drawc, Boundedc, Syncc, Shieldc, Commanderc, Displayable, Senseable, Ranged{
+abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, Itemsc, Rotc, Unitc, Weaponsc, Drawc, Boundedc, Syncc, Shieldc, Commanderc, Displayable, Senseable, Ranged, Minerc{
 
     @Import boolean hovering, dead;
     @Import float x, y, rotation, elevation, maxHealth, drag, armor, hitSize, health, ammo, minFormationSpeed;
@@ -88,11 +88,12 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
     public float prefRotation(){
         if(this instanceof Builderc builder && builder.activelyBuilding()){
             return angleTo(builder.buildPlan());
-        }else if(this instanceof Minerc miner && miner.mineTile() != null){
-            return angleTo(miner.mineTile());
-        }else{
+        }else if(mineTile() != null){
+            return angleTo(mineTile());
+        }else if(moving()){
             return vel().angle();
         }
+        return rotation;
     }
 
     @Override

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

@@ -65,9 +65,7 @@ public class AIController implements UnitController{
         if(unit.isFlying()){
             unit.wobble();
 
-            if(unit.moving()){
-                unit.lookAt(unit.vel.angle());
-            }
+            unit.lookAt(unit.prefRotation());
         }
     }