More appropriate field names of LevelGaugeWidget

This commit is contained in:
DBotThePony 2022-09-04 16:06:35 +07:00
parent 0d5629ef07
commit ca3e5d948c
Signed by: DBot
GPG Key ID: DCC23B5715498507

View File

@ -8,12 +8,12 @@ import ru.dbotthepony.mc.otm.menu.MatteryMenu
@Suppress("unused") @Suppress("unused")
class LevelGaugeWidget(menu: MatteryMenu) : AbstractWidget(menu) { class LevelGaugeWidget(menu: MatteryMenu) : AbstractWidget(menu) {
var level = { ImpreciseFraction.ONE } var levelProvider = { ImpreciseFraction.ONE }
var maxLevel = {ImpreciseFraction.ONE } var maxLevelProvider = {ImpreciseFraction.ONE }
var levelContainer by menu.mSynchronizer.fraction() var level by menu.mSynchronizer.fraction()
private set private set
var maxLevelContainer by menu.mSynchronizer.fraction() var maxLevel by menu.mSynchronizer.fraction()
private set private set
constructor( constructor(
@ -22,8 +22,8 @@ class LevelGaugeWidget(menu: MatteryMenu) : AbstractWidget(menu) {
) : this(menu) { ) : this(menu) {
if (power == null) return if (power == null) return
this.level = power::batteryLevel this.levelProvider = power::batteryLevel
this.maxLevel = power::maxBatteryLevel this.maxLevelProvider = power::maxBatteryLevel
} }
constructor( constructor(
@ -32,8 +32,8 @@ class LevelGaugeWidget(menu: MatteryMenu) : AbstractWidget(menu) {
) : this(menu) { ) : this(menu) {
if (matter == null) return if (matter == null) return
this.level = matter::storedMatter this.levelProvider = matter::storedMatter
this.maxLevel = matter::maxStoredMatter this.maxLevelProvider = matter::maxStoredMatter
} }
constructor( constructor(
@ -42,8 +42,8 @@ class LevelGaugeWidget(menu: MatteryMenu) : AbstractWidget(menu) {
) : this(menu) { ) : this(menu) {
if (patterns == null) return if (patterns == null) return
this.level = {ImpreciseFraction(patterns.stored)} this.levelProvider = {ImpreciseFraction(patterns.stored)}
this.maxLevel = {ImpreciseFraction(patterns.capacity)} this.maxLevelProvider = {ImpreciseFraction(patterns.capacity)}
} }
constructor( constructor(
@ -51,16 +51,16 @@ class LevelGaugeWidget(menu: MatteryMenu) : AbstractWidget(menu) {
level: () -> ImpreciseFraction, level: () -> ImpreciseFraction,
maxLevel: () -> ImpreciseFraction, maxLevel: () -> ImpreciseFraction,
) : this(menu) { ) : this(menu) {
this.level = level this.levelProvider = level
this.maxLevel = maxLevel this.maxLevelProvider = maxLevel
} }
override fun updateServer() { override fun updateServer() {
levelContainer = level.invoke() level = levelProvider.invoke()
maxLevelContainer = maxLevel.invoke() maxLevel = maxLevelProvider.invoke()
} }
fun level(): ImpreciseFraction = levelContainer fun level(): ImpreciseFraction = level
fun maxLevel(): ImpreciseFraction = maxLevelContainer fun maxLevel(): ImpreciseFraction = maxLevel
fun percentage(): Float = levelContainer.percentage(maxLevelContainer) fun percentage(): Float = level.percentage(maxLevel)
} }