Merge remote-tracking branch 'origin/1.21.5' into feature/module/ElytraAttitudeControl

Author: IceTank

gradle.properties

@@ -22,7 +22,7 @@ modVersion=0.0.1
 modDescription=Minecraft utility mod for automation
 modIcon=assets/lambda/lambda.png
 mavenGroup=com.lambda
-modAuthors=Avanatiker, Blade, beanbag44, Emy
+modAuthors=Constructor (Avanatiker), Blade, beanbag44, Emy
 
 # General
 minecraftVersion=1.21.5

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

@@ -29,6 +29,8 @@
 import com.lambda.module.modules.player.InventoryMove;
 import com.lambda.module.modules.player.PacketMine;
 import com.lambda.util.WindowUtils;
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
@@ -49,7 +51,6 @@
 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.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(value = MinecraftClient.class, priority = Integer.MAX_VALUE)
@@ -154,10 +155,10 @@ 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() {
+    @WrapOperation(method = "setScreen", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/option/KeyBinding;unpressAll()V"))
+    private void redirectUnPressAll(Operation<Void> original) {
         if (!InventoryMove.getShouldMove()) {
-            KeyBinding.unpressAll();
+            original.call();
             return;
         }
         KeyBinding.KEYS_BY_ID.values().forEach(bind -> {
@@ -167,20 +168,16 @@ private void redirectUnPressAll() {
         });
     }
 
-    @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;
-        if (this.crosshairTarget.getType() != HitResult.Type.BLOCK || PacketMine.INSTANCE.isDisabled()) {
-            instance.swingHand(hand);
-        }
+    @WrapWithCondition(method = "doAttack()Z", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;swingHand(Lnet/minecraft/util/Hand;)V"))
+    private boolean redirectHandSwing(ClientPlayerEntity instance, Hand hand) {
+        if (this.crosshairTarget == null) return false;
+        return this.crosshairTarget.getType() != HitResult.Type.BLOCK || PacketMine.INSTANCE.isDisabled();
     }
 
-    @Redirect(method = "doItemUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;isBreakingBlock()Z"))
-    boolean redirectMultiActon(ClientPlayerInteractionManager instance) {
-        if (instance == null) return true;
-
+    @ModifyExpressionValue(method = "doItemUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerInteractionManager;isBreakingBlock()Z"))
+    boolean redirectMultiActon(boolean original) {
         if (Interact.INSTANCE.isEnabled() && Interact.getMultiAction()) return false;
-        return instance.isBreakingBlock();
+        return original;
     }
 
     @Inject(method = "doItemUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isRiding()Z"))

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

@@ -21,7 +21,7 @@
 import baritone.api.utils.Rotation;
 import baritone.utils.player.BaritonePlayerContext;
 import com.lambda.interaction.BaritoneManager;
-import com.lambda.interaction.request.rotating.RotationManager;
+import com.lambda.interaction.managers.rotating.RotationManager;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

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

@@ -22,7 +22,7 @@
 import baritone.api.utils.Rotation;
 import baritone.behavior.LookBehavior;
 import com.lambda.interaction.BaritoneManager;
-import com.lambda.interaction.request.rotating.RotationManager;
+import com.lambda.interaction.managers.rotating.RotationManager;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

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

@@ -20,12 +20,19 @@
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.InventoryEvent;
 import com.lambda.event.events.PlayerEvent;
+import com.lambda.interaction.managers.inventory.InventoryManager;
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
+import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
+import net.minecraft.client.recipebook.ClientRecipeBook;
+import net.minecraft.client.world.ClientWorld;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.screen.slot.SlotActionType;
+import net.minecraft.stat.StatHandler;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
@@ -36,13 +43,11 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(ClientPlayerInteractionManager.class)
 public class ClientPlayInteractionManagerMixin {
-
     @Shadow
     public float currentBreakingProgress;
 
@@ -98,9 +103,9 @@ public void clickSlotHead(int syncId, int slotId, int button, SlotActionType act
      * }
      * }</pre>
      */
-    @Redirect(method = "syncSelectedSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerInventory;getSelectedSlot()I"))
-    public int overrideSelectedSlotSync(PlayerInventory instance) {
-        return EventFlow.post(new InventoryEvent.HotbarSlot.Update(instance.getSelectedSlot())).getSlot();
+    @ModifyExpressionValue(method = "syncSelectedSlot", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerInventory;getSelectedSlot()I"))
+    public int overrideSelectedSlotSync(int original) {
+        return EventFlow.post(new InventoryEvent.HotbarSlot.Update(original)).getSlot();
     }
 
     @Inject(method = "updateBlockBreakingProgress", at = @At("HEAD"), cancellable = true)
@@ -115,4 +120,11 @@ private void updateBlockBreakingProgressPre(BlockPos pos, Direction side, Callba
     private void cancelBlockBreakingPre(CallbackInfo ci) {
         if (EventFlow.post(new PlayerEvent.Breaking.Cancel(currentBreakingProgress)).isCanceled()) ci.cancel();
     }
+
+    @WrapMethod(method = "createPlayer(Lnet/minecraft/client/world/ClientWorld;Lnet/minecraft/stat/StatHandler;Lnet/minecraft/client/recipebook/ClientRecipeBook;ZZ)Lnet/minecraft/client/network/ClientPlayerEntity;")
+    private ClientPlayerEntity injectCreatePlayer(ClientWorld world, StatHandler statHandler, ClientRecipeBook recipeBook, boolean lastSneaking, boolean lastSprinting, Operation<ClientPlayerEntity> original) {
+        var player = original.call(world, statHandler, recipeBook, lastSneaking, lastSprinting);
+        InventoryManager.INSTANCE.setScreenHandler(player.playerScreenHandler);
+        return player;
+    }
 }

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

@@ -22,12 +22,14 @@
 import com.lambda.event.events.MovementEvent;
 import com.lambda.event.events.PlayerEvent;
 import com.lambda.event.events.TickEvent;
-import com.lambda.interaction.PlayerPacketManager;
-import com.lambda.interaction.request.rotating.RotationManager;
+import com.lambda.interaction.PlayerPacketHandler;
+import com.lambda.interaction.managers.rotating.RotationManager;
 import com.lambda.module.modules.player.PortalGui;
 import com.lambda.module.modules.render.ViewModel;
+import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 import com.mojang.authlib.GameProfile;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
@@ -43,7 +45,6 @@
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.Redirect;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
@@ -59,16 +60,16 @@ public ClientPlayerEntityMixin(ClientWorld world, GameProfile profile) {
         super(world, profile);
     }
 
-    @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));
+    @WrapOperation(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(ClientPlayerEntity instance, MovementType movementType, Vec3d vec3d, Operation<Void> original) {
+        EventFlow.post(new MovementEvent.Player.Pre(movementType, vec3d));
+        original.call(instance, movementType, vec3d);
+        EventFlow.post(new MovementEvent.Player.Post(movementType, vec3d));
     }
 
-    @Redirect(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/input/Input;tick()V"))
-    void processMovement(Input input) {
-        input.tick();
+    @WrapOperation(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/input/Input;tick()V"))
+    void processMovement(Input input, Operation<Void> original) {
+        original.call(input);
         RotationManager.processRotations();
         RotationManager.redirectStrafeInputs(input);
         EventFlow.post(new MovementEvent.InputUpdate(input));
@@ -80,18 +81,18 @@ void processMovement(Input input) {
     @Inject(method = "sendMovementPackets", at = @At(value = "HEAD"), cancellable = true)
     void sendLambdaMovement(CallbackInfo ci) {
         ci.cancel();
-        PlayerPacketManager.sendPlayerPackets();
+        PlayerPacketHandler.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();
+    @WrapOperation(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;sendSneakingPacket()V"))
+    void sendSneakingPacket(ClientPlayerEntity entity, Operation<Void> original) {
+        PlayerPacketHandler.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();
+    @ModifyExpressionValue(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;isSprinting()Z"))
+    boolean isSprinting(boolean original) {
+        return EventFlow.post(new MovementEvent.Sprint(original)).getSprint();
     }
 
     @Inject(method = "isSneaking", at = @At(value = "HEAD"), cancellable = true)
@@ -110,27 +111,27 @@ void onTick(Operation<Void> original) {
         EventFlow.post(TickEvent.Player.Post.INSTANCE);
     }
 
-    @Redirect(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;getYaw()F"))
-    float fixHeldItemYaw(ClientPlayerEntity instance) {
-        return Objects.requireNonNullElse(RotationManager.getHandYaw(), instance.getYaw());
+    @WrapOperation(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;getYaw()F"))
+    float fixHeldItemYaw(ClientPlayerEntity instance, Operation<Float> original) {
+        return Objects.requireNonNullElse(RotationManager.getHandYaw(), original.call(instance));
     }
 
-    @Redirect(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;getPitch()F"))
-    float fixHeldItemPitch(ClientPlayerEntity instance) {
-        return Objects.requireNonNullElse(RotationManager.getHandPitch(), instance.getPitch());
+    @WrapOperation(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;getPitch()F"))
+    float fixHeldItemPitch(ClientPlayerEntity instance, Operation<Float> original) {
+        return Objects.requireNonNullElse(RotationManager.getHandPitch(), original.call(instance));
     }
 
     @Inject(method = "swingHand", at = @At("HEAD"), cancellable = true)
     void onSwing(Hand hand, CallbackInfo ci) {
         if (EventFlow.post(new PlayerEvent.SwingHand(hand)).isCanceled()) ci.cancel();
     }
 
-    @Redirect(method = "swingHand", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;swingHand(Lnet/minecraft/util/Hand;)V"))
-    private void adjustSwing(AbstractClientPlayerEntity instance, Hand hand) {
+    @WrapOperation(method = "swingHand", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/AbstractClientPlayerEntity;swingHand(Lnet/minecraft/util/Hand;)V"))
+    private void adjustSwing(ClientPlayerEntity instance, Hand hand, Operation<Void> original) {
         ViewModel viewModel = ViewModel.INSTANCE;
 
         if (!viewModel.isEnabled()) {
-            instance.swingHand(hand, false);
+            original.call(instance, hand);
             return;
         }
 
@@ -157,9 +158,9 @@ public void damage(float health, CallbackInfo ci) {
      * }
      * }</pre>
      */
-    @Redirect(method = "tickNausea", at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;"))
-    Screen keepScreensInPortal(MinecraftClient instance) {
+    @ModifyExpressionValue(method = "tickNausea", at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;"))
+    Screen keepScreensInPortal(Screen original) {
         if (PortalGui.INSTANCE.isEnabled()) return null;
-        else return client.currentScreen;
+        else return original;
     }
 }