Interface Terminal

Fixed bug with Assembler Packet Crashing the server.

client/ClientHelper.java

@@ -35,6 +35,7 @@ import appeng.block.AEBaseBlock;
 import appeng.client.render.BaseBlockRender;
 import appeng.client.render.TESRWrapper;
 import appeng.client.render.WorldRender;
+import appeng.client.render.effects.AssemblerFX;
 import appeng.client.render.effects.CraftingFx;
 import appeng.client.render.effects.EnergyFx;
 import appeng.client.render.effects.LightningFX;
@@ -46,6 +47,7 @@ import appeng.core.AEConfig;
 import appeng.core.AELog;
 import appeng.core.CommonHelper;
 import appeng.core.sync.network.NetworkHandler;
+import appeng.core.sync.packets.PacketAssemblerAnimation;
 import appeng.core.sync.packets.PacketValueConfig;
 import appeng.entity.EntityFloatingItem;
 import appeng.entity.EntityTinyTNTPrimed;
@@ -232,12 +234,14 @@ public class ClientHelper extends ServerHelper
 	}
 
 	@Override
-	public void spawnEffect(EffectType effect, World worldObj, double posX, double posY, double posZ)
+	public void spawnEffect(EffectType effect, World worldObj, double posX, double posY, double posZ, Object o)
 	{
 		if ( AEConfig.instance.enableEffects )
 		{
 			switch (effect)
 			{
+			case Assembler:
+				spawnAssembler( worldObj, posX, posY, posZ, o );
 			case Vibrant:
 				spawnVibrant( worldObj, posX, posY, posZ );
 				return;
@@ -254,6 +258,14 @@ public class ClientHelper extends ServerHelper
 		}
 	}
 
+	private void spawnAssembler(World worldObj, double posX, double posY, double posZ, Object o)
+	{
+		PacketAssemblerAnimation paa = (PacketAssemblerAnimation) o;
+
+		AssemblerFX fx = new AssemblerFX( Minecraft.getMinecraft().theWorld, posX, posY, posZ, 0.0D, 0.0D, 0.0D, paa.rate, paa.is );
+		Minecraft.getMinecraft().effectRenderer.addEffect( (EntityFX) fx );
+	}
+
 	private void spawnVibrant(World w, double x, double y, double z)
 	{
 		if ( CommonHelper.proxy.shouldAddParticles( Platform.getRandom() ) )

client/EffectType.java

@@ -2,5 +2,5 @@ package appeng.client;
 
 public enum EffectType
 {
-	Energy, Lightning, Vibrant, Crafting
+	Energy, Lightning, Vibrant, Crafting, Assembler
 }

client/gui/AEBaseGui.java

@@ -27,6 +27,7 @@ import appeng.api.storage.data.IAEItemStack;
 import appeng.client.gui.widgets.GuiScrollbar;
 import appeng.client.gui.widgets.ITooltip;
 import appeng.client.me.InternalSlotME;
+import appeng.client.me.SlotDisconnected;
 import appeng.client.me.SlotME;
 import appeng.client.render.AppEngRenderItem;
 import appeng.container.AEBaseContainer;
@@ -115,7 +116,7 @@ public abstract class AEBaseGui extends GuiContainer
 					int times = Math.abs( wheel );
 					for (int h = 0; h < times; h++)
 					{
-						PacketInventoryAction p = new PacketInventoryAction( direction, inventorySlots.inventorySlots.size(), null );
+						PacketInventoryAction p = new PacketInventoryAction( direction, inventorySlots.inventorySlots.size(), 0 );
 						NetworkHandler.instance.sendToServer( p );
 					}
 				}
@@ -166,7 +167,7 @@ public abstract class AEBaseGui extends GuiContainer
 			{
 				try
 				{
-					PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, null );
+					PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
 					NetworkHandler.instance.sendToServer( p );
 				}
 				catch (IOException e)
@@ -207,7 +208,7 @@ public abstract class AEBaseGui extends GuiContainer
 			{
 				try
 				{
-					PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, null );
+					PacketInventoryAction p = new PacketInventoryAction( action, slotIdx, 0 );
 					NetworkHandler.instance.sendToServer( p );
 				}
 				catch (IOException e)
@@ -235,7 +236,7 @@ public abstract class AEBaseGui extends GuiContainer
 						slotNum = slot.slotNumber;
 
 					((AEBaseContainer) inventorySlots).setTargetStack( stack );
-					PacketInventoryAction p = new PacketInventoryAction( InventoryAction.MOVE_REGION, slotNum, null );
+					PacketInventoryAction p = new PacketInventoryAction( InventoryAction.MOVE_REGION, slotNum, 0 );
 					NetworkHandler.instance.sendToServer( p );
 				}
 				catch (IOException e)
@@ -246,6 +247,49 @@ public abstract class AEBaseGui extends GuiContainer
 			}
 		}
 
+		if ( slot instanceof SlotDisconnected )
+		{
+			InventoryAction action = null;
+
+			switch (key)
+			{
+			case 0: // pickup / set-down.
+				action = ctrlDown == 1 ? InventoryAction.SPLIT_OR_PLACESINGLE : InventoryAction.PICKUP_OR_SETDOWN;
+				break;
+			case 1:
+				action = ctrlDown == 1 ? InventoryAction.PICKUP_SINGLE : InventoryAction.SHIFT_CLICK;
+				break;
+
+			case 3: // creative dupe:
+
+				if ( player.capabilities.isCreativeMode )
+				{
+					action = InventoryAction.CREATIVE_DUPLICATE;
+				}
+
+				break;
+
+			default:
+			case 4: // drop item:
+			case 6:
+			}
+
+			if ( action != null )
+			{
+				try
+				{
+					PacketInventoryAction p = new PacketInventoryAction( action, slot.getSlotIndex(), ((SlotDisconnected) slot).mySlot.id );
+					NetworkHandler.instance.sendToServer( p );
+				}
+				catch (IOException e)
+				{
+					AELog.error( e );
+				}
+			}
+
+			return;
+		}
+
 		if ( slot instanceof SlotME )
 		{
 			InventoryAction action = null;
@@ -292,7 +336,7 @@ public abstract class AEBaseGui extends GuiContainer
 				try
 				{
 					((AEBaseContainer) inventorySlots).setTargetStack( stack );
-					PacketInventoryAction p = new PacketInventoryAction( action, inventorySlots.inventorySlots.size(), null );
+					PacketInventoryAction p = new PacketInventoryAction( action, inventorySlots.inventorySlots.size(), 0 );
 					NetworkHandler.instance.sendToServer( p );
 				}
 				catch (IOException e)
@@ -760,7 +804,7 @@ public abstract class AEBaseGui extends GuiContainer
 					if ( ((AppEngSlot) s).isValid == hasCalculatedValidness.NotAvailable )
 					{
 						boolean isValid = s.isItemValid( is ) || s instanceof SlotOutput || s instanceof AppEngCraftingSlot || s instanceof SlotDisabled
-								|| s instanceof SlotInaccessable || s instanceof SlotFake || s instanceof SlotRestrictedInput;
+								|| s instanceof SlotInaccessable || s instanceof SlotFake || s instanceof SlotRestrictedInput || s instanceof SlotDisconnected;
 						if ( isValid && s instanceof SlotRestrictedInput )
 						{
 							try

client/gui/implementations/GuiCraftingTerm.java

@@ -51,7 +51,7 @@ public class GuiCraftingTerm extends GuiMEMonitorable
 				PacketInventoryAction p;
 				try
 				{
-					p = new PacketInventoryAction( InventoryAction.MOVE_REGION, s.slotNumber, null );
+					p = new PacketInventoryAction( InventoryAction.MOVE_REGION, s.slotNumber, 0 );
 					NetworkHandler.instance.sendToServer( p );
 				}
 				catch (IOException e)

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;
 		}
 

client/me/ClientDCInternalInv.java

@@ -0,0 +1,27 @@
+package appeng.client.me;
+
+import net.minecraft.util.StatCollector;
+import appeng.tile.inventory.AppEngInternalInventory;
+
+public class ClientDCInternalInv
+{
+
+	final public String unlocalizedName;
+	final public long id;
+	final public AppEngInternalInventory inv;
+
+	public ClientDCInternalInv(int size, long id, String unlocalizedName) {
+		inv = new AppEngInternalInventory( null, size );
+		this.unlocalizedName = unlocalizedName;
+		this.id = id;
+	}
+
+	public String getName()
+	{
+		String s = StatCollector.translateToLocal( unlocalizedName + ".name" );
+		if ( s.equals( unlocalizedName + ".name" ) )
+			return StatCollector.translateToLocal( unlocalizedName );
+		return s;
+	}
+
+}

client/me/SlotDisconnected.java

@@ -0,0 +1,83 @@
+package appeng.client.me;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.item.ItemStack;
+import appeng.container.slot.AppEngSlot;
+import appeng.items.misc.ItemEncodedPattern;
+import appeng.util.Platform;
+
+public class SlotDisconnected extends AppEngSlot
+{
+
+	public ClientDCInternalInv mySlot;
+
+	public SlotDisconnected(ClientDCInternalInv me, int which, int x, int y) {
+		super( me.inv, which, x, y );
+		mySlot = me;
+	}
+
+	@Override
+	public ItemStack getDisplayStack()
+	{
+		if ( Platform.isClient() )// && (which == PlaceableItemType.ENCODED_PATTERN) )
+		{
+			ItemStack is = super.getStack();
+			if ( is != null && is.getItem() instanceof ItemEncodedPattern )
+			{
+				ItemEncodedPattern iep = (ItemEncodedPattern) is.getItem();
+				ItemStack out = iep.getOutput( is );
+				return out;
+			}
+		}
+		return super.getStack();
+	}
+
+	@Override
+	public boolean canTakeStack(EntityPlayer par1EntityPlayer)
+	{
+		return false;
+	}
+
+	@Override
+	public ItemStack decrStackSize(int par1)
+	{
+		return null;
+	}
+
+	@Override
+	public void putStack(ItemStack par1ItemStack)
+	{
+
+	}
+
+	@Override
+	public boolean getHasStack()
+	{
+		return getStack() != null;
+	}
+
+	@Override
+	public boolean isItemValid(ItemStack par1ItemStack)
+	{
+		return false;
+	}
+
+	@Override
+	public int getSlotStackLimit()
+	{
+		return 0;
+	}
+
+	@Override
+	public boolean isSlotInInventory(IInventory par1iInventory, int par2)
+	{
+		return false;
+	}
+
+	@Override
+	public void onPickupFromSlot(EntityPlayer par1EntityPlayer, ItemStack par2ItemStack)
+	{
+	}
+
+}

client/render/effects/AssemblerFX.java

@@ -58,7 +58,7 @@ public class AssemblerFX extends EntityFX
 			time -= 4.0;
 			// if ( CommonHelper.proxy.shouldAddParticles( r ) )
 			for (int x = 0; x < (int) Math.ceil( speed / 5 ); x++)
-				CommonHelper.proxy.spawnEffect( EffectType.Crafting, worldObj, posX, posY, posZ );
+				CommonHelper.proxy.spawnEffect( EffectType.Crafting, worldObj, posX, posY, posZ, null );
 		}
 	}