Fixes #2556, #2579: Restore old click behaviour.

This commit is contained in:
yueh
2016-11-05 23:27:14 +01:00
parent 0ceb4765a2
commit 7ac817e9ae
@@ -325,7 +325,7 @@ public abstract class AEBaseGui extends GuiContainer
if( slot instanceof SlotFake ) if( slot instanceof SlotFake )
{ {
final InventoryAction action = isCtrlKeyDown() ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN; final InventoryAction action = mouseButton == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
if( this.drag_click.size() > 1 ) if( this.drag_click.size() > 1 )
{ {
@@ -412,7 +412,7 @@ public abstract class AEBaseGui extends GuiContainer
action = ( mouseButton == 1 ) ? 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 QUICK_MOVE: case QUICK_MOVE:
action = isCtrlKeyDown() ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK; action = ( mouseButton == 1 ) ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK;
break; break;
case CLONE: // creative dupe: case CLONE: // creative dupe:
@@ -455,7 +455,7 @@ public abstract class AEBaseGui extends GuiContainer
break; break;
case QUICK_MOVE: case QUICK_MOVE:
action = isCtrlKeyDown() ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK; action = ( mouseButton == 1 ) ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK;
stack = ( (SlotME) slot ).getAEStack(); stack = ( (SlotME) slot ).getAEStack();
break; break;
@@ -848,6 +848,7 @@ public abstract class AEBaseGui extends GuiContainer
final ResourceLocation loc = new ResourceLocation( AppEng.MOD_ID, "textures/" + file ); final ResourceLocation loc = new ResourceLocation( AppEng.MOD_ID, "textures/" + file );
this.mc.getTextureManager().bindTexture( loc ); this.mc.getTextureManager().bindTexture( loc );
} }
protected GuiScrollbar getScrollBar() protected GuiScrollbar getScrollBar()
{ {
return this.myScrollBar; return this.myScrollBar;