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

better colors for jade bars

Browse Source
This commit is contained in:
YuRaNnNzZZ 2023-07-15 21:02:47 +03:00
parent f2e4c80d31
commit d0334e761d
Signed by: YuRaNnNzZZ
GPG Key ID: 5F71738C85A6006D
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/kotlin/ru/dbotthepony/mc/otm/compat/jade/JadeCompatData.kt
View File

@ -2,6 +2,7 @@ package ru.dbotthepony.mc.otm.compat.jade
import net.minecraft.resources.ResourceLocation import net.minecraft.resources.ResourceLocation
import ru.dbotthepony.mc.otm.OverdriveThatMatters.loc import ru.dbotthepony.mc.otm.OverdriveThatMatters.loc
import ru.dbotthepony.mc.otm.core.math.RGBAColor
object JadeUids { object JadeUids {
val MATTERY_ENERGY: ResourceLocation = loc("mattery_energy") val MATTERY_ENERGY: ResourceLocation = loc("mattery_energy")
@ -20,3 +21,9 @@ object JadeTagKeys {
val MATTER_BOTTLER_DATA = "otmJadeMatterBottlerData" val MATTER_BOTTLER_DATA = "otmJadeMatterBottlerData"
val MATTER_RECONSTRUCTOR_DATA = "otmJadeMatterReconstructorData" 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)
}

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

@ -3,6 +3,7 @@ package ru.dbotthepony.mc.otm.compat.jade.providers
import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.CompoundTag
import net.minecraft.resources.ResourceLocation import net.minecraft.resources.ResourceLocation
import ru.dbotthepony.mc.otm.capability.MatteryCapability 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.JadeTagKeys
import ru.dbotthepony.mc.otm.compat.jade.JadeUids import ru.dbotthepony.mc.otm.compat.jade.JadeUids
import ru.dbotthepony.mc.otm.core.TranslatableComponent 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 ratio = if (maxStoredMatter.isZero) 0f else (storedMatter / maxStoredMatter).coerceIn(Decimal.ZERO, Decimal.ONE).toFloat()
val style = tooltip.elementHelper.progressStyle() val style = tooltip.elementHelper.progressStyle()
.color(RGBAColor.LOW_MATTER.linearInterpolation(ratio, RGBAColor.FULL_MATTER).toARGB()) .color(JadeColors.MATTER_COLOR.toARGB())
.textColor(RGBAColor.WHITE.toARGB()) .textColor(RGBAColor.WHITE.toARGB())
tooltip.add( tooltip.add(

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

@ -3,6 +3,7 @@ package ru.dbotthepony.mc.otm.compat.jade.providers
import net.minecraft.nbt.CompoundTag import net.minecraft.nbt.CompoundTag
import net.minecraft.resources.ResourceLocation import net.minecraft.resources.ResourceLocation
import ru.dbotthepony.mc.otm.capability.MatteryCapability 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.JadeTagKeys
import ru.dbotthepony.mc.otm.compat.jade.JadeUids import ru.dbotthepony.mc.otm.compat.jade.JadeUids
import ru.dbotthepony.mc.otm.core.TranslatableComponent 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 ratio = if (maxBatteryLevel.isZero) 0f else (batteryLevel / maxBatteryLevel).coerceIn(Decimal.ZERO, Decimal.ONE).toFloat()
val style = tooltip.elementHelper.progressStyle() 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()) .textColor(RGBAColor.WHITE.toARGB())
tooltip.add( tooltip.add(