Interface Terminal

Fixed bug with Assembler Packet Crashing the server.

client/gui/implementations/GuiInterfaceTerminal.java

@@ -3,52 +3,83 @@ package appeng.client.gui.implementations;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
 
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.StatCollector;
+
+import org.lwjgl.opengl.GL11;
+
 import appeng.client.gui.AEBaseGui;
+import appeng.client.gui.widgets.GuiScrollbar;
+import appeng.client.me.ClientDCInternalInv;
+import appeng.client.me.SlotDisconnected;
 import appeng.container.implementations.ContainerInterfaceTerminal;
 import appeng.core.localization.GuiText;
 import appeng.parts.reporting.PartMonitor;
-import appeng.tile.inventory.AppEngInternalInventory;
 
 import com.google.common.collect.HashMultimap;
 
 public class GuiInterfaceTerminal extends AEBaseGui
 {
 
-	class ClientFakeInv
-	{
-
-		String unlocalizedName;
-		long id;
-
-		AppEngInternalInventory inv = new AppEngInternalInventory( null, 9 );
-
-		public String getName()
-		{
-			return StatCollector.translateToLocal( unlocalizedName + ".name" );
-		}
-
-	};
-
-	HashMap<Long, ClientFakeInv> byId = new HashMap();
-	HashMultimap<String, ClientFakeInv> byName = HashMultimap.create();
+	HashMap<Long, ClientDCInternalInv> byId = new HashMap();
+	HashMultimap<String, ClientDCInternalInv> byName = HashMultimap.create();
 	ArrayList<String> names = new ArrayList();
 
+	ArrayList<Object> lines = new ArrayList();
+
+	private int getTotalRows()
+	{
+		return names.size() + byId.size();// unique names, and each inv row.
+	}
+
 	public GuiInterfaceTerminal(InventoryPlayer inventoryPlayer, PartMonitor te) {
 		super( new ContainerInterfaceTerminal( inventoryPlayer, te ) );
+		myScrollBar = new GuiScrollbar();
 		xSize = 195;
 		ySize = 222;
 	}
 
+	LinkedList<SlotDisconnected> dcSlots = new LinkedList();
+
+	@Override
+	public void initGui()
+	{
+		super.initGui();
+		myScrollBar.setLeft( 175 );
+		myScrollBar.setHeight( 106 );
+		myScrollBar.setTop( 18 );
+	}
+
 	@Override
 	public void drawBG(int offsetX, int offsetY, int mouseX, int mouseY)
 	{
 		bindTexture( "guis/interfaceterminal.png" );
 		this.drawTexturedModalRect( offsetX, offsetY, 0, 0, xSize, ySize );
+
+		int offset = 17;
+		int ex = myScrollBar.getCurrentScroll();
+		int linesOnPage = 6;
+
+		for (int x = 0; x < linesOnPage; x++)
+		{
+			if ( ex + x < lines.size() )
+			{
+				Object lineObj = lines.get( ex + x );
+				if ( lineObj instanceof ClientDCInternalInv )
+				{
+					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 );
+				}
+			}
+			offset += 18;
+		}
 	}
 
 	@Override
@@ -57,12 +88,46 @@ public class GuiInterfaceTerminal extends AEBaseGui
 		fontRendererObj.drawString( getGuiDisplayName( GuiText.InterfaceTerminal.getLocal() ), 8, 6, 4210752 );
 		fontRendererObj.drawString( GuiText.inventory.getLocal(), 8, ySize - 96 + 3, 4210752 );
 
-		int offset = 0;
+		int offset = 17;
 
-		for (String name : names)
+		// for (String name : lines)
+		int ex = myScrollBar.getCurrentScroll();
+		int linesOnPage = 6;
+
+		Iterator<Object> o = inventorySlots.inventorySlots.iterator();
+		while (o.hasNext())
 		{
-			fontRendererObj.drawString( name, 8, 30 + offset, 4210752 );
-			offset += 18;
+			if ( o.next() instanceof SlotDisconnected )
+				o.remove();
+		}
+
+		for (int x = 0; x < linesOnPage; x++)
+		{
+			if ( ex + x < lines.size() )
+			{
+				Object lineObj = lines.get( ex + x );
+				if ( lineObj instanceof ClientDCInternalInv )
+				{
+					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 ) );
+					}
+				}
+				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;
+			}
 		}
 	}
 
@@ -71,7 +136,10 @@ public class GuiInterfaceTerminal extends AEBaseGui
 	public void postUpdate(NBTTagCompound in)
 	{
 		if ( in.getBoolean( "clear" ) )
+		{
 			byId.clear();
+			refreshList = true;
+		}
 
 		for (Object oKey : in.func_150296_c())
 		{
@@ -82,8 +150,7 @@ public class GuiInterfaceTerminal extends AEBaseGui
 				{
 					long id = Long.parseLong( key.substring( 1 ), Character.MAX_RADIX );
 					NBTTagCompound invData = in.getCompoundTag( key );
-					ClientFakeInv current = getById( id );
-					current.unlocalizedName = invData.getString( "un" );
+					ClientDCInternalInv current = getById( id, invData.getString( "un" ) );
 
 					for (int x = 0; x < current.inv.getSizeInventory(); x++)
 					{
@@ -100,24 +167,36 @@ public class GuiInterfaceTerminal extends AEBaseGui
 
 		if ( refreshList )
 		{
+			refreshList = false;
+
 			byName.clear();
-			for (ClientFakeInv o : byId.values())
+			for (ClientDCInternalInv o : byId.values())
 				byName.put( o.getName(), o );
 
 			names.clear();
 			names.addAll( byName.keySet() );
 
 			Collections.sort( names );
+
+			lines = new ArrayList( getTotalRows() );
+			for (String n : names)
+			{
+				lines.add( n );
+				for (ClientDCInternalInv i : byName.get( n ))
+					lines.add( i );
+			}
+
+			myScrollBar.setRange( 0, getTotalRows() - 6, 2 );
 		}
 	}
 
-	private ClientFakeInv getById(long id)
+	private ClientDCInternalInv getById(long id, String string)
 	{
-		ClientFakeInv o = byId.get( id );
+		ClientDCInternalInv o = byId.get( id );
 
 		if ( o == null )
 		{
-			byId.put( id, o = new ClientFakeInv() );
+			byId.put( id, o = new ClientDCInternalInv( 9, id, string ) );
 			refreshList = true;
 		}