Fixed Bug: #1000 - Crafting Terminal NEI Sync Clearing

This commit is contained in:
AlgorithmX2
2014-08-30 16:26:42 -05:00
parent b7ea4e75d3
commit 689a9bb8ae
+7 -5
View File
@@ -44,6 +44,7 @@ public class ItemRepo
public int rowSize = 9; public int rowSize = 9;
public String searchString = ""; public String searchString = "";
private String innerSearch = "";
public ItemRepo(IScrollSource src, ISortSource sortSrc) { public ItemRepo(IScrollSource src, ISortSource sortSrc) {
this.src = src; this.src = src;
@@ -172,7 +173,7 @@ public class ItemRepo
Method b = searchField.getClass().getMethod( "onTextChange", String.class ); Method b = searchField.getClass().getMethod( "onTextChange", String.class );
NEIWord = filter; NEIWord = filter;
a.invoke( searchField, filter ); a.invoke( searchField, new String( filter ) );
b.invoke( searchField, "" ); b.invoke( searchField, "" );
} }
} }
@@ -195,26 +196,27 @@ public class ItemRepo
if ( mode == SearchBoxMode.NEI_AUTOSEARCH || mode == SearchBoxMode.NEI_MANUAL_SEARCH ) if ( mode == SearchBoxMode.NEI_AUTOSEARCH || mode == SearchBoxMode.NEI_MANUAL_SEARCH )
updateNEI( searchString ); updateNEI( searchString );
innerSearch = searchString;
boolean terminalSearchToolTips = AEConfig.instance.settings.getSetting( Settings.SEARCH_TOOLTIPS ) != YesNo.NO; boolean terminalSearchToolTips = AEConfig.instance.settings.getSetting( Settings.SEARCH_TOOLTIPS ) != YesNo.NO;
// boolean terminalSearchMods = Configuration.instance.settings.getSetting( Settings.SEARCH_MODS ) != YesNo.NO; // boolean terminalSearchMods = Configuration.instance.settings.getSetting( Settings.SEARCH_MODS ) != YesNo.NO;
boolean searchMod = false; boolean searchMod = false;
if ( searchString.startsWith( "@" ) ) if ( innerSearch.startsWith( "@" ) )
{ {
searchMod = true; searchMod = true;
searchString = searchString.substring( 1 ); innerSearch = innerSearch.substring( 1 );
} }
Pattern m = null; Pattern m = null;
try try
{ {
m = Pattern.compile( searchString.toLowerCase(), Pattern.CASE_INSENSITIVE ); m = Pattern.compile( innerSearch.toLowerCase(), Pattern.CASE_INSENSITIVE );
} }
catch (Throwable _) catch (Throwable _)
{ {
try try
{ {
m = Pattern.compile( Pattern.quote( searchString.toLowerCase() ), Pattern.CASE_INSENSITIVE ); m = Pattern.compile( Pattern.quote( innerSearch.toLowerCase() ), Pattern.CASE_INSENSITIVE );
} }
catch (Throwable __) catch (Throwable __)
{ {