Added mode to prevent stepping when player is in a safe hole (#295)

* Check hole option for Step module.

This option allows you to prevent Step from moving you out of a hole!

* Fix typo

* Refactor and proper hole check

* Remove trailing line

Co-authored-by: Constructor <[email protected]>

Author: SnivyLlama

src/main/kotlin/com/lambda/client/module/modules/combat/HoleESP.kt

@@ -72,7 +72,7 @@ object HoleESP : Module(
 
                 val bb = AxisAlignedBB(if (renderMode == Mode.BLOCK_FLOOR) pos.down() else pos)
 
-                if (holeType == SurroundUtils.HoleType.OBBY && shouldAddObsidian()) {
+                if (holeType == SurroundUtils.HoleType.OBSIDIAN && shouldAddObsidian()) {
                     cached.add(Triple(bb, colorObsidian, side))
                 }
 

src/main/kotlin/com/lambda/client/module/modules/combat/HoleMiner.kt

@@ -49,7 +49,7 @@ object HoleMiner : Module(
             runSafeR {
                 val target = CombatManager.target
                 if (target != null) {
-                    if (checkHole(target) != SurroundUtils.HoleType.OBBY) {
+                    if (checkHole(target) != SurroundUtils.HoleType.OBSIDIAN) {
                         MessageSendHelper.sendChatMessage("$chatName Target is not in a valid hole, disabling")
                         disable()
                     } else {

src/main/kotlin/com/lambda/client/module/modules/combat/Surround.kt

@@ -130,7 +130,7 @@ object Surround : Module(
         }
     }
 
-    private fun SafeClientEvent.inHoleCheck() = player.onGround && player.speed < 0.15 && checkHole(player) == SurroundUtils.HoleType.OBBY
+    fun SafeClientEvent.inHoleCheck() = player.onGround && player.speed < 0.15 && checkHole(player) == SurroundUtils.HoleType.OBSIDIAN
 
     private fun outOfHoleCheck() {
         if (autoDisable == AutoDisableMode.OUT_OF_HOLE) {

src/main/kotlin/com/lambda/client/module/modules/movement/Step.kt

@@ -14,6 +14,7 @@ import com.lambda.client.util.text.MessageSendHelper
 import com.lambda.client.util.threads.runSafe
 import com.lambda.client.util.threads.safeListener
 import com.lambda.client.event.listener.listener
+import com.lambda.client.module.modules.combat.Surround.inHoleCheck
 import net.minecraft.network.play.client.CPacketPlayer
 import net.minecraftforge.fml.common.gameevent.InputEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent
@@ -33,6 +34,7 @@ object Step : Module(
     private val upStep = setting("Up Step", true)
     private val downStep = setting("Down Step", false)
     private val entityStep by setting("Entities", true)
+    private val checkHole by setting("Check Hole", false)
     private val height by setting("Height", 1.0f, 0.25f..2.0f, 0.25f)
     private val downSpeed by setting("Down Speed", 0.2f, 0.0f..1.0f, 0.05f)
     private val bindUpStep by setting("Bind Up Step", Bind())
@@ -97,6 +99,7 @@ object Step : Module(
             && !player.capabilities.isFlying
             && !player.isOnLadder
             && !player.isInOrAboveLiquid
+            && (!checkHole || !inHoleCheck())
 
     private fun SafeClientEvent.setStepHeight() {
         player.stepHeight = if (upStep.value && player.onGround && player.collidedHorizontally) height else defaultHeight

src/main/kotlin/com/lambda/client/util/combat/SurroundUtils.kt

@@ -9,8 +9,6 @@ import net.minecraft.init.Blocks
 import net.minecraft.util.math.BlockPos
 
 object SurroundUtils {
-    private val mc = Wrapper.minecraft
-
     val surroundOffset = arrayOf(
         BlockPos(0, -1, 0), // down
         BlockPos(0, 0, -1), // north
@@ -36,7 +34,7 @@ object SurroundUtils {
                 break
             }
 
-            if (block != Blocks.BEDROCK) type = HoleType.OBBY
+            if (block != Blocks.BEDROCK) type = HoleType.OBSIDIAN
         }
 
         return type
@@ -47,6 +45,6 @@ object SurroundUtils {
     }
 
     enum class HoleType {
-        NONE, OBBY, BEDROCK
+        NONE, OBSIDIAN, BEDROCK
     }
 }