More lights

core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java

@@ -34,39 +34,36 @@ public interface BuilderTrait extends Entity, TeamTrait{
     default void updateBuilding(){
         float finalPlaceDst = state.rules.infiniteResources ? Float.MAX_VALUE : placeDistance;
         Unit unit = (Unit)this;
+
         //remove already completed build requests
         removal.clear();
-        for(BuildRequest req : buildQueue()){
-            removal.add(req);
-        }
+        removal.addAll(buildQueue());
 
-        buildQueue().clear();
+        Structs.filter(buildQueue(), req -> {
+            Tile tile = world.tile(req.x, req.y);
+            return tile == null || (req.breaking && tile.block() == Blocks.air) || (!req.breaking && (tile.rotation() == req.rotation || !req.block.rotate) && tile.block() == req.block);
+        });
 
-        for(BuildRequest request : removal){
-            Tile tile = world.tile(request.x, request.y);
+        TileEntity core = unit.getClosestCore();
 
-            if(!(tile == null || (request.breaking && tile.block() == Blocks.air) ||
-            (!request.breaking && (tile.rotation() == request.rotation || !request.block.rotate) && tile.block() == request.block))){
-                buildQueue().addLast(request);
+        //nothing to build.
+        if(buildRequest() == null) return;
+
+        //find the next build request
+        if(buildQueue().size > 1){
+            int total = 0;
+            BuildRequest req;
+            while((dst((req = buildRequest()).tile()) > finalPlaceDst || shouldSkip(req, core)) && total < buildQueue().size){
+                buildQueue().removeFirst();
+                buildQueue().addLast(req);
+                total++;
             }
         }
 
         BuildRequest current = buildRequest();
 
-        if(current == null){
-            return;
-        }
-
         Tile tile = world.tile(current.x, current.y);
 
-        if(dst(tile) > finalPlaceDst){
-            if(buildQueue().size > 1){
-                buildQueue().removeFirst();
-                buildQueue().addLast(current);
-            }
-            return;
-        }
-
         if(!(tile.block() instanceof BuildBlock)){
             if(!current.initialized && canCreateBlocks() && !current.breaking && Build.validPlace(getTeam(), current.x, current.y, current.block, current.rotation)){
                 Call.beginPlace(getTeam(), current.x, current.y, current.block, current.rotation);
@@ -78,8 +75,6 @@ public interface BuilderTrait extends Entity, TeamTrait{
             }
         }
 
-        TileEntity core = unit.getClosestCore();
-
         if(tile.entity instanceof BuildEntity && !current.initialized){
             Core.app.post(() -> Events.fire(new BuildSelectEvent(tile, unit.getTeam(), this, current.breaking)));
             current.initialized = true;
@@ -111,9 +106,17 @@ public interface BuilderTrait extends Entity, TeamTrait{
             }
         }
 
+        current.stuck = Mathf.equal(current.progress, entity.progress);
         current.progress = entity.progress;
     }
 
+    /** @return whether this request should be skipped, in favor of the next one. */
+    default boolean shouldSkip(BuildRequest request, @Nullable TileEntity core){
+        //requests that you have at least *started* are considered
+        if(state.rules.infiniteResources || request.breaking || !request.initialized || core == null) return false;
+        return request.stuck && !core.items.has(request.block.requirements);
+    }
+
     /** Returns the queue for storing build requests. */
     Queue<BuildRequest> buildQueue();
 
@@ -287,8 +290,8 @@ public interface BuilderTrait extends Entity, TeamTrait{
 
         /** Last progress.*/
         public float progress;
-        /** Whether construction has started for this request.*/
-        public boolean initialized, worldContext = true;
+        /** Whether construction has started for this request, and other special variables.*/
+        public boolean initialized, worldContext = true, stuck;
 
         /** Visual scale. Used only for rendering.*/
         public float animScale = 0f;

core/src/io/anuke/mindustry/entities/type/Player.java

@@ -592,6 +592,11 @@ public class Player extends Unit implements BuilderMinerTrait, ShooterTrait{
             movement.x += xa * speed;
         }
 
+        if(Core.input.keyDown(Binding.mouse_move)){
+            movement.x += Mathf.clamp((Core.input.mouseX() - Core.graphics.getWidth() / 2) * 0.005f, -1, 1) * speed;
+            movement.y += Mathf.clamp((Core.input.mouseY() - Core.graphics.getHeight() / 2) * 0.005f, -1, 1) * speed;
+        }
+
         Vector2 vec = Core.input.mouseWorld(control.input.getMouseX(), control.input.getMouseY());
         pointerX = vec.x;
         pointerY = vec.y;

core/src/io/anuke/mindustry/entities/type/TileEntity.java

@@ -87,6 +87,11 @@ public class TileEntity extends BaseEntity implements TargetTrait, HealthTrait{
         return Time.delta() * timeScale;
     }
 
+    /** Base efficiency. If this entity has non-buffered power, returns the power %, otherwise returns 1. */
+    public float efficiency(){
+        return power != null && !block.consumes.getPower().buffered ? power.status : 1f;
+    }
+
     /** Call when nothing is happening to the entity. This increments the internal sleep timer. */
     public void sleep(){
         sleepTime += Time.delta();