Switch menu type when picking block

MEEPofFaith · Mar 31, 2024 · 5b6ebaa · 5b6ebaa
1 parent e3bb657
commit 5b6ebaa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/src/testing/editor/PainterTool.java b/src/testing/editor/PainterTool.java
@@ -19,7 +19,7 @@ public void touched(int x, int y){
             if(!Structs.inBounds(x, y, painter.width(), painter.height())) return;
 
             Tile tile = painter.tile(x, y);
-            painter.drawBlock = tile.block() == Blocks.air || !tile.block().inEditor ? tile.overlay() == Blocks.air ? tile.floor() : tile.overlay() : tile.block();
+            painter.setDrawBlock(tile.block() == Blocks.air || !tile.block().inEditor ? tile.overlay() == Blocks.air ? tile.floor() : tile.overlay() : tile.block());
         }
     },
     line("replace", "orthogonal"){

diff --git a/src/testing/editor/TerrainPainter.java b/src/testing/editor/TerrainPainter.java
@@ -12,6 +12,7 @@
 import mindustry.game.*;
 import mindustry.world.*;
 import mindustry.world.blocks.environment.*;
+import testing.util.*;
 
 import static mindustry.Vars.*;
 import static testing.util.TUVars.*;
@@ -85,6 +86,11 @@ public float brushSize(){
         return drawBlock instanceof SteamVent ? 2 : brushSize;
     }
 
+    public void setDrawBlock(Block block){
+        drawBlock = block;
+        Setup.terrainFrag.updateMenu();
+    }
+
     public void drawBlocksReplace(int x, int y){
         drawBlocks(x, y, data -> data.block() != Blocks.air || drawBlock.isFloor());
     }

diff --git a/src/testing/ui/TerrainPainterFragment.java b/src/testing/ui/TerrainPainterFragment.java
@@ -314,6 +314,11 @@ private void rebuild(){
         }).fillX().left().padBottom(10);
     }
 
+    public void updateMenu(){
+        buildings = isBuilding(painter.drawBlock);
+        rebuild();
+    }
+
     private boolean blockFilter(Block b){
         if(buildings){
             return isBuilding(b);