From ae1514700b289bbf6005af8a097b3fd5ea98b7fe Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Sat, 8 Oct 2022 14:34:00 +0700
Subject: [PATCH] Combine android charge bars

---
 .../ru/dbotthepony/mc/otm/client/MatteryGUI.kt    |   9 +++++----
 .../textures/gui/android_charge.png               | Bin 0 -> 280 bytes
 2 files changed, 5 insertions(+), 4 deletions(-)
 create mode 100644 src/main/resources/assets/overdrive_that_matters/textures/gui/android_charge.png

diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt
index 11ede6357..aa022a2f8 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/client/MatteryGUI.kt
@@ -30,11 +30,12 @@ import java.util.*
 import kotlin.math.ceil
 
 object MatteryGUI {
-	val CHARGE = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_charge/android_charge"), 80f, 9f)
-	val CHARGE_BG = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_charge/android_charge_bg"), 80f, 9f)
+	private val BARS = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_charge"), 80f, 36f)
+	val CHARGE = BARS.subElement(height = 9f)
+	val CHARGE_BG = BARS.subElement(y = 9f, height = 9f)
 
-	val CHARGE_HUNGER = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_charge/android_charge_hunger"), 80f, 9f)
-	val CHARGE_HUNGER_BG = AtlasSkinElement(ResourceLocation(OverdriveThatMatters.MOD_ID, "android_charge/android_charge_hunger_bg"), 80f, 9f)
+	val CHARGE_HUNGER = BARS.subElement(y = 18f, height = 9f)
+	val CHARGE_HUNGER_BG = BARS.subElement(y = 27f, height = 9f)
 
 	private var originalBedButtonX = -1
 	private var originalBedButtonY = -1
diff --git a/src/main/resources/assets/overdrive_that_matters/textures/gui/android_charge.png b/src/main/resources/assets/overdrive_that_matters/textures/gui/android_charge.png
new file mode 100644
index 0000000000000000000000000000000000000000..95dde45ce2034cd90ca7303cb29e171db7c6626f
GIT binary patch
literal 280
zcmeAS@N?(olHy`uVBq!ia0vp^4M6O`!3-pya`gKGDaPU;cPEB*=VV?2IV|apzK#qG
z8~eHcB(ehe5&=FTuKyo+{=Wg_FlcCKY<wKE@TRPgBR7!yVfA5cAjMG<<QM!O0vPT!
z?~MeCaTa()7BevL9ROj*tZSW|K*3T^7srqc=eO4!xeh4sxLnLwz4L$X?wQOik{uWR
z-{sF2?a9$IYWtkIO%AB|*ZTt|%kLH$%4Y*P77Q~k=k4UKb9rB6clH|4@ecoGZ#>%)
yt+%ajhbB;7hT%-+_B*Whi=F{F2=L&2!x{eQncG(%dDvnO683cUb6Mw<&;$UfoL-Os

literal 0
HcmV?d00001