Skip to content

Commit b07055d

Browse files
committed
adjust ViewModel scale settings and fix incorrect default values for positioning. Also move Freecam into the render category and AutoArmor into combat
1 parent 62ba701 commit b07055d

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

src/main/kotlin/com/lambda/module/modules/player/AutoArmor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ import net.minecraft.screen.slot.Slot
4343
object AutoArmor : Module(
4444
name = "AutoArmor",
4545
description = "Automatically equips armor",
46-
tag = ModuleTag.PLAYER
46+
tag = ModuleTag.COMBAT
4747
) {
4848
private var elytraPriority by setting("Elytra Priority", true, "Prioritizes elytra's over other armor pieces in the chest slot")
4949
private val toggleElytraPriority by setting("Toggle Elytra Priority", Bind.EMPTY)

src/main/kotlin/com/lambda/module/modules/player/Freecam.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ import net.minecraft.util.math.Vec3d
5757
object Freecam : Module(
5858
name = "Freecam",
5959
description = "Move your camera freely",
60-
tag = ModuleTag.PLAYER,
60+
tag = ModuleTag.RENDER,
6161
autoDisable = true,
6262
) {
6363
private val speed by setting("Speed", 0.5, 0.1..1.0, 0.1, "Freecam movement speed", unit = "m/s")

src/main/kotlin/com/lambda/module/modules/render/ViewModel.kt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,20 @@ object ViewModel : Module(
5252
// val shadow by setting("Shadows", true, "If disabled, removes shadows on the model") { page == Page.General }
5353

5454
private val splitScale by setting("Split Scale", false, "Splits left and right hand scale settings").group(Group.Scale)
55-
private val xScale by setting("X Scale", 1.0f, -1.0f..1.0f, 0.025f) { !splitScale }.onValueChange { _, to -> leftXScale = to; rightXScale = to }.group(Group.Scale)
56-
private val yScale by setting("Y Scale", 1.0f, -1.0f..1.0f, 0.025f) { !splitScale }.onValueChange { _, to -> leftYScale = to; rightYScale = to }.group(Group.Scale)
57-
private val zScale by setting("Z Scale", 1.0f, -1.0f..1.0f, 0.025f) { !splitScale }.onValueChange { _, to -> leftZScale = to; rightZScale = to }.group(Group.Scale)
58-
private var leftXScale by setting("Left X Scale", 1.0f, -1.0f..1.0f, 0.025f) { splitScale }.group(Group.Scale)
59-
private var leftYScale by setting("Left Y Scale", 1.0f, -1.0f..1.0f, 0.025f) { splitScale }.group(Group.Scale)
60-
private var leftZScale by setting("Left Z Scale", 1.0f, -1.0f..1.0f, 0.025f) { splitScale }.group(Group.Scale)
61-
private var rightXScale by setting("Right X Scale", 1.0f, -1.0f..1.0f, 0.025f) { splitScale }.group(Group.Scale)
62-
private var rightYScale by setting("Right Y Scale", 1.0f, -1.0f..1.0f, 0.025f) { splitScale }.group(Group.Scale)
63-
private var rightZScale by setting("Right Z Scale", 1.0f, -1.0f..1.0f, 0.025f) { splitScale }.group(Group.Scale)
55+
private val xScale by setting("X Scale", 1.0f, 0.0f..2.0f, 0.025f) { !splitScale }.onValueChange { _, to -> leftXScale = to; rightXScale = to }.group(Group.Scale)
56+
private val yScale by setting("Y Scale", 1.0f, 0.0f..2.0f, 0.025f) { !splitScale }.onValueChange { _, to -> leftYScale = to; rightYScale = to }.group(Group.Scale)
57+
private val zScale by setting("Z Scale", 1.0f, 0.0f..2.0f, 0.025f) { !splitScale }.onValueChange { _, to -> leftZScale = to; rightZScale = to }.group(Group.Scale)
58+
private var leftXScale by setting("Left X Scale", 1.0f, 0.0f..2.0f, 0.025f) { splitScale }.group(Group.Scale)
59+
private var leftYScale by setting("Left Y Scale", 1.0f, 0.0f..2.0f, 0.025f) { splitScale }.group(Group.Scale)
60+
private var leftZScale by setting("Left Z Scale", 1.0f, 0.0f..2.0f, 0.025f) { splitScale }.group(Group.Scale)
61+
private var rightXScale by setting("Right X Scale", 1.0f, 0.0f..2.0f, 0.025f) { splitScale }.group(Group.Scale)
62+
private var rightYScale by setting("Right Y Scale", 1.0f, 0.0f..2.0f, 0.025f) { splitScale }.group(Group.Scale)
63+
private var rightZScale by setting("Right Z Scale", 1.0f, 0.0f..2.0f, 0.025f) { splitScale }.group(Group.Scale)
6464

6565
private val splitPosition by setting("Split Position", false, "Splits left and right position settings").group(Group.Position)
66-
private val xPosition by setting("X Position", 1.0f, -1.0f..1.0f, 0.025f) { !splitPosition }.onValueChange { _, to -> leftXPosition = to; rightXPosition = to }.group(Group.Position)
67-
private val yPosition by setting("Y Position", 1.0f, -1.0f..1.0f, 0.025f) { !splitPosition }.onValueChange { _, to -> leftYPosition = to; rightYPosition = to }.group(Group.Position)
68-
private val zPosition by setting("Z Position", 1.0f, -1.0f..1.0f, 0.025f) { !splitPosition }.onValueChange { _, to -> leftZPosition = to; rightZPosition = to }.group(Group.Position)
66+
private val xPosition by setting("X Position", 0.0f, -1.0f..1.0f, 0.025f) { !splitPosition }.onValueChange { _, to -> leftXPosition = to; rightXPosition = to }.group(Group.Position)
67+
private val yPosition by setting("Y Position", 0.0f, -1.0f..1.0f, 0.025f) { !splitPosition }.onValueChange { _, to -> leftYPosition = to; rightYPosition = to }.group(Group.Position)
68+
private val zPosition by setting("Z Position", 0.0f, -1.0f..1.0f, 0.025f) { !splitPosition }.onValueChange { _, to -> leftZPosition = to; rightZPosition = to }.group(Group.Position)
6969
private var leftXPosition by setting("Left X Position", 0.0f, -1.0f..1.0f, 0.025f) { splitPosition }.group(Group.Position)
7070
private var leftYPosition by setting("Left Y Position", 0.0f, -1.0f..1.0f, 0.025f) { splitPosition }.group(Group.Position)
7171
private var leftZPosition by setting("Left Z Position", 0.0f, -1.0f..1.0f, 0.025f) { splitPosition }.group(Group.Position)
@@ -93,9 +93,9 @@ object ViewModel : Module(
9393
private var rightFovAnchorDistance by setting("Right Anchor Distance", 0.5f, 0.0f..1.0f, 0.01f, "The distance to anchor the right FOV transformation from") { splitFov }.group(Group.Fov)
9494

9595
private val enableHand by setting("Hand", false, "Enables settings for the players hand").group(Group.Hand)
96-
private val handXScale by setting("Hand X Scale", 1.0f, -1.0f..1.0f, 0.025f) { enableHand }.group(Group.Hand)
97-
private val handYScale by setting("Hand Y Scale", 1.0f, -1.0f..1.0f, 0.025f) { enableHand }.group(Group.Hand)
98-
private val handZScale by setting("Hand Z Scale", 1.0f, -1.0f..1.0f, 0.025f) { enableHand }.group(Group.Hand)
96+
private val handXScale by setting("Hand X Scale", 1.0f, 0.0f..2.0f, 0.025f) { enableHand }.group(Group.Hand)
97+
private val handYScale by setting("Hand Y Scale", 1.0f, 0.0f..2.0f, 0.025f) { enableHand }.group(Group.Hand)
98+
private val handZScale by setting("Hand Z Scale", 1.0f, 0.0f..2.0f, 0.025f) { enableHand }.group(Group.Hand)
9999
private val handXPosition by setting("Hand X Position", 0.0f, -1.0f..1.0f, 0.025f) { enableHand }.group(Group.Hand)
100100
private val handYPosition by setting("Hand Y Position", 0.0f, -1.0f..1.0f, 0.025f) { enableHand }.group(Group.Hand)
101101
private val handZPosition by setting("Hand Z Position", 0.0f, -1.0f..1.0f, 0.025f) { enableHand }.group(Group.Hand)

0 commit comments

Comments
 (0)