tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Fixes #2395 by using new clickType argument.

Browse source
This commit is contained in:
Sebastian Hartte 2016-10-03 14:04:37 +02:00
parent ecc447ab2c
commit 8087b58851
1 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/main/java/appeng/client/gui/AEBaseGui.java
View file

@ -323,7 +323,7 @@ public abstract class AEBaseGui extends GuiContainer
//TODO 1.9.4 aftermath - Whole ClickType thing, to be checked. //TODO 1.9.4 aftermath - Whole ClickType thing, to be checked.
@Override @Override
protected void handleMouseClick( final Slot slot, final int slotIdx, final int key, final ClickType clickType ) protected void handleMouseClick( final Slot slot, final int slotIdx, final int mouseButton, final ClickType clickType )
{ {
final EntityPlayer player = Minecraft.getMinecraft().thePlayer; final EntityPlayer player = Minecraft.getMinecraft().thePlayer;
@ -344,14 +344,14 @@ public abstract class AEBaseGui extends GuiContainer
if( slot instanceof SlotPatternTerm ) if( slot instanceof SlotPatternTerm )
{ {
if( key == 6 ) if( mouseButton == 6 )
{ {
return; // prevent weird double clicks.. return; // prevent weird double clicks..
} }
try try
{ {
NetworkHandler.instance.sendToServer( ( (SlotPatternTerm) slot ).getRequest( key == 1 ) ); NetworkHandler.instance.sendToServer( ( (SlotPatternTerm) slot ).getRequest( isShiftKeyDown() ) );
} }
catch( final IOException e ) catch( final IOException e )
{ {
@ -360,19 +360,20 @@ public abstract class AEBaseGui extends GuiContainer
} }
else if( slot instanceof SlotCraftingTerm ) else if( slot instanceof SlotCraftingTerm )
{ {
if( key == 6 ) if( mouseButton == 6 )
{ {
return; // prevent weird double clicks.. return; // prevent weird double clicks..
} }
InventoryAction action = null; InventoryAction action = null;
if( key == 1 ) if( isShiftKeyDown() )
{ {
action = InventoryAction.CRAFT_SHIFT; action = InventoryAction.CRAFT_SHIFT;
} }
else else
{ {
action = isCtrlKeyDown() ? InventoryAction.CRAFT_STACK : InventoryAction.CRAFT_ITEM; // Craft stack on right-click, craft single on left-click
action = (mouseButton == 1) ? InventoryAction.CRAFT_STACK : InventoryAction.CRAFT_ITEM;
} }
final PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 ); final PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
@ -409,16 +410,16 @@ public abstract class AEBaseGui extends GuiContainer
{ {
InventoryAction action = null; InventoryAction action = null;
switch( key ) switch( clickType )
{ {
case 0: // pickup / set-down. case PICKUP: // pickup / set-down.
action = isCtrlKeyDown() ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN; action = (mouseButton == 1) ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
break; break;
case 1: case QUICK_MOVE:
action = isCtrlKeyDown() ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK; action = isCtrlKeyDown() ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK;
break; break;
case 3: // creative dupe: case CLONE: // creative dupe:
if( player.capabilities.isCreativeMode ) if( player.capabilities.isCreativeMode )
{ {
@ -428,8 +429,7 @@ public abstract class AEBaseGui extends GuiContainer
break; break;
default: default:
case 4: // drop item: case THROW: // drop item:
case 6:
} }
if( action != null ) if( action != null )
@ -446,10 +446,10 @@ public abstract class AEBaseGui extends GuiContainer
InventoryAction action = null; InventoryAction action = null;
IAEItemStack stack = null; IAEItemStack stack = null;
switch( key ) switch( clickType )
{ {
case 0: // pickup / set-down. case PICKUP: // pickup / set-down.
action = isCtrlKeyDown() ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN; action = (mouseButton == 1) ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
stack = ( (SlotME) slot ).getAEStack(); stack = ( (SlotME) slot ).getAEStack();
if( stack != null && action == InventoryAction.PICKUP_OR_SET_DOWN && stack.getStackSize() == 0 && player.inventory.getItemStack() == null ) if( stack != null && action == InventoryAction.PICKUP_OR_SET_DOWN && stack.getStackSize() == 0 && player.inventory.getItemStack() == null )
@ -458,12 +458,12 @@ public abstract class AEBaseGui extends GuiContainer
} }
break; break;
case 1: case QUICK_MOVE:
action = isCtrlKeyDown() ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK; action = isCtrlKeyDown() ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK;
stack = ( (SlotME) slot ).getAEStack(); stack = ( (SlotME) slot ).getAEStack();
break; break;
case 3: // creative dupe: case CLONE: // creative dupe:
stack = ( (SlotME) slot ).getAEStack(); stack = ( (SlotME) slot ).getAEStack();
if( stack != null && stack.isCraftable() ) if( stack != null && stack.isCraftable() )
@ -481,8 +481,7 @@ public abstract class AEBaseGui extends GuiContainer
break; break;
default: default:
case 4: // drop item: case THROW: // drop item:
case 6:
} }
if( action != null ) if( action != null )
@ -530,7 +529,7 @@ public abstract class AEBaseGui extends GuiContainer
this.disableShiftClick = false; this.disableShiftClick = false;
} }
super.handleMouseClick( slot, slotIdx, key, clickType ); super.handleMouseClick( slot, slotIdx, mouseButton, clickType );
} }
@Override @Override