From aa554fc9f6ad022afae1c3eb4cf7737012bf8981 Mon Sep 17 00:00:00 2001 From: ProfMobius Date: Mon, 12 May 2014 19:53:31 +0200 Subject: [PATCH] Fixed upload/download display. --- .../mobius/opis/data/holders/newtypes/DataPacket250.java | 3 +-- .../mcp/mobius/opis/data/profilers/ProfilerPacket.java | 8 ++++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataPacket250.java b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataPacket250.java index 41cbb6f..67d87f4 100644 --- a/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataPacket250.java +++ b/src/main/java/mcp/mobius/opis/data/holders/newtypes/DataPacket250.java @@ -25,8 +25,7 @@ public class DataPacket250 implements ISerializable{ this.amount = new DataAmountRate(0, 5); } - public DataPacket250 fill(FMLProxyPacket packet){ - int pktsize = packet.payload().readableBytes();//packet.payload().array().length; + public DataPacket250 fill(FMLProxyPacket packet, int pktsize){ this.size.size += pktsize; this.rate.size += pktsize; this.amount.size += 1; diff --git a/src/main/java/mcp/mobius/opis/data/profilers/ProfilerPacket.java b/src/main/java/mcp/mobius/opis/data/profilers/ProfilerPacket.java index c59ee1a..bc6e18a 100644 --- a/src/main/java/mcp/mobius/opis/data/profilers/ProfilerPacket.java +++ b/src/main/java/mcp/mobius/opis/data/profilers/ProfilerPacket.java @@ -38,6 +38,8 @@ public class ProfilerPacket extends ProfilerAbstract { if (!(msg instanceof FMLProxyPacket)){ Packet pkt = (Packet) msg; + dataAmount += (Integer)size; + try{ data.get(msg.getClass().getSimpleName()).fill(pkt, (Integer)size); } catch (Exception e){ @@ -54,12 +56,14 @@ public class ProfilerPacket extends ProfilerAbstract { if (msg instanceof FMLProxyPacket){ FMLProxyPacket pkt = (FMLProxyPacket) msg; String channel = pkt.channel(); + int pktsize = pkt.payload().capacity(); + dataAmount += pktsize; try{ - data250.get(channel).fill(pkt); + data250.get(channel).fill(pkt, pktsize); } catch (Exception e){ data250.put(channel, new DataPacket250(channel)); - data250.get(channel).fill(pkt); + data250.get(channel).fill(pkt, pktsize); } } }