Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add network bytes information for network status gui #419

Merged
merged 40 commits into from
Nov 17, 2023
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
ba686f9
Add network bytes infomation for network status gui
MCTBL Oct 31, 2023
2fdbe14
Add network bytes infomation for network status gui
MCTBL Oct 31, 2023
d31900e
Update src/main/java/appeng/me/cache/GridStorageCache.java
MCTBL Oct 31, 2023
93fc689
swap some of Class.forName to instanceof
MCTBL Oct 31, 2023
80f7e1e
Merge branch 'master' into dev
MCTBL Oct 31, 2023
c94206a
Merge pull request #1 from MCTBL/dev
MCTBL Oct 31, 2023
e4a10fd
make cache update delay
MCTBL Oct 31, 2023
1ed5568
make cache update delay
MCTBL Oct 31, 2023
0524da5
Change error conditions
MCTBL Oct 31, 2023
4869ca9
Change delay from 1000t(50s) to 100t(5s)
MCTBL Oct 31, 2023
13fe5b0
Let cache update data at the beginning
MCTBL Oct 31, 2023
d09184e
Add a cfg that can change the cache update rate
MCTBL Nov 1, 2023
01dde62
Merge branch 'GTNewHorizons:master' into master
MCTBL Nov 2, 2023
1bc8db3
Add fluid bytes information
MCTBL Nov 2, 2023
e3da6a9
Add essentia status and change gui form
MCTBL Nov 3, 2023
f13174d
Apply the spotlessApply
MCTBL Nov 3, 2023
9747e1f
Delete useless rows
MCTBL Nov 3, 2023
ff3b6ee
Delete useless rows
MCTBL Nov 3, 2023
864bbd4
Revert "Merge branch 'GTNewHorizons:master' into master"
MCTBL Nov 3, 2023
de4eaea
Revert "Revert "Merge branch 'GTNewHorizons:master' into master""
MCTBL Nov 3, 2023
597a078
back roll some commits
MCTBL Nov 3, 2023
229c3e7
Merge branch 'master' into dev
MCTBL Nov 3, 2023
fd3eda1
Merge pull request #2 from MCTBL/dev
MCTBL Nov 3, 2023
ce9efce
delete incorrect import and depends
MCTBL Nov 3, 2023
bb1f4ec
Change interface's name
MCTBL Nov 3, 2023
a8334ba
Remove wrong annotations
MCTBL Nov 4, 2023
df8b2b3
Add new AdvancedNetworkTool
MCTBL Nov 5, 2023
9a6fb39
Add the Advanced Network Tool gui
MCTBL Nov 6, 2023
4a8bb6f
Add the advanced toolbox for other Gui
MCTBL Nov 7, 2023
4697694
Update Build Script
MCTBL Nov 7, 2023
025d595
Add recipe into AE and fix some issue
MCTBL Nov 9, 2023
8369c39
Fix the wrong info when cell in ME chest
MCTBL Nov 10, 2023
781e19f
Add external buttons for advanced network status
MCTBL Nov 11, 2023
4323385
Merge branch 'master' into master
MCTBL Nov 11, 2023
8872428
merge with main branch
MCTBL Nov 11, 2023
2b999db
Apply spotless
MCTBL Nov 12, 2023
ddb9cc3
Add external Gui for advanced network tool
MCTBL Nov 12, 2023
39c01cb
Add more info to new Gui
MCTBL Nov 14, 2023
41b822b
Apply spotless
MCTBL Nov 14, 2023
f01f40c
Replace some class to interface
MCTBL Nov 15, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//version: 1697697256
//version: 1698936026
/*
DO NOT CHANGE THIS FILE!
Also, you may replace this file at any time if there is an update available.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -906,6 +906,7 @@ runClient17Task.configure {
mainClass = "GradleStart"
username = minecraft.username
userUUID = minecraft.userUUID
// jvmArgs '-Xdebug', '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005'
}

def runServer17Task = tasks.register("runServer17", RunHotswappableMinecraftTask, Distribution.DEDICATED_SERVER, "runServer")
Expand Down
2 changes: 2 additions & 0 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
dependencies {
implementation('com.github.GTNewHorizons:NotEnoughItems:2.4.6-GTNH:dev')
implementation('curse.maven:cofh-core-69162:2388751')
compileOnly('com.github.GTNewHorizons:ThaumicEnergistics:1.4.13-GTNH:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:AE2FluidCraft-Rework:1.1.42-gtnh:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.36:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.3.4:dev') {transitive = false}
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.44.73:dev') {transitive = false}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,5 @@ public interface IStorageGrid extends IGridCache, IStorageMonitorable {
* remove a provider added with addCellContainer
*/
void unregisterCellProvider(ICellProvider cc);

}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

package appeng.client.gui.implementations;

import java.text.DecimalFormat;
import java.util.List;

import net.minecraft.client.gui.GuiButton;
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -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("#.##");
MCTBL marked this conversation as resolved.
Show resolved Hide resolved
this.fontRendererObj
.drawString(GuiText.NetworkDetails.getLocal(), 8, 6, GuiColors.NetworkStatusDetails.getColor());

Expand All @@ -141,6 +142,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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -49,6 +51,24 @@ public class ContainerNetworkStatus extends AEBaseContainer {
@GuiSync(3)
public long maxPower;

@GuiSync(4)
public long itemBytesTotal;

@GuiSync(5)
public long itemBytesUsed;

@GuiSync(6)
public long fluidBytesTotal;

@GuiSync(7)
public long fluidBytesUsed;

@GuiSync(8)
public long essentiaBytesTotal;

@GuiSync(9)
public long essentiaBytesUsed;

private IGrid network;
private int delay = 40;

Expand Down Expand Up @@ -121,6 +141,15 @@ 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.setFluidBytesTotal(sg.getFluidBytesTotal());
this.setFluidBytesUsed(sg.getFluidBytesUsed());
this.setEssentiaBytesTotal(sg.getEssentiaBytesTotal());
this.setEssentiaBytesUsed(sg.getEssentiaBytesUsed());
}
}
super.detectAndSendChanges();
}
Expand Down Expand Up @@ -156,4 +185,53 @@ 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 void setItemBytesTotal(final long itemBytesTotal) {
this.itemBytesTotal = itemBytesTotal;
}

public void setItemBytesUsed(final long itemBytesUsed) {
this.itemBytesUsed = itemBytesUsed;
}

public long getFluidBytesTotal() {
return this.fluidBytesTotal;
}

public long getFluidBytesUsed() {
return this.fluidBytesUsed;
}

public void setFluidBytesTotal(final long fluidBytesTotal) {
this.fluidBytesTotal = fluidBytesTotal;
}

public void setFluidBytesUsed(final long fluidBytesUsed) {
this.fluidBytesUsed = fluidBytesUsed;
}

public long getEssentiaBytesTotal() {
return essentiaBytesTotal;
}

public long getEssentiaBytesUsed() {
return essentiaBytesUsed;
}

public void setEssentiaBytesTotal(long essentiaBytesTotal) {
this.essentiaBytesTotal = essentiaBytesTotal;
}

public void setEssentiaBytesUsed(long essentiaBytesUsed) {
this.essentiaBytesUsed = essentiaBytesUsed;
}

}
11 changes: 11 additions & 0 deletions src/main/java/appeng/core/AEConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ public final class AEConfig extends Configuration implements IConfigurableObject
public int storageBiomeID = -1;
public int storageProviderID = -1;
public int formationPlaneEntityLimit = 128;
public int networkBytesUpdateFrequency = 5;
public float spawnChargedChance = 0.92f;
public int quartzOresPerCluster = 4;
public int quartzOresClusterAmount = 15;
Expand Down Expand Up @@ -191,6 +192,16 @@ public AEConfig(final File configFile) {
this.formationPlaneEntityLimit = this
.get("automation", "formationPlaneEntityLimit", this.formationPlaneEntityLimit)
.getInt(this.formationPlaneEntityLimit);
this.networkBytesUpdateFrequency = this
.get("automation", "networkBytesUpdateFrequency", this.networkBytesUpdateFrequency)
.getInt(this.networkBytesUpdateFrequency);
if (this.networkBytesUpdateFrequency == 0) {
throw new IllegalArgumentException("networkBytesUpdateFrequency can not be 0!");
}
this.get(
"automation",
"networkBytesUpdateFrequency",
this.networkBytesUpdateFrequency).comment = "#Network bytes information update Frequency(s) default:5";

this.wirelessTerminalBattery = this.get("battery", "wirelessTerminal", this.wirelessTerminalBattery)
.getInt(this.wirelessTerminalBattery);
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/appeng/core/localization/GuiText.java
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,12 @@ public enum GuiText {
VoidCellTooltip,

// If a thing is deprecated
Deprecated;
Deprecated,

// Network bytes status
Items,
Fluids,
Essentias;

private final String root;

Expand Down
Loading