Merge remote-tracking branch 'lambda-client/master' into safewalkCompat

Author: Avanatiker

README.md

@@ -123,7 +123,7 @@ In this guide we will use [IntelliJ IDEA](https://www.jetbrains.com/idea/) as ou
 ### Gradle build
 
 Test if the environment is set up correctly by building the client and running it inside the IDE using the Gradle tab on the right side of the IDE.
-1. Go to `lambda > Tasks > build > runClient` in the Gradle tab and run the client.
+1. Go to `lambda > Tasks > forgegradle runs > runClient` in the Gradle tab and run the client.
 2. To build the client as a jar run `lambda > Tasks > build > build`. Gradle will create a new directory called `build`. The final built jar will be in `build/libs`.
 
 ### Stargazers

src/main/java/com/lambda/mixin/entity/MixinEntity.java

@@ -3,6 +3,8 @@
 import com.lambda.client.module.modules.movement.Velocity;
 import com.lambda.client.module.modules.player.Freecam;
 import com.lambda.client.module.modules.player.ViewLock;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -25,4 +27,33 @@ public void turn(float yaw, float pitch, CallbackInfo ci) {
         if (Freecam.handleTurn(casted, yaw, pitch, ci)) return;
         ViewLock.handleTurn(casted, yaw, pitch, ci);
     }
+
+    // these mixins are for step module before and after the step calculations are performed
+    @Inject(method = "move", at = @At(value = "FIELD", target = "net/minecraft/entity/Entity.stepHeight:F", ordinal = 3, shift = At.Shift.BEFORE))
+    private void preStep(MoverType type, double x, double y, double z, CallbackInfo ci) {
+        EntityPlayerSP player = Minecraft.getMinecraft().player;
+
+        if (player == null) return;
+
+        if (entityId == player.getEntityId()
+            && Step.INSTANCE.isEnabled()
+            && !Step.INSTANCE.pre(boundingBox, player)
+        ) {
+            storedStepHeight = player.stepHeight;
+            player.stepHeight = Step.INSTANCE.getStrict() ? 1.015f : Step.INSTANCE.getUpStep().getValue();
+        }
+    }
+
+    @Inject(method = "move", at = @At(value = "INVOKE", target = "net/minecraft/entity/Entity.resetPositionToBB ()V", ordinal = 1, shift = At.Shift.BEFORE))
+    private void postStep(MoverType type, double x, double y, double z, CallbackInfo ci) {
+        Minecraft mc = Minecraft.getMinecraft();
+        EntityPlayerSP player = mc.player;
+
+        if (player == null || !Step.INSTANCE.isEnabled()) return;
+
+        if (entityId == player.getEntityId()) {
+            Step.INSTANCE.post(boundingBox, mc);
+        }
+    }
+
 }

src/main/java/com/lambda/mixin/render/MixinRenderGlobal.java

@@ -5,7 +5,10 @@
 import com.lambda.client.event.events.RenderEntityEvent;
 import com.lambda.client.module.modules.player.Freecam;
 import com.lambda.client.module.modules.render.SelectionHighlight;
+import com.lambda.client.util.Wrapper;
+import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.renderer.RenderGlobal;
+import net.minecraft.client.renderer.ViewFrustum;
 import net.minecraft.client.renderer.culling.ICamera;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -15,6 +18,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyVariable;
+import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(RenderGlobal.class)
@@ -50,4 +54,16 @@ public BlockPos setupTerrainStoreFlooredChunkPosition(BlockPos playerPos) {
 
         return playerPos;
     }
+
+    @Redirect(method = "setupTerrain", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ViewFrustum;updateChunkPositions(DD)V"))
+    public void updateSetupTerrain(ViewFrustum viewFrustum, double viewEntityX, double viewEntityZ) {
+        if (Freecam.INSTANCE.isEnabled()) {
+            EntityPlayerSP player = Wrapper.getPlayer();
+            if (player != null) {
+                viewEntityX = player.posX;
+                viewEntityZ = player.posZ;
+            }
+        }
+        viewFrustum.updateChunkPositions(viewEntityX, viewEntityZ);
+    }
 }

src/main/java/com/lambda/mixin/render/MixinViewFrustum.java

@@ -21,8 +21,8 @@ object TimerManager : Manager {
 
     init {
         listener<RunGameLoopEvent.Start> {
-            if (timer.tick(5L)) {
-                val removeTime = System.currentTimeMillis() - 250L
+            if (timer.tick(6L)) {
+                val removeTime = System.currentTimeMillis() - 600L
                 modifications.values.removeIf { it.second < removeTime }
             }
 

src/main/kotlin/com/lambda/client/manager/managers/TimerManager.kt

@@ -33,7 +33,9 @@ object Flight : Module(
     modulePriority = 500
 ) {
     // non packet
-    private val mode by setting("Mode", FlightMode.PACKET)
+    private val mode by setting("Mode", FlightMode.PACKET).also {
+        it.listeners.add { if (it.value == FlightMode.PACKET) sendRubberbandPacket() }
+    }
     private val speed by setting("Speed", 1.0f, 0f..10f, 0.1f, { mode != FlightMode.PACKET })
     private val glideSpeed by setting("Glide Speed", 0.05, 0.0..0.3, 0.001, { mode != FlightMode.PACKET })
 
@@ -82,11 +84,8 @@ object Flight : Module(
         }
 
         onEnable {
-            runSafeR {
-                val position = CPacketPlayer.Position(.0, .0, .0, true)
-                filter.add(position)
-                connection.sendPacket(position)
-            } ?: disable()
+            if (mode != FlightMode.PACKET) return@onEnable
+            sendRubberbandPacket()
         }
 
         safeListener<PlayerMoveEvent> {
@@ -297,4 +296,12 @@ object Flight : Module(
 
         }
     }
+    
+    private fun sendRubberbandPacket(){
+        runSafeR {
+            val position = CPacketPlayer.Position(.0, .0, .0, true)
+            filter.add(position)
+            connection.sendPacket(position)
+        } ?: disable()
+    }
 }