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