diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/BatteryBankMenu.java b/src/main/java/ru/dbotthepony/mc/otm/menu/BatteryBankMenu.java index c648dec85..f5d71d25f 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/BatteryBankMenu.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/BatteryBankMenu.java @@ -30,9 +30,9 @@ public class BatteryBankMenu extends MatteryMenu { this.tile = tile; if (tile == null || tile.getCapability(MatteryCapability.ENERGY).resolve().isEmpty()) { - battery_widget = new BatteryLevelWidget(this, 13, 14); + battery_widget = new BatteryLevelWidget(this, 13, 24); } 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++) diff --git a/src/main/java/ru/dbotthepony/mc/otm/menu/widget/ProgressGaugeWidget.java b/src/main/java/ru/dbotthepony/mc/otm/menu/widget/ProgressGaugeWidget.java index 9b1b5bb82..98ddf9b44 100644 --- a/src/main/java/ru/dbotthepony/mc/otm/menu/widget/ProgressGaugeWidget.java +++ b/src/main/java/ru/dbotthepony/mc/otm/menu/widget/ProgressGaugeWidget.java @@ -12,7 +12,7 @@ import java.util.List; import java.util.function.Supplier; public class ProgressGaugeWidget extends GaugeWidget { - protected Supplier progress_supplier; + protected final Supplier progress_supplier; protected final ContainerData progress_container = new ContainerData() { private int value; @@ -33,15 +33,15 @@ public class ProgressGaugeWidget extends GaugeWidget { } }; - public ProgressGaugeWidget(T menu, int x, int y) { + public ProgressGaugeWidget(T menu, int x, int y, Supplier progress) { super(menu, x, y); fill_order = GaugeDirection.LEFT_TO_RIGHT; addDataSlots(progress_container); + progress_supplier = progress; } - public ProgressGaugeWidget(T menu, int x, int y, Supplier progress) { - this(menu, x, y); - progress_supplier = progress; + public ProgressGaugeWidget(T menu, int x, int y) { + this(menu, x, y, null); } @Override diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.xcf b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.xcf index ee92f6c9d..ef53e23ef 100644 Binary files a/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.xcf and b/src/main/resources/assets/overdrive_that_matters/textures/gui/widgets.xcf differ