Merge remote-tracking branch 'origin/refactor/ui' into refactor/ui

Author: Blade-kt

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

@@ -37,6 +37,7 @@ import com.lambda.util.KeyCode
 import com.lambda.util.Nameable
 import net.minecraft.block.Block
 import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Vec3d
 import java.awt.Color
 
 /**
@@ -387,6 +388,40 @@ abstract class Configurable(
         visibility: () -> Boolean = { true },
     ) = ColorSetting(name, defaultValue, description, visibility).register()
 
+    /**
+     * Creates a [Vec3dSetting] with the provided parameters and adds it to the [settings].
+     *
+     * @param name The unique identifier for the setting.
+     * @param defaultValue The default [Vec3d] value of the setting.
+     * @param description A brief explanation of the setting's purpose and behavior.
+     * @param visibility A lambda expression that determines the visibility status of the setting.
+     *
+     * @return The created [Vec3dSetting].
+     */
+    fun setting(
+        name: String,
+        defaultValue: Vec3d,
+        description: String = "",
+        visibility: () -> Boolean = { true },
+    ) = Vec3dSetting(name, defaultValue, description, visibility).register()
+
+    /**
+     * Creates a [BlockPosSetting] with the provided parameters and adds it to the [settings].
+     *
+     * @param name The unique identifier for the setting.
+     * @param defaultValue The default [BlockPos.Mutable] value of the setting.
+     * @param description A brief explanation of the setting's purpose and behavior.
+     * @param visibility A lambda expression that determines the visibility status of the setting.
+     *
+     * @return The created [BlockPosSetting].
+     */
+    fun setting(
+        name: String,
+        defaultValue: BlockPos.Mutable,
+        description: String = "",
+        visibility: () -> Boolean = { true },
+    ) = BlockPosSetting(name, defaultValue, description, visibility).register()
+
     /**
      * Creates a [BlockPosSetting] with the provided parameters and adds it to the [settings].
      *

common/src/main/kotlin/com/lambda/config/settings/complex/Vec3dSetting.kt

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2024 Lambda
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.lambda.config.settings.complex
+
+import com.google.gson.reflect.TypeToken
+import com.lambda.brigadier.argument.double
+import com.lambda.brigadier.argument.integer
+import com.lambda.brigadier.argument.value
+import com.lambda.brigadier.execute
+import com.lambda.brigadier.required
+import com.lambda.config.AbstractSetting
+import com.lambda.util.extension.CommandBuilder
+import net.minecraft.command.CommandRegistryAccess
+import net.minecraft.util.math.BlockPos
+import net.minecraft.util.math.Vec3d
+
+class Vec3dSetting(
+    override val name: String,
+    defaultValue: Vec3d,
+    description: String,
+    visibility: () -> Boolean,
+) : AbstractSetting<Vec3d>(
+    defaultValue,
+    TypeToken.get(Vec3d::class.java).type,
+    description,
+    visibility
+) {
+    override fun CommandBuilder.buildCommand(registry: CommandRegistryAccess) {
+        required(double("X", -30000000.0, 30000000.0)) { x ->
+            required(double("Y", -64.0, 255.0)) { y ->
+                required(double("Z", -30000000.0, 30000000.0)) { z ->
+                    execute {
+                        trySetValue(Vec3d(x().value(), y().value(), z().value()))
+                    }
+                }
+            }
+        }
+    }
+}

common/src/main/kotlin/com/lambda/module/Module.kt

@@ -115,7 +115,7 @@ abstract class Module(
     enabledByDefault: Boolean = false,
     defaultKeybind: KeyCode = KeyCode.UNBOUND,
 ) : Nameable, Muteable, Configurable(ModuleConfig) {
-    private val isEnabledSetting = setting("Enabled", enabledByDefault, visibility = { false })
+    private val isEnabledSetting = setting("Enabled", enabledByDefault) { false }
     private val keybindSetting = setting("Keybind", defaultKeybind)
     val isVisible = setting("Visible", true) { ModuleList.isEnabled }
     val reset by setting("Reset", { settings.forEach { it.reset() }; this@Module.info("Settings set to default") })

common/src/main/kotlin/com/lambda/util/Formatting.kt

@@ -17,6 +17,7 @@
 
 package com.lambda.util
 
+import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Vec3d
 import java.time.LocalDateTime
 import java.time.ZoneId
@@ -39,6 +40,8 @@ object Formatting {
         return "(${format.format(Locale.US, x)}, ${format.format(Locale.US, y)}, ${format.format(Locale.US, z)})"
     }
 
+    fun BlockPos.asString() = "($x, $y, $z)"
+
     fun getTime(formatter: DateTimeFormatter = DateTimeFormatter.RFC_1123_DATE_TIME): String {
         val localDateTime = LocalDateTime.now()
         val zoneId = ZoneId.systemDefault()

common/src/main/kotlin/com/lambda/util/math/Vectors.kt

@@ -88,6 +88,13 @@ infix operator fun Vec3d.div(other: Double): Vec3d = times(1 / other)
 infix operator fun Vec3d.div(other: Float): Vec3d = times(1 / other)
 infix operator fun Vec3d.div(other: Int): Vec3d = times(1 / other)
 
+infix operator fun ClosedRange<Double>.rangeTo(other: Double) = Vec3d(start, endInclusive, other)
+infix operator fun ClosedRange<Float>.rangeTo(other: Float) = Vec3d(start.toDouble(), endInclusive.toDouble(), other.toDouble())
+infix operator fun ClosedRange<Int>.rangeTo(other: Int) = Vec3d(start.toDouble(), endInclusive.toDouble(), other.toDouble())
+infix operator fun OpenEndRange<Double>.rangeTo(other: Double) = Vec3d(start, endExclusive, other)
+infix operator fun OpenEndRange<Float>.rangeTo(other: Float) = Vec3d(start.toDouble(), endExclusive.toDouble(), other.toDouble())
+infix operator fun OpenEndRange<Int>.rangeTo(other: Int) = BlockPos.Mutable(start, endExclusive, other)
+
 /* Vec3i */
 val Vec3i.vec3d get() =
     Vec3d(x.toDouble(), y.toDouble(), z.toDouble())