From 255d1c511ef07c6e7cbb9cf3353f3ff616026e62 Mon Sep 17 00:00:00 2001 From: Summet-V Date: Fri, 6 Nov 2020 17:45:35 +0300 Subject: [PATCH] Optimization tweaks --- core/src/mindustry/editor/MapEditorDialog.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/core/src/mindustry/editor/MapEditorDialog.java b/core/src/mindustry/editor/MapEditorDialog.java index c7824890d3..fc96184ec4 100644 --- a/core/src/mindustry/editor/MapEditorDialog.java +++ b/core/src/mindustry/editor/MapEditorDialog.java @@ -693,8 +693,6 @@ public class MapEditorDialog extends Dialog implements Disposable{ private void rebuildBlockSelection(String searchText){ blockSelection.clear(); - Seq filteredBlocks = new Seq<>(); - blocksOut.clear(); blocksOut.addAll(Vars.content.blocks()); blocksOut.sort((b1, b2) -> { @@ -714,11 +712,9 @@ public class MapEditorDialog extends Dialog implements Disposable{ if(!Core.atlas.isFound(region) || !block.inEditor || block.buildVisibility == BuildVisibility.debugOnly - || (!block.localizedName.toLowerCase().contains(searchText.toLowerCase()) && !searchText.isEmpty()) + || (!searchText.isEmpty() && !block.localizedName.toLowerCase().contains(searchText.toLowerCase())) ) continue; - filteredBlocks.add(block); - ImageButton button = new ImageButton(Tex.whiteui, Styles.clearTogglei); button.getStyle().imageUp = new TextureRegionDrawable(region); button.clicked(() -> editor.drawBlock = block); @@ -726,13 +722,15 @@ public class MapEditorDialog extends Dialog implements Disposable{ button.update(() -> button.setChecked(editor.drawBlock == block)); blockSelection.add(button).size(50f).tooltip(block.localizedName); - if(++i % 4 == 0) blockSelection.row(); + if(i == 0) editor.drawBlock = block; + + if(++i % 4 == 0){ + blockSelection.row(); + } } - if(filteredBlocks.isEmpty()){ + if(i == 0){ blockSelection.add("@none").padLeft(80f).padTop(10f); - }else{ - editor.drawBlock = filteredBlocks.first(); } } }