Add network bytes information for network status gui

src/main/java/appeng/api/networking/storage/IStorageGrid.java

@@ -53,4 +53,5 @@ public interface IStorageGrid extends IGridCache, IStorageMonitorable {
      * remove a provider added with addCellContainer
      */
     void unregisterCellProvider(ICellProvider cc);
+
 }

src/main/java/appeng/client/gui/implementations/GuiNetworkStatus.java

@@ -10,6 +10,7 @@
 
 package appeng.client.gui.implementations;
 
+import java.text.DecimalFormat;
 import java.util.List;
 
 import net.minecraft.client.gui.GuiButton;
@@ -51,7 +52,7 @@ public GuiNetworkStatus(final InventoryPlayer inventoryPlayer, final INetworkToo
 
         this.setScrollBar(scrollbar);
         this.repo = new ItemRepo(scrollbar, this);
-        this.ySize = 153;
+        this.ySize = 183;
         this.xSize = 195;
         this.repo.setRowSize(5);
     }
@@ -115,7 +116,7 @@ public void drawScreen(final int mouseX, final int mouseY, final float btn) {
     @Override
     public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
         final ContainerNetworkStatus ns = (ContainerNetworkStatus) this.inventorySlots;
-
+        final DecimalFormat df = new DecimalFormat("#.##");
         this.fontRendererObj
                 .drawString(GuiText.NetworkDetails.getLocal(), 8, 6, GuiColors.NetworkStatusDetails.getColor());
 
@@ -140,6 +141,29 @@ public void drawFG(final int offsetX, final int offsetY, final int mouseX, final
                 13,
                 143 - 20,
                 GuiColors.NetworkStatusPowerUsageRate.getColor());
+        this.fontRendererObj.drawString(
+                GuiText.ByteTotal.getLocal() + ": " + Platform.formatByteLong(ns.getItemBytesTotal()),
+                13,
+                143,
+                GuiColors.NetworkStatusPowerUsageRate.getColor());
+        this.fontRendererObj.drawString(
+                GuiText.ByteUsage.getLocal() + ": "
+                        + Platform.formatByteLong(ns.getItemBytesUsed())
+                        + " ("
+                        + df.format(ns.getItemBytesUsed() * 100d / ns.getItemBytesTotal())
+                        + "%)",
+                13,
+                143 + 10,
+                GuiColors.NetworkStatusPowerUsageRate.getColor());
+        this.fontRendererObj.drawString(
+                GuiText.ByteFree.getLocal() + ": "
+                        + Platform.formatByteLong(ns.getItemBytesFree())
+                        + " ("
+                        + df.format(ns.getItemBytesFree() * 100d / ns.getItemBytesTotal())
+                        + "%)",
+                13,
+                143 + 20,
+                GuiColors.NetworkStatusPowerUsageRate.getColor());
 
         final int sectionLength = 30;
 

src/main/java/appeng/container/implementations/ContainerNetworkStatus.java

@@ -26,12 +26,14 @@
 import appeng.api.networking.IGridHost;
 import appeng.api.networking.IGridNode;
 import appeng.api.networking.energy.IEnergyGrid;
+import appeng.api.networking.storage.IStorageGrid;
 import appeng.api.storage.data.IAEItemStack;
 import appeng.api.storage.data.IItemList;
 import appeng.container.AEBaseContainer;
 import appeng.container.guisync.GuiSync;
 import appeng.core.sync.network.NetworkHandler;
 import appeng.core.sync.packets.PacketMEInventoryUpdate;
+import appeng.me.cache.GridStorageCache;
 import appeng.util.Platform;
 import appeng.util.item.AEItemStack;
 
@@ -49,6 +51,15 @@ public class ContainerNetworkStatus extends AEBaseContainer {
     @GuiSync(3)
     public long maxPower;
 
+    @GuiSync(4)
+    public long itemBytesTotal;
+
+    @GuiSync(5)
+    public long itemBytesUsed;
+
+    @GuiSync(6)
+    public long itemBytesFree;
+
     private IGrid network;
     private int delay = 40;
 
@@ -121,6 +132,12 @@ public void detectAndSendChanges() {
             } catch (final IOException e) {
                 // :P
             }
+            final GridStorageCache sg = this.network.getCache(IStorageGrid.class);
+            if (sg != null) {
+                this.setItemBytesTotal(sg.getItemBytesTotal());
+                this.setItemBytesUsed(sg.getItemBytesUsed());
+                this.setItemBytesFree(this.getItemBytesTotal() - this.getItemBytesUsed());
+            }
         }
         super.detectAndSendChanges();
     }
@@ -156,4 +173,28 @@ public long getPowerUsage() {
     private void setPowerUsage(final long powerUsage) {
         this.powerUsage = powerUsage;
     }
+
+    public long getItemBytesTotal() {
+        return this.itemBytesTotal;
+    }
+
+    public long getItemBytesUsed() {
+        return this.itemBytesUsed;
+    }
+
+    public long getItemBytesFree() {
+        return this.itemBytesFree;
+    }
+
+    public void setItemBytesTotal(final long itemBytesTotal) {
+        this.itemBytesTotal = itemBytesTotal;
+    }
+
+    public void setItemBytesUsed(final long itemBytesUsed) {
+        this.itemBytesUsed = itemBytesUsed;
+    }
+
+    public void setItemBytesFree(final long itemBytesFree) {
+        this.itemBytesFree = itemBytesFree;
+    }
 }

src/main/java/appeng/core/localization/GuiText.java

@@ -205,7 +205,12 @@ public enum GuiText {
     VoidCellTooltip,
 
     // If a thing is deprecated
-    Deprecated;
+    Deprecated,
+
+    // mine
+    ByteTotal,
+    ByteUsage,
+    ByteFree;
 
     private final String root;
 

src/main/java/appeng/me/cache/GridStorageCache.java

@@ -42,6 +42,8 @@
 import appeng.api.storage.data.IAEStack;
 import appeng.api.storage.data.IItemList;
 import appeng.me.helpers.GenericInterestManager;
+import appeng.me.storage.CellInventoryHandler;
+import appeng.me.storage.DriveWatcher;
 import appeng.me.storage.ItemWatcher;
 import appeng.me.storage.NetworkInventoryHandler;
 
@@ -58,6 +60,10 @@ public class GridStorageCache implements IStorageGrid {
     private NetworkInventoryHandler<IAEItemStack> myItemNetwork;
     private NetworkInventoryHandler<IAEFluidStack> myFluidNetwork;
 
+    // mine
+    private long itemBytesTotal;
+    private long itemBytesUsed;
+
     public GridStorageCache(final IGrid g) {
         this.myGrid = g;
     }
@@ -66,6 +72,32 @@ public GridStorageCache(final IGrid g) {
     public void onUpdateTick() {
         this.itemMonitor.onTick();
         this.fluidMonitor.onTick();
+
+        this.itemBytesTotal = 0;
+        this.itemBytesUsed = 0;
+        try {
+            for (ICellProvider icp : this.activeCellProviders) {
+                if (icp.getClass() == Class.forName("appeng.tile.storage.TileDrive")) {
+                    // All Item Cell
+                    for (IMEInventoryHandler meih : icp.getCellArray(StorageChannel.ITEMS)) {
+                        if (((DriveWatcher<IAEItemStack>) meih).getInternal().getClass()
+                                == Class.forName("appeng.me.storage.VoidCellInventory")) { // exclude void cell and
+                                                                                           // creative cell
+                            continue;
+                        }
+                        if (((CellInventoryHandler) (((DriveWatcher<IAEItemStack>) meih).getInternal())).getCellInv()
+                                != null) {
+                            itemBytesTotal += ((CellInventoryHandler) (((DriveWatcher<IAEItemStack>) meih)
+                                    .getInternal())).getCellInv().getTotalBytes();
+                            itemBytesUsed += ((CellInventoryHandler) (((DriveWatcher<IAEItemStack>) meih)
+                                    .getInternal())).getCellInv().getUsedBytes();
+                        }
+                    }
+                }
+            }
+        } catch (ClassNotFoundException e) {
+            // XD
+        }
     }
 
     @Override
@@ -196,6 +228,7 @@ public void cellUpdate(final MENetworkCellArrayUpdate ev) {
         this.fluidMonitor.forceUpdate();
 
         tracker.applyChanges();
+
     }
 
     private void postChangesToNetwork(final StorageChannel chan, final int upOrDown, final IItemList availableItems,
@@ -329,4 +362,13 @@ public void applyChanges() {
             }
         }
     }
+
+    public long getItemBytesTotal() {
+        return this.itemBytesTotal;
+    }
+
+    public long getItemBytesUsed() {
+        return this.itemBytesUsed;
+    }
+
 }

src/main/java/appeng/util/Platform.java

@@ -1863,4 +1863,33 @@ public static IAEItemStack getAEStackInSlot(Slot slot) {
     public static long ceilDiv(long a, long b) {
         return Math.addExact(Math.addExact(a, b), -1) / b;
     }
+
+    /**
+     * From bytes to K,M,G,T like
+     * 
+     * @param n Bytes number
+     * @return String that like 1G or 1.4T
+     */
+    public static String formatByteLong(final long n) {
+        int storageUnit = Long.toBinaryString(n).length() / 10;
+        final DecimalFormat df = new DecimalFormat("#.##");
+        switch (storageUnit) {
+            case 6:
+                return df.format((double) n / 1152921504606846976d) + " EB";
+            case 5:
+                return df.format((double) n / 1125899906842624d) + " PB";
+            case 4:
+                return df.format((double) n / 1099511627776d) + " TB";
+            case 3:
+                return df.format((double) n / 1073741824d) + " GB";
+            case 2:
+                return df.format((double) n / 1048576d) + " MB";
+            case 1:
+                return df.format((double) n / 1024d) + " kB";
+            case 0:
+                return df.format((double) n) + " B";
+            default:
+                return df.format((double) n) + " B";
+        }
+    }
 }

src/main/resources/assets/appliedenergistics2/lang/en_US.lang

@@ -272,6 +272,10 @@ gui.appliedenergistics2.Nothing=Nothing
 gui.appliedenergistics2.VoidCellTooltip=Deletes §4everything§7 stored on it
 gui.appliedenergistics2.Deprecated=Deprecated, will be removed soon!
 
+gui.appliedenergistics2.ByteTotal=Bytes Total
+gui.appliedenergistics2.ByteUsage=Bytes Used
+gui.appliedenergistics2.ByteFree=Bytes Free
+
 # GUI Colors - ARGB
 gui.color.appliedenergistics2.SearchboxFocused=6E000000
 gui.color.appliedenergistics2.SearchboxUnfocused=00000000

src/main/resources/assets/appliedenergistics2/lang/zh_CN.lang

@@ -265,6 +265,10 @@ gui.appliedenergistics2.HoldShiftClick_HIGHLIGHT_INTERFACE=shift点击,高亮ME
 gui.appliedenergistics2.VoidCellTooltip=删除§任何§7存储在里面的物品
 gui.appliedenergistics2.Nothing=无
 
+gui.appliedenergistics2.ByteTotal=所有字节
+gui.appliedenergistics2.ByteUsage=已用字节
+gui.appliedenergistics2.ByteFree=剩余字节
+
 # GUI Colors - ARGB
 gui.color.appliedenergistics2.SearchboxFocused=6E000000
 gui.color.appliedenergistics2.SearchboxUnfocused=00000000