cleanup and tiny fixes

Author: beanbag44

src/main/kotlin/com/lambda/module/modules/movement/elytrafly/ObstaclePassingMode.kt

@@ -57,10 +57,10 @@ abstract class ObstaclePassingMode(
 			if (passerConfig.passObstacles) BaritoneHandler.cancel()
 		}
 		onFlag {
-			if (!passerConfig.walkWhenFlagged) return@onFlag
+			if (!passerConfig.passObstacles || !passerConfig.walkWhenFlagged) return@onFlag
 			val snappedDir = getSnappedDir()
 			val closestLinePoint = player.pos.findClosestPointOnLine(snappedDir)
-			if (passerConfig.walkWhenFlagged) runGameScheduled {
+			runGameScheduled {
 				val delta = snappedDir.multiply(passerConfig.obstacleLookAhead.toDouble())
 				val pathToPoint = closestLinePoint.add(delta)
 				pathToValidPoint(pathToPoint, snappedDir)

src/main/kotlin/com/lambda/module/modules/movement/elytrafly/modes/BounceElytraFly.kt

@@ -48,19 +48,19 @@ class BounceElytraFly(
 		private const val BOUNCE_OBSTACLE_PASSER_GROUP = "Bounce Obstacle Passer"
 	}
 
-	val takeoff by c.setting("Takeoff", true, "Automatically jumps and initiates gliding") { mode == FlyMode.Bounce }
-	val autoPitch by c.setting("Auto Pitch", true, "Automatically pitches the players rotation down to bounce at faster speeds") { mode == FlyMode.Bounce }
-	val pitch by c.setting("Pitch", 80.0, -90.0..90.0, 0.000001) { mode == FlyMode.Bounce && autoPitch }
-	val jump by c.setting("Jump", true, "Automatically jumps") { mode == FlyMode.Bounce }
-	val interruptPause by c.setting("Interrupt Pause", 5, 0..100, 1, "How long to pause if the server flags you for a movement check", "ticks") { mode == FlyMode.Bounce }
-
-	@Group(Y_MOTION_GROUP) val yMotionSetting by c.setting("Y Motion", false, "Cancels the players y velocity to aid speed") { mode == FlyMode.Bounce }
-	@Group(Y_MOTION_GROUP) val onlyOnDiagonal: Boolean by c.setting("Only On Diagonal", true, "Only use y motion when the player is flying on a non-axial angle") { mode == FlyMode.Bounce && yMotionSetting }
-	@Group(Y_MOTION_GROUP) val minDiagonalAngle by c.setting("Min Diagonal Angle", 15.0, 0.0..180.0, 0.1, "The minimum angle the player must be flying to use y motion") { mode == FlyMode.Bounce && yMotionSetting && onlyOnDiagonal }
-	@Group(Y_MOTION_GROUP) val yMotionStartSpeed by c.setting("Y Motion Start Speed", 30, 5..40, 1, "bps") { mode == FlyMode.Bounce && yMotionSetting }
-	@Group(Y_MOTION_GROUP) val speedLimit by c.setting("Speed Limit", 110, 10..400, 1, "bps") { mode == FlyMode.Bounce && yMotionSetting }
+	private val takeoff by c.setting("Takeoff", true, "Automatically jumps and initiates gliding")
+	private val autoPitch by c.setting("Auto Pitch", true, "Automatically pitches the players rotation down to bounce at faster speeds")
+	private val pitch by c.setting("Pitch", 80.0, -90.0..90.0, 0.000001) { autoPitch }
+	private val jump by c.setting("Jump", true, "Automatically jumps")
+	private val flagPause by c.setting("FlagPause Pause", 5, 0..100, 1, "How long to pause if the server flags you for a movement check", "ticks")
+
+	@Group(Y_MOTION_GROUP) val yMotionSetting by c.setting("Y Motion", false, "Cancels the players y velocity to aid speed")
+	@Group(Y_MOTION_GROUP) val onlyOnDiagonal: Boolean by c.setting("Only On Diagonal", true, "Only use y motion when the player is flying on a non-axial angle") { yMotionSetting }
+	@Group(Y_MOTION_GROUP) val minDiagonalAngle by c.setting("Min Diagonal Angle", 15.0, 0.0..180.0, 0.1, "The minimum angle the player must be flying to use y motion") { yMotionSetting && onlyOnDiagonal }
+	@Group(Y_MOTION_GROUP) val yMotionStartSpeed by c.setting("Y Motion Start Speed", 30, 0..40, 1, unit = "bps") { yMotionSetting }
+	@Group(Y_MOTION_GROUP) val speedLimit by c.setting("Speed Limit", 110, 10..400, 1, unit = "bps") { yMotionSetting }
 	context(safeContext: SafeContext)
-	val yMotion
+	private val yMotion
 		get() = yMotionSetting &&
 				(!onlyOnDiagonal || abs(RotationManager.activeRotation.yaw % 90) > minDiagonalAngle) &&
 				safeContext.player.isOnGround &&
@@ -83,7 +83,7 @@ class BounceElytraFly(
 
 			if (handlePassingObstacles()) return@listen
 
-			if (!pauseTimer.hasSurpassed(interruptPause)) return@listen
+			if (!pauseTimer.hasSurpassed(flagPause)) return@listen
 
 			if (!player.isGliding) {
 				if (takeoff && player.canTakeoff) {
@@ -122,7 +122,7 @@ class BounceElytraFly(
 		return if (
 			mode == FlyMode.Bounce &&
 			prevGliding == true &&
-			pauseTimer.hasSurpassed(interruptPause) &&
+			pauseTimer.hasSurpassed(flagPause) &&
 			!BaritoneHandler.isActive
 		) true
 		else {

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

@@ -50,7 +50,7 @@ object ViewModel : Module(
 	private const val HAND_TAB = "Hand"
 
 	@Tab(GENERAL_TAB) private val swingMode by setting("Swing Mode", SwingMode.Standard, "Changes which hands swing")
-	@Tab(GENERAL_TAB)val swingDuration by setting("Swing Duration", 6, 0..20, 1, "Adjusts how fast the player swings", "ticks")
+	@Tab(GENERAL_TAB)val swingDuration by setting("Swing Duration", 6, 0..20, 1, "Adjusts how fast the player swings", " ticks")
 	@Tab(GENERAL_TAB)private val noSwingDelay by setting("No Swing Delay", false, "Removes the delay between swings")
 	@Tab(GENERAL_TAB)val mainSwingProgress by setting("Main Swing Progress", 0.0f, 0.0f..1.0f, 0.025f, "Renders as if the players main hand was this progress through the swing animation")
 	@Tab(GENERAL_TAB)val offhandSwingProgress by setting("Offhand Swing Progress", 0.0f, 0.0f..1.0f, 0.025f, "Renders as if the players offhand was this progress through the swing animation")