fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adds filter by machine name to interface terminals

Browse Source
This commit is contained in:
yueh
2014-09-30 15:50:11 +02:00
parent d8da97d2af
commit 185500c017
2 changed files with 114 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/client/gui/implementations/GuiInterfaceTerminal.java
+114 -67
View File
@@ -14,6 +14,7 @@ import org.lwjgl.opengl.GL11;
import appeng.client.gui.AEBaseGui;
import appeng.client.gui.widgets.GuiScrollbar;
import appeng.client.gui.widgets.MEGuiTextField;
import appeng.client.me.ClientDCInternalInv;
import appeng.client.me.SlotDisconnected;
import appeng.container.implementations.ContainerInterfaceTerminal;
@@ -25,26 +26,32 @@ import com.google.common.collect.HashMultimap;
public class GuiInterfaceTerminal extends AEBaseGui
{
private static final int LINES_ON_PAGE = 6;
// TODO: copied from GuiMEMonitorable. It looks not changed, maybe unneeded?
int offsetX = 9;
final HashMap<Long, ClientDCInternalInv> byId = new HashMap<Long, ClientDCInternalInv>();
final HashMultimap<String, ClientDCInternalInv> byName = HashMultimap.create();
final ArrayList<String> names = new ArrayList<String>();
ArrayList<Object> lines = new ArrayList<Object>();
LinkedList<SlotDisconnected> dcSlots = new LinkedList<SlotDisconnected>();
private MEGuiTextField searchField;
private int getTotalRows()
private int getMaxRows()
{
return names.size() + byId.size();// unique names, and each inv row.
}
public GuiInterfaceTerminal(InventoryPlayer inventoryPlayer, PartMonitor te) {
public GuiInterfaceTerminal(InventoryPlayer inventoryPlayer, PartMonitor te)
{
super( new ContainerInterfaceTerminal( inventoryPlayer, te ) );
myScrollBar = new GuiScrollbar();
xSize = 195;
ySize = 222;
}
LinkedList<SlotDisconnected> dcSlots = new LinkedList<SlotDisconnected>();
@Override
public void initGui()
{
@@ -52,6 +59,45 @@ public class GuiInterfaceTerminal extends AEBaseGui
myScrollBar.setLeft( 175 );
myScrollBar.setHeight( 106 );
myScrollBar.setTop( 18 );
searchField = new MEGuiTextField( fontRendererObj, this.guiLeft + Math.max( 107, offsetX ), this.guiTop + 6, 64, fontRendererObj.FONT_HEIGHT );
searchField.setEnableBackgroundDrawing( false );
searchField.setMaxStringLength( 25 );
searchField.setTextColor( 0xFFFFFF );
searchField.setVisible( true );
}
@Override
protected void mouseClicked(int xCoord, int yCoord, int btn)
{
searchField.mouseClicked( xCoord, yCoord, btn );
if ( btn == 1 && searchField.isMouseIn( xCoord, yCoord ) )
{
searchField.setText( "" );
refreshList();
}
super.mouseClicked( xCoord, yCoord, btn );
}
@Override
protected void keyTyped(char character, int key)
{
if ( !this.checkHotbarKeys( key ) )
{
if ( character == ' ' && this.searchField.getText().length() == 0 )
return;
if ( searchField.textboxKeyTyped( character, key ) )
{
refreshList();
}
else
{
super.keyTyped( character, key );
}
}
}
@Override
@@ -62,24 +108,23 @@ public class GuiInterfaceTerminal extends AEBaseGui
int offset = 17;
int ex = myScrollBar.getCurrentScroll();
int linesOnPage = 6;
for (int x = 0; x < linesOnPage; x++)
for (int x = 0; x < LINES_ON_PAGE && ex + x < lines.size(); x++)
{
if ( ex + x < lines.size() )
Object lineObj = lines.get( ex + x );
if ( lineObj instanceof ClientDCInternalInv )
{
Object lineObj = lines.get( ex + x );
if ( lineObj instanceof ClientDCInternalInv )
{
ClientDCInternalInv inv = (ClientDCInternalInv) lineObj;
ClientDCInternalInv inv = (ClientDCInternalInv) lineObj;
GL11.glColor4f( 1, 1, 1, 1 );
for (int z = 0; z < inv.inv.getSizeInventory(); z++)
this.drawTexturedModalRect( offsetX + z * 18 + 7, offsetY + offset, 7, 139, 18, 18 );
}
GL11.glColor4f( 1, 1, 1, 1 );
for (int z = 0; z < inv.inv.getSizeInventory(); z++)
this.drawTexturedModalRect( offsetX + z * 18 + 7, offsetY + offset, 7, 139, 18, 18 );
}
offset += 18;
}
if ( searchField != null )
searchField.drawTextBox();
}
@Override
@@ -89,10 +134,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
int offset = 17;
// for (String name : lines)
int ex = myScrollBar.getCurrentScroll();
int linesOnPage = 6;
Iterator<Object> o = inventorySlots.inventorySlots.iterator();
while (o.hasNext())
@@ -101,33 +143,30 @@ public class GuiInterfaceTerminal extends AEBaseGui
o.remove();
}
for (int x = 0; x < linesOnPage; x++)
for (int x = 0; x < LINES_ON_PAGE && ex + x < lines.size(); x++)
{
if ( ex + x < lines.size() )
Object lineObj = lines.get( ex + x );
if ( lineObj instanceof ClientDCInternalInv )
{
Object lineObj = lines.get( ex + x );
if ( lineObj instanceof ClientDCInternalInv )
ClientDCInternalInv inv = (ClientDCInternalInv) lineObj;
for (int z = 0; z < inv.inv.getSizeInventory(); z++)
{
ClientDCInternalInv inv = (ClientDCInternalInv) lineObj;
for (int z = 0; z < inv.inv.getSizeInventory(); z++)
{
inventorySlots.inventorySlots.add( new SlotDisconnected( inv, z, z * 18 + 8, 1 + offset ) );
}
inventorySlots.inventorySlots.add( new SlotDisconnected( inv, z, z * 18 + 8, 1 + offset ) );
}
else if ( lineObj instanceof String )
{
String name = (String) lineObj;
int rows = byName.get( name ).size();
if ( rows > 1 )
name = name + " (" + rows + ")";
while (name.length() > 2 && fontRendererObj.getStringWidth( name ) > 155)
name = name.substring( 0, name.length() - 1 );
fontRendererObj.drawString( name, 10, 6 + offset, 4210752 );
}
offset += 18;
}
else if ( lineObj instanceof String )
{
String name = (String) lineObj;
int rows = byName.get( name ).size();
if ( rows > 1 )
name = name + " (" + rows + ")";
while (name.length() > 2 && fontRendererObj.getStringWidth( name ) > 155)
name = name.substring( 0, name.length() - 1 );
fontRendererObj.drawString( name, 10, 6 + offset, 4210752 );
}
offset += 18;
}
}
@@ -168,36 +207,44 @@ public class GuiInterfaceTerminal extends AEBaseGui
if ( refreshList )
{
refreshList = false;
byName.clear();
for (ClientDCInternalInv o : byId.values())
byName.put( o.getName(), o );
names.clear();
names.addAll( byName.keySet() );
Collections.sort( names );
lines = new ArrayList<Object>( getTotalRows() );
for (String n : names)
{
lines.add( n );
ArrayList<ClientDCInternalInv> clientInventories = new ArrayList<ClientDCInternalInv>();
clientInventories.addAll( byName.get( n ) );
Collections.sort( clientInventories );
for (ClientDCInternalInv i : clientInventories)
{
lines.add( i );
}
}
myScrollBar.setRange( 0, getTotalRows() - 6, 2 );
refreshList();
}
}
private void refreshList()
{
byName.clear();
String searchFilterLowerCase = searchField.getText().toLowerCase();
String itemNameLowerCase;
for (ClientDCInternalInv entry : byId.values())
{
itemNameLowerCase = entry.getName().toLowerCase();
if ( !searchFilterLowerCase.equals( "" ) && !itemNameLowerCase.contains( searchFilterLowerCase ) )
continue;
byName.put( entry.getName(), entry );
}
names.clear();
names.addAll( byName.keySet() );
Collections.sort( names );
lines = new ArrayList<Object>( getMaxRows() );
for (String n : names)
{
lines.add( n );
ArrayList<ClientDCInternalInv> clientInventories = new ArrayList<ClientDCInternalInv>();
clientInventories.addAll( byName.get( n ) );
Collections.sort( clientInventories );
lines.addAll( clientInventories );
}
myScrollBar.setRange( 0, lines.size() - LINES_ON_PAGE, 2 );
}
private ClientDCInternalInv getById(long id, long sortBy, String string)
{
ClientDCInternalInv o = byId.get( id );