Merge branch 'master' into feature/packetmine-rewrite

Author: beanbag44

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

@@ -30,8 +30,15 @@ import com.lambda.config.settings.collections.MapSetting
 import com.lambda.config.settings.collections.SetSetting
 import com.lambda.config.settings.comparable.BooleanSetting
 import com.lambda.config.settings.comparable.EnumSetting
-import com.lambda.config.settings.complex.*
-import com.lambda.config.settings.numeric.*
+import com.lambda.config.settings.complex.BlockPosSetting
+import com.lambda.config.settings.complex.BlockSetting
+import com.lambda.config.settings.complex.ColorSetting
+import com.lambda.config.settings.complex.KeyBindSetting
+import com.lambda.config.settings.complex.Vec3dSetting
+import com.lambda.config.settings.numeric.DoubleSetting
+import com.lambda.config.settings.numeric.FloatSetting
+import com.lambda.config.settings.numeric.IntegerSetting
+import com.lambda.config.settings.numeric.LongSetting
 import com.lambda.util.Communication.logError
 import com.lambda.util.KeyCode
 import com.lambda.util.Nameable
@@ -277,7 +284,7 @@ abstract class Configurable(
         description: String = "",
         unit: String = "",
         visibility: () -> Boolean = { true },
-    ) = DoubleSetting(name, defaultValue, range, step, description, visibility, unit).register()
+    ) = DoubleSetting(name, defaultValue, range, step, description, unit, visibility).register()
 
     /**
      * Creates a [FloatSetting] with the provided parameters and adds it to the [settings].
@@ -302,7 +309,7 @@ abstract class Configurable(
         description: String = "",
         unit: String = "",
         visibility: () -> Boolean = { true },
-    ) = FloatSetting(name, defaultValue, range, step, description, visibility, unit).register()
+    ) = FloatSetting(name, defaultValue, range, step, description, unit, visibility).register()
 
     /**
      * Creates an [IntegerSetting] with the provided parameters and adds it to the [settings].
@@ -327,7 +334,7 @@ abstract class Configurable(
         description: String = "",
         unit: String = "",
         visibility: () -> Boolean = { true },
-    ) = IntegerSetting(name, defaultValue, range, step, description, visibility, unit).register()
+    ) = IntegerSetting(name, defaultValue, range, step, description, unit, visibility).register()
 
     /**
      * Creates a [LongSetting] with the provided parameters and adds it to the [settings].
@@ -352,7 +359,7 @@ abstract class Configurable(
         description: String = "",
         unit: String = "",
         visibility: () -> Boolean = { true },
-    ) = LongSetting(name, defaultValue, range, step, description, visibility, unit).register()
+    ) = LongSetting(name, defaultValue, range, step, description, unit, visibility).register()
 
     /**
      * Creates a [KeyBindSetting] with the provided parameters and adds it to the [settings].

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

@@ -31,8 +31,8 @@ abstract class NumericSetting<T>(
     open val range: ClosedRange<T>,
     open val step: T,
     description: String,
-    visibility: () -> Boolean,
     val unit: String,
+    visibility: () -> Boolean
 ) : AbstractSetting<T>(
     value,
     TypeToken.get(value::class.java).type,

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

@@ -35,15 +35,15 @@ class DoubleSetting(
     override val range: ClosedRange<Double>,
     override val step: Double,
     description: String,
-    visibility: () -> Boolean,
     unit: String,
+    visibility: () -> Boolean
 ) : NumericSetting<Double>(
     defaultValue,
     range,
     step,
     description,
-    visibility,
-    unit
+    unit,
+    visibility
 ) {
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {
         required(double(name, range.start, range.endInclusive)) { parameter ->

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

@@ -34,15 +34,15 @@ class FloatSetting(
     override val range: ClosedRange<Float>,
     override val step: Float = 1f,
     description: String,
-    visibility: () -> Boolean,
     unit: String,
+    visibility: () -> Boolean
 ) : NumericSetting<Float>(
     defaultValue,
     range,
     step,
     description,
-    visibility,
-    unit
+    unit,
+    visibility
 ) {
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {
         required(float(name, range.start, range.endInclusive)) { parameter ->

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

@@ -34,15 +34,15 @@ class IntegerSetting(
     override val range: ClosedRange<Int>,
     override val step: Int = 1,
     description: String,
-    visibility: () -> Boolean,
     unit: String,
+    visibility: () -> Boolean
 ) : NumericSetting<Int>(
     defaultValue,
     range,
     step,
     description,
-    visibility,
-    unit
+    unit,
+    visibility
 ) {
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {
         required(integer(name, range.start, range.endInclusive)) { parameter ->

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

@@ -34,15 +34,15 @@ class LongSetting(
     override val range: ClosedRange<Long>,
     override val step: Long = 1,
     description: String,
-    visibility: () -> Boolean,
     unit: String,
+    visibility: () -> Boolean
 ) : NumericSetting<Long>(
     defaultValue,
     range,
     step,
     description,
-    visibility,
-    unit
+    unit,
+    visibility
 ) {
     override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {
         required(long(name, range.start, range.endInclusive)) { parameter ->