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

Fixed "Clear" and "Create Pattern" buttons not working correctly when using Grid Filter tabs, fixes #983

Browse Source
This commit is contained in:
raoulvdberge
2017-02-13 17:24:27 +01:00
parent fc8ae833f9
commit ef5dccee83
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -5,6 +5,7 @@
- Fixed Processing Pattern Encoder and Reader recipes not supporting oredict workbench and chest (VT-14) - Fixed Processing Pattern Encoder and Reader recipes not supporting oredict workbench and chest (VT-14)
- Fixed network nodes not saving correctly (raoulvdberge) - Fixed network nodes not saving correctly (raoulvdberge)
- Fixed network nodes not respecting redstone mode (raoulvdberge) - Fixed network nodes not respecting redstone mode (raoulvdberge)
- Fixed "Clear" and "Create Pattern" buttons not working correctly when using Grid Filter tabs (raoulvdberge)
### 1.4 ### 1.4
- Added Security Manager (raoulvdberge) - Added Security Manager (raoulvdberge)

4
src/main/java/com/raoulvdberge/refinedstorage/gui/grid/GuiGrid.java
View File

@@ -514,8 +514,8 @@ public class GuiGrid extends GuiBase implements IGridDisplay {
updateJEI(); updateJEI();
} }
boolean clickedClear = clickedButton == 0 && isOverClear(mouseX - guiLeft, mouseY - guiTop + getTabDelta()); boolean clickedClear = clickedButton == 0 && isOverClear(mouseX - guiLeft, mouseY - guiTop);
boolean clickedCreatePattern = clickedButton == 0 && isOverCreatePattern(mouseX - guiLeft, mouseY - guiTop + getTabDelta()); boolean clickedCreatePattern = clickedButton == 0 && isOverCreatePattern(mouseX - guiLeft, mouseY - guiTop);
if (clickedCreatePattern) { if (clickedCreatePattern) {
BlockPos gridPos = ((NetworkNodeGrid) grid).getPos(); BlockPos gridPos = ((NetworkNodeGrid) grid).getPos();

12
src/main/resources/assets/refinedstorage/blockstates/storage_monitor.json
View File

@@ -4,12 +4,12 @@
"model": "cube", "model": "cube",
"textures": { "textures": {
"particle": "refinedstorage:blocks/side", "particle": "refinedstorage:blocks/side",
"north": "refinedstorage:blocks/machine_casing", "north": "refinedstorage:blocks/interface_disconnected",
"east": "refinedstorage:blocks/grid_left", "east": "refinedstorage:blocks/side",
"south": "refinedstorage:blocks/grid_back", "south": "refinedstorage:blocks/side",
"west": "refinedstorage:blocks/grid_right", "west": "refinedstorage:blocks/side",
"up": "refinedstorage:blocks/grid_top", "up": "refinedstorage:blocks/side",
"down": "refinedstorage:blocks/bottom" "down": "refinedstorage:blocks/side"
} }
}, },
"variants": { "variants": {