Skip to content

Commit 96f90b3

Browse files
committed
Merge branch 'master' into feature/packetmine-rewrite
2 parents 17ee6fd + be1d683 commit 96f90b3

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

common/src/main/kotlin/com/lambda/gui/impl/clickgui/module/settings/EnumSlider.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ package com.lambda.gui.impl.clickgui.module.settings
2020
import com.lambda.config.settings.comparable.EnumSetting
2121
import com.lambda.gui.component.core.UIBuilder
2222
import com.lambda.gui.component.layout.Layout
23+
import com.lambda.util.NamedEnum
2324
import com.lambda.util.math.MathUtils.floorToInt
2425
import com.lambda.util.math.transform
2526

@@ -28,7 +29,7 @@ class EnumSlider <T : Enum<T>>(
2829
setting: EnumSetting<T>
2930
) : SettingSlider<T, EnumSetting<T>>(owner, setting) {
3031
override val settingValue: String
31-
get() = settingDelegate.name
32+
get() = (settingDelegate as? NamedEnum)?.displayName ?: settingDelegate.name
3233

3334
init {
3435
slider.progress {

common/src/main/kotlin/com/lambda/module/modules/network/Rubberband.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ object Rubberband : Module(
6262
this@Rubberband.warn(buildText {
6363
literal("Reverted position by ")
6464
color(Color.YELLOW) {
65-
literal("${PlayerPacketManager.configurations.reversed().indexOf(last) + 1}")
65+
literal("${PlayerPacketManager.configurations.toList().asReversed().indexOf(last) + 1}")
6666
}
6767
literal(" ticks (deviation: ")
6868
color(Color.YELLOW) {

0 commit comments

Comments
 (0)