Made tiles not clear overlay on setFloor + cleanup/refactor

core/src/mindustry/world/Build.java

@@ -66,9 +66,9 @@ public class Build{
         Events.fire(new BlockBuildBeginEvent(tile, team, unit, true));
     }
 
-    /** Places a ConstructBlock at this location. */
+    /** Places a ConstructBlock at this location. To preserve bandwidth, a config is only passed in the case of instant-place blocks. */
     @Remote(called = Loc.server)
-    public static void beginPlace(@Nullable Unit unit, Block result, Team team, int x, int y, int rotation){
+    public static void beginPlace(@Nullable Unit unit, Block result, Team team, int x, int y, int rotation, @Nullable Object placeConfig){
         if(!validPlace(result, team, x, y, rotation)){
             return;
         }
@@ -127,7 +127,7 @@ public class Build{
         if(result.instantBuild){
             Events.fire(new BlockBuildBeginEvent(tile, team, unit, false));
             result.placeBegan(tile, tile.block, unit);
-            ConstructBlock.constructFinish(tile, result, unit, (byte)rotation, team, null);
+            ConstructBlock.constructFinish(tile, result, unit, (byte)rotation, team, placeConfig);
             return;
         }
 

core/src/mindustry/world/Tile.java

@@ -290,11 +290,11 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         setBlock(type, Team.derelict, 0);
     }
 
-    /** This resets the overlay! */
     public void setFloor(Floor type){
+        if(this.floor == type) return;
+
         var prev = this.floor;
         this.floor = type;
-        this.overlay = (Floor)Blocks.air;
 
         if(!headless && !world.isGenerating() && !isEditorTile()){
             renderer.blocks.removeFloorIndex(this);
@@ -321,15 +321,6 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         return false;
     }
 
-    /** Sets the floor, preserving overlay.*/
-    public void setFloorUnder(Floor floor){
-        Block overlay = this.overlay;
-        setFloor(floor);
-        if(this.overlay != overlay){
-            setOverlay(overlay);
-        }
-    }
-
     /** Sets the block to air. */
     public void setAir(){
         setBlock(Blocks.air);
@@ -412,10 +403,6 @@ public class Tile implements Position, QuadTreeObject, Displayable{
         return floor.id;
     }
 
-    public void setOverlayID(short ore){
-        setOverlay(content.block(ore));
-    }
-
     public void setOverlay(Block block){
         this.overlay = (Floor)block;
 
@@ -431,7 +418,7 @@ public class Tile implements Position, QuadTreeObject, Displayable{
     }
 
     public void clearOverlay(){
-        setOverlayID((short)0);
+        setOverlay(Blocks.air);
     }
 
     public boolean passable(){

core/src/mindustry/world/blocks/ConstructBlock.java

@@ -77,8 +77,10 @@ public class ConstructBlock extends Block{
 
         if(block instanceof OverlayFloor overlay){
             tile.setOverlay(overlay);
+            overlay.placed(tile, config);
         }else if(block instanceof Floor floor){
-            tile.setFloorUnder(floor);
+            tile.setFloor(floor);
+            floor.placed(tile, config);
         }else{
             tile.setBlock(block, team, rotation);
         }

core/src/mindustry/world/blocks/environment/ColoredFloor.java

@@ -5,6 +5,7 @@ import arc.graphics.g2d.*;
 import arc.math.geom.*;
 import arc.util.*;
 import mindustry.*;
+import mindustry.entities.units.*;
 import mindustry.world.*;
 import mindustry.world.blocks.*;
 
@@ -133,6 +134,22 @@ public class ColoredFloor extends Floor{
         tile.extraData = defaultColorRgba;
     }
 
+    @Override
+    public void placed(Tile tile, @Nullable Object config){
+        //config is assumed to be an integer RGBA color
+        if(config instanceof Integer i){
+            tile.extraData = i;
+        }
+    }
+
+    @Override
+    public void drawPlanRegion(BuildPlan plan, Eachable<BuildPlan> list){
+        if(plan.config instanceof Integer i){
+            Draw.tint(Tmp.c1.set(i | 0xff));
+        }
+        drawDefaultPlanRegion(plan, list);
+    }
+
     @Override
     public boolean checkAutotileSame(Tile tile, @Nullable Tile other){
         return other != null && other.floor().blendGroup == blendGroup && ((tile.extraData & 0xff) == flagIgnoreDifferentColor || tile.extraData == other.extraData);

core/src/mindustry/world/blocks/environment/Floor.java

@@ -275,6 +275,9 @@ public class Floor extends Block{
     /** Called when this floor is set on the specified tile. */
     public void floorChanged(Tile tile){}
 
+    /** Called when this floor or overlay is placed on a tile. The config may be null. */
+    public void placed(Tile tile, @Nullable Object config){}
+
     /** @return whether to index this floor by flag */
     public boolean shouldIndex(Tile tile){
         return true;