Schematic Verifier GUI: Add search bar

Author: mms0316

README.md

@@ -89,6 +89,7 @@ Features:
   * Useful for building with multiple people
   * Keeps checking for block changes outside render distance
 * Schematic Verifier: Addition of cardinal coordinates for entries in Info Hud
+* Schematic Verifier GUI: Addition of search bar
 
 Tweaks:
 * EasyPlace: Prestocks main hand using a single shift+click packet

src/main/java/fi/dy/masa/litematica/gui/widgets/WidgetListSchematicVerificationResults.java

@@ -1,11 +1,17 @@
 package fi.dy.masa.litematica.gui.widgets;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
+
+import fi.dy.masa.litematica.gui.Icons;
+import fi.dy.masa.malilib.gui.LeftRight;
+import fi.dy.masa.malilib.gui.widgets.WidgetSearchBar;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 
+import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.item.ItemStack;
@@ -20,6 +26,8 @@
 import fi.dy.masa.malilib.gui.widgets.WidgetListBase;
 import fi.dy.masa.malilib.util.ItemType;
 import fi.dy.masa.malilib.util.StringUtils;
+import net.minecraft.registry.Registries;
+import net.minecraft.util.Identifier;
 
 public class WidgetListSchematicVerificationResults extends WidgetListBase<BlockMismatchEntry, WidgetSchematicVerificationResult>
 {
@@ -36,6 +44,8 @@ public WidgetListSchematicVerificationResults(int x, int y, int width, int heigh
         this.browserEntryHeight = 22;
         this.guiSchematicVerifier = parent;
         this.allowMultiSelection = true;
+        this.widgetSearchBar = new WidgetSearchBar(x + 2, y + 8, width - 16, 14, 0, Icons.FILE_ICON_SEARCH, LeftRight.RIGHT);
+        this.widgetSearchBar.setZLevel(1);
         this.sorter = new VerifierResultSorter(parent.getPlacement().getSchematicVerifier());
     }
 
@@ -53,6 +63,57 @@ protected void offsetSelectionOrScrollbar(int amount, boolean changeSelection)
         lastScrollbarPosition = this.scrollBar.getValue();
     }
 
+    @Override
+    protected Collection<BlockMismatchEntry> getAllEntries()
+    {
+        List<BlockMismatchEntry> listContents = new ArrayList<>();
+
+        MismatchType type = this.guiSchematicVerifier.getResultMode();
+
+        if (type == MismatchType.ALL)
+        {
+            this.addEntriesForType(listContents, MismatchType.WRONG_BLOCK);
+            if (Configs.Generic.ENABLE_DIFFERENT_BLOCKS.getBooleanValue())
+            {
+                this.addEntriesForType(listContents, MismatchType.DIFF_BLOCK);
+            }
+            this.addEntriesForType(listContents, MismatchType.WRONG_STATE);
+            this.addEntriesForType(listContents, MismatchType.EXTRA);
+            this.addEntriesForType(listContents, MismatchType.MISSING);
+        }
+        else
+        {
+            this.addEntriesForType(listContents, type);
+        }
+
+        return listContents;
+    }
+
+    @Override
+    protected List<String> getEntryStringsForFilter(BlockMismatchEntry entry)
+    {
+        if (entry.blockMismatch == null)
+            return Collections.emptyList();
+
+        List<String> list = new ArrayList<>();
+
+        Block block = entry.blockMismatch.stateExpected.getBlock();
+        Identifier rl = Registries.ITEM.getId(block.asItem());
+
+        list.add(block.getName().getString().toLowerCase());
+        if (rl != null)
+            list.add(rl.toString().toLowerCase());
+
+        block = entry.blockMismatch.stateFound.getBlock();
+        rl = Registries.ITEM.getId(block.asItem());
+
+        list.add(block.getName().getString().toLowerCase());
+        if (rl != null)
+            list.add(rl.toString().toLowerCase());
+
+        return list;
+    }
+
     @Override
     protected WidgetSchematicVerificationResult createHeaderWidget(int x, int y, int listIndexStart, int usableHeight, int usedHeight)
     {
@@ -83,27 +144,7 @@ protected WidgetSchematicVerificationResult createHeaderWidget(int x, int y, int
     @Override
     protected void refreshBrowserEntries()
     {
-        this.listContents.clear();
-
-        MismatchType type = this.guiSchematicVerifier.getResultMode();
-
-        if (type == MismatchType.ALL)
-        {
-            this.addEntriesForType(MismatchType.WRONG_BLOCK);
-            if (Configs.Generic.ENABLE_DIFFERENT_BLOCKS.getBooleanValue())
-            {
-                this.addEntriesForType(MismatchType.DIFF_BLOCK);
-            }
-            this.addEntriesForType(MismatchType.WRONG_STATE);
-            this.addEntriesForType(MismatchType.EXTRA);
-            this.addEntriesForType(MismatchType.MISSING);
-        }
-        else
-        {
-            this.addEntriesForType(type);
-        }
-
-        this.reCreateListEntryWidgets();
+        super.refreshBrowserEntries();
 
         if (this.scrollbarRestored == false && lastScrollbarPosition <= this.scrollBar.getMaxValue())
         {
@@ -114,10 +155,10 @@ protected void refreshBrowserEntries()
         }
     }
 
-    private void addEntriesForType(MismatchType type)
+    private void addEntriesForType(Collection<BlockMismatchEntry> listContents, MismatchType type)
     {
         String title = type.getFormattingCode() + type.getDisplayname() + TXT_RST;
-        this.listContents.add(new BlockMismatchEntry(type, title));
+        listContents.add(new BlockMismatchEntry(type, title));
         List<BlockMismatch> list;
 
         if (type == MismatchType.CORRECT_STATE)
@@ -162,7 +203,7 @@ private void addEntriesForType(MismatchType type)
 
         for (BlockMismatch mismatch : list)
         {
-            this.listContents.add(new BlockMismatchEntry(type, mismatch));
+            listContents.add(new BlockMismatchEntry(type, mismatch));
         }
     }
 

src/main/java/fi/dy/masa/litematica/gui/widgets/WidgetSchematicVerificationResult.java

@@ -274,11 +274,14 @@ else if (this.isOdd)
 
         if (this.header1 != null && this.header2 != null)
         {
-            this.drawString(x1, y, color, this.header1, drawContext);
-            this.drawString(x2, y, color, this.header2, drawContext);
-            this.drawString(x3, y, color, this.header3, drawContext);
+            if (this.listWidget.getSearchBarWidget().isSearchOpen() == false)
+            {
+                this.drawString(x1, y, color, this.header1, drawContext);
+                this.drawString(x2, y, color, this.header2, drawContext);
+                this.drawString(x3, y, color, this.header3, drawContext);
 
-            this.renderColumnHeader(mouseX, mouseY, Icons.ARROW_DOWN, Icons.ARROW_UP, drawContext);
+                this.renderColumnHeader(mouseX, mouseY, Icons.ARROW_DOWN, Icons.ARROW_UP, drawContext);
+            }
         }
         else if (this.header1 != null)
         {