From 421d0b0abd703367d6078f344def91ddfa24bdec Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 11 Jan 2020 01:21:55 +0800 Subject: fix search --- gradle.properties | 2 +- src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 85db4cfa8..a8d513021 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -mod_version=3.3.7 +mod_version=3.3.8 minecraft_version=1.15.1 yarn_version=1.15.1+build.1 fabricloader_version=0.7.2+build.174 diff --git a/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java b/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java index dd1032cbe..5804f021b 100644 --- a/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java +++ b/src/main/java/me/shedaniel/rei/gui/widget/EntryListWidget.java @@ -613,15 +613,13 @@ public class EntryListWidget extends WidgetWithBounds { mod = stack.getIdentifier().map(Identifier::getNamespace).orElse("").replace(SPACE, EMPTY).toLowerCase(Locale.ROOT); if (mod != null && !mod.isEmpty()) { if (argument.getFunction(!argument.isInclude()).apply(mod)) { - applicable = false; - break; - } else { if (modName == null) modName = ClientHelper.getInstance().getModFromModId(mod).replace(SPACE, EMPTY).toLowerCase(Locale.ROOT); - if (modName != null && !modName.isEmpty() && argument.getFunction(!argument.isInclude()).apply(modName)) { + if (modName == null || modName.isEmpty() || argument.getFunction(!argument.isInclude()).apply(modName)) { applicable = false; break; } + break; } } } else if (argument.getArgumentType() == SearchArgument.ArgumentType.TEXT) { -- cgit