Add network bytes information for network status gui

build.gradle

@@ -1,4 +1,4 @@
-//version: 1697697256
+//version: 1699290261
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -646,7 +646,7 @@ repositories {
 
 def mixinProviderGroup = "io.github.legacymoddingmc"
 def mixinProviderModule = "unimixins"
-def mixinProviderVersion = "0.1.7.1"
+def mixinProviderVersion = "0.1.13"
 def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}:${mixinProviderVersion}"
 def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
 ext.mixinProviderSpec = mixinProviderSpec
@@ -1187,9 +1187,8 @@ publishing {
             version = System.getenv("RELEASE_VERSION") ?: identifiedVersion
         }
     }
-
     repositories {
-        if (usesMavenPublishing.toBoolean()) {
+        if (usesMavenPublishing.toBoolean() && System.getenv("MAVEN_USER") != null) {
             maven {
                 url = mavenPublishUrl
                 allowInsecureProtocol = mavenPublishUrl.startsWith("http://") // Mostly for the GTNH maven

src/main/java/appeng/api/definitions/IItems.java

@@ -62,6 +62,8 @@ public interface IItems {
 
     IItemDefinition networkTool();
 
+    IItemDefinition advancedNetworkTool();
+
     IItemDefinition portableCell();
 
     IItemDefinition cellCreative();

src/main/java/appeng/api/implementations/guiobjects/INetworkTool.java

@@ -22,5 +22,7 @@
  */
 public interface INetworkTool extends IInventory, IGuiItemObject {
 
+    int getSize();
+
     IGridHost getGridHost(); // null for most purposes.
 }

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/api/storage/ICellCacheRegistry.java

@@ -0,0 +1,23 @@
+package appeng.api.storage;
+
+/**
+ * For {@link appeng.me.storage.CellInventoryHandler}(or FluidCellInventoryHandler in AE2FC) to easily get bytes
+ * informations
+ */
+public interface ICellCacheRegistry {
+
+    long getTotalBytes();
+
+    long getFreeBytes();
+
+    long getUsedBytes();
+
+    long getTotalTypes();
+
+    long getFreeTypes();
+
+    long getUsedTypes();
+
+    StorageChannel getCellType();
+
+}

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

@@ -0,0 +1,78 @@
+package appeng.client.gui.implementations;
+
+import java.io.IOException;
+
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.entity.player.InventoryPlayer;
+
+import appeng.api.implementations.guiobjects.INetworkTool;
+import appeng.client.gui.AEBaseGui;
+import appeng.client.gui.widgets.GuiToggleButton;
+import appeng.container.implementations.ContainerAdvancedNetworkTool;
+import appeng.core.AELog;
+import appeng.core.localization.GuiColors;
+import appeng.core.localization.GuiText;
+import appeng.core.sync.network.NetworkHandler;
+import appeng.core.sync.packets.PacketValueConfig;
+
+public class GuiAdvancedNetworkTool extends AEBaseGui {
+
+    private GuiToggleButton tFacades;
+
+    public GuiAdvancedNetworkTool(final InventoryPlayer inventoryPlayer, final INetworkTool te) {
+        super(new ContainerAdvancedNetworkTool(inventoryPlayer, te));
+        this.ySize = 202;
+    }
+
+    @Override
+    protected void actionPerformed(final GuiButton btn) {
+        super.actionPerformed(btn);
+
+        try {
+            if (btn == this.tFacades) {
+                NetworkHandler.instance.sendToServer(new PacketValueConfig("AdvancedNetworkTool", "Toggle"));
+            }
+        } catch (final IOException e) {
+            AELog.debug(e);
+        }
+    }
+
+    @Override
+    public void initGui() {
+        super.initGui();
+
+        this.tFacades = new GuiToggleButton(
+                this.guiLeft - 18,
+                this.guiTop + 8,
+                23,
+                22,
+                GuiText.TransparentFacades.getLocal(),
+                GuiText.TransparentFacadesHint.getLocal());
+
+        this.buttonList.add(this.tFacades);
+    }
+
+    @Override
+    public void drawFG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
+        if (this.tFacades != null) {
+            this.tFacades.setState(((ContainerAdvancedNetworkTool) this.inventorySlots).isFacadeMode());
+        }
+
+        this.fontRendererObj.drawString(
+                this.getGuiDisplayName(GuiText.AdvancedNetworkTool.getLocal()),
+                8,
+                6,
+                GuiColors.AdvancedNetworkToolTitle.getColor());
+        this.fontRendererObj.drawString(
+                GuiText.inventory.getLocal(),
+                8,
+                this.ySize - 96 + 3,
+                GuiColors.AdvancedNetworkToolInventory.getColor());
+    }
+
+    @Override
+    public void drawBG(final int offsetX, final int offsetY, final int mouseX, final int mouseY) {
+        this.bindTexture("guis/advancedtoolbox.png");
+        this.drawTexturedModalRect(offsetX, offsetY, 0, 0, this.xSize, this.ySize);
+    }
+}

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

@@ -139,7 +139,18 @@ public void drawBG(final int offsetX, final int offsetY, final int mouseX, final
             }
         }
         if (this.hasToolbox()) {
-            this.drawTexturedModalRect(offsetX + 178, offsetY + this.ySize - 90, 178, 161, 68, 68);
+            // this.drawTexturedModalRect(offsetX + 178, offsetY + this.ySize - 90, 178, 161, 68, 68);
+            switch (this.getToolboxSize()) {
+                case 3 -> this
+                        .drawTexturedModalRect(offsetX + 178, offsetY + this.ySize - 90, 178, this.ySize - 90, 68, 68);
+                case 5 -> {
+                    this.bindTexture(this.getAdvancedBackground());
+                    // It's too big, so move it up a little bit
+                    this.drawTexturedModalRect(offsetX + 178, offsetY + this.ySize - 90 - 7, 0, 0, 104, 104);
+                }
+                default -> this
+                        .drawTexturedModalRect(offsetX + 178, offsetY + this.ySize - 90, 178, this.ySize - 90, 68, 68);
+            }
         }
     }
 

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;
@@ -44,14 +45,16 @@ public class GuiNetworkStatus extends AEBaseGui implements ISortSource {
     private final int rows = 4;
     private GuiImgButton units;
     private int tooltip = -1;
+    private final DecimalFormat df;
 
     public GuiNetworkStatus(final InventoryPlayer inventoryPlayer, final INetworkTool te) {
         super(new ContainerNetworkStatus(inventoryPlayer, te));
         final GuiScrollbar scrollbar = new GuiScrollbar();
 
+        this.df = new DecimalFormat("#.##");
         this.setScrollBar(scrollbar);
         this.repo = new ItemRepo(scrollbar, this);
-        this.ySize = 153;
+        this.ySize = 183;
         this.xSize = 195;
         this.repo.setRowSize(5);
     }
@@ -115,7 +118,6 @@ 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;
-
         this.fontRendererObj
                 .drawString(GuiText.NetworkDetails.getLocal(), 8, 6, GuiColors.NetworkStatusDetails.getColor());
 
@@ -141,6 +143,45 @@ public void drawFG(final int offsetX, final int offsetY, final int mouseX, final
                 143 - 20,
                 GuiColors.NetworkStatusPowerUsageRate.getColor());
 
+        // Item byte status
+        this.fontRendererObj.drawString(
+                GuiText.Items.getLocal() + ": "
+                        + Platform.formatByteLong(ns.getItemBytesUsed())
+                        + " / "
+                        + Platform.formatByteLong(ns.getItemBytesTotal())
+                        + " ("
+                        + df.format(ns.getItemBytesUsed() * 100d / ns.getItemBytesTotal())
+                        + "%)",
+                13,
+                143,
+                GuiColors.NetworkStatusPowerUsageRate.getColor());
+
+        // Fluid byte status
+        this.fontRendererObj.drawString(
+                GuiText.Fluids.getLocal() + ": "
+                        + Platform.formatByteLong(ns.getFluidBytesUsed())
+                        + " / "
+                        + Platform.formatByteLong(ns.getFluidBytesTotal())
+                        + " ("
+                        + df.format(ns.getFluidBytesUsed() * 100d / ns.getFluidBytesTotal())
+                        + "%)",
+                13,
+                143 + 10,
+                GuiColors.NetworkStatusPowerUsageRate.getColor());
+
+        // Essential byte status
+        this.fontRendererObj.drawString(
+                GuiText.Essentias.getLocal() + ": "
+                        + Platform.formatByteLong(ns.getEssentiaBytesUsed())
+                        + " / "
+                        + Platform.formatByteLong(ns.getEssentiaBytesTotal())
+                        + " ("
+                        + df.format(ns.getEssentiaBytesUsed() * 100d / ns.getEssentiaBytesTotal())
+                        + "%)",
+                13,
+                143 + 20,
+                GuiColors.NetworkStatusPowerUsageRate.getColor());
+
         final int sectionLength = 30;
 
         int x = 0;

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

@@ -70,14 +70,26 @@ public GuiUpgradeable(final ContainerUpgradeable te) {
         this.cvb = te;
 
         this.bc = (IUpgradeableHost) te.getTarget();
-        this.xSize = this.hasToolbox() ? 246 : 211;
+        if (this.hasToolbox()) {
+            this.xSize = switch (this.getToolboxSize()) {
+                case 3 -> 246;
+                case 5 -> 290;
+                default -> 246;
+            };
+        } else {
+            this.xSize = 211;
+        }
         this.ySize = 184;
     }
 
     protected boolean hasToolbox() {
         return ((ContainerUpgradeable) this.inventorySlots).hasToolbox();
     }
 
+    protected int getToolboxSize() {
+        return ((ContainerUpgradeable) this.inventorySlots).getToolboxSize();
+    }
+
     @Override
     public void initGui() {
         super.initGui();
@@ -150,12 +162,24 @@ public void drawBG(final int offsetX, final int offsetY, final int mouseX, final
         this.handleButtonVisibility();
 
         this.bindTexture(this.getBackground());
+
         this.drawTexturedModalRect(offsetX, offsetY, 0, 0, 211 - 34, this.ySize);
         if (this.drawUpgrades()) {
             this.drawTexturedModalRect(offsetX + 177, offsetY, 177, 0, 35, 14 + this.cvb.availableUpgrades() * 18);
         }
         if (this.hasToolbox()) {
-            this.drawTexturedModalRect(offsetX + 178, offsetY + this.ySize - 90, 178, this.ySize - 90, 68, 68);
+            switch (this.getToolboxSize()) {
+                case 3 -> this
+                        .drawTexturedModalRect(offsetX + 178, offsetY + this.ySize - 90, 178, this.ySize - 90, 68, 68);
+                case 5 -> {
+                    this.bindTexture(this.getAdvancedBackground());
+                    // It's too big, so move it up a little bit
+                    // Why Storage Bus will use this to draw all the slot?????
+                    this.drawTexturedModalRect(offsetX + 178, offsetY + this.ySize - 90 - 7, 0, 0, 104, 104);
+                }
+                default -> this
+                        .drawTexturedModalRect(offsetX + 178, offsetY + this.ySize - 90, 178, this.ySize - 90, 68, 68);
+            }
         }
     }
 
@@ -184,6 +208,10 @@ protected String getBackground() {
         return "guis/bus.png";
     }
 
+    protected String getAdvancedBackground() {
+        return "guis/advanced_toolbox.png";
+    }
+
     protected boolean drawUpgrades() {
         return true;
     }

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

@@ -0,0 +1,80 @@
+package appeng.container.implementations;
+
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
+import appeng.api.implementations.guiobjects.INetworkTool;
+import appeng.container.AEBaseContainer;
+import appeng.container.guisync.GuiSync;
+import appeng.container.slot.SlotRestrictedInput;
+import appeng.util.Platform;
+
+public class ContainerAdvancedNetworkTool extends AEBaseContainer {
+
+    private final INetworkTool toolInv;
+
+    @GuiSync(1)
+    public boolean facadeMode;
+
+    public ContainerAdvancedNetworkTool(final InventoryPlayer ip, final INetworkTool te) {
+        super(ip, null, null);
+        this.toolInv = te;
+
+        this.lockPlayerInventorySlot(ip.currentItem);
+
+        for (int y = 0; y < 5; y++) {
+            for (int x = 0; x < 5; x++) {
+                this.addSlotToContainer(
+                        (new SlotRestrictedInput(
+                                SlotRestrictedInput.PlacableItemType.UPGRADES,
+                                te,
+                                y * 5 + x,
+                                62 - 18 + x * 18,
+                                37 - 18 + y * 18,
+                                this.getInventoryPlayer())));
+            }
+        }
+
+        this.bindPlayerInventory(ip, 0, 120);
+    }
+
+    public void toggleFacadeMode() {
+        final NBTTagCompound data = Platform.openNbtData(this.toolInv.getItemStack());
+        data.setBoolean("hideFacades", !data.getBoolean("hideFacades"));
+        this.detectAndSendChanges();
+    }
+
+    @Override
+    public void detectAndSendChanges() {
+        final ItemStack currentItem = this.getPlayerInv().getCurrentItem();
+
+        if (currentItem != this.toolInv.getItemStack()) {
+            if (currentItem != null) {
+                if (Platform.isSameItem(this.toolInv.getItemStack(), currentItem)) {
+                    this.getPlayerInv()
+                            .setInventorySlotContents(this.getPlayerInv().currentItem, this.toolInv.getItemStack());
+                } else {
+                    this.setValidContainer(false);
+                }
+            } else {
+                this.setValidContainer(false);
+            }
+        }
+
+        if (this.isValidContainer()) {
+            final NBTTagCompound data = Platform.openNbtData(currentItem);
+            this.setFacadeMode(data.getBoolean("hideFacades"));
+        }
+
+        super.detectAndSendChanges();
+    }
+
+    public boolean isFacadeMode() {
+        return this.facadeMode;
+    }
+
+    private void setFacadeMode(final boolean facadeMode) {
+        this.facadeMode = facadeMode;
+    }
+}