diff --git a/mcp/mobius/opis/data/holders/newtypes/DataPacket.java b/mcp/mobius/opis/data/holders/newtypes/DataPacket.java new file mode 100644 index 0000000..3bee315 --- /dev/null +++ b/mcp/mobius/opis/data/holders/newtypes/DataPacket.java @@ -0,0 +1,53 @@ +package mcp.mobius.opis.data.holders.newtypes; + +import java.io.DataInputStream; +import java.io.DataOutputStream; +import java.io.IOException; + +import mcp.mobius.opis.data.holders.ISerializable; +import net.minecraft.network.packet.Packet; + +public class DataPacket implements ISerializable{ + public int id; + public long size; + public long amount; + public String type; + + public DataPacket(){ + } + + public DataPacket(int id){ + this.id = id; + try { + this.type = ((Class)(Packet.packetIdToClassMap.lookup(this.id))).getName(); + } catch (Exception e) { + this.type = ""; + } + } + + public DataPacket fill(Packet packet){ + this.size += packet.getPacketSize() + 1; + this.amount += 1; + return this; + } + + @Override + public void writeToStream(DataOutputStream stream) throws IOException { + stream.writeInt(this.id); + stream.writeLong(this.size); + stream.writeLong(this.amount); + } + + public static DataPacket readFromStream(DataInputStream stream) throws IOException { + DataPacket retVal = new DataPacket(); + retVal.id = stream.readInt(); + retVal.size = stream.readLong(); + retVal.amount = stream.readLong(); + try { + retVal.type = ((Class)(Packet.packetIdToClassMap.lookup(retVal.id))).getName(); + } catch (Exception e) { + retVal.type = ""; + } + return retVal; + } +} diff --git a/mcp/mobius/opis/data/profilers/ProfilerPacket.java b/mcp/mobius/opis/data/profilers/ProfilerPacket.java index 1bd5c1b..733cf83 100644 --- a/mcp/mobius/opis/data/profilers/ProfilerPacket.java +++ b/mcp/mobius/opis/data/profilers/ProfilerPacket.java @@ -1,21 +1,32 @@ package mcp.mobius.opis.data.profilers; +import java.util.ArrayList; +import java.util.HashMap; + +import mcp.mobius.opis.data.holders.newtypes.DataPacket; import net.minecraft.network.packet.Packet; public class ProfilerPacket extends ProfilerAbstract { - public long data = 0; + public long dataAmount = 0; + public ArrayList data = new ArrayList(); + + public ProfilerPacket(){ + for (int i = 0; i < 254; i++) + data.add(new DataPacket(i)); + } @Override public void reset() { - data = 0; + dataAmount = 0; } @Override public void start(Object key) { if (key != null){ Packet packet = (Packet)key; - data += packet.getPacketSize() + 1; + dataAmount += packet.getPacketSize() + 1; + data.get(packet.getPacketId()).fill(packet); } } diff --git a/mcp/mobius/opis/events/OpisServerTickHandler.java b/mcp/mobius/opis/events/OpisServerTickHandler.java index fa8cd26..48a8290 100644 --- a/mcp/mobius/opis/events/OpisServerTickHandler.java +++ b/mcp/mobius/opis/events/OpisServerTickHandler.java @@ -71,8 +71,8 @@ public enum OpisServerTickHandler implements ITickHandler { if (System.nanoTime() - timer1000 > 1000000000L){ timer1000 = System.nanoTime(); - OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_UPLOAD, new SerialLong(((ProfilerPacket)ProfilerSection.PACKET_OUTBOUND.getProfiler()).data))); - OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_DOWNLOAD, new SerialLong(((ProfilerPacket)ProfilerSection.PACKET_INBOUND.getProfiler()).data))); + OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_UPLOAD, new SerialLong(((ProfilerPacket)ProfilerSection.PACKET_OUTBOUND.getProfiler()).dataAmount))); + OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_AMOUNT_DOWNLOAD, new SerialLong(((ProfilerPacket)ProfilerSection.PACKET_INBOUND.getProfiler()).dataAmount))); OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_CHUNK_FORCED, new SerialInt(ChunkManager.INSTANCE.getForcedChunkAmount()))); OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_CHUNK_LOADED, new SerialInt(ChunkManager.INSTANCE.getLoadedChunkAmount()))); OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.VALUE_TIMING_TICK, new DataTiming(((ProfilerTick)ProfilerSection.TICK.getProfiler()).data.getGeometricMean()))); @@ -98,14 +98,17 @@ public enum OpisServerTickHandler implements ITickHandler { OpisPacketHandler.sendPacketToAllSwing(NetDataValue.create(Message.STATUS_RUN_UPDATE, new SerialInt(profilerRunningTicks))); } - ((ProfilerPacket)ProfilerSection.PACKET_INBOUND.getProfiler()).data = 0L; - ((ProfilerPacket)ProfilerSection.PACKET_OUTBOUND.getProfiler()).data = 0L; + ((ProfilerPacket)ProfilerSection.PACKET_INBOUND.getProfiler()).dataAmount = 0L; + ((ProfilerPacket)ProfilerSection.PACKET_OUTBOUND.getProfiler()).dataAmount = 0L; } // Five second timer if (System.nanoTime() - timer5000 > 5000000000L){ timer5000 = System.nanoTime(); updatePlayers(); + + OpisPacketHandler.sendPacketToAllSwing(NetDataList.create(Message.LIST_PACKETS_OUTBOUND, ((ProfilerPacket)ProfilerSection.PACKET_OUTBOUND.getProfiler()).data)); + OpisPacketHandler.sendPacketToAllSwing(NetDataList.create(Message.LIST_PACKETS_INBOUND, ((ProfilerPacket)ProfilerSection.PACKET_INBOUND.getProfiler()).data)); } profilerUpdateTickCounter++; diff --git a/mcp/mobius/opis/network/enums/Message.java b/mcp/mobius/opis/network/enums/Message.java index 2f7dc6b..68e3744 100644 --- a/mcp/mobius/opis/network/enums/Message.java +++ b/mcp/mobius/opis/network/enums/Message.java @@ -18,6 +18,8 @@ public enum Message { LIST_AMOUNT_ENTITIES, LIST_PLAYERS, LIST_DIMENSION_DATA, //Data for the dimension panel + LIST_PACKETS_OUTBOUND, + LIST_PACKETS_INBOUND, VALUE_TIMING_TILEENTS, VALUE_TIMING_ENTITIES, diff --git a/mcp/mobius/opis/proxy/ProxyClient.java b/mcp/mobius/opis/proxy/ProxyClient.java index 2acbc4e..dfeb9ca 100644 --- a/mcp/mobius/opis/proxy/ProxyClient.java +++ b/mcp/mobius/opis/proxy/ProxyClient.java @@ -33,6 +33,7 @@ import mcp.mobius.opis.network.packets.server.NetDataRaw; import mcp.mobius.opis.swing.SwingUI; import mcp.mobius.opis.swing.panels.PanelAmountEntities; import mcp.mobius.opis.swing.panels.PanelDimensions; +import mcp.mobius.opis.swing.panels.PanelPackets; import mcp.mobius.opis.swing.panels.PanelPlayers; import mcp.mobius.opis.swing.panels.PanelRenderEntities; import mcp.mobius.opis.swing.panels.PanelRenderTileEnts; @@ -71,6 +72,7 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{ IMessageHandler panelTimingHandlers = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelTimingHandlers()); IMessageHandler panelTimingChunks = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelTimingChunks()); IMessageHandler panelDimensions = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelDimensions()); + IMessageHandler panelPackets = (IMessageHandler)TabPanelRegistrar.INSTANCE.registerTab(new PanelPackets()); TabPanelRegistrar.INSTANCE.registerTab(new PanelRenderTileEnts()); TabPanelRegistrar.INSTANCE.registerTab(new PanelRenderEntities()); @@ -130,6 +132,9 @@ public class ProxyClient extends ProxyServer implements IMessageHandler{ MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_DIMENSION_DATA, panelDimensions); + MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_PACKETS_OUTBOUND, panelPackets); + MessageHandlerRegistrar.INSTANCE.registerHandler(Message.LIST_PACKETS_INBOUND, panelPackets); + MessageHandlerRegistrar.INSTANCE.registerHandler(Message.CLIENT_CLEAR_SELECTION, modOpis.proxy); MessageHandlerRegistrar.INSTANCE.registerHandler(Message.CLIENT_START_PROFILING, modOpis.proxy); MessageHandlerRegistrar.INSTANCE.registerHandler(Message.CLIENT_SHOW_RENDER_TICK, modOpis.proxy); diff --git a/mcp/mobius/opis/swing/panels/PanelPackets.java b/mcp/mobius/opis/swing/panels/PanelPackets.java new file mode 100644 index 0000000..4a4368f --- /dev/null +++ b/mcp/mobius/opis/swing/panels/PanelPackets.java @@ -0,0 +1,152 @@ +package mcp.mobius.opis.swing.panels; + +import javax.swing.JPanel; + +import mcp.mobius.opis.api.ITabPanel; +import mcp.mobius.opis.data.holders.newtypes.DataPacket; +import mcp.mobius.opis.network.enums.Message; +import mcp.mobius.opis.network.packets.server.NetDataRaw; +import mcp.mobius.opis.swing.widgets.JPanelMsgHandler; +import mcp.mobius.opis.swing.widgets.JTableStats; +import net.miginfocom.swing.MigLayout; + +import javax.swing.JScrollPane; +import javax.swing.JTable; +import javax.swing.SwingConstants; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.DefaultTableModel; +import javax.swing.JTabbedPane; + +public class PanelPackets extends JPanelMsgHandler implements ITabPanel { + private JTableStats tableOutbound; + private JTableStats tableInbound; + private JTableStats tablePacket250; + + public PanelPackets() { + setLayout(new MigLayout("", "[grow]", "[grow]")); + + JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP); + add(tabbedPane, "cell 0 0,grow"); + + JScrollPane scrollPane = new JScrollPane(); + tabbedPane.addTab("Outbound", null, scrollPane, null); + + tableOutbound = new JTableStats(); + tableOutbound.setModel(new DefaultTableModel( + new Object[][] { + {null, null, null, null}, + }, + new String[] { + "Type", "ID", "Amount", "Total Size" + } + ) { + Class[] columnTypes = new Class[] { + String.class, Integer.class, Long.class, Long.class + }; + public Class getColumnClass(int columnIndex) { + return columnTypes[columnIndex]; + } + }); + tableOutbound.setAutoCreateRowSorter(true); + scrollPane.setViewportView(tableOutbound); + + JScrollPane scrollPane_1 = new JScrollPane(); + tabbedPane.addTab("Inbound", null, scrollPane_1, null); + + tableInbound = new JTableStats(); + tableInbound.setModel(new DefaultTableModel( + new Object[][] { + {null, null, null, null}, + }, + new String[] { + "Type", "ID", "Amount", "Total Size" + } + ) { + Class[] columnTypes = new Class[] { + String.class, Integer.class, Long.class, Long.class + }; + public Class getColumnClass(int columnIndex) { + return columnTypes[columnIndex]; + } + }); + tableInbound.setAutoCreateRowSorter(true); + scrollPane_1.setViewportView(tableInbound); + + JScrollPane scrollPane_2 = new JScrollPane(); + tabbedPane.addTab("Packet250", null, scrollPane_2, null); + + tablePacket250 = new JTableStats(); + scrollPane_2.setViewportView(tablePacket250); + + } + + @Override + public String getTabTitle() { return "Packets"; } + @Override + public String getTabRefName() { return "opis.packets"; } + + @Override + public boolean handleMessage(Message msg, NetDataRaw rawdata) { + switch(msg){ + case LIST_PACKETS_OUTBOUND:{ + + ((JTableStats)this.getTableOutbound()).setTableData(rawdata.array); + + DefaultTableModel model = (DefaultTableModel)this.getTableOutbound().getModel(); + int row = this.updateData(tableOutbound, model, DataPacket.class); + + for (Object o : rawdata.array){ + DataPacket packet = (DataPacket)o; + if (packet.type.equals("")) continue; + model.addRow(new Object[] { + packet.type, + packet.id, + packet.amount, + packet.size + }); + } + + this.dataUpdated(tableOutbound, model, row); + + break; + } + + case LIST_PACKETS_INBOUND:{ + + ((JTableStats)this.getTableInbound()).setTableData(rawdata.array); + + DefaultTableModel model = (DefaultTableModel)this.getTableInbound().getModel(); + int row = this.updateData(tableInbound, model, DataPacket.class); + + for (Object o : rawdata.array){ + DataPacket packet = (DataPacket)o; + if (packet.type.equals("")) continue; + model.addRow(new Object[] { + packet.type, + packet.id, + packet.amount, + packet.size + }); + } + + this.dataUpdated(tableInbound, model, row); + + break; + } + + default: + return false; + + } + return true; + } + public JTableStats getTablePacket250() { + return tablePacket250; + } + public JTableStats getTableInbound() { + return tableInbound; + } + public JTableStats getTableOutbound() { + return tableOutbound; + } +}