Velocity: NoBlockPush (lambda-client#435)

* Adding PushOutOfBlocksEvent

* Add needed mixin for PushOutOfBlocksEvent

* Add Block setting for NoPush

* Block default setting off

Co-authored-by: Constructor <fractalminds@protonmail.com>

Author: 2 people

src/main/java/com/lambda/mixin/player/MixinEntityPlayerSP.java

@@ -4,6 +4,7 @@
 import com.lambda.client.event.events.OnUpdateWalkingPlayerEvent;
 import com.lambda.client.event.events.PlayerBlockPushEvent;
 import com.lambda.client.event.events.PlayerMoveEvent;
+import com.lambda.client.event.events.PushOutOfBlocksEvent;
 import com.lambda.client.gui.mc.LambdaGuiBeacon;
 import com.lambda.client.manager.managers.MessageManager;
 import com.lambda.client.manager.managers.PlayerPacketManager;
@@ -72,6 +73,15 @@ public void closeScreen(Minecraft minecraft, GuiScreen screen) {
         if (PortalChat.INSTANCE.isDisabled()) Wrapper.getMinecraft().displayGuiScreen(screen);
     }
 
+    @Inject(method = "pushOutOfBlocks", at = @At("HEAD"), cancellable = true)
+    private void onPushOutOfBlocks(CallbackInfoReturnable<Boolean> callbackInfoReturnable) {
+        PushOutOfBlocksEvent event = new PushOutOfBlocksEvent();
+        LambdaEventBus.INSTANCE.post(event);
+        if (event.getCancelled()) {
+            callbackInfoReturnable.setReturnValue(false);
+        }
+    }
+
     /**
      * @author TBM
      * Used with full permission from TBM - l1ving

src/main/kotlin/com/lambda/client/event/events/PushOutOfBlocksEvent.kt

@@ -0,0 +1,5 @@
+package com.lambda.client.event.events
+
+import com.lambda.client.event.*
+
+class PushOutOfBlocksEvent : Event, ICancellable by Cancellable()

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

@@ -1,6 +1,7 @@
 package com.lambda.client.module.modules.movement
 
 import com.lambda.client.event.events.PacketEvent
+import com.lambda.client.event.events.PushOutOfBlocksEvent
 import com.lambda.client.mixin.extension.*
 import com.lambda.client.module.Category
 import com.lambda.client.module.Module
@@ -31,6 +32,7 @@ object Velocity : Module(
     private val noPush by setting("No Push", true)
     private val entity by setting("Entity", true, { noPush })
     private val liquid by setting("Liquid", true, { noPush })
+    private val block by setting("Block", false, { noPush })
 
     init {
         safeListener<PacketEvent.Receive> {
@@ -57,6 +59,10 @@ object Velocity : Module(
                 }
             }
         }
+
+        safeListener<PushOutOfBlocksEvent> {
+            if (block) it.cancel()
+        }
     }
 
     private val isZero get() = horizontal == 0.0f && vertical == 0.0f