dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #51, #49

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-05-17 15:15:34 +02:00
parent 08d4bc805c
commit d74fbb6049
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -4,6 +4,7 @@
**Bugfixes** **Bugfixes**
- Fixed race condition with crafting tasks - Fixed race condition with crafting tasks
- Fixed pressing escape in crafting settings GUI not going back to grid GUI - 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) - Added a max crafting quantity per request cap (hardcoded to 100)
### 0.6.1 ### 0.6.1

4
src/main/java/refinedstorage/gui/GuiGrid.java
View File

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

1
src/main/java/refinedstorage/item/ItemUpgrade.java
View File

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

4
src/main/java/refinedstorage/tile/grid/TileGrid.java
View File

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