Skip to content

Commit 7903f33

Browse files
authored
Fix: Setting argument order (#129)
fixes the order of unit and visibility arguments for numeric settings
1 parent b5bec2d commit 7903f33

File tree

6 files changed

+26
-19
lines changed

6 files changed

+26
-19
lines changed

common/src/main/kotlin/com/lambda/config/Configurable.kt

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,15 @@ import com.lambda.config.settings.collections.MapSetting
3030
import com.lambda.config.settings.collections.SetSetting
3131
import com.lambda.config.settings.comparable.BooleanSetting
3232
import com.lambda.config.settings.comparable.EnumSetting
33-
import com.lambda.config.settings.complex.*
34-
import com.lambda.config.settings.numeric.*
33+
import com.lambda.config.settings.complex.BlockPosSetting
34+
import com.lambda.config.settings.complex.BlockSetting
35+
import com.lambda.config.settings.complex.ColorSetting
36+
import com.lambda.config.settings.complex.KeyBindSetting
37+
import com.lambda.config.settings.complex.Vec3dSetting
38+
import com.lambda.config.settings.numeric.DoubleSetting
39+
import com.lambda.config.settings.numeric.FloatSetting
40+
import com.lambda.config.settings.numeric.IntegerSetting
41+
import com.lambda.config.settings.numeric.LongSetting
3542
import com.lambda.util.Communication.logError
3643
import com.lambda.util.KeyCode
3744
import com.lambda.util.Nameable
@@ -277,7 +284,7 @@ abstract class Configurable(
277284
description: String = "",
278285
unit: String = "",
279286
visibility: () -> Boolean = { true },
280-
) = DoubleSetting(name, defaultValue, range, step, description, visibility, unit).register()
287+
) = DoubleSetting(name, defaultValue, range, step, description, unit, visibility).register()
281288

282289
/**
283290
* Creates a [FloatSetting] with the provided parameters and adds it to the [settings].
@@ -302,7 +309,7 @@ abstract class Configurable(
302309
description: String = "",
303310
unit: String = "",
304311
visibility: () -> Boolean = { true },
305-
) = FloatSetting(name, defaultValue, range, step, description, visibility, unit).register()
312+
) = FloatSetting(name, defaultValue, range, step, description, unit, visibility).register()
306313

307314
/**
308315
* Creates an [IntegerSetting] with the provided parameters and adds it to the [settings].
@@ -327,7 +334,7 @@ abstract class Configurable(
327334
description: String = "",
328335
unit: String = "",
329336
visibility: () -> Boolean = { true },
330-
) = IntegerSetting(name, defaultValue, range, step, description, visibility, unit).register()
337+
) = IntegerSetting(name, defaultValue, range, step, description, unit, visibility).register()
331338

332339
/**
333340
* Creates a [LongSetting] with the provided parameters and adds it to the [settings].
@@ -352,7 +359,7 @@ abstract class Configurable(
352359
description: String = "",
353360
unit: String = "",
354361
visibility: () -> Boolean = { true },
355-
) = LongSetting(name, defaultValue, range, step, description, visibility, unit).register()
362+
) = LongSetting(name, defaultValue, range, step, description, unit, visibility).register()
356363

357364
/**
358365
* Creates a [KeyBindSetting] with the provided parameters and adds it to the [settings].

common/src/main/kotlin/com/lambda/config/settings/NumericSetting.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ abstract class NumericSetting<T>(
3131
open val range: ClosedRange<T>,
3232
open val step: T,
3333
description: String,
34-
visibility: () -> Boolean,
3534
val unit: String,
35+
visibility: () -> Boolean
3636
) : AbstractSetting<T>(
3737
value,
3838
TypeToken.get(value::class.java).type,

common/src/main/kotlin/com/lambda/config/settings/numeric/DoubleSetting.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ class DoubleSetting(
3535
override val range: ClosedRange<Double>,
3636
override val step: Double,
3737
description: String,
38-
visibility: () -> Boolean,
3938
unit: String,
39+
visibility: () -> Boolean
4040
) : NumericSetting<Double>(
4141
defaultValue,
4242
range,
4343
step,
4444
description,
45-
visibility,
46-
unit
45+
unit,
46+
visibility
4747
) {
4848
override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {
4949
required(double(name, range.start, range.endInclusive)) { parameter ->

common/src/main/kotlin/com/lambda/config/settings/numeric/FloatSetting.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ class FloatSetting(
3434
override val range: ClosedRange<Float>,
3535
override val step: Float = 1f,
3636
description: String,
37-
visibility: () -> Boolean,
3837
unit: String,
38+
visibility: () -> Boolean
3939
) : NumericSetting<Float>(
4040
defaultValue,
4141
range,
4242
step,
4343
description,
44-
visibility,
45-
unit
44+
unit,
45+
visibility
4646
) {
4747
override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {
4848
required(float(name, range.start, range.endInclusive)) { parameter ->

common/src/main/kotlin/com/lambda/config/settings/numeric/IntegerSetting.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ class IntegerSetting(
3434
override val range: ClosedRange<Int>,
3535
override val step: Int = 1,
3636
description: String,
37-
visibility: () -> Boolean,
3837
unit: String,
38+
visibility: () -> Boolean
3939
) : NumericSetting<Int>(
4040
defaultValue,
4141
range,
4242
step,
4343
description,
44-
visibility,
45-
unit
44+
unit,
45+
visibility
4646
) {
4747
override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {
4848
required(integer(name, range.start, range.endInclusive)) { parameter ->

common/src/main/kotlin/com/lambda/config/settings/numeric/LongSetting.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ class LongSetting(
3434
override val range: ClosedRange<Long>,
3535
override val step: Long = 1,
3636
description: String,
37-
visibility: () -> Boolean,
3837
unit: String,
38+
visibility: () -> Boolean
3939
) : NumericSetting<Long>(
4040
defaultValue,
4141
range,
4242
step,
4343
description,
44-
visibility,
45-
unit
44+
unit,
45+
visibility
4646
) {
4747
override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {
4848
required(long(name, range.start, range.endInclusive)) { parameter ->

0 commit comments

Comments
 (0)