From 57b3d355aee30873f9a73c6e096de8b2cb9408e1 Mon Sep 17 00:00:00 2001
From: minjaesong <alswo9628@gmail.com>
Date: Fri, 19 Jul 2024 01:30:38 +0900
Subject: [PATCH] battery complication not using shaperenderer

---
 assets/graphics/gui/fullscreen_bat_ind.tga    |  4 ++--
 lib/GetBatteryStatus.jar                      |  4 ++--
 .../torvald/terrarum/TerrarumPostProcessor.kt | 21 ++++++-------------
 .../graphics/gui/fullscreen_bat_ind.kra       |  3 +++
 4 files changed, 13 insertions(+), 19 deletions(-)
 create mode 100644 work_files/graphics/gui/fullscreen_bat_ind.kra

diff --git a/assets/graphics/gui/fullscreen_bat_ind.tga b/assets/graphics/gui/fullscreen_bat_ind.tga
index 1334805a9..cc9c25759 100644
--- a/assets/graphics/gui/fullscreen_bat_ind.tga
+++ b/assets/graphics/gui/fullscreen_bat_ind.tga
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f1df316f8b3135af57abbecec2ff3ae326cdf36464af28eec895f5d8793141f
-size 2594
+oid sha256:c30dd7cd7490f2ded58f2d8e5be45993250ba5e66f482cef5082825d8191755d
+size 164882
diff --git a/lib/GetBatteryStatus.jar b/lib/GetBatteryStatus.jar
index 78622f2c8..72bd1d3c4 100644
--- a/lib/GetBatteryStatus.jar
+++ b/lib/GetBatteryStatus.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2dbc832e12fd32e7020affb9f50196e7c0b5c42b5d279b815c5b42860e3507f5
-size 1514165
+oid sha256:6a0160baaee1a743f9283fdd522a378e64e6a59fa4d55c51d0dd44b918eb4010
+size 1514170
diff --git a/src/net/torvald/terrarum/TerrarumPostProcessor.kt b/src/net/torvald/terrarum/TerrarumPostProcessor.kt
index 9ce8f2fc6..62e8d9cb8 100644
--- a/src/net/torvald/terrarum/TerrarumPostProcessor.kt
+++ b/src/net/torvald/terrarum/TerrarumPostProcessor.kt
@@ -412,12 +412,17 @@ object TerrarumPostProcessor : Disposable {
         val watchStr = "$clockH:$clockM"
         val batteryPercentageStr = "$batteryPercentage%"
 
+        val percIndex = (batteryPercentage.toFloat() * 0.01 * 64).toInt() // 0-63
+        val btx = percIndex % 4
+        val bty = percIndex / 4
+        val btxoff = isCharging.toInt() * 4
+
         batch.inUse {
             batch.color = Color.WHITE
             App.fontSmallNumbers.draw(batch, watchStr, wx, wy)
 
             if (hasBattery) {
-                val batCell = batteryTex.get(0, isCharging.toInt())
+                val batCell = batteryTex.get(btxoff + btx, bty)
                 batch.draw(batCell, wx - watchHeight - batCell.regionWidth, wy)
 
                 App.fontSmallNumbers.draw(
@@ -427,20 +432,6 @@ object TerrarumPostProcessor : Disposable {
                 )
             }
         }
-
-        val magn = App.scr.magn
-
-        shapeRenderer.inUse(ShapeRenderer.ShapeType.Filled) {
-            if (hasBattery && !isCharging) {
-                val w = magn * (16f * batteryPercentage / 100f)
-                val h = magn * 6f
-                val x = magn * (wx - watchHeight - batteryTex.tileW + 2)
-                val y = magn * (wy + 3)
-
-                shapeRenderer.color = Color(1f, 1f, 1f, 1f)
-                shapeRenderer.rect(x, y, w, h)
-            }
-        }
     }
 
     private val defaultResStr = "Ingame UI Area"
diff --git a/work_files/graphics/gui/fullscreen_bat_ind.kra b/work_files/graphics/gui/fullscreen_bat_ind.kra
new file mode 100644
index 000000000..6b8265308
--- /dev/null
+++ b/work_files/graphics/gui/fullscreen_bat_ind.kra
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:45385a814d0dd9aa218edecde555be02ea8143e1c81e9528df35c0456f6eab13
+size 72241