Tickshift improvements

Author: bladekt

common/src/main/java/com/lambda/mixin/MinecraftClientMixin.java

@@ -35,6 +35,16 @@ void onTickPost(CallbackInfo ci) {
         EventFlow.post(new TickEvent.Post());
     }
 
+    @Inject(method = "render", at = @At("HEAD"))
+    void onLoopTickPre(CallbackInfo ci) {
+        EventFlow.post(new TickEvent.GameLoop.Pre());
+    }
+
+    @Inject(method = "render", at = @At("RETURN"))
+    void onLoopTickPost(CallbackInfo ci) {
+        EventFlow.post(new TickEvent.GameLoop.Post());
+    }
+
     @Inject(at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;info(Ljava/lang/String;)V", shift = At.Shift.AFTER, remap = false), method = "stop")
     private void onShutdown(CallbackInfo ci) {
         EventFlow.post(new ClientEvent.Shutdown());

common/src/main/kotlin/com/lambda/event/events/TickEvent.kt

@@ -18,15 +18,30 @@ import com.lambda.event.events.TickEvent.Pre
  */
 abstract class TickEvent : Event {
     /**
-     * A class representing a [TickEvent] that is triggered before each tick of the game loop.
+     * A class representing a [TickEvent] that is triggered before each tick of the tick loop.
      */
     class Pre : TickEvent()
 
     /**
-     * A class representing a [TickEvent] that is triggered after each tick of the game loop.
+     * A class representing a [TickEvent] that is triggered after each tick of the tick loop.
      */
     class Post : TickEvent()
 
+    /**
+     * A class representing a [TickEvent] that is triggered on each tick of the game loop.
+     */
+    abstract class GameLoop : TickEvent() {
+        /**
+         * A class representing a [TickEvent.Player] that is triggered before each tick of the game loop.
+         */
+        class Pre : TickEvent()
+
+        /**
+         * A class representing a [TickEvent.Player] that is triggered after each tick of the game loop.
+         */
+        class Post : TickEvent()
+    }
+
     /**
      * A class representing a [TickEvent] that is triggered when the player gets ticked.
      */

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

@@ -14,10 +14,12 @@ import com.lambda.util.ClientPacket
 import com.lambda.util.PacketUtils.handlePacketSilently
 import com.lambda.util.PacketUtils.sendPacketSilently
 import com.lambda.util.math.ColorUtils.setAlpha
+import com.lambda.util.math.VecUtils.minus
 import net.minecraft.network.packet.c2s.play.PlayerMoveC2SPacket
 import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket
 import net.minecraft.util.math.BlockPos
 import net.minecraft.util.math.Box
+import net.minecraft.util.math.Vec3d
 import java.util.concurrent.ConcurrentLinkedDeque
 
 object Blink : Module(
@@ -61,6 +63,16 @@ object Blink : Module(
             return@listener
         }
 
+        listener<PacketEvent.Send.Post> { event ->
+            val packet = event.packet
+            if (packet !is PlayerMoveC2SPacket) return@listener
+
+            val vec = Vec3d(packet.getX(0.0), packet.getY(0.0), packet.getZ(0.0))
+            if (vec == Vec3d.ZERO) return@listener
+
+            lastBox = player.boundingBox.offset(vec - player.pos)
+        }
+
         listener<PacketEvent.Receive.Pre> { event ->
             if (!isActive || !shiftVelocity) return@listener
 
@@ -81,12 +93,6 @@ object Blink : Module(
         while (packetPool.isNotEmpty()) {
             packetPool.poll().let { packet ->
                 connection.sendPacketSilently(packet)
-
-                if (packet is PlayerMoveC2SPacket && packet.changesPosition()) {
-                    lastBox = player.boundingBox
-                        .offset(player.pos.negate())
-                        .offset(packet.getX(0.0), packet.getY(0.0), packet.getZ(0.0))
-                }
             }
         }
 

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

@@ -26,10 +26,13 @@ object TickShift : Module(
     private val boostAmount by setting("Boost", 3.0, 1.1..20.0, 0.01)
     private val slowdown by setting("Slowdown", 0.35, 0.01..0.9, 0.01)
     private val delaySetting by setting("Delay", 0, 0..2000, 10)
-    private val strict by setting("Strict", true)
-    private val shiftVelocity by setting("Shift velocity", true)
+    private val grim by setting("Grim", true)
+    private val strictSetting by setting("Strict", true) { !grim }
+    private val shiftVelocity by setting("Shift velocity", true) { grim }
     private val requiresAura by setting("Requires Aura", false)
 
+    private val strict get() = grim || strictSetting
+
     val isActive: Boolean get() {
         if (requiresAura && (!KillAura.isEnabled || KillAura.target == null)) return false
         return System.currentTimeMillis() - lastBoost > delaySetting
@@ -90,7 +93,7 @@ object TickShift : Module(
         }
 
         listener<PacketEvent.Send.Pre> { event ->
-            if (!isActive) return@listener
+            if (!isActive || !grim || event.isCanceled()) return@listener
             if (event.packet !is CommonPongC2SPacket) return@listener
 
             pingPool.add(event.packet)
@@ -99,7 +102,7 @@ object TickShift : Module(
         }
 
         listener<PacketEvent.Receive.Pre> { event ->
-            if (!isActive || !shiftVelocity) return@listener
+            if (!isActive || !grim || !shiftVelocity || event.isCanceled()) return@listener
 
             if (event.packet !is EntityVelocityUpdateS2CPacket) return@listener
             if (event.packet.id != player.id) return@listener