diff --git a/src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java b/src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java index ba7f3a50..64f9f6c4 100644 --- a/src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java +++ b/src/main/java/com/glodblock/github/client/gui/GuiFCBaseMonitor.java @@ -376,7 +376,18 @@ public class GuiFCBaseMonitor extends AEBaseMEGui implements ISortSource, IConfi if( slot instanceof SlotFake) { - final InventoryAction action = ctrlDown == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN; + InventoryAction action = ctrlDown == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN; + + if (Keyboard.isKeyDown(Keyboard.KEY_LMENU) || Keyboard.isKeyDown(Keyboard.KEY_RMENU)) { + if (action == InventoryAction.SPLIT_OR_PLACE_SINGLE) { + action = InventoryAction.MOVE_REGION; + } + else { + action = InventoryAction.PICKUP_SINGLE; + } + } + + System.out.print(action + "\n"); if( Ae2ReflectClient.getDragClick(this).size() > 1 ) { diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminal.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminal.java index a86e0bb0..489a0bad 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminal.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminal.java @@ -140,6 +140,7 @@ public class ContainerFluidPatternTerminal extends FCBasePartContainer implement @Override public void doAction(EntityPlayerMP player, InventoryAction action, int slotId, long id) { + System.out.print(action + "\n"); if (this.isCraftingMode()) { super.doAction(player, action, slotId, id); return; @@ -148,6 +149,14 @@ public class ContainerFluidPatternTerminal extends FCBasePartContainer implement super.doAction(player, action, slotId, id); return; } + if (action == InventoryAction.MOVE_REGION) { + super.doAction(player, InventoryAction.SPLIT_OR_PLACE_SINGLE, slotId, id); + return; + } + if (action == InventoryAction.PICKUP_SINGLE) { + super.doAction(player, InventoryAction.PICKUP_OR_SET_DOWN, slotId, id); + return; + } Slot slot = getSlot(slotId); ItemStack stack = player.inventory.getItemStack(); if (Util.getFluidFromItem(stack) == null || Util.getFluidFromItem(stack).amount <= 0) { @@ -177,11 +186,6 @@ public class ContainerFluidPatternTerminal extends FCBasePartContainer implement } return; } - if (action == InventoryAction.SPLIT_OR_PLACE_SINGLE) { - if (stack == null && slot.getStack() != null && slot.getStack().getItem() instanceof ItemFluidPacket) { - return; - } - } super.doAction(player, action, slotId, id); } diff --git a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminalEx.java b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminalEx.java index 4ba4fb91..100c7381 100644 --- a/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminalEx.java +++ b/src/main/java/com/glodblock/github/client/gui/container/ContainerFluidPatternTerminalEx.java @@ -141,6 +141,14 @@ public class ContainerFluidPatternTerminalEx extends FCBasePartContainerEx imple super.doAction(player, action, slotId, id); return; } + if (action == InventoryAction.MOVE_REGION) { + super.doAction(player, InventoryAction.SPLIT_OR_PLACE_SINGLE, slotId, id); + return; + } + if (action == InventoryAction.PICKUP_SINGLE) { + super.doAction(player, InventoryAction.PICKUP_OR_SET_DOWN, slotId, id); + return; + } Slot slot = getSlot(slotId); ItemStack stack = player.inventory.getItemStack(); if (Util.getFluidFromItem(stack) == null || Util.getFluidFromItem(stack).amount <= 0) {