Improved velocity and safewalk

Author: Blade-kt

common/src/main/java/com/lambda/mixin/network/ClientPlayNetworkHandlerMixin.java

@@ -74,6 +74,6 @@ public boolean onServerMetadata(ClientPlayNetworkHandler clientPlayNetworkHandle
     // this.client.player.setVelocity(this.client.player.getVelocity().add((double)packet.getPlayerVelocityX(), (double)packet.getPlayerVelocityY(), (double)packet.getPlayerVelocityZ()));
     @Inject(method = "onExplosion(Lnet/minecraft/network/packet/s2c/play/ExplosionS2CPacket;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;setVelocity(Lnet/minecraft/util/math/Vec3d;)V"), cancellable = true)
     void injectVelocity(ExplosionS2CPacket packet, CallbackInfo ci) {
-        if (Velocity.INSTANCE.isEnabled()) ci.cancel();
+        if (Velocity.getExplosion()) ci.cancel();
     }
 }

common/src/main/kotlin/com/lambda/module/modules/movement/SafeWalk.kt

@@ -21,6 +21,8 @@ import com.lambda.event.events.MovementEvent
 import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
+import com.lambda.util.player.MovementUtils.motionX
+import com.lambda.util.player.MovementUtils.motionZ
 import net.minecraft.entity.LivingEntity
 
 object SafeWalk : Module(
@@ -46,8 +48,8 @@ object SafeWalk : Module(
 
     private fun LivingEntity.isNearLedge(distance: Double, stepHeight: Double): Boolean {
         fun checkDirection(deltaX: Double, deltaZ: Double): Boolean {
-            var dx = deltaX
-            var dz = deltaZ
+            var dx = deltaX + motionX
+            var dz = deltaZ + motionZ
             while (dx != 0.0 || dz != 0.0) {
                 if (world.isBlockSpaceEmpty(this, boundingBox.offset(dx, -stepHeight, dz))) {
                     return true

common/src/main/kotlin/com/lambda/module/modules/movement/Velocity.kt

@@ -17,11 +17,29 @@
 
 package com.lambda.module.modules.movement
 
+import com.lambda.event.events.PacketEvent
+import com.lambda.event.listener.SafeListener.Companion.listen
 import com.lambda.module.Module
 import com.lambda.module.tag.ModuleTag
+import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket
 
 object Velocity : Module(
     name = "Velocity",
     description = "Modifies your velocity",
     defaultTags = setOf(ModuleTag.MOVEMENT),
-)
+) {
+    private val knockback by setting("Knockback", true)
+
+    private val explosionSetting by setting("Explosion", true)
+    @JvmStatic val explosion get() = isEnabled && explosionSetting
+
+    init {
+        listen<PacketEvent.Receive.Pre> { event ->
+            if (!knockback) return@listen
+            if (event.packet !is EntityVelocityUpdateS2CPacket) return@listen
+            if (event.packet.id != player.id) return@listen
+
+            event.cancel()
+        }
+    }
+}