Fix #51, #49

CHANGELOG.md

@@ -4,6 +4,7 @@
 **Bugfixes**
 - Fixed race condition with crafting tasks
 - Fixed pressing escape in crafting settings GUI not going back to grid GUI
+- Fixed losing autoselection in Grid when clicking on slot with autoselection mode
 - Added a max crafting quantity per request cap (hardcoded to 100)
 
 ### 0.6.1

src/main/java/refinedstorage/gui/GuiGrid.java

@@ -60,8 +60,8 @@ public class GuiGrid extends GuiBase {
         searchField.setEnableBackgroundDrawing(false);
         searchField.setVisible(true);
         searchField.setTextColor(16777215);
-        searchField.setCanLoseFocus(true);
-        searchField.setFocused(grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_NORMAL_AUTOSELECTED || grid.getSearchBoxMode() == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED);
+        searchField.setCanLoseFocus(!TileGrid.isSearchBoxModeWithAutoselection(grid.getSearchBoxMode()));
+        searchField.setFocused(TileGrid.isSearchBoxModeWithAutoselection(grid.getSearchBoxMode()));
 
         addSideButton(new SideButtonGridSortingDirection(grid));
         addSideButton(new SideButtonGridSortingType(grid));

src/main/java/refinedstorage/item/ItemUpgrade.java

@@ -16,7 +16,6 @@ public class ItemUpgrade extends ItemBase {
 
         setHasSubtypes(true);
         setMaxDamage(0);
-        setMaxStackSize(1);
     }
 
     @Override

src/main/java/refinedstorage/tile/grid/TileGrid.java

@@ -380,6 +380,10 @@ public class TileGrid extends TileMachine implements IGrid {
             mode == SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED;
     }
 
+    public static boolean isSearchBoxModeWithAutoselection(int mode) {
+        return mode == SEARCH_BOX_MODE_NORMAL_AUTOSELECTED || mode == TileGrid.SEARCH_BOX_MODE_JEI_SYNCHRONIZED_AUTOSELECTED;
+    }
+
     public static boolean isValidSortingType(int type) {
         return type == SORTING_TYPE_QUANTITY || type == TileGrid.SORTING_TYPE_NAME;
     }