From d0334e761d3c5795bc232f452d0c672097b49c34 Mon Sep 17 00:00:00 2001
From: YuRaNnNzZZ <medved609@yandex.ru>
Date: Sat, 15 Jul 2023 21:02:47 +0300
Subject: [PATCH] better colors for jade bars

---
 .../ru/dbotthepony/mc/otm/compat/jade/JadeCompatData.kt    | 7 +++++++
 .../mc/otm/compat/jade/providers/MatterStorageProvider.kt  | 3 ++-
 .../mc/otm/compat/jade/providers/MatteryEnergyProvider.kt  | 3 ++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/JadeCompatData.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/JadeCompatData.kt
index 2423d7ffb..7678283fb 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/JadeCompatData.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/JadeCompatData.kt
@@ -2,6 +2,7 @@ package ru.dbotthepony.mc.otm.compat.jade
 
 import net.minecraft.resources.ResourceLocation
 import ru.dbotthepony.mc.otm.OverdriveThatMatters.loc
+import ru.dbotthepony.mc.otm.core.math.RGBAColor
 
 object JadeUids {
 	val MATTERY_ENERGY: ResourceLocation = loc("mattery_energy")
@@ -20,3 +21,9 @@ object JadeTagKeys {
 	val MATTER_BOTTLER_DATA = "otmJadeMatterBottlerData"
 	val MATTER_RECONSTRUCTOR_DATA = "otmJadeMatterReconstructorData"
 }
+
+object JadeColors {
+	val ENERGY_COLOR = RGBAColor(231, 232, 0)
+	val ENERGY_COLOR2 = RGBAColor(192, 193, 0)
+	val MATTER_COLOR = RGBAColor(71, 255, 187)
+}
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterStorageProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterStorageProvider.kt
index 43620216a..1ed43911c 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterStorageProvider.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterStorageProvider.kt
@@ -3,6 +3,7 @@ package ru.dbotthepony.mc.otm.compat.jade.providers
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.resources.ResourceLocation
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
+import ru.dbotthepony.mc.otm.compat.jade.JadeColors
 import ru.dbotthepony.mc.otm.compat.jade.JadeTagKeys
 import ru.dbotthepony.mc.otm.compat.jade.JadeUids
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
@@ -43,7 +44,7 @@ object MatterStorageProvider : IBlockComponentProvider, IServerDataProvider<Bloc
 
 		val ratio = if (maxStoredMatter.isZero) 0f else (storedMatter / maxStoredMatter).coerceIn(Decimal.ZERO, Decimal.ONE).toFloat()
 		val style = tooltip.elementHelper.progressStyle()
-			.color(RGBAColor.LOW_MATTER.linearInterpolation(ratio, RGBAColor.FULL_MATTER).toARGB())
+			.color(JadeColors.MATTER_COLOR.toARGB())
 			.textColor(RGBAColor.WHITE.toARGB())
 
 		tooltip.add(
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatteryEnergyProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatteryEnergyProvider.kt
index 56e6189ae..586c5ed2d 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatteryEnergyProvider.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatteryEnergyProvider.kt
@@ -3,6 +3,7 @@ package ru.dbotthepony.mc.otm.compat.jade.providers
 import net.minecraft.nbt.CompoundTag
 import net.minecraft.resources.ResourceLocation
 import ru.dbotthepony.mc.otm.capability.MatteryCapability
+import ru.dbotthepony.mc.otm.compat.jade.JadeColors
 import ru.dbotthepony.mc.otm.compat.jade.JadeTagKeys
 import ru.dbotthepony.mc.otm.compat.jade.JadeUids
 import ru.dbotthepony.mc.otm.core.TranslatableComponent
@@ -41,7 +42,7 @@ object MatteryEnergyProvider : IBlockComponentProvider, IServerDataProvider<Bloc
 
 		val ratio = if (maxBatteryLevel.isZero) 0f else (batteryLevel / maxBatteryLevel).coerceIn(Decimal.ZERO, Decimal.ONE).toFloat()
 		val style = tooltip.elementHelper.progressStyle()
-			.color(RGBAColor.LOW_POWER.linearInterpolation(ratio, RGBAColor.FULL_POWER).toARGB())
+			.color(JadeColors.ENERGY_COLOR.toARGB(), JadeColors.ENERGY_COLOR2.toARGB())
 			.textColor(RGBAColor.WHITE.toARGB())
 
 		tooltip.add(