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 all 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
9 changes: 9 additions & 0 deletions src/main/java/appeng/api/config/CellType.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package appeng.api.config;

public enum CellType {

ITEM,
FLUID,
ESSENTIA

}
2 changes: 2 additions & 0 deletions src/main/java/appeng/api/config/Settings.java
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ public enum Settings {

CRAFTING_MODE(EnumSet.allOf(CraftingMode.class)),

CELL_TYPE(EnumSet.allOf(CellType.class)),

STICKY_MODE(EnumSet.of(YesNo.YES, YesNo.NO));

private final EnumSet<? extends Enum<?>> values;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/appeng/api/definitions/IItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@ public interface IItems {

IItemDefinition networkTool();

IItemDefinition advancedNetworkTool();

IItemDefinition portableCell();

IItemDefinition cellCreative();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package appeng.api.implementations;

import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;

public interface HasServerSideToolLogic {

boolean serverSideToolLogic(final ItemStack is, final EntityPlayer p, final World w, final int x, final int y,
final int z, final int side, final float hitX, final float hitY, final float hitZ);

}
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,7 @@
*/
public interface INetworkTool extends IInventory, IGuiItemObject {

int getSize();

IGridHost getGridHost(); // null for most purposes.
}
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);

}
27 changes: 27 additions & 0 deletions src/main/java/appeng/api/storage/ICellCacheRegistry.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package appeng.api.storage;

/**
* For {@link appeng.me.storage.CellInventoryHandler}(or FluidCellInventoryHandler in AE2FC) to easily get bytes
* informations
*/
public interface ICellCacheRegistry {

boolean canGetInv();

long getTotalBytes();

long getFreeBytes();

long getUsedBytes();

long getTotalTypes();

long getFreeTypes();

long getUsedTypes();

int getCellStatus();

StorageChannel getCellType();
MCTBL marked this conversation as resolved.
Show resolved Hide resolved

}
Original file line number Diff line number Diff line change
@@ -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);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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 -> {
MCTBL marked this conversation as resolved.
Show resolved Hide resolved
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);
}
}
}

Expand Down
Loading