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

prevent disabled slots from being scrolled fixes #3131

Browse Source
This commit is contained in:
Darkere
2021-11-22 19:01:01 +01:00
parent 1e6dcfa332
commit a5b5c7c296
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/refinedmods/refinedstorage/container/GridContainer.java
View File

@@ -336,7 +336,7 @@ public class GridContainer extends BaseContainer implements ICraftingGridListene
} }
@Override @Override
protected int getDisabledSlotNumber() { public int getDisabledSlotNumber() {
return grid.getSlotId(); return grid.getSlotId();
} }

2
src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java
View File

@@ -584,7 +584,7 @@ public class GridScreen extends BaseScreen<GridContainer> implements IScreenInfo
doSort = !isOverSlotArea(x - guiLeft, y - guiTop) && !isOverCraftingOutputArea(x - guiLeft, y - guiTop); doSort = !isOverSlotArea(x - guiLeft, y - guiTop) && !isOverCraftingOutputArea(x - guiLeft, y - guiTop);
} }
if (grid.getGridType() != GridType.FLUID) { if (grid.getGridType() != GridType.FLUID) {
if (isOverInventory(x - guiLeft, y - guiTop) && hoveredSlot != null && hoveredSlot.getHasStack()) { if (isOverInventory(x - guiLeft, y - guiTop) && hoveredSlot != null && hoveredSlot.getHasStack() && getContainer().getDisabledSlotNumber() != hoveredSlot.getSlotIndex()) {
RS.NETWORK_HANDLER.sendToServer(new GridItemInventoryScrollMessage(hoveredSlot.getSlotIndex(), hasShiftDown(), delta > 0)); RS.NETWORK_HANDLER.sendToServer(new GridItemInventoryScrollMessage(hoveredSlot.getSlotIndex(), hasShiftDown(), delta > 0));
} else if (isOverSlotArea(x - guiLeft, y - guiTop)) { } else if (isOverSlotArea(x - guiLeft, y - guiTop)) {
RS.NETWORK_HANDLER.sendToServer(new GridItemGridScrollMessage(isOverSlotWithStack() ? view.getStacks().get(slotNumber).getId() : null, hasShiftDown(), delta > 0)); RS.NETWORK_HANDLER.sendToServer(new GridItemGridScrollMessage(isOverSlotWithStack() ? view.getStacks().get(slotNumber).getId() : null, hasShiftDown(), delta > 0));