Merged Unit & Builder components / Cleanup

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

@@ -13,6 +13,7 @@ import mindustry.entities.units.*;
 import mindustry.game.EventType.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
+import mindustry.type.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
 import mindustry.world.blocks.ConstructBlock.*;
@@ -22,17 +23,22 @@ import java.util.*;
 import static mindustry.Vars.*;
 
 @Component
-abstract class BuilderComp implements Unitc{
+abstract class BuilderComp implements Posc, Teamc, Rotc{
     static final Vec2[] vecs = new Vec2[]{new Vec2(), new Vec2(), new Vec2(), new Vec2()};
 
     @Import float x, y, rotation;
+    @Import UnitType type;
 
     @SyncLocal Queue<BuildPlan> plans = new Queue<>(1);
     @SyncLocal transient boolean updateBuilding = true;
 
+    public boolean canBuild(){
+        return type.buildSpeed > 0;
+    }
+
     @Override
     public void update(){
-        if(!updateBuilding) return;
+        if(!updateBuilding || !canBuild()) return;
 
         float finalPlaceDst = state.rules.infiniteResources ? Float.MAX_VALUE : buildingRange;
         boolean infinite = state.rules.infiniteResources || team().rules().infiniteResources;
@@ -102,9 +108,9 @@ abstract class BuilderComp implements Unitc{
         ConstructBuild entity = tile.bc();
 
         if(current.breaking){
-            entity.deconstruct(self(), core, 1f / entity.buildCost * Time.delta * type().buildSpeed * state.rules.buildSpeedMultiplier);
+            entity.deconstruct(self(), core, 1f / entity.buildCost * Time.delta * type.buildSpeed * state.rules.buildSpeedMultiplier);
         }else{
-            entity.construct(self(), core, 1f / entity.buildCost * Time.delta * type().buildSpeed * state.rules.buildSpeedMultiplier, current.config);
+            entity.construct(self(), core, 1f / entity.buildCost * Time.delta * type.buildSpeed * state.rules.buildSpeedMultiplier, current.config);
         }
 
         current.stuck = Mathf.equal(current.progress, entity.progress);
@@ -161,6 +167,8 @@ abstract class BuilderComp implements Unitc{
 
     /** Add another build requests to the queue, if it doesn't exist there yet. */
     void addBuild(BuildPlan place, boolean tail){
+        if(!canBuild()) return;
+
         BuildPlan replace = null;
         for(BuildPlan request : plans){
             if(request.x == place.x && request.y == place.y){
@@ -196,9 +204,8 @@ abstract class BuilderComp implements Unitc{
         return plans.size == 0 ? null : plans.first();
     }
 
-    @Override
     public void draw(){
-        if(!isBuilding() || !updateBuilding) return;
+        if(!isBuilding() || !updateBuilding || !canBuild()) return;
 
         //TODO check correctness
         Draw.z(Layer.flyingUnit);

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

@@ -1122,7 +1122,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
 
     /** Returns whether or not a hand cursor should be shown over this block. */
     public Cursor getCursor(){
-        return block.configurable ? SystemCursor.hand : SystemCursor.arrow;
+        return block.configurable && team == player.team() ? SystemCursor.hand : SystemCursor.arrow;
     }
 
     /**

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

@@ -32,7 +32,7 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc{
     }
 
     boolean mining(){
-        return mineTile != null && !(((Object)this) instanceof Builderc b && b.activelyBuilding());
+        return mineTile != null && !this.<Unit>self().activelyBuilding();
     }
 
     public boolean validMine(Tile tile, boolean checkDst){
@@ -44,6 +44,10 @@ abstract class MinerComp implements Itemsc, Posc, Teamc, Rotc, Drawc{
         return validMine(tile, true);
     }
 
+    public boolean canMine(){
+        return type.mineSpeed > 0;
+    }
+
     @Override
     public void update(){
         Building core = closestCore();

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

@@ -48,7 +48,7 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
     transient float textFadeTime;
 
     public boolean isBuilder(){
-        return unit instanceof Builderc;
+        return unit.canBuild();
     }
 
     public @Nullable CoreBuild closestCore(){
@@ -160,10 +160,6 @@ abstract class PlayerComp implements UnitController, Entityc, Syncc, Timerc, Dra
         return unit;
     }
 
-    public Builderc builder(){
-        return !(unit instanceof Builderc) ? Nulls.builder : (Builderc)unit;
-    }
-
     public void unit(Unit unit){
         if(unit == null) throw new IllegalArgumentException("Unit cannot be null. Use clearUnit() instead.");
         if(this.unit == unit) return;

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, Minerc{
+abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, Itemsc, Rotc, Unitc, Weaponsc, Drawc, Boundedc, Syncc, Shieldc, Commanderc, Displayable, Senseable, Ranged, Minerc, Builderc{
 
     @Import boolean hovering, dead;
     @Import float x, y, rotation, elevation, maxHealth, drag, armor, hitSize, health, ammo, minFormationSpeed;
@@ -88,8 +88,8 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
 
     /** @return where the unit wants to look at. */
     public float prefRotation(){
-        if(this instanceof Builderc builder && builder.activelyBuilding()){
-            return angleTo(builder.buildPlan());
+        if(activelyBuilding()){
+            return angleTo(buildPlan());
         }else if(mineTile() != null){
             return angleTo(mineTile());
         }else if(moving()){