From d74fbb6049e08ecc6c6f4638c0032ab1ed0366ac Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Tue, 17 May 2016 15:15:34 +0200 Subject: [PATCH] Fix #51, #49 --- CHANGELOG.md | 1 + src/main/java/refinedstorage/gui/GuiGrid.java | 4 ++-- src/main/java/refinedstorage/item/ItemUpgrade.java | 1 - src/main/java/refinedstorage/tile/grid/TileGrid.java | 4 ++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6320f24f2..5f62f58f3 100755 --- a/CHANGELOG.md +++ b/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 diff --git a/src/main/java/refinedstorage/gui/GuiGrid.java b/src/main/java/refinedstorage/gui/GuiGrid.java index e578efa08..a3901fc07 100755 --- a/src/main/java/refinedstorage/gui/GuiGrid.java +++ b/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)); diff --git a/src/main/java/refinedstorage/item/ItemUpgrade.java b/src/main/java/refinedstorage/item/ItemUpgrade.java index 0872ecbf1..7557796c6 100755 --- a/src/main/java/refinedstorage/item/ItemUpgrade.java +++ b/src/main/java/refinedstorage/item/ItemUpgrade.java @@ -16,7 +16,6 @@ public class ItemUpgrade extends ItemBase { setHasSubtypes(true); setMaxDamage(0); - setMaxStackSize(1); } @Override diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java index 5f8d03bff..66bc2acf4 100755 --- a/src/main/java/refinedstorage/tile/grid/TileGrid.java +++ b/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; }