DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

update widgets

Browse Source
This commit is contained in:
DBotThePony 2021-08-14 12:37:34 +07:00
parent d5a0c8acd2
commit 010fd38e92
Signed by: DBot
GPG Key ID: DCC23B5715498507
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/ru/dbotthepony/mc/otm/menu/BatteryBankMenu.java
View File

@ -30,9 +30,9 @@ public class BatteryBankMenu extends MatteryMenu {
this.tile = tile; this.tile = tile;
if (tile == null || tile.getCapability(MatteryCapability.ENERGY).resolve().isEmpty()) { if (tile == null || tile.getCapability(MatteryCapability.ENERGY).resolve().isEmpty()) {
battery_widget = new BatteryLevelWidget(this, 13, 14); battery_widget = new BatteryLevelWidget(this, 13, 24);
} else { } else {
battery_widget = new BatteryLevelWidget(this, 13, 14, tile.getCapability(MatteryCapability.ENERGY).resolve().get()); battery_widget = new BatteryLevelWidget(this, 13, 24, tile.getCapability(MatteryCapability.ENERGY).resolve().get());
} }
for (int row = 0; row < 3; row++) for (int row = 0; row < 3; row++)

10
src/main/java/ru/dbotthepony/mc/otm/menu/widget/ProgressGaugeWidget.java
View File

@ -12,7 +12,7 @@ import java.util.List;
import java.util.function.Supplier; import java.util.function.Supplier;
public class ProgressGaugeWidget<T extends MatteryMenu> extends GaugeWidget<T> { public class ProgressGaugeWidget<T extends MatteryMenu> extends GaugeWidget<T> {
protected Supplier<Float> progress_supplier; protected final Supplier<Float> progress_supplier;
protected final ContainerData progress_container = new ContainerData() { protected final ContainerData progress_container = new ContainerData() {
private int value; private int value;
@ -33,15 +33,15 @@ public class ProgressGaugeWidget<T extends MatteryMenu> extends GaugeWidget<T> {
} }
}; };
public ProgressGaugeWidget(T menu, int x, int y) { public ProgressGaugeWidget(T menu, int x, int y, Supplier<Float> progress) {
super(menu, x, y); super(menu, x, y);
fill_order = GaugeDirection.LEFT_TO_RIGHT; fill_order = GaugeDirection.LEFT_TO_RIGHT;
addDataSlots(progress_container); addDataSlots(progress_container);
progress_supplier = progress;
} }
public ProgressGaugeWidget(T menu, int x, int y, Supplier<Float> progress) { public ProgressGaugeWidget(T menu, int x, int y) {
this(menu, x, y); this(menu, x, y, null);
progress_supplier = progress;
} }
@Override @Override

BIN
src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.xcf
View File

Binary file not shown.