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

Fix missing logic for portable item grid

Browse Source
This commit is contained in:
raoulvdberge
2020-10-03 13:02:50 +02:00
parent 41a1ce68a8
commit a30205a541
2 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/ItemGridHandler.java
View File

@@ -254,11 +254,15 @@ public class ItemGridHandler implements IItemGridHandler {
@Override @Override
public void onInventoryScroll(ServerPlayerEntity player, int slot, boolean shift, boolean up) { public void onInventoryScroll(ServerPlayerEntity player, int slot, boolean shift, boolean up) {
onInventoryScroll(this, player, slot, shift, up, network);
}
public static void onInventoryScroll(IItemGridHandler gridHandler, ServerPlayerEntity player, int slot, boolean shift, boolean up, @Nullable INetwork network) {
if (player == null || !(player.openContainer instanceof GridContainer)) { if (player == null || !(player.openContainer instanceof GridContainer)) {
return; return;
} }
if (up && !network.getSecurityManager().hasPermission(Permission.INSERT, player) || !up && !network.getSecurityManager().hasPermission(Permission.EXTRACT, player)) { if (network != null && ((up && !network.getSecurityManager().hasPermission(Permission.INSERT, player)) || (!up && !network.getSecurityManager().hasPermission(Permission.EXTRACT, player)))) {
return; return;
} }
@@ -269,20 +273,19 @@ public class ItemGridHandler implements IItemGridHandler {
if (shift) { // shift if (shift) { // shift
flags |= EXTRACT_SHIFT; flags |= EXTRACT_SHIFT;
if (up) { // scroll up if (up) { // scroll up
player.inventory.setInventorySlotContents(slot, onInsert(player, stackInSlot, true)); player.inventory.setInventorySlotContents(slot, gridHandler.onInsert(player, stackInSlot, true));
} else { // scroll down } else { // scroll down
onExtract(player, stackInSlot, slot, flags); gridHandler.onExtract(player, stackInSlot, slot, flags);
} }
} else { //ctrl } else { //ctrl
if (up) { // scroll up if (up) { // scroll up
onInsert(player, stackOnCursor, true); gridHandler.onInsert(player, stackOnCursor, true);
player.updateHeldItem(); player.updateHeldItem();
} else { //scroll down } else { //scroll down
if (stackOnCursor.isEmpty()) { if (stackOnCursor.isEmpty()) {
onExtract(player, stackInSlot, -1, flags); gridHandler.onExtract(player, stackInSlot, -1, flags);
} else { } else {
onExtract(player, stackOnCursor, -1, flags); gridHandler.onExtract(player, stackOnCursor, -1, flags);
} }
} }
} }
@@ -290,11 +293,15 @@ public class ItemGridHandler implements IItemGridHandler {
@Override @Override
public void onGridScroll(ServerPlayerEntity player, UUID id, boolean shift, boolean ctrl, boolean up) { public void onGridScroll(ServerPlayerEntity player, UUID id, boolean shift, boolean ctrl, boolean up) {
onGridScroll(this, player, id, shift, ctrl, up, network);
}
public static void onGridScroll(IItemGridHandler gridHandler, ServerPlayerEntity player, UUID id, boolean shift, boolean ctrl, boolean up, @Nullable INetwork network) {
if (player == null || !(player.openContainer instanceof GridContainer)) { if (player == null || !(player.openContainer instanceof GridContainer)) {
return; return;
} }
if (up && !network.getSecurityManager().hasPermission(Permission.INSERT, player) || !up && !network.getSecurityManager().hasPermission(Permission.EXTRACT, player)) { if (network != null && ((up && !network.getSecurityManager().hasPermission(Permission.INSERT, player)) || (!up && !network.getSecurityManager().hasPermission(Permission.EXTRACT, player)))) {
return; return;
} }
@@ -319,25 +326,25 @@ public class ItemGridHandler implements IItemGridHandler {
int slot = player.inventory.getSlotFor(stack); int slot = player.inventory.getSlotFor(stack);
if (slot != -1) { if (slot != -1) {
onInsert(player, player.inventory.getStackInSlot(slot), true); gridHandler.onInsert(player, player.inventory.getStackInSlot(slot), true);
return; return;
} }
} else { //scroll down, extract hovering item } else { //scroll down, extract hovering item
onExtract(player, id, -1, flags); gridHandler.onExtract(player, id, -1, flags);
return; return;
} }
} else if (!shift && ctrl) { //ctrl } else if (!shift && ctrl) { //ctrl
if (!up) { //scroll down, extract hovering item if (!up) { //scroll down, extract hovering item
onExtract(player, id, -1, flags); gridHandler.onExtract(player, id, -1, flags);
return; return;
} }
} }
} }
if (up) { //scroll up, insert item from cursor if (up) { //scroll up, insert item from cursor
onInsert(player, player.inventory.getItemStack(), true); gridHandler.onInsert(player, player.inventory.getItemStack(), true);
player.updateHeldItem(); player.updateHeldItem();
} }
} }

10
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/handler/PortableItemGridHandler.java
View File

@@ -192,4 +192,14 @@ public class PortableItemGridHandler implements IItemGridHandler {
public void onCraftingCancelRequested(ServerPlayerEntity player, @Nullable UUID id) { public void onCraftingCancelRequested(ServerPlayerEntity player, @Nullable UUID id) {
// NO OP // NO OP
} }
@Override
public void onInventoryScroll(ServerPlayerEntity player, int slot, boolean shift, boolean up) {
ItemGridHandler.onInventoryScroll(this, player, slot, shift, up, null);
}
@Override
public void onGridScroll(ServerPlayerEntity player, UUID id, boolean shift, boolean ctrl, boolean up) {
ItemGridHandler.onGridScroll(this, player, id, shift, ctrl, up, null);
}
} }