ref: use mc's reach

Author: emyfops

common/src/main/kotlin/com/lambda/config/groups/InteractionConfig.kt

@@ -20,6 +20,11 @@ package com.lambda.config.groups
 import com.lambda.core.PingManager
 
 interface InteractionConfig {
+    /**
+     * Minecraft's default reach values
+     */
+    val defaultReach: Boolean
+
     /**
      * Maximum distance to interact.
      */

common/src/main/kotlin/com/lambda/config/groups/InteractionSettings.kt

@@ -18,13 +18,17 @@
 package com.lambda.config.groups
 
 import com.lambda.config.Configurable
+import com.lambda.threading.runSafe
+import net.minecraft.entity.player.PlayerEntity
 
 class InteractionSettings(
     c: Configurable,
-    defaultReach: Double = 4.6,
     vis: () -> Boolean = { true },
 ) : InteractionConfig {
-    override val reach by c.setting("Reach", defaultReach, 0.1..10.0, 0.1, "Players reach / range", " blocks", vis)
+    override val defaultReach by c.setting("Default Reach", true)
+    private val customReach by c.setting("Reach", 4.5, 0.1..10.0, 0.1, "Players reach / range", " blocks") { vis() && !defaultReach }
+    override val reach: Double
+        get() = if (defaultReach) runSafe { PlayerEntity.getReachDistance(interaction.currentGameMode.isCreative).toDouble() } ?: 4.5 else customReach
     override val useRayCast by c.setting("Raycast", true, "Verify hit vector with ray casting (for very strict ACs)", vis)
     override val visibilityCheck by c.setting("Visibility Check", true, "Check if target is visible", vis)
     override val resolution by c.setting("Resolution", 4, 1..40, 1, "How many raycast checks per surface (will be squared)") { vis() && useRayCast }

common/src/main/kotlin/com/lambda/module/modules/combat/KillAura.kt

@@ -62,7 +62,7 @@ object KillAura : Module(
     private val page by setting("Page", Page.Interact)
 
     // Interact
-    private val interactionSettings = InteractionSettings(this, 3.0) { page == Page.Interact }
+    private val interactionSettings = InteractionSettings(this) { page == Page.Interact }
     private val attackMode by setting("Attack Mode", AttackMode.Cooldown) { page == Page.Interact }
     private val delaySync by setting("Client-side Delay", true) { page == Page.Interact && attackMode == AttackMode.Cooldown }
     private val cooldownSync by setting("Client-side Cooldown", true) { page == Page.Interact && attackMode == AttackMode.Cooldown }