From 14f711563986dd5b2f7a39dc8dd6568070941d7f Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Mon, 23 Aug 2021 18:36:55 +0700 Subject: [PATCH] Display stored matter in network --- .../mc/otm/menu/MatterCapacitorBankMenu.java | 17 +++++++++++++++++ .../otm/screen/MatterCapacitorBankScreen.java | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/MatterCapacitorBankMenu.java b/src/main/java/ru/dbotthepony/mc/otm/menu/MatterCapacitorBankMenu.java index e7f30eb79..6f7e356f1 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/MatterCapacitorBankMenu.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/MatterCapacitorBankMenu.java @@ -9,12 +9,15 @@ import ru.dbotthepony.mc.otm.capability.IMatterHandler; import ru.dbotthepony.mc.otm.menu.slot.MatterContainerInputSlot; import ru.dbotthepony.mc.otm.menu.widget.MatterLevelWidget; +import java.math.BigDecimal; + public class MatterCapacitorBankMenu extends MatteryMenu { public MatterCapacitorBankMenu(int p_38852_, Inventory inventory) { this(p_38852_, inventory, null); } public MatterLevelWidget matter_widget; + public MatterLevelWidget total_matter_widget; public MatterContainerInputSlot[] container_slots = new MatterContainerInputSlot[2 * 6]; @@ -23,8 +26,22 @@ public class MatterCapacitorBankMenu extends MatteryMenu { if (tile == null) { matter_widget = new MatterLevelWidget(this, 14, 20); + total_matter_widget = new MatterLevelWidget(this, 14, 20); } else { matter_widget = new MatterLevelWidget(this, 14, 20, tile.matter); + total_matter_widget = new MatterLevelWidget(this, 14, 20, () -> { + if (tile.getMatterGrid() != null) { + return tile.getMatterGrid().getStored(); + } + + return BigDecimal.ZERO; + }, () -> { + if (tile.getMatterGrid() != null) { + return tile.getMatterGrid().getCapacity(); + } + + return BigDecimal.ZERO; + }); } Container container = tile != null ? tile.matter_container : new SimpleContainer(2 * 6); diff --git a/src/main/java/ru/dbotthepony/mc/otm/screen/MatterCapacitorBankScreen.java b/src/main/java/ru/dbotthepony/mc/otm/screen/MatterCapacitorBankScreen.java index 371d79762..24f0849b6 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/screen/MatterCapacitorBankScreen.java +++ b/src/main/java/ru/dbotthepony/mc/otm/screen/MatterCapacitorBankScreen.java @@ -17,7 +17,7 @@ public class MatterCapacitorBankScreen extends MatteryScreen getGauges() { - return List.of(menu.matter_widget); + return List.of(menu.matter_widget, menu.total_matter_widget); } @Override