ME Tunnel + Network Tool

core/Registration.java

@@ -91,10 +91,10 @@ import appeng.items.storage.ItemBasicStorageCell;
 import appeng.items.storage.ItemCreativeStorageCell;
 import appeng.items.storage.ItemSpatialStorageCell;
 import appeng.items.tools.ToolMemoryCard;
+import appeng.items.tools.ToolNetworkTool;
 import appeng.items.tools.powered.ToolChargedStaff;
 import appeng.items.tools.powered.ToolEntropyManipulator;
 import appeng.items.tools.powered.ToolMassCannon;
-import appeng.items.tools.powered.ToolNetworkTool;
 import appeng.items.tools.powered.ToolPortableCell;
 import appeng.items.tools.powered.ToolWirelessTerminal;
 import appeng.items.tools.quartz.ToolQuartzAxe;

core/localization/GuiText.java

@@ -7,7 +7,17 @@ public enum GuiText
 {
 	inventory("container"), // mc's default Inventory localization.
 
-	Chest, StoredEnergy, Of, Condenser, Drive, GrindStone, VibrationChamber, SpatialIOPort, LevelEmitter, Terminal, Interface, Config, StoredItems, Patterns, ImportBus, ExportBus, CellWorkbench, NetworkDetails, StorageCells, IOBuses, IOPort, BytesUsed, Types, QuantumLinkChamber, PortableCell;
+	Chest, StoredEnergy, Of, Condenser, Drive, GrindStone,
+
+	VibrationChamber, SpatialIOPort, LevelEmitter, Terminal,
+
+	Interface, Config, StoredItems, Patterns, ImportBus, ExportBus,
+
+	CellWorkbench, NetworkDetails, StorageCells, IOBuses,
+
+	IOPort, BytesUsed, Types, QuantumLinkChamber, PortableCell,
+
+	NetworkTool, PowerUsageRate, PowerInputRate, Installed, EnergyDrain;
 
 	String root;
 

core/sync/GuiBridge.java

@@ -25,12 +25,15 @@ import appeng.container.implementations.ContainerInterface;
 import appeng.container.implementations.ContainerLevelEmitter;
 import appeng.container.implementations.ContainerMEMonitorable;
 import appeng.container.implementations.ContainerMEPortableCell;
+import appeng.container.implementations.ContainerNetworkStatus;
+import appeng.container.implementations.ContainerNetworkTool;
 import appeng.container.implementations.ContainerQNB;
 import appeng.container.implementations.ContainerUpgradeable;
 import appeng.container.implementations.ContainerVibrationChamber;
 import appeng.helpers.ICellItemViewer;
 import appeng.helpers.IGuiItem;
 import appeng.helpers.IInterfaceHost;
+import appeng.helpers.INetworkTool;
 import appeng.parts.automation.PartLevelEmitter;
 import appeng.tile.grindstone.TileGrinder;
 import appeng.tile.misc.TileCellWorkbench;
@@ -58,6 +61,10 @@ public enum GuiBridge implements IGuiHandler
 
 	GUI_PORTABLE_CELL(ContainerMEPortableCell.class, ICellItemViewer.class, true),
 
+	GUI_NETWORK_STATUS(ContainerNetworkStatus.class, INetworkTool.class, true),
+
+	GUI_NETWORK_TOOL(ContainerNetworkTool.class, INetworkTool.class, true),
+
 	GUI_DRIVE(ContainerDrive.class, TileDrive.class, false),
 
 	GUI_VIBRATIONCHAMBER(ContainerVibrationChamber.class, TileVibrationChamber.class, false),
@@ -166,7 +173,7 @@ public enum GuiBridge implements IGuiHandler
 			ItemStack it = player.inventory.getCurrentItem();
 			if ( it != null && it.getItem() instanceof IGuiItem )
 			{
-				Object myItem = ((IGuiItem) it.getItem()).getGuiObject( it );
+				Object myItem = ((IGuiItem) it.getItem()).getGuiObject( it, w, x, y, z );
 				if ( ID.CorrectTileOrPart( myItem ) )
 					return ID.ConstructContainer( player.inventory, side, myItem );
 			}
@@ -191,7 +198,7 @@ public enum GuiBridge implements IGuiHandler
 		return new ContainerNull();
 	}
 
-	private boolean isItem()
+	public boolean isItem()
 	{
 		return isItem;
 	}
@@ -207,7 +214,7 @@ public enum GuiBridge implements IGuiHandler
 			ItemStack it = player.inventory.getCurrentItem();
 			if ( it != null && it.getItem() instanceof IGuiItem )
 			{
-				Object myItem = ((IGuiItem) it.getItem()).getGuiObject( it );
+				Object myItem = ((IGuiItem) it.getItem()).getGuiObject( it, w, x, y, z );
 				if ( ID.CorrectTileOrPart( myItem ) )
 					return ID.ConstructGui( player.inventory, side, myItem );
 			}

core/sync/packets/PacketInventoryAction.java

@@ -36,8 +36,11 @@ public class PacketInventoryAction extends AppEngPacket
 	public void serverPacketData(INetworkManager manager, AppEngPacket packet, EntityPlayer player)
 	{
 		EntityPlayerMP sender = (EntityPlayerMP) player;
-		AEBaseContainer aebc = (AEBaseContainer) sender.openContainer;
-		aebc.doAction( sender, action, slot, slotItem );
+		if ( sender.openContainer instanceof AEBaseContainer )
+		{
+			AEBaseContainer aebc = (AEBaseContainer) sender.openContainer;
+			aebc.doAction( sender, action, slot, slotItem );
+		}
 	}
 
 	// api

core/sync/packets/PacketMEInventoryUpdate.java

@@ -14,6 +14,7 @@ import net.minecraft.network.INetworkManager;
 import net.minecraft.network.packet.Packet250CustomPayload;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.client.gui.implementations.GuiMEMonitorable;
+import appeng.client.gui.implementations.GuiNetworkStatus;
 import appeng.core.sync.AppEngPacket;
 import appeng.util.item.AEItemStack;
 import cpw.mods.fml.relauncher.Side;
@@ -45,10 +46,13 @@ public class PacketMEInventoryUpdate extends AppEngPacket
 	public void clientPacketData(INetworkManager network, AppEngPacket packet, EntityPlayer player)
 	{
 		GuiScreen gs = Minecraft.getMinecraft().currentScreen;
+
 		if ( gs instanceof GuiMEMonitorable )
-		{
 			((GuiMEMonitorable) gs).postUpdate( list );
-		}
+
+		if ( gs instanceof GuiNetworkStatus )
+			((GuiNetworkStatus) gs).postUpdate( list );
+
 	}
 
 	@Override