[change] bundle searchables; return code for searchables

ponuing · ponuing · commit db382d7b363f · 2026-03-27T14:01:02.000+03:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -206,9 +206,9 @@ dependencies {
     compileOnly("com.blamejared.searchables:Searchables-fabric-${properties["searchables_version"]}") {
         exclude(group = "net.fabricmc.fabric-api", module = "fabric-api")
     }
-    //runtimeOnly("com.blamejared.searchables:Searchables-fabric-${properties["searchables_version"]}") {
-        //exclude(group = "net.fabricmc.fabric-api", module = "fabric-api")
-    //}
+    runtimeOnly("com.blamejared.searchables:Searchables-fabric-${properties["searchables_version"]}") {
+        exclude(group = "net.fabricmc.fabric-api", module = "fabric-api")
+    }
     if (isBundlingSearchables) include("com.blamejared.searchables:Searchables-fabric-${properties["searchables_version"]}")
 
     // Mod Menu
diff --git a/gradle.properties b/gradle.properties
@@ -8,13 +8,13 @@ minecraft_version=26.1
 loader_version=0.18.4
 
 # Mod Properties
-mod_version=2.8.1-beta.2
+mod_version=2.8.1-beta.3
 maven_group=red.jackf
 archives_base_name=chesttracker
 
 # Dependencies
-bundle_searchables=false
-searchables_version=1.21.11:1.0.2
+bundle_searchables=true
+searchables_version=26.1:1.0.4
 
 # Mod Compat
 # clothconfig_version=21.11.152
diff --git a/src/client/java/red/jackf/chesttracker/impl/compat/mods/searchables/CustomSearchablesFormatter.java b/src/client/java/red/jackf/chesttracker/impl/compat/mods/searchables/CustomSearchablesFormatter.java
@@ -44,36 +44,34 @@ public void reset() {
     public TokenRange visitGrouping(final GroupingExpression expr, final @NotNull FormattingContext context) {
 
         TokenRange leftRange = expr.left().accept(this, context);
-        //tokens.add(Pair.of(getAndPushRange(), context.style()));
+        tokens.add(Pair.of(getAndPushRange(), context.style()));
         TokenRange rightRange = expr.right().accept(this, context);
         return TokenRange.encompassing(leftRange, rightRange);
     }
 
     @NotNull
     public TokenRange visitComponent(final ComponentExpression expr, final FormattingContext context) {
 
-        /*boolean valid = context.valid() && expr.left() instanceof LiteralExpression && expr.right() instanceof LiteralExpression;
+        boolean valid = context.valid() && expr.left() instanceof LiteralExpression && expr.right() instanceof LiteralExpression;
         TokenRange leftRange = expr.left()
                 .accept(this, FormattingContext.key(Style.EMPTY.withColor(TextColours.getSearchKeyColour()), valid));
         tokens.add(Pair.of(getAndPushRange(), context.style(valid)));
         TokenRange rightRange = expr.right()
                 .accept(this, FormattingContext.literal(Style.EMPTY.withColor(TextColours.getSearchTermColour()), valid));
-        return TokenRange.encompassing(leftRange, rightRange);*/
-        return null;
+        return TokenRange.encompassing(leftRange, rightRange);
     }
 
     @Override
     @NotNull
     public TokenRange visitLiteral(final @NotNull LiteralExpression expr, final FormattingContext context) {
 
-        /*Style style = context.style();
+        Style style = context.style();
         if (!context.valid() || context.isKey() && !type.components().containsKey(expr.value())) {
             style = Style.EMPTY.withColor(TextColours.getErrorColour()).withUnderlined(true);
         }
         TokenRange range = getAndPushRange(expr.displayValue().length());
         tokens.add(Pair.of(range, style));
-        return range;*/
-        return null;
+        return range;
     }
 
     @Override
diff --git a/src/client/java/red/jackf/chesttracker/impl/compat/mods/searchables/SearchablesUtil.java b/src/client/java/red/jackf/chesttracker/impl/compat/mods/searchables/SearchablesUtil.java
@@ -1,114 +1,49 @@
-//package red.jackf.chesttracker.impl.compat.mods.searchables;
-//
-//import com.blamejared.searchables.api.SearchableComponent;
-//import com.blamejared.searchables.api.SearchableType;
-//import com.blamejared.searchables.api.autcomplete.AutoCompletingEditBox;
-//import net.minecraft.client.gui.Font;
-//import net.minecraft.client.gui.components.AbstractWidget;
-//import net.minecraft.client.gui.components.EditBox;
-//import net.minecraft.core.component.DataComponents;
-//import net.minecraft.core.registries.BuiltInRegistries;
-//import net.minecraft.resources.Identifier;
-//import net.minecraft.world.item.ItemStack;
-//import red.jackf.chesttracker.impl.config.ChestTrackerConfig;
-//import red.jackf.chesttracker.impl.gui.widget.CustomEditBox;
-//import red.jackf.chesttracker.impl.gui.widget.WidgetZOffsetWrapper;
-//import red.jackf.chesttracker.impl.util.ItemStacks;
-//
-//import java.util.List;
-//import java.util.Optional;
-//import java.util.function.Consumer;
-//import java.util.function.Predicate;
-//import java.util.function.Supplier;
-//
-//public class SearchablesUtil {
-//    public static final SearchableType<ItemStack> ITEM_STACK = buildType();
-//
-//    private static SearchableType<ItemStack> buildType() {
-//        return new SearchableType.Builder<ItemStack>()
-//                .defaultComponent(SearchableComponent.create("text", ItemStacks::defaultPredicate))
-//                .component(SearchableComponent.create("name", SearchablesUtil::stackNameSuggestions, ItemStacks::namePredicate))
-//                .component(SearchableComponent.create("tooltip", ItemStacks::tooltipPredicate))
-//                .component(SearchableComponent.create("id", stack -> Optional.of(BuiltInRegistries.ITEM.getKey(stack.getItem())
-//                        .getPath())))
-//                .component(SearchableComponent.create("tag", ItemStacks::tagPredicate))
-//                .component(SearchableComponent.create("mod", stack -> Optional.of(BuiltInRegistries.ITEM.getKey(stack.getItem()))
-//                        .map(Identifier::getNamespace)))
-//                .component(SearchableComponent.create("enchantment", ItemStacks::enchantmentPredicate))
-//                .component(SearchableComponent.create("potion", ItemStacks::potionOrEffectPredicate))
-//                .build();
-//    }
-//
-//    private static Optional<String> stackNameSuggestions(ItemStack stack) {
-//        if (stack.has(DataComponents.CUSTOM_NAME) || ChestTrackerConfig.INSTANCE.instance().gui.autocompleteShowsRegularNames)
-//            return Optional.of(stack.getHoverName().getString());
-//        return Optional.empty();
-//    }
-//
-//    public static EditBox getEditBox(
-//            Font font,
-//            int x,
-//            int y,
-//            int width,
-//            int height,
-//            EditBox previous,
-//            Supplier<List<ItemStack>> itemSupplier,
-//            Consumer<String> callback) {
-//        AutoCompletingEditBox<ItemStack> box = new AutoCompletingEditBox<>(
-//                font,
-//                x,
-//                y,
-//                width,
-//                height,
-//                previous,
-//                CustomEditBox.SEARCH_MESSAGE,
-//                ITEM_STACK,
-//                itemSupplier
-//        );
-//
-//        var formatter = SearchablesUtil.getFormatter();
-//        box.addResponder(formatter);
-//        box.addFormatter(formatter::apply);
-//
-//        box.addResponder(callback);
-//
-//        return box;
-//    }
-//
-//    public static CustomSearchablesFormatter getFormatter() {
-//        return new CustomSearchablesFormatter(ITEM_STACK);
-//    }
-//
-//    public static boolean ifSearchables(EditBox box, Predicate<AbstractWidget> ifSearchablesBox) {
-//        if (box instanceof AutoCompletingEditBox<?> autoCompletingEditBox) {
-//            return ifSearchablesBox.test(autoCompletingEditBox.autoComplete());
-//        } else {
-//            return false;
-//        }
-//    }
-//
-//    public static AbstractWidget getWrappedAutocomplete(EditBox search) {
-//        //noinspection unchecked
-//        return new WidgetZOffsetWrapper<>(((AutoCompletingEditBox<ItemStack>) search).autoComplete(), 250);
-//    }
-//}
-//temp remove searchabless
 package red.jackf.chesttracker.impl.compat.mods.searchables;
 
+import com.blamejared.searchables.api.SearchableComponent;
+import com.blamejared.searchables.api.SearchableType;
+import com.blamejared.searchables.api.autcomplete.AutoCompletingEditBox;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.core.component.DataComponents;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.resources.Identifier;
 import net.minecraft.world.item.ItemStack;
+import red.jackf.chesttracker.impl.config.ChestTrackerConfig;
 import red.jackf.chesttracker.impl.gui.widget.CustomEditBox;
+import red.jackf.chesttracker.impl.gui.widget.WidgetZOffsetWrapper;
 import red.jackf.chesttracker.impl.util.ItemStacks;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
 public class SearchablesUtil {
-    public static final DummySearchableType ITEM_STACK = new DummySearchableType();
+    public static final SearchableType<ItemStack> ITEM_STACK = buildType();
+
+    private static SearchableType<ItemStack> buildType() {
+        return new SearchableType.Builder<ItemStack>()
+                .defaultComponent(SearchableComponent.create("text", ItemStacks::defaultPredicate))
+                .component(SearchableComponent.create("name", SearchablesUtil::stackNameSuggestions, ItemStacks::namePredicate))
+                .component(SearchableComponent.create("tooltip", ItemStacks::tooltipPredicate))
+                .component(SearchableComponent.create("id", stack -> Optional.of(BuiltInRegistries.ITEM.getKey(stack.getItem())
+                        .getPath())))
+                .component(SearchableComponent.create("tag", ItemStacks::tagPredicate))
+                .component(SearchableComponent.create("mod", stack -> Optional.of(BuiltInRegistries.ITEM.getKey(stack.getItem()))
+                        .map(Identifier::getNamespace)))
+                .component(SearchableComponent.create("enchantment", ItemStacks::enchantmentPredicate))
+                .component(SearchableComponent.create("potion", ItemStacks::potionOrEffectPredicate))
+                .build();
+    }
+
+    private static Optional<String> stackNameSuggestions(ItemStack stack) {
+        if (stack.has(DataComponents.CUSTOM_NAME) || ChestTrackerConfig.INSTANCE.instance().gui.autocompleteShowsRegularNames)
+            return Optional.of(stack.getHoverName().getString());
+        return Optional.empty();
+    }
 
     public static EditBox getEditBox(
             Font font,
@@ -118,42 +53,42 @@ public static EditBox getEditBox(
             int height,
             EditBox previous,
             Supplier<List<ItemStack>> itemSupplier,
-            Consumer<String> callback
-    ) {
-        CustomEditBox box = new CustomEditBox(
+            Consumer<String> callback) {
+        AutoCompletingEditBox<ItemStack> box = new AutoCompletingEditBox<>(
                 font,
                 x,
                 y,
                 width,
                 height,
                 previous,
-                CustomEditBox.SEARCH_MESSAGE
+                CustomEditBox.SEARCH_MESSAGE,
+                ITEM_STACK,
+                itemSupplier
         );
 
-        box.setHint(CustomEditBox.SEARCH_MESSAGE);
-        box.setResponder(callback);
+        var formatter = SearchablesUtil.getFormatter();
+        box.addResponder(formatter);
+        box.addFormatter(formatter::apply);
+
+        box.addResponder(callback);
+
         return box;
     }
 
     public static CustomSearchablesFormatter getFormatter() {
-        return new CustomSearchablesFormatter(null);
+        return new CustomSearchablesFormatter(ITEM_STACK);
     }
 
     public static boolean ifSearchables(EditBox box, Predicate<AbstractWidget> ifSearchablesBox) {
-        return false;
+        if (box instanceof AutoCompletingEditBox<?> autoCompletingEditBox) {
+            return ifSearchablesBox.test(autoCompletingEditBox.autoComplete());
+        } else {
+            return false;
+        }
     }
 
     public static AbstractWidget getWrappedAutocomplete(EditBox search) {
-        return (AbstractWidget) search;
-    }
-
-    public static class DummySearchableType {
-        public List<ItemStack> filterEntries(List<ItemStack> items, String filter) {
-            String lowered = filter == null ? "" : filter.toLowerCase();
-
-            return items.stream()
-                    .filter(stack -> ItemStacks.defaultPredicate(stack, lowered))
-                    .toList();
-        }
+        //noinspection unchecked
+        return new WidgetZOffsetWrapper<>(((AutoCompletingEditBox<ItemStack>) search).autoComplete(), 250);
     }
 }
diff --git a/src/client/resources/fabric.mod.json b/src/client/resources/fabric.mod.json
@@ -9,7 +9,7 @@
     "ponuing"
   ],
   "contributors": [
-    "WinTone01 - Turkish Translations "
+    "WinTone01 - Turkish Translations"
   ],
   "contact": {
     "homepage": "https://modrinth.com/mod/chest-tracker-port",
