Merge branch '1.21.5' into refactor/3d

Author: emyfops

README.md

@@ -1,21 +1,66 @@
-# Lambda
+<p align="center">
+    <img src="https://raw.githubusercontent.com/lambda-client/assets/main/lambda%20logo%20text.svg" style="width: 69%" alt="logo">
+</p>
 
-[![Minecraft](https://img.shields.io/badge/Minecraft-1.21.5-lime?style=for-the-badge&link=https://www.minecraft.net/)](https://www.minecraft.net/)
-[![License](https://img.shields.io/badge/License-GPL%20v3-blue?style=for-the-badge&link=https://www.gnu.org/licenses/gpl-3.0.en.html)](https://www.gnu.org/licenses/gpl-3.0.en.html)
+![Minecraft](https://img.shields.io/badge/minecraft-1.21.5-green?link=https%3A%2F%2Fwww.minecraft.net%2F)
+![GitHub Downloads](https://img.shields.io/github/downloads/lambda-client/lambda/total)
+![Discord](https://img.shields.io/discord/834570721070022687?logo=Discord&logoColor=white&link=https%3A%2F%2Fdiscord.gg%2FMBAEzyFn)
+![CodeFactor grade](https://img.shields.io/codefactor/grade/github/lambda-client/lambda?color=royalblue)
+![GitHub workflow status](https://img.shields.io/github/actions/workflow/status/lambda-client/lambda/build.yml?branch=1.21.5&logo=gradle)
+![GitHub contributors](https://img.shields.io/github/contributors/lambda-client/lambda)
+![GitHub Repo stars](https://img.shields.io/github/stars/lambda-client/lambda)
+![GitHub License](https://img.shields.io/github/license/lambda-client/lambda?logo=gplv3&link=https%3A%2F%2Fwww.gnu.org%2Flicenses%2Fgpl-3.0.en.html)
 
-<div align="center">
-  <a href="https://discord.gg/3y3ah5BtjB"><img src="https://invidget.switchblade.xyz/3y3ah5BtjB" alt="Link to the lambda discord server https://discord.gg/3y3ah5BtjB"></a>
-</div>
+Lambda is a free, open-source Minecraft Fabric utility mod focused on advanced automation to execute complex, repeatable tasks with minimal micromanagement.
 
-## License
+<p align="center">
+    <a href="https://github.com/lambda-client/lambda/releases/download/1.0.0/lambda-1.0.0.jar"><img alt="lambda-1.0.0.jar" src="https://raw.githubusercontent.com/lambda-client/assets/main/download_button_1.0.0.png" width="70%" height="70%"></a>
+</p>
 
-Lambda is distributed under
-the [GNU General Public License v3.0](https://github.com/Avanatiker/NeoLambda/blob/master/LICENSE.md).
+<p align="center">
+  <a href="https://discord.gg/MBAEzyFn"><img src="https://invidget.switchblade.xyz/MBAEzyFn" alt="Link to the lambda discord server https://discord.gg/MBAEzyFn"></a>
+</p>
+
+Find our matrix space at [#lambda-client:matrix.org](https://app.element.io/#/room/#lambda-client:matrix.org).
+
+## Installation
+<a href="https://fabricmc.net/wiki/install"><img src="https://cdn.jonasjones.dev/mod-badges/support-fabric.png" width="150px" alt="Fabric Supported"></a>
+1. Install Minecraft 1.21.5 [(download)](https://www.minecraft.net/)
+2. Install Fabric [(download)](https://fabricmc.net/use/installer/)
+3. Get the latest Lambda version here [(download)](https://github.com/lambda-client/lambda/releases/download/1.0.0/lambda-1.0.0.jar)
+4. Put the file in your `.minecraft/mods` folder
+
+## FAQ
+
+How do I...
+
+<details>
+  <summary>... open the ClickGUI?</summary>
+
+> Press `Y`.
+
+</details>
+
+<details>
+  <summary>... execute a command?</summary>
+
+> Use the ingame chat with the prefix `;`.
+
+</details>
+
+<p align="center">
+    <img alt="" src="https://raw.githubusercontent.com/lambda-client/assets/main/footer.png">
+</p>
+
+## Thanks to...
+
+[![GitHub contributors](https://contrib.rocks/image?repo=lambda-client/lambda)](https://github.com/lambda-client/lambda/graphs/contributors)
 
 ---
 
 If you have any questions, concerns, or suggestions,
-you can visit our [official Discord server](https://discord.gg/3y3ah5BtjB).
+you can visit our [official Discord server](https://discord.gg/MBAEzyFn).
 
-**Disclaimer:** Lambda is not affiliated with Mojang Studios. Minecraft is a registered trademark of Mojang Studios.
-Use of the Lambda software is subject to the terms outlined in the license agreement.
+> ### Disclaimer
+> Lambda is not affiliated with Mojang Studios. Minecraft is a registered trademark of Mojang Studios.
+Use of the Lambda software is subject to the terms outlined in the license agreement [GNU General Public License v3.0](https://github.com/lambda-client/lambda/blob/master/LICENSE.md).

build.gradle.kts

@@ -71,7 +71,6 @@ repositories {
     mavenLocal() // Allow the use of local repositories
     maven("https://maven.2b2t.vc/releases") // Baritone
     maven("https://jitpack.io") // KDiscordIPC
-    maven("https://raw.githubusercontent.com/kotlin-graphics/mary/master")
     mavenCentral()
 
     // Allow the use of local libraries
@@ -111,7 +110,7 @@ loom {
             property("mixin.debug.export", "true")
 
             vmArgs("-XX:+HeapDumpOnOutOfMemoryError", "-XX:+CreateCoredumpOnCrash", "-XX:+UseOSErrorReporting")
-            programArgs("--username", "Steve", "--uuid", "8667ba71b85a4004af54457a9734eed7", "--accessToken", "<TOKEN>")
+            programArgs("--username", "Steve", "--uuid", "8667ba71b85a4004af54457a9734eed7", "--accessToken", "****")
         }
     }
 }
@@ -160,9 +159,9 @@ dependencies {
 
     includeLib("io.github.spair:imgui-java-binding:$spairVersion")
     includeLib("io.github.spair:imgui-java-lwjgl3:$spairVersion")
-    runtimeOnly("io.github.spair:imgui-java-natives-windows:$spairVersion")
-    runtimeOnly("io.github.spair:imgui-java-natives-linux:$spairVersion")
-    runtimeOnly("io.github.spair:imgui-java-natives-macos:$spairVersion")
+    includeLib("io.github.spair:imgui-java-natives-windows:$spairVersion")
+    includeLib("io.github.spair:imgui-java-natives-linux:$spairVersion")
+    includeLib("io.github.spair:imgui-java-natives-macos:$spairVersion")
 
     // Ktor
     includeLib("io.ktor:ktor-client-core:$ktorVersion")
@@ -255,3 +254,15 @@ java {
     sourceCompatibility = JavaVersion.VERSION_21
     targetCompatibility = JavaVersion.VERSION_21
 }
+
+publishing {
+    publications {
+        create<MavenPublication>("maven") {
+            groupId = mavenGroup
+            artifactId = modId
+            version = "$modVersion+$minecraftVersion"
+
+            from(components["java"])
+        }
+    }
+}

gradle.properties

@@ -40,7 +40,7 @@ ktorVersion=3.1.2
 mockitoKotlin=5.4.0
 mockitoInline=5.2.0
 mockkVersion=1.13.17
-spairVersion=1.89.0
+spairVersion=1.90.0
 
 # Fabric https://fabricmc.net/develop/
 fabricLoaderVersion=0.16.13

src/main/java/com/lambda/mixin/CrashReportMixin.java

@@ -54,8 +54,7 @@ void injectConstructor(String message, Throwable cause, CallbackInfo ci) {
     @WrapMethod(method = "asString(Lnet/minecraft/util/crash/ReportType;Ljava/util/List;)Ljava/lang/String;")
     String injectString(ReportType type, List<String> extraInfo, Operation<String> original) {
         var list = new ArrayList<>(extraInfo);
-
-        list.add("If this issue is related to Lambda, check if other users have experienced this too, or create a new issue at https://github.com/lambda-client/lambda/issues.\n\n");
+        list.add("If this issue is related to Lambda, check if other users have experienced this too, or create a new issue at " + Lambda.REPO_URL + "/issues.\n\n");
 
         if (MinecraftClient.getInstance() != null) {
             list.add("Enabled modules:");

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

@@ -17,13 +17,13 @@
 
 package com.lambda.mixin;
 
-import com.lambda.Lambda;
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.ClientEvent;
 import com.lambda.event.events.InventoryEvent;
 import com.lambda.event.events.TickEvent;
 import com.lambda.gui.DearImGui;
 import com.lambda.module.modules.player.Interact;
+import com.lambda.module.modules.player.InventoryMove;
 import com.lambda.module.modules.player.PacketMine;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
@@ -33,6 +33,7 @@
 import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
+import net.minecraft.client.option.KeyBinding;
 import net.minecraft.client.render.WorldRenderer;
 import net.minecraft.client.sound.SoundManager;
 import net.minecraft.util.Hand;
@@ -51,10 +52,14 @@ public class MinecraftClientMixin {
     @Shadow
     @Nullable
     public Screen currentScreen;
+
     @Shadow
     @Nullable
     public HitResult crosshairTarget;
 
+    @Shadow
+    public int itemUseCooldown;
+
     @Inject(method = "close", at = @At("HEAD"))
     void closeImGui(CallbackInfo ci) {
         DearImGui.INSTANCE.destroy();
@@ -131,6 +136,19 @@ private void onScreenRemove(@Nullable Screen screen, CallbackInfo ci) {
         }
     }
 
+    @Redirect(method = "setScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/option/KeyBinding;unpressAll()V"))
+    private void redirectUnPressAll() {
+        if (!InventoryMove.getShouldMove()) {
+            KeyBinding.unpressAll();
+            return;
+        }
+        KeyBinding.KEYS_BY_ID.values().forEach(bind -> {
+            if (!InventoryMove.isKeyMovementRelated(bind.boundKey.getCode())) {
+                bind.reset();
+            }
+        });
+    }
+
     @Redirect(method = "doAttack()Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;swingHand(Lnet/minecraft/util/Hand;)V"))
     private void redirectHandSwing(ClientPlayerEntity instance, Hand hand) {
         if (this.crosshairTarget == null) return;
@@ -151,6 +169,6 @@ boolean redirectMultiActon(ClientPlayerInteractionManager instance) {
     void injectFastPlace(CallbackInfo ci) {
         if (!Interact.INSTANCE.isEnabled()) return;
 
-        Lambda.getMc().itemUseCooldown = Interact.getPlaceDelay();
+        itemUseCooldown = Interact.getPlaceDelay();
     }
 }

src/main/java/com/lambda/mixin/baritone/MixinLookBehavior.java

@@ -36,7 +36,7 @@ void onTargetUpdate(Rotation rotation, boolean blockInteract, CallbackInfo ci) {
         LookBehavior instance = ((LookBehavior) (Object) this);
         if (instance.baritone != BaritoneUtils.getPrimary()) return;
 
-        RotationManager.BaritoneProcessor.handleBaritoneRotation(rotation.getYaw(), rotation.getPitch());
+        RotationManager.handleBaritoneRotation(rotation.getYaw(), rotation.getPitch());
         ci.cancel();
     }
 

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

@@ -37,7 +37,6 @@
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.MovementType;
 import net.minecraft.util.Hand;
-import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -60,80 +59,50 @@ public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile) {
         super(world, profile);
     }
 
-    @Shadow protected abstract void autoJump(float dx, float dz);
-
-    /**
-     * Post movement events and applies the modified player velocity
-     */
-    @Inject(method = "move", at = @At("HEAD"), cancellable = true)
-    void onMove(MovementType movementType, Vec3d movement, CallbackInfo ci) {
-        ClientPlayerEntity self = (ClientPlayerEntity) (Object) this;
-        if (self != Lambda.getMc().player) return;
-
-        ci.cancel();
-
-        float prevX = (float) self.getX();
-        float prevZ = (float) self.getZ();
-
+    @Redirect(method = "move", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;move(Lnet/minecraft/entity/MovementType;Lnet/minecraft/util/math/Vec3d;)V"))
+    private void emitMovementEvents(AbstractClientPlayerEntity instance, MovementType movementType, Vec3d movement) {
         EventFlow.post(new MovementEvent.Player.Pre(movementType, movement));
         super.move(movementType, movement);
         EventFlow.post(new MovementEvent.Player.Post(movementType, movement));
-
-        float deltaX = (float) self.getX() - prevX;
-        float deltaZ = (float) self.getZ() - prevZ;
-
-        this.autoJump(deltaX, deltaZ);
-        this.distanceMoved = this.distanceMoved + MathHelper.hypot(deltaX, deltaZ) * 0.6F;
     }
 
     @Redirect(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/input/Input;tick()V"))
     void processMovement(Input input) {
         input.tick();
         RotationManager.processRotations();
-        RotationManager.BaritoneProcessor.processPlayerMovement(input);
+        RotationManager.redirectStrafeInputs(input);
         EventFlow.post(new MovementEvent.InputUpdate(input));
     }
 
     /**
-     * Posts the {@link MovementEvent.Sprint} event
-     * <pre>{@code
-     * if (this.isSprinting()) {
-     *     boolean bl8 = !this.input.hasForwardMovement() || !this.canSprint();
-     *     boolean bl9 = bl8 || this.horizontalCollision && !this.collidedSoftly || this.isTouchingWater() && !this.isSubmergedInWater();
-     *     if (this.isSwimming()) {
-     *         if (!this.isOnGround() && !this.input.sneaking && bl8 || !this.isTouchingWater()) {
-     *             this.setSprinting(false);
-     *         }
-     *     } else if (bl9) {
-     *         this.setSprinting(false);
-     *     }
-     * }
-     * }</pre>
+     * Overwrites the movement packet update function to use our code
      */
+    @Inject(method = "sendMovementPackets", at = @At(value = "HEAD"), cancellable = true)
+    void sendLambdaMovement(CallbackInfo ci) {
+        ci.cancel();
+        PlayerPacketManager.sendPlayerPackets();
+        autoJumpEnabled = Lambda.getMc().options.getAutoJump().getValue();
+    }
+
+    @Redirect(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;sendSneakingPacket()V"))
+    void sendSneakingPacket(ClientPlayerEntity entity) {
+        PlayerPacketManager.sendSneakPackets();
+    }
+
     @Redirect(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isSprinting()Z"))
     boolean isSprinting(ClientPlayerEntity entity) {
         return EventFlow.post(new MovementEvent.Sprint(entity.isSprinting())).getSprint();
     }
 
     @Inject(method = "isSneaking", at = @At(value = "HEAD"), cancellable = true)
-    void redirectSneaking(CallbackInfoReturnable<Boolean> cir) {
+    void injectSneakingInput(CallbackInfoReturnable<Boolean> cir) {
         ClientPlayerEntity self = (ClientPlayerEntity) (Object) this;
         if (self != Lambda.getMc().player) return;
 
         if (self.input == null) return;
         cir.setReturnValue(EventFlow.post(new MovementEvent.Sneak(self.input.playerInput.sneak())).getSneak());
     }
 
-    /**
-     * Overwrites the movement packet update function to use our code
-     */
-    @Inject(method = "sendMovementPackets", at = @At(value = "HEAD"), cancellable = true)
-    void sendBegin(CallbackInfo ci) {
-        ci.cancel();
-        PlayerPacketManager.sendPlayerPackets();
-        autoJumpEnabled = Lambda.getMc().options.getAutoJump().getValue();
-    }
-
     @WrapMethod(method = "tick")
     void onTick(Operation<Void> original) {
         EventFlow.post(TickEvent.Player.Pre.INSTANCE);
@@ -170,7 +139,7 @@ private void adjustSwing(AbstractClientPlayerEntity instance, Hand hand) {
 
     @Inject(method = "updateHealth", at = @At("HEAD"))
     public void damage(float health, CallbackInfo ci) {
-        EventFlow.post(new PlayerEvent.Damage(health));
+        EventFlow.post(new PlayerEvent.Health(health));
     }
 
     /**

src/main/java/com/lambda/mixin/input/KeyboardMixin.java

@@ -19,7 +19,10 @@
 
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.KeyboardEvent;
+import com.lambda.module.modules.player.InventoryMove;
 import net.minecraft.client.Keyboard;
+import net.minecraft.client.option.KeyBinding;
+import net.minecraft.client.util.InputUtil;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -32,6 +35,13 @@ private void onKey(long window, int key, int scancode, int action, int modifiers
         EventFlow.post(new KeyboardEvent.Press(key, scancode, action, modifiers));
     }
 
+    @Inject(method = "onKey", at = @At("RETURN"))
+    private void onKeyTail(long window, int key, int scancode, int action, int modifiers, CallbackInfo ci) {
+        if (!InventoryMove.getShouldMove() || !InventoryMove.isKeyMovementRelated(key)) return;
+        InputUtil.Key fromCode = InputUtil.fromKeyCode(key, scancode);
+        KeyBinding.setKeyPressed(fromCode, action != 0);
+    }
+
     @Inject(method = "onChar", at = @At("HEAD"))
     private void onChar(long window, int codePoint, int modifiers, CallbackInfo ci) {
         char[] chars = Character.toChars(codePoint);

src/main/java/com/lambda/mixin/items/BarrierBlockMixin.java

@@ -21,6 +21,7 @@
 import net.minecraft.block.BarrierBlock;
 import net.minecraft.block.BlockRenderType;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -33,10 +34,9 @@ public class BarrierBlockMixin {
      */
     @Inject(method = "getRenderType", at = @At("RETURN"), cancellable = true)
     private void getRenderType(BlockState state, CallbackInfoReturnable<BlockRenderType> cir) {
-        // FixMe: This mixins fucks up the loading process by calling the configurations too early and doesn't load the settings
-        /*if (BlockESP.INSTANCE.isEnabled()
+        if (BlockESP.INSTANCE.isEnabled()
                 && BlockESP.getBarrier()
                 && state.getBlock() == Blocks.BARRIER
-        ) cir.setReturnValue(BlockRenderType.MODEL);*/
+        ) cir.setReturnValue(BlockRenderType.MODEL);
     }
 }

src/main/java/com/lambda/mixin/network/ClientConnectionMixin.java

@@ -34,6 +34,7 @@
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -62,7 +63,7 @@ private void sendingPacketPost(Packet<?> packet, final CallbackInfo callbackInfo
         EventFlow.post(new PacketEvent.Send.Post((Packet<? extends ServerPlayPacketListener>) packet));
     }
 
-    @SuppressWarnings("all")
+    @SuppressWarnings("unchecked")
     @Inject(method = "channelRead0(Lio/netty/channel/ChannelHandlerContext;Lnet/minecraft/network/packet/Packet;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/ClientConnection;handlePacket(Lnet/minecraft/network/packet/Packet;Lnet/minecraft/network/listener/PacketListener;)V", shift = At.Shift.BEFORE), cancellable = true, require = 1)
     private void receivingPacket(
             ChannelHandlerContext channelHandlerContext,