fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes new modes not being considered JEI modes.

Browse Source
This commit is contained in:
yueh
2017-10-14 14:39:05 +02:00
parent 4f07b63b13
commit 58e96aa3de
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/me/ItemRepo.java
+1 -2
View File
@@ -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( "@" ) )
src/main/java/appeng/util/Platform.java
+2 -6
View File
@@ -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;
}