From 010fd38e921fc2f044932e253f9f129ace8716b4 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Sat, 14 Aug 2021 12:37:34 +0700
Subject: [PATCH] update widgets

---
 .../mc/otm/menu/BatteryBankMenu.java          |   4 ++--
 .../otm/menu/widget/ProgressGaugeWidget.java  |  10 +++++-----
 .../textures/gui/widgets.xcf                  | Bin 8003 -> 7940 bytes
 3 files changed, 7 insertions(+), 7 deletions(-)

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<T extends MatteryMenu> extends GaugeWidget<T> {
-	protected Supplier<Float> progress_supplier;
+	protected final Supplier<Float> progress_supplier;
 
 	protected final ContainerData progress_container = new ContainerData() {
 		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);
 		fill_order = GaugeDirection.LEFT_TO_RIGHT;
 		addDataSlots(progress_container);
+		progress_supplier = progress;
 	}
 
-	public ProgressGaugeWidget(T menu, int x, int y, Supplier<Float> 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 ee92f6c9d6a5407878703f689b879de507f349ff..ef53e23ef4656b1e18bb2ce36970caacdbe848a7 100644
GIT binary patch
delta 806
zcmX?X*J3xpiBW%|^Jm9p3}C>P1ED#NLTIj65Smv9LJO)uXkje~E#U;AWeg{mGulnQ
z#oRO5lPQ34*5p}C(vsUCa$u4jNb*AXOy@SAV|u}8x*bVc3djaw7Kj+jWh`<a>DQZI
zvrJ%OteJd{Q%Z_`29hc<AX@;!XWy`S1G_8}<2j%zX+@|Hz*0zxxR_v?C)aUVPp;>(
z+FZ|-&&c?G@_TM+Rc@FhkQRbsAjP8$6BjW5*FE_okIf`rk;(Nuk0x(roHF?>Z!a&W
zIa@a)3{PIjcX;v!J`Qo12&Xx!{6_u-lMnD~<CHHHIL(F7yV+5YmyywIvcHftW6<OR
z5iusAtj*0r7Z@3>fnrijBH=(mamM`39U_le7=tI<@k!}R=EGbJq&b1u0K%7Shl!)P
zNb)pJ*Bq4EH~E4TFHU(>*G|rn`Be|K4P+N16vN_JHU{DXxi?Vy2ZRQZaJ4|TEL2|h
z4@6#$2TIF8X=u`vvw`w`pfu2YI}lSY2P#klrF)?C94Ng8O7DTvXQ1?*&B}5Li~uwq
BeH8!z

delta 718
zcmZp%J8U<>iBWZ;^Jm9(3}C=k0--t1LTIi}5SrHnLJPV=Xkl*%Es+eNWeO&jGup8*
z0eO=*GCq)91Q7<4>_Czih*=<FO#3FUV-jb)w)q&-3r5EMlh?CItKNo4fk`PK3Bo|Y
z@)<%iFi4pH>z>TWmNMCZRb+EID-V-w3rq?~ivh6!5JPQXUod$ByEx;H%`4btnPjiw
zR>=7Ys8EcFi)-^Q&Nqyv-;q=b0ofo7HIhddiyTmhM|-n0j~(OWJc$XDKk|06u!Gz=
zk?-K-3w)~V-R!3!eE!9g8~B}p{1ae)q4cK74FV?2-R%E2D+uy3GKNpq6Ov{up6o9o
z#w66eIZ5aOBV!CuOo~aQ0w^fXIAL?T$YU19lF4>_QfiVDklexvWE(*Ek}F{1KwH*N
zJ}5bF@&-u{_Vw%mK>qg02c;S&Z;(o3-OirGZa%qCU@6cIj!c~YC+o`ms?UdMWnf?g
zGC>&Tb=lbvIeBd;Z4RM9BwQ_!EeDmCvxdmaL6eAFG?bqWrK_QIH<SjNZwF$^t%eHh
bhSH~@^ld2p8cP3$(DK|+T6*&nSp`M_SXpxU