raycast ElytraFly obstacle passer based on collider rather than outline to avoid triggering over blocks like torches and signs

Author: beanbag44

src/main/kotlin/com/lambda/interaction/managers/inventory/InventoryRequest.kt

@@ -57,6 +57,7 @@ class InventoryRequest private constructor(
 	@DslMarker
 	private annotation class InvRequestDsl
 
+	@Suppress("unused")
 	@InvRequestDsl
 	class InvRequestBuilder(val settleForLess: Boolean, val mustPerform: Boolean) {
 		val actions = mutableListOf<InventoryAction>()

src/main/kotlin/com/lambda/interaction/managers/rotating/Rotation.kt

@@ -18,6 +18,7 @@
 package com.lambda.interaction.managers.rotating
 
 import com.lambda.threading.runSafe
+import com.lambda.util.BlockUtils.fluids
 import com.lambda.util.math.MathUtils.toDegree
 import com.lambda.util.math.MathUtils.toRadian
 import com.lambda.util.math.plus
@@ -29,6 +30,7 @@ import net.minecraft.util.math.Box
 import net.minecraft.util.math.Direction
 import net.minecraft.util.math.MathHelper.wrapDegrees
 import net.minecraft.util.math.Vec3d
+import net.minecraft.world.RaycastContext
 import kotlin.math.abs
 import kotlin.math.atan2
 import kotlin.math.cos
@@ -63,10 +65,11 @@ data class Rotation(val yaw: Double, val pitch: Double) {
     fun rayCast(
         reach: Double,
         eye: Vec3d? = null,
-        fluids: Boolean = false,
         mask: InteractionMask = InteractionMask.Both,
+        shapeType: RaycastContext.ShapeType = RaycastContext.ShapeType.OUTLINE,
+        fluidHandling: RaycastContext.FluidHandling = RaycastContext.FluidHandling.NONE
     ) = runSafe {
-        rayCast(eye ?: player.eyePos, vector, reach, mask, fluids)
+        rayCast(eye ?: player.eyePos, vector, reach, mask, shapeType, fluidHandling)
     }
 
     fun castBox(

src/main/kotlin/com/lambda/module/modules/movement/ElytraFly.kt

@@ -61,6 +61,7 @@ import net.minecraft.network.packet.c2s.play.ClientCommandC2SPacket
 import net.minecraft.network.packet.s2c.play.PlayerPositionLookS2CPacket
 import net.minecraft.sound.SoundEvents
 import net.minecraft.util.math.Vec3d
+import net.minecraft.world.RaycastContext
 import java.lang.Math.toDegrees
 import java.lang.Math.toRadians
 import kotlin.math.abs
@@ -296,7 +297,8 @@ object ElytraFly : Module(
             this,
             direction,
             obstacleLookAhead.toDouble(),
-            InteractionMask.Block
+            InteractionMask.Block,
+            RaycastContext.ShapeType.COLLIDER
         )?.blockResult != null
 
     private fun Vec3d.findClosestPointOnLine(snappedDirection: Vec3d): Vec3d {

src/main/kotlin/com/lambda/util/world/raycast/RayCastUtils.kt

@@ -20,6 +20,7 @@ package com.lambda.util.world.raycast
 import com.lambda.Lambda.mc
 import com.lambda.context.SafeContext
 import com.lambda.interaction.managers.rotating.Rotation
+import com.lambda.util.BlockUtils.fluids
 import com.lambda.util.math.distSq
 import net.minecraft.client.network.ClientPlayerEntity
 import net.minecraft.entity.Entity
@@ -42,16 +43,16 @@ object RayCastUtils {
         direction: Vec3d,
         reach: Double,
         mask: InteractionMask,
-        fluids: Boolean = false,
+        shapeType: RaycastContext.ShapeType = RaycastContext.ShapeType.OUTLINE,
+        fluidHandling: RaycastContext.FluidHandling = RaycastContext.FluidHandling.NONE,
     ): HitResult? {
         val vec = direction.multiply(reach)
         val point = start.add(vec)
 
         val block = run {
             if (!mask.block) return@run null
 
-            val fluidHandling = if (fluids) RaycastContext.FluidHandling.ANY else RaycastContext.FluidHandling.NONE
-            val context = RaycastContext(start, point, RaycastContext.ShapeType.OUTLINE, fluidHandling, player)
+            val context = RaycastContext(start, point, shapeType, fluidHandling, player)
             val result = world.raycast(context)
 
             result?.blockResult
@@ -72,7 +73,7 @@ object RayCastUtils {
     // ToDo: Should rather move player hitbox down and check collision
     fun SafeContext.distanceToGround(maxDist: Double = 100.0): Double {
         val pos = player.pos.add(0.0, 0.1, 0.0)
-        val cast = Rotation.DOWN.rayCast(maxDist, pos, false, InteractionMask.Block) ?: return maxDist
+        val cast = Rotation.DOWN.rayCast(maxDist, pos, InteractionMask.Block) ?: return maxDist
 
         return max(0.0, pos.y - cast.pos.y)
     }