add tooltip to fluid level emitter number box

src/main/java/appeng/client/gui/AEBaseGui.java

@@ -387,29 +387,13 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 			{
 				if( !itemstack.isEmpty() )
 				{
-					Set<IItemHandler> visitedInterfaces = new HashSet<>();
 					for( final Slot dr : this.drag_click )
 					{
-						IItemHandler interfaceHandler = ( (SlotDisconnected) slot ).getSlot().getInventory();
-						if (visitedInterfaces.contains( interfaceHandler )) break;
-						visitedInterfaces.add( interfaceHandler );
-						boolean canInsert = true;
-						for( int s = 0; s < interfaceHandler.getSlots(); s++ )
+						if( slot.getStack().isEmpty() )
 						{
-							if( ItemStack.areItemStacksEqual( interfaceHandler.getStackInSlot( s ), itemstack ) )
-							{
-								canInsert = false;
-								break;
-							}
-						}
-						if( canInsert )
-						{
-							if( slot.getStack().isEmpty() )
-							{
-								InventoryAction action = InventoryAction.SPLIT_OR_PLACE_SINGLE;
-								final PacketInventoryAction p = new PacketInventoryAction( action, dr.getSlotIndex(), ( (SlotDisconnected) slot ).getSlot().getId() );
-								NetworkHandler.instance().sendToServer( p );
-							}
+							InventoryAction action = InventoryAction.SPLIT_OR_PLACE_SINGLE;
+							final PacketInventoryAction p = new PacketInventoryAction( action, dr.getSlotIndex(), ( (SlotDisconnected) slot ).getSlot().getId() );
+							NetworkHandler.instance().sendToServer( p );
 						}
 					}
 				}
@@ -538,23 +522,12 @@ public abstract class AEBaseGui extends GuiContainer implements IMTModGuiContain
 				case PICKUP: // pickup / set-down.
 					if( slot.getStack().isEmpty() && !player.inventory.getItemStack().isEmpty() )
 					{
-						boolean canInsert = true;
-						IItemHandler interfaceHandler = ( (SlotDisconnected) slot ).getSlot().getInventory();
-						for( int s = 0; s < interfaceHandler.getSlots(); s++ )
-						{
-							if( ItemStack.areItemStacksEqual( interfaceHandler.getStackInSlot( s ), player.inventory.getItemStack() ) )
-							{
-								canInsert = false;
-								break;
-							}
-						}
-						if( canInsert )
-						{
-							action = InventoryAction.SPLIT_OR_PLACE_SINGLE;
-						}
-						break;
+						action = InventoryAction.SPLIT_OR_PLACE_SINGLE;
+					}
+					if( !slot.getStack().isEmpty() && player.inventory.getItemStack().getCount() <= 1 )
+					{
+						action = InventoryAction.PICKUP_OR_SET_DOWN;
 					}
-					if( !slot.getStack().isEmpty() && player.inventory.getItemStack().getCount() <= 1 ) action = InventoryAction.PICKUP_OR_SET_DOWN;
 					break;
 				case QUICK_MOVE:
 					action = ( mouseButton == 1 ) ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK;

src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java

@@ -123,14 +123,6 @@ public class GuiInterfaceTerminal extends AEBaseGui
 		super.onGuiClosed();
 	}
 
-	@Override
-	protected boolean isPointInRegion( int rectX, int rectY, int rectWidth, int rectHeight, int pointX, int pointY )
-	{
-		if( searchFieldInputs.isMouseIn( pointX, pointY ) ) drawTooltip( pointX - guiLeft - offsetX, pointY - guiTop , "Inputs OR names" );
-		else if( searchFieldOutputs.isMouseIn( pointX, pointY ) ) drawTooltip( pointX - guiLeft - offsetX, pointY - guiTop, "Outputs OR names" );
-		return super.isPointInRegion( rectX, rectY, rectWidth, rectHeight, pointX, pointY );
-	}
-
 	@Override
 	public void drawFG( final int offsetX, final int offsetY, final int mouseX, final int mouseY )
 	{
@@ -186,6 +178,10 @@ public class GuiInterfaceTerminal extends AEBaseGui
 			}
 			offset += 18;
 		}
+
+		if( searchFieldInputs.isMouseIn( mouseX, mouseY ) ) drawTooltip( mouseX - guiLeft - offsetX, mouseY - guiTop, "Inputs OR names" );
+		else if( searchFieldOutputs.isMouseIn( mouseX, mouseY ) ) drawTooltip( mouseX - guiLeft - offsetX, mouseY - guiTop, "Outputs OR names" );
+
 	}
 
 	@Override
@@ -377,6 +373,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
 			// Shortcut to skip any filter if search term is ""/empty
 
 			boolean found = (searchFieldInputs.isEmpty() && searchFieldOutputs.isEmpty() && !partInterfaceTerminal.onlyInterfacesWithFreeSlots);
+			boolean interfaceHasFreeSlots = false;
 
 			// Search if the current inventory holds a pattern containing the search term.
 			if( !found )
@@ -389,25 +386,15 @@ public class GuiInterfaceTerminal extends AEBaseGui
 						found = ( this.itemStackMatchesSearchTerm( itemStack, searchFieldInputs, 0 ) );
 					else if( !searchFieldOutputs.isEmpty() )
 						found = ( this.itemStackMatchesSearchTerm( itemStack, searchFieldOutputs, 1 ) );
+					// If only Interfaces with empty slots should be shown, check that here
+					if(itemStack.isEmpty())
+						interfaceHasFreeSlots = true;
 					if( found )
 					{
 						break;
 					}
 				}
-			} 
-
-			// If only Interfaces with empty slots should be shown, check that here
-			boolean interfaceHasFreeSlots = false;
-			if (partInterfaceTerminal.onlyInterfacesWithFreeSlots) {
-				for( final ItemStack itemStack : entry.getInventory() )
-				{
-					if(itemStack.isEmpty()){
-						interfaceHasFreeSlots = true;
-						break;
-					}
-				}
 			}
-
 			// if found, filter skipped or machine name matching the search term, add it
 			if( found || (entry.getName().toLowerCase().contains( searchFieldInputs ) && entry.getName().toLowerCase().contains( searchFieldOutputs )))
 			{

src/main/java/appeng/container/implementations/ContainerInterfaceTerminal.java

@@ -215,35 +215,48 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 			final IItemHandler theSlot = new WrapperFilteredItemHandler( new WrapperRangeItemHandler( inv.server, slot, slot + 1 ), new PatternSlotFilter() );
 			final InventoryAdaptor interfaceSlot = new AdaptorItemHandler( theSlot );
 
-			switch( action )
+			IItemHandler interfaceHandler = inv.server;
+			boolean canInsert = true;
+
+			switch ( action )
 			{
 				case PICKUP_OR_SET_DOWN:
-
 					if( hasItemInHand )
 					{
-						ItemStack inSlot = theSlot.getStackInSlot( 0 );
-						if( inSlot.isEmpty() )
+						for( int s = 0; s < interfaceHandler.getSlots(); s++ )
 						{
-							player.inventory.setItemStack( interfaceSlot.addItems( player.inventory.getItemStack() ) );
-						}
-						else
-						{
-							inSlot = inSlot.copy();
-							final ItemStack inHand = player.inventory.getItemStack().copy();
-
-							ItemHandlerUtil.setStackInSlot( theSlot, 0, ItemStack.EMPTY );
-							player.inventory.setItemStack( ItemStack.EMPTY );
-
-							player.inventory.setItemStack( interfaceSlot.addItems( inHand.copy() ) );
-
-							if( player.inventory.getItemStack().isEmpty() )
+							if( Platform.itemComparisons().isSameItem( interfaceHandler.getStackInSlot( s ), player.inventory.getItemStack() ) )
 							{
-								player.inventory.setItemStack( inSlot );
+								canInsert = false;
+								break;
+							}
+						}
+						if( canInsert )
+						{
+							ItemStack inSlot = theSlot.getStackInSlot( 0 );
+							if( inSlot.isEmpty() )
+							{
+								player.inventory.setItemStack( interfaceSlot.addItems( player.inventory.getItemStack() ) );
 							}
 							else
 							{
-								player.inventory.setItemStack( inHand );
-								ItemHandlerUtil.setStackInSlot( theSlot, 0, inSlot );
+								inSlot = inSlot.copy();
+								final ItemStack inHand = player.inventory.getItemStack().copy();
+
+								ItemHandlerUtil.setStackInSlot( theSlot, 0, ItemStack.EMPTY );
+								player.inventory.setItemStack( ItemStack.EMPTY );
+
+								player.inventory.setItemStack( interfaceSlot.addItems( inHand.copy() ) );
+
+								if( player.inventory.getItemStack().isEmpty() )
+								{
+									player.inventory.setItemStack( inSlot );
+								}
+								else
+								{
+									player.inventory.setItemStack( inHand );
+									ItemHandlerUtil.setStackInSlot( theSlot, 0, inSlot );
+								}
 							}
 						}
 					}
@@ -254,17 +267,27 @@ public final class ContainerInterfaceTerminal extends AEBaseContainer
 
 					break;
 				case SPLIT_OR_PLACE_SINGLE:
-
 					if( hasItemInHand )
 					{
-						ItemStack extra = playerHand.removeItems( 1, ItemStack.EMPTY, null );
-						if( !extra.isEmpty() && !interfaceSlot.containsItems())
+						for( int s = 0; s < interfaceHandler.getSlots(); s++ )
 						{
-							extra = interfaceSlot.addItems( extra );
+							if( Platform.itemComparisons().isSameItem( interfaceHandler.getStackInSlot( s ), player.inventory.getItemStack() ) )
+							{
+								canInsert = false;
+								break;
+							}
 						}
-						if( !extra.isEmpty() )
+						if( canInsert )
 						{
-							playerHand.addItems( extra );
+							ItemStack extra = playerHand.removeItems( 1, ItemStack.EMPTY, null );
+							if( !extra.isEmpty() && !interfaceSlot.containsItems() )
+							{
+								extra = interfaceSlot.addItems( extra );
+							}
+							if( !extra.isEmpty() )
+							{
+								playerHand.addItems( extra );
+							}
 						}
 					}
 					else if( !is.isEmpty() )

src/main/java/appeng/fluids/client/gui/GuiFluidLevelEmitter.java

@@ -90,6 +90,13 @@ public class GuiFluidLevelEmitter extends GuiUpgradeable
 		this.level.drawTextBox();
 	}
 
+	@Override
+	public void drawFG( int offsetX, int offsetY, int mouseX, int mouseY )
+	{
+		if( isPointInRegion( 24, 43,89,this.fontRenderer.FONT_HEIGHT,mouseX,mouseY ) ) drawTooltip( mouseX - guiLeft - 7, mouseY - guiTop + 25, "Amount in millibuckets" );
+		super.drawFG( offsetX, offsetY, mouseX, mouseY );
+	}
+
 	@Override
 	protected boolean drawUpgrades()
 	{