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

Interface Terminal

Browse Source 
Fixed bug with Assembler Packet Crashing the server.
This commit is contained in:
AlgorithmX2
2014-07-09 03:17:11 -05:00
parent 1541998281
commit 16ef731c00
18 changed files with 505 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/gui/AEBaseGui.java
+50 -6
View File
@@ -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
+1 -1
View File
@@ -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
+108 -29
View File
@@ -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;
}