From 58e96aa3de9a30763d323d64e63d6b741f9d4725 Mon Sep 17 00:00:00 2001 From: yueh Date: Sat, 14 Oct 2017 14:39:05 +0200 Subject: [PATCH] Fixes new modes not being considered JEI modes. --- src/main/java/appeng/client/me/ItemRepo.java | 3 +-- src/main/java/appeng/util/Platform.java | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/java/appeng/client/me/ItemRepo.java b/src/main/java/appeng/client/me/ItemRepo.java index 499b4896..534e4a2f 100644 --- a/src/main/java/appeng/client/me/ItemRepo.java +++ b/src/main/java/appeng/client/me/ItemRepo.java @@ -112,14 +112,13 @@ public class ItemRepo final Enum viewMode = this.sortSrc.getSortDisplay(); final Enum searchMode = AEConfig.instance().getConfigManager().getSetting( Settings.SEARCH_MODE ); - if( searchMode == SearchBoxMode.JEI_AUTOSEARCH || searchMode == SearchBoxMode.JEI_MANUAL_SEARCH ) + if( searchMode == SearchBoxMode.JEI_AUTOSEARCH || searchMode == SearchBoxMode.JEI_MANUAL_SEARCH || searchMode == SearchBoxMode.JEI_AUTOSEARCH_KEEP || searchMode == SearchBoxMode.JEI_MANUAL_SEARCH_KEEP ) { this.updateJEI( this.searchString ); } this.innerSearch = this.searchString; final boolean terminalSearchToolTips = AEConfig.instance().getConfigManager().getSetting( Settings.SEARCH_TOOLTIPS ) != YesNo.NO; - // boolean terminalSearchMods = Configuration.INSTANCE.settings.getSetting( Settings.SEARCH_MODS ) != YesNo.NO; boolean searchMod = false; if( this.innerSearch.startsWith( "@" ) ) diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index b3444a91..b1f98879 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -344,12 +344,8 @@ public class Platform return true; } - if( e == SearchBoxMode.JEI_AUTOSEARCH && !Integrations.jei().isEnabled() ) - { - return true; - } - - if( e == SearchBoxMode.JEI_MANUAL_SEARCH && !Integrations.jei().isEnabled() ) + final boolean isJEI = e == SearchBoxMode.JEI_AUTOSEARCH || e == SearchBoxMode.JEI_AUTOSEARCH_KEEP || e == SearchBoxMode.JEI_MANUAL_SEARCH || e == SearchBoxMode.JEI_MANUAL_SEARCH_KEEP; + if( isJEI && !Integrations.jei().isEnabled() ) { return true; }