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

Merge pull request #240 from thatsIch/alwaystrue

Browse source 
Removed not needed conditions
This commit is contained in:
FireBall1725 2014-10-04 09:33:42 -04:00
commit eac1765def
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -186,17 +186,13 @@ public abstract class AEBaseGui extends GuiContainer
if ( slot instanceof SlotFake ) if ( slot instanceof SlotFake )
{ {
InventoryAction action = null; final InventoryAction action = ctrlDown == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
action = ctrlDown == 1 ? InventoryAction.SPLIT_OR_PLACE_SINGLE : InventoryAction.PICKUP_OR_SET_DOWN;
if ( drag_click.size() > 1 ) if ( drag_click.size() > 1 )
return; return;
if ( action != null )
{
PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 ); PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
NetworkHandler.instance.sendToServer( p ); NetworkHandler.instance.sendToServer( p );
}
return; return;
} }
@ -226,11 +222,8 @@ public abstract class AEBaseGui extends GuiContainer
else else
action = ctrlDown == 1 ? InventoryAction.CRAFT_STACK : InventoryAction.CRAFT_ITEM; action = ctrlDown == 1 ? InventoryAction.CRAFT_STACK : InventoryAction.CRAFT_ITEM;
if ( action != null )
{
PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 ); PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
NetworkHandler.instance.sendToServer( p ); NetworkHandler.instance.sendToServer( p );
}
return; return;
} }
@ -776,10 +769,7 @@ public abstract class AEBaseGui extends GuiContainer
this.zLevel = 0.0F; this.zLevel = 0.0F;
itemRender.zLevel = 0.0F; itemRender.zLevel = 0.0F;
if ( s instanceof SlotME )
aeRenderItem.aeStack = ((SlotME) s).getAEStack(); aeRenderItem.aeStack = ((SlotME) s).getAEStack();
else
aeRenderItem.aeStack = null;
safeDrawSlot( s ); safeDrawSlot( s );
} }