From d7794320fa5ac5f9e83d8cafc567595f2673ff57 Mon Sep 17 00:00:00 2001
From: YuRaNnNzZZ <medved609@yandex.ru>
Date: Fri, 27 Oct 2023 16:39:34 +0300
Subject: [PATCH] jade update

---
 gradle.properties                               |  4 ++--
 .../jade/providers/MatterBottlerProvider.kt     | 12 +++++-------
 .../providers/MatterReconstructorProvider.kt    |  9 ++++++---
 .../jade/providers/MatterStorageProvider.kt     | 16 +++++++---------
 .../jade/providers/MatteryEnergyProvider.kt     | 17 +++++++----------
 .../jade/providers/MatteryWorkerProvider.kt     |  5 +++--
 6 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index a6d094fe2..dc2d2cd2d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,12 +22,12 @@ mixin_version=0.8.5
 jei_version=16.0.0.28
 jupiter_version=5.9.2
 curios_version=6.0.2
-cosmetic_armor_reworked_id=4575609
+cosmetic_armor_reworked_id=4764779
 ad_astra_id=4594155
 botarium_id=4594094
 resourceful_lib_id=4598948
 resourceful_config_id=4576455
-jade_id=4614153
+jade_id=4818518
 configured_id=4462894
 
 kotlin_for_forge_version=4.4.0
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterBottlerProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterBottlerProvider.kt
index e2314a0ca..c44d42c25 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterBottlerProvider.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterBottlerProvider.kt
@@ -14,6 +14,7 @@ import snownee.jade.api.IServerDataProvider
 import snownee.jade.api.ITooltip
 import snownee.jade.api.config.IPluginConfig
 import snownee.jade.api.ui.BoxStyle
+import snownee.jade.api.ui.IElementHelper
 
 object MatterBottlerProvider : IBlockComponentProvider, IServerDataProvider<BlockAccessor> {
 	override fun getUid(): ResourceLocation = JadeUids.MATTER_BOTTLER
@@ -36,7 +37,7 @@ object MatterBottlerProvider : IBlockComponentProvider, IServerDataProvider<Bloc
 		if (!data.contains(JadeTagKeys.MATTER_BOTTLER_DATA)) return
 		val bottlerData = data.getCompound(JadeTagKeys.MATTER_BOTTLER_DATA)
 
-		val elementHelper = tooltip.elementHelper
+		val elementHelper = IElementHelper.get()
 		tooltip.add(
 			elementHelper.text(
 				TranslatableComponent(
@@ -50,15 +51,12 @@ object MatterBottlerProvider : IBlockComponentProvider, IServerDataProvider<Bloc
 		)
 
 		if (!data.getBoolean("isIdling")) {
-			val workProgress = data.getFloat("workProgress")
-			val style = elementHelper.progressStyle().color(RGBAColor.WHITE.toARGB())
-
 			tooltip.add(
 				elementHelper.progress(
-					workProgress,
+					data.getFloat("workProgress"),
 					null,
-					style,
-					BoxStyle.DEFAULT,
+					elementHelper.progressStyle().color(RGBAColor.WHITE.toARGB()),
+					BoxStyle.getNestedBox(),
 					true
 				)
 			)
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterReconstructorProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterReconstructorProvider.kt
index bbe6cece3..456e555f0 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterReconstructorProvider.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterReconstructorProvider.kt
@@ -13,6 +13,7 @@ import snownee.jade.api.IServerDataProvider
 import snownee.jade.api.ITooltip
 import snownee.jade.api.config.IPluginConfig
 import snownee.jade.api.ui.BoxStyle
+import snownee.jade.api.ui.IElementHelper
 
 object MatterReconstructorProvider : IBlockComponentProvider, IServerDataProvider<BlockAccessor> {
 	override fun getUid(): ResourceLocation = JadeUids.MATTER_RECONSTRUCTOR
@@ -45,16 +46,18 @@ object MatterReconstructorProvider : IBlockComponentProvider, IServerDataProvide
 
 		val ratio = damage.toFloat() / maxDamage.toFloat()
 
+		val elementHelper = IElementHelper.get()
+
 		tooltip.add(
-			tooltip.elementHelper.progress(
+			elementHelper.progress(
 				ratio,
 				TranslatableComponent(
 					"item.durability",
 					damage,
 					maxDamage
 				),
-				tooltip.elementHelper.progressStyle().color(RGBAColor.DARK_GREEN.toARGB()).textColor(RGBAColor.WHITE.toARGB()),
-				BoxStyle.DEFAULT,
+				elementHelper.progressStyle().color(RGBAColor.DARK_GREEN.toARGB()).textColor(RGBAColor.WHITE.toARGB()),
+				BoxStyle.getNestedBox(),
 				true
 			)
 		)
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 8e2d45201..3a150f84b 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
@@ -22,6 +22,7 @@ import snownee.jade.api.IServerDataProvider
 import snownee.jade.api.ITooltip
 import snownee.jade.api.config.IPluginConfig
 import snownee.jade.api.ui.BoxStyle
+import snownee.jade.api.ui.IElementHelper
 
 object MatterStorageProvider : IBlockComponentProvider, IServerDataProvider<BlockAccessor> {
 	override fun getUid(): ResourceLocation = JadeUids.MATTER_STORAGE
@@ -57,21 +58,18 @@ object MatterStorageProvider : IBlockComponentProvider, IServerDataProvider<Bloc
 		val storedMatter = matterData.getDecimal("storedMatter")
 		val maxStoredMatter = matterData.getDecimal("maxStoredMatter")
 
-		val ratio = if (maxStoredMatter.isZero) 0f else (storedMatter / maxStoredMatter).coerceIn(Decimal.ZERO, Decimal.ONE).toFloat()
-		val style = tooltip.elementHelper.progressStyle()
-			.color(JadeColors.MATTER_COLOR.toARGB())
-			.textColor(RGBAColor.WHITE.toARGB())
+		val elementHelper = IElementHelper.get()
 
 		tooltip.add(
-			tooltip.elementHelper.progress(
-				ratio,
+			elementHelper.progress(
+				if (maxStoredMatter.isZero) 0f else (storedMatter / maxStoredMatter).coerceIn(Decimal.ZERO, Decimal.ONE).toFloat(),
 				TranslatableComponent(
 					"otm.gui.level",
 					storedMatter.formatMatter(),
 					maxStoredMatter.formatMatter()
 				),
-				style,
-				BoxStyle.DEFAULT,
+				elementHelper.progressStyle().color(JadeColors.MATTER_COLOR.toARGB()).textColor(RGBAColor.WHITE.toARGB()),
+				BoxStyle.getNestedBox(),
 				true
 			)
 		)
@@ -80,7 +78,7 @@ object MatterStorageProvider : IBlockComponentProvider, IServerDataProvider<Bloc
 			val profiledData = matterData.getCompound("profiledData")
 
 			tooltip.add(
-				tooltip.elementHelper.text(
+				elementHelper.text(
 					formatLevel(
 						profiledData.getDecimal("weightedReceive"),
 						profiledData.getDecimal("weightedTransfer")
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 2ef189a32..9a113893f 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
@@ -15,11 +15,11 @@ import ru.dbotthepony.mc.otm.core.math.Decimal
 import ru.dbotthepony.mc.otm.core.math.RGBAColor
 import ru.dbotthepony.mc.otm.core.math.getDecimal
 import ru.dbotthepony.mc.otm.core.math.putDecimal
-import ru.dbotthepony.mc.otm.core.util.formatMatter
 import ru.dbotthepony.mc.otm.core.util.formatPower
 import snownee.jade.api.*
 import snownee.jade.api.config.IPluginConfig
 import snownee.jade.api.ui.BoxStyle
+import snownee.jade.api.ui.IElementHelper
 
 object MatteryEnergyProvider : IBlockComponentProvider, IServerDataProvider<BlockAccessor> {
 	override fun getUid(): ResourceLocation = JadeUids.MATTERY_ENERGY
@@ -56,21 +56,18 @@ object MatteryEnergyProvider : IBlockComponentProvider, IServerDataProvider<Bloc
 		val batteryLevel = energyData.getDecimal("batteryLevel")
 		val maxBatteryLevel = energyData.getDecimal("maxBatteryLevel")
 
-		val ratio = if (maxBatteryLevel.isZero) 0f else (batteryLevel / maxBatteryLevel).coerceIn(Decimal.ZERO, Decimal.ONE).toFloat()
-		val style = tooltip.elementHelper.progressStyle()
-			.color(JadeColors.ENERGY_COLOR.toARGB(), JadeColors.ENERGY_COLOR2.toARGB())
-			.textColor(RGBAColor.WHITE.toARGB())
+		val elementHelper = IElementHelper.get()
 
 		tooltip.add(
-			tooltip.elementHelper.progress(
-				ratio,
+			elementHelper.progress(
+				if (maxBatteryLevel.isZero) 0f else (batteryLevel / maxBatteryLevel).coerceIn(Decimal.ZERO, Decimal.ONE).toFloat(),
 				TranslatableComponent(
 					"otm.gui.level",
 					batteryLevel.formatPower(),
 					maxBatteryLevel.formatPower()
 				),
-				style,
-				BoxStyle.DEFAULT,
+				elementHelper.progressStyle().color(JadeColors.ENERGY_COLOR.toARGB(), JadeColors.ENERGY_COLOR2.toARGB()).textColor(RGBAColor.WHITE.toARGB()),
+				BoxStyle.getNestedBox(),
 				true
 			)
 		)
@@ -79,7 +76,7 @@ object MatteryEnergyProvider : IBlockComponentProvider, IServerDataProvider<Bloc
 			val profiledData = energyData.getCompound("profiledData")
 
 			tooltip.add(
-				tooltip.elementHelper.text(
+				elementHelper.text(
 					formatLevel(
 						profiledData.getDecimal("weightedReceive"),
 						profiledData.getDecimal("weightedTransfer")
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatteryWorkerProvider.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatteryWorkerProvider.kt
index 9da096393..bda41684e 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatteryWorkerProvider.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatteryWorkerProvider.kt
@@ -17,6 +17,7 @@ import snownee.jade.api.IServerDataProvider
 import snownee.jade.api.ITooltip
 import snownee.jade.api.config.IPluginConfig
 import snownee.jade.api.ui.BoxStyle
+import snownee.jade.api.ui.IElementHelper
 
 object MatteryWorkerProvider : IBlockComponentProvider, IServerDataProvider<BlockAccessor> {
 	override fun getUid(): ResourceLocation = JadeUids.MATTERY_WORKER
@@ -53,7 +54,7 @@ object MatteryWorkerProvider : IBlockComponentProvider, IServerDataProvider<Bloc
 		if (!data.contains(JadeTagKeys.MATTERY_WORKER_DATA)) return
 		val workerData = data.getCompound(JadeTagKeys.MATTERY_WORKER_DATA)
 
-		val elementHelper = tooltip.elementHelper
+		val elementHelper = IElementHelper.get()
 		val style = elementHelper.progressStyle().color(RGBAColor.WHITE.toARGB())
 		val styleError = elementHelper.progressStyle().color(RGBAColor.REDDISH.toARGB())
 
@@ -74,7 +75,7 @@ object MatteryWorkerProvider : IBlockComponentProvider, IServerDataProvider<Bloc
 						progress,
 						null,
 						if (isUnableToProcess) styleError else style,
-						BoxStyle.DEFAULT,
+						BoxStyle.getNestedBox(),
 						true
 					)
 				)