DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

jade update

Browse Source
This commit is contained in:
YuRaNnNzZZ 2023-10-27 16:39:34 +03:00
parent e116f0cd6e
commit d7794320fa
Signed by: YuRaNnNzZZ
GPG Key ID: 5F71738C85A6006D
6 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gradle.properties
View File

@ -22,12 +22,12 @@ mixin_version=0.8.5
jei_version=16.0.0.28 jei_version=16.0.0.28
jupiter_version=5.9.2 jupiter_version=5.9.2
curios_version=6.0.2 curios_version=6.0.2
cosmetic_armor_reworked_id=4575609 cosmetic_armor_reworked_id=4764779
ad_astra_id=4594155 ad_astra_id=4594155
botarium_id=4594094 botarium_id=4594094
resourceful_lib_id=4598948 resourceful_lib_id=4598948
resourceful_config_id=4576455 resourceful_config_id=4576455
jade_id=4614153 jade_id=4818518
configured_id=4462894 configured_id=4462894
kotlin_for_forge_version=4.4.0 kotlin_for_forge_version=4.4.0

12
src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterBottlerProvider.kt
View File

@ -14,6 +14,7 @@ import snownee.jade.api.IServerDataProvider
import snownee.jade.api.ITooltip import snownee.jade.api.ITooltip
import snownee.jade.api.config.IPluginConfig import snownee.jade.api.config.IPluginConfig
import snownee.jade.api.ui.BoxStyle import snownee.jade.api.ui.BoxStyle
import snownee.jade.api.ui.IElementHelper
object MatterBottlerProvider : IBlockComponentProvider, IServerDataProvider<BlockAccessor> { object MatterBottlerProvider : IBlockComponentProvider, IServerDataProvider<BlockAccessor> {
override fun getUid(): ResourceLocation = JadeUids.MATTER_BOTTLER override fun getUid(): ResourceLocation = JadeUids.MATTER_BOTTLER
@ -36,7 +37,7 @@ object MatterBottlerProvider : IBlockComponentProvider, IServerDataProvider<Bloc
if (!data.contains(JadeTagKeys.MATTER_BOTTLER_DATA)) return if (!data.contains(JadeTagKeys.MATTER_BOTTLER_DATA)) return
val bottlerData = data.getCompound(JadeTagKeys.MATTER_BOTTLER_DATA) val bottlerData = data.getCompound(JadeTagKeys.MATTER_BOTTLER_DATA)
val elementHelper = tooltip.elementHelper val elementHelper = IElementHelper.get()
tooltip.add( tooltip.add(
elementHelper.text( elementHelper.text(
TranslatableComponent( TranslatableComponent(
@ -50,15 +51,12 @@ object MatterBottlerProvider : IBlockComponentProvider, IServerDataProvider<Bloc
) )
if (!data.getBoolean("isIdling")) { if (!data.getBoolean("isIdling")) {
val workProgress = data.getFloat("workProgress")
val style = elementHelper.progressStyle().color(RGBAColor.WHITE.toARGB())
tooltip.add( tooltip.add(
elementHelper.progress( elementHelper.progress(
workProgress, data.getFloat("workProgress"),
null, null,
style, elementHelper.progressStyle().color(RGBAColor.WHITE.toARGB()),
BoxStyle.DEFAULT, BoxStyle.getNestedBox(),
true true
) )
) )

9
src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterReconstructorProvider.kt
View File

@ -13,6 +13,7 @@ import snownee.jade.api.IServerDataProvider
import snownee.jade.api.ITooltip import snownee.jade.api.ITooltip
import snownee.jade.api.config.IPluginConfig import snownee.jade.api.config.IPluginConfig
import snownee.jade.api.ui.BoxStyle import snownee.jade.api.ui.BoxStyle
import snownee.jade.api.ui.IElementHelper
object MatterReconstructorProvider : IBlockComponentProvider, IServerDataProvider<BlockAccessor> { object MatterReconstructorProvider : IBlockComponentProvider, IServerDataProvider<BlockAccessor> {
override fun getUid(): ResourceLocation = JadeUids.MATTER_RECONSTRUCTOR override fun getUid(): ResourceLocation = JadeUids.MATTER_RECONSTRUCTOR
@ -45,16 +46,18 @@ object MatterReconstructorProvider : IBlockComponentProvider, IServerDataProvide
val ratio = damage.toFloat() / maxDamage.toFloat() val ratio = damage.toFloat() / maxDamage.toFloat()
val elementHelper = IElementHelper.get()
tooltip.add( tooltip.add(
tooltip.elementHelper.progress( elementHelper.progress(
ratio, ratio,
TranslatableComponent( TranslatableComponent(
"item.durability", "item.durability",
damage, damage,
maxDamage maxDamage
), ),
tooltip.elementHelper.progressStyle().color(RGBAColor.DARK_GREEN.toARGB()).textColor(RGBAColor.WHITE.toARGB()), elementHelper.progressStyle().color(RGBAColor.DARK_GREEN.toARGB()).textColor(RGBAColor.WHITE.toARGB()),
BoxStyle.DEFAULT, BoxStyle.getNestedBox(),
true true
) )
) )

16
src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatterStorageProvider.kt
View File

@ -22,6 +22,7 @@ import snownee.jade.api.IServerDataProvider
import snownee.jade.api.ITooltip import snownee.jade.api.ITooltip
import snownee.jade.api.config.IPluginConfig import snownee.jade.api.config.IPluginConfig
import snownee.jade.api.ui.BoxStyle import snownee.jade.api.ui.BoxStyle
import snownee.jade.api.ui.IElementHelper
object MatterStorageProvider : IBlockComponentProvider, IServerDataProvider<BlockAccessor> { object MatterStorageProvider : IBlockComponentProvider, IServerDataProvider<BlockAccessor> {
override fun getUid(): ResourceLocation = JadeUids.MATTER_STORAGE override fun getUid(): ResourceLocation = JadeUids.MATTER_STORAGE
@ -57,21 +58,18 @@ object MatterStorageProvider : IBlockComponentProvider, IServerDataProvider<Bloc
val storedMatter = matterData.getDecimal("storedMatter") val storedMatter = matterData.getDecimal("storedMatter")
val maxStoredMatter = matterData.getDecimal("maxStoredMatter") val maxStoredMatter = matterData.getDecimal("maxStoredMatter")
val ratio = if (maxStoredMatter.isZero) 0f else (storedMatter / maxStoredMatter).coerceIn(Decimal.ZERO, Decimal.ONE).toFloat() val elementHelper = IElementHelper.get()
val style = tooltip.elementHelper.progressStyle()
.color(JadeColors.MATTER_COLOR.toARGB())
.textColor(RGBAColor.WHITE.toARGB())
tooltip.add( tooltip.add(
tooltip.elementHelper.progress( elementHelper.progress(
ratio, if (maxStoredMatter.isZero) 0f else (storedMatter / maxStoredMatter).coerceIn(Decimal.ZERO, Decimal.ONE).toFloat(),
TranslatableComponent( TranslatableComponent(
"otm.gui.level", "otm.gui.level",
storedMatter.formatMatter(), storedMatter.formatMatter(),
maxStoredMatter.formatMatter() maxStoredMatter.formatMatter()
), ),
style, elementHelper.progressStyle().color(JadeColors.MATTER_COLOR.toARGB()).textColor(RGBAColor.WHITE.toARGB()),
BoxStyle.DEFAULT, BoxStyle.getNestedBox(),
true true
) )
) )
@ -80,7 +78,7 @@ object MatterStorageProvider : IBlockComponentProvider, IServerDataProvider<Bloc
val profiledData = matterData.getCompound("profiledData") val profiledData = matterData.getCompound("profiledData")
tooltip.add( tooltip.add(
tooltip.elementHelper.text( elementHelper.text(
formatLevel( formatLevel(
profiledData.getDecimal("weightedReceive"), profiledData.getDecimal("weightedReceive"),
profiledData.getDecimal("weightedTransfer") profiledData.getDecimal("weightedTransfer")

17
src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatteryEnergyProvider.kt
View File

@ -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.RGBAColor
import ru.dbotthepony.mc.otm.core.math.getDecimal import ru.dbotthepony.mc.otm.core.math.getDecimal
import ru.dbotthepony.mc.otm.core.math.putDecimal 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 ru.dbotthepony.mc.otm.core.util.formatPower
import snownee.jade.api.* import snownee.jade.api.*
import snownee.jade.api.config.IPluginConfig import snownee.jade.api.config.IPluginConfig
import snownee.jade.api.ui.BoxStyle import snownee.jade.api.ui.BoxStyle
import snownee.jade.api.ui.IElementHelper
object MatteryEnergyProvider : IBlockComponentProvider, IServerDataProvider<BlockAccessor> { object MatteryEnergyProvider : IBlockComponentProvider, IServerDataProvider<BlockAccessor> {
override fun getUid(): ResourceLocation = JadeUids.MATTERY_ENERGY override fun getUid(): ResourceLocation = JadeUids.MATTERY_ENERGY
@ -56,21 +56,18 @@ object MatteryEnergyProvider : IBlockComponentProvider, IServerDataProvider<Bloc
val batteryLevel = energyData.getDecimal("batteryLevel") val batteryLevel = energyData.getDecimal("batteryLevel")
val maxBatteryLevel = energyData.getDecimal("maxBatteryLevel") val maxBatteryLevel = energyData.getDecimal("maxBatteryLevel")
val ratio = if (maxBatteryLevel.isZero) 0f else (batteryLevel / maxBatteryLevel).coerceIn(Decimal.ZERO, Decimal.ONE).toFloat() val elementHelper = IElementHelper.get()
val style = tooltip.elementHelper.progressStyle()
.color(JadeColors.ENERGY_COLOR.toARGB(), JadeColors.ENERGY_COLOR2.toARGB())
.textColor(RGBAColor.WHITE.toARGB())
tooltip.add( tooltip.add(
tooltip.elementHelper.progress( elementHelper.progress(
ratio, if (maxBatteryLevel.isZero) 0f else (batteryLevel / maxBatteryLevel).coerceIn(Decimal.ZERO, Decimal.ONE).toFloat(),
TranslatableComponent( TranslatableComponent(
"otm.gui.level", "otm.gui.level",
batteryLevel.formatPower(), batteryLevel.formatPower(),
maxBatteryLevel.formatPower() maxBatteryLevel.formatPower()
), ),
style, elementHelper.progressStyle().color(JadeColors.ENERGY_COLOR.toARGB(), JadeColors.ENERGY_COLOR2.toARGB()).textColor(RGBAColor.WHITE.toARGB()),
BoxStyle.DEFAULT, BoxStyle.getNestedBox(),
true true
) )
) )
@ -79,7 +76,7 @@ object MatteryEnergyProvider : IBlockComponentProvider, IServerDataProvider<Bloc
val profiledData = energyData.getCompound("profiledData") val profiledData = energyData.getCompound("profiledData")
tooltip.add( tooltip.add(
tooltip.elementHelper.text( elementHelper.text(
formatLevel( formatLevel(
profiledData.getDecimal("weightedReceive"), profiledData.getDecimal("weightedReceive"),
profiledData.getDecimal("weightedTransfer") profiledData.getDecimal("weightedTransfer")

5
src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/providers/MatteryWorkerProvider.kt
View File

@ -17,6 +17,7 @@ import snownee.jade.api.IServerDataProvider
import snownee.jade.api.ITooltip import snownee.jade.api.ITooltip
import snownee.jade.api.config.IPluginConfig import snownee.jade.api.config.IPluginConfig
import snownee.jade.api.ui.BoxStyle import snownee.jade.api.ui.BoxStyle
import snownee.jade.api.ui.IElementHelper
object MatteryWorkerProvider : IBlockComponentProvider, IServerDataProvider<BlockAccessor> { object MatteryWorkerProvider : IBlockComponentProvider, IServerDataProvider<BlockAccessor> {
override fun getUid(): ResourceLocation = JadeUids.MATTERY_WORKER override fun getUid(): ResourceLocation = JadeUids.MATTERY_WORKER
@ -53,7 +54,7 @@ object MatteryWorkerProvider : IBlockComponentProvider, IServerDataProvider<Bloc
if (!data.contains(JadeTagKeys.MATTERY_WORKER_DATA)) return if (!data.contains(JadeTagKeys.MATTERY_WORKER_DATA)) return
val workerData = data.getCompound(JadeTagKeys.MATTERY_WORKER_DATA) 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 style = elementHelper.progressStyle().color(RGBAColor.WHITE.toARGB())
val styleError = elementHelper.progressStyle().color(RGBAColor.REDDISH.toARGB()) val styleError = elementHelper.progressStyle().color(RGBAColor.REDDISH.toARGB())
@ -74,7 +75,7 @@ object MatteryWorkerProvider : IBlockComponentProvider, IServerDataProvider<Bloc
progress, progress,
null, null,
if (isUnableToProcess) styleError else style, if (isUnableToProcess) styleError else style,
BoxStyle.DEFAULT, BoxStyle.getNestedBox(),
true true
) )
) )