merged master

Author: beanbag44

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml

@@ -0,0 +1,36 @@
+name: Feature
+description: Request or implement a feature.
+title: "[Version] [Mod Loader] [Feature]: "
+assignees:
+  - Edouard127
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Before submitting your feature, please check to see if it has already been requested.
+  - type: textarea
+    id: feature-idea
+    attributes:
+      label: Feature
+      value: "I would like to implement a feature that..."
+    validations:
+      required: true
+  - type: textarea
+    id: extra
+    attributes:
+      label: Additional Information
+      description: Is there anything else you would like to add?
+  - type: checkboxes
+    id: pr
+    attributes:
+      label: Pull Request
+      options:
+        - label: I will be submitting a pull request
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://github.com/lambda-client/lambda/blob/master/.github/CODE_OF_CONDUCT.md).
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true

.gitignore

@@ -16,6 +16,7 @@ build/
 out/
 !**/src/main/**/out/
 !**/src/test/**/out/
+.kotlin/
 
 ### Eclipse ###
 .apt_generated

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

@@ -6,7 +6,9 @@
 import io.netty.channel.ChannelHandlerContext;
 import net.minecraft.network.ClientConnection;
 import net.minecraft.network.NetworkSide;
+import net.minecraft.network.listener.ClientPacketListener;
 import net.minecraft.network.listener.PacketListener;
+import net.minecraft.network.listener.ServerPacketListener;
 import net.minecraft.network.packet.Packet;
 import net.minecraft.network.packet.c2s.handshake.ConnectionIntent;
 import net.minecraft.text.Text;
@@ -25,14 +27,18 @@ public class ClientConnectionMixin {
 
     @Inject(method = "send(Lnet/minecraft/network/packet/Packet;)V", at = @At("HEAD"), cancellable = true)
     private void sendingPacket(Packet<?> packet, final CallbackInfo callbackInfo) {
-        if (EventFlow.post(new PacketEvent.Send.Pre(packet)).isCanceled()) {
+        if (side != NetworkSide.SERVERBOUND) return;
+
+        if (EventFlow.post(new PacketEvent.Send.Pre((Packet<ServerPacketListener>) packet)).isCanceled()) {
             callbackInfo.cancel();
         }
     }
 
     @Inject(method = "send(Lnet/minecraft/network/packet/Packet;)V", at = @At("RETURN"))
     private void sendingPacketPost(Packet<?> packet, final CallbackInfo callbackInfo) {
-        EventFlow.post(new PacketEvent.Send.Post(packet));
+        if (side != NetworkSide.SERVERBOUND) return;
+
+        EventFlow.post(new PacketEvent.Send.Post((Packet<ServerPacketListener>) packet));
     }
 
     @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)
@@ -42,7 +48,8 @@ private void receivingPacket(
             CallbackInfo callbackInfo
     ) {
         if (side != NetworkSide.CLIENTBOUND) return;
-        if (EventFlow.post(new PacketEvent.Receive.Pre(packet)).isCanceled()) {
+
+        if (EventFlow.post(new PacketEvent.Receive.Pre((Packet<ClientPacketListener>) packet)).isCanceled()) {
             callbackInfo.cancel();
         }
     }
@@ -55,7 +62,7 @@ private void receivingPacketPost(
     ) {
         if (side != NetworkSide.CLIENTBOUND) return;
 
-        EventFlow.post(new PacketEvent.Receive.Post(packet));
+        EventFlow.post(new PacketEvent.Receive.Post((Packet<ClientPacketListener>) packet));
     }
 
     @Inject(method = "connect(Ljava/lang/String;ILnet/minecraft/network/listener/PacketListener;Lnet/minecraft/network/packet/c2s/handshake/ConnectionIntent;)V", at = @At("HEAD"))

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

@@ -6,10 +6,10 @@
 import com.lambda.event.events.ScreenEvent;
 import com.lambda.event.events.ScreenHandlerEvent;
 import com.lambda.event.events.TickEvent;
+import com.lambda.interaction.RotationManager;
 import com.lambda.module.modules.player.Interact;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.gui.screen.ingame.ScreenHandlerProvider;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
 import org.jetbrains.annotations.Nullable;
@@ -27,6 +27,7 @@ public class MinecraftClientMixin {
     @Inject(method = "tick", at = @At("HEAD"))
     void onTickPre(CallbackInfo ci) {
         EventFlow.post(new TickEvent.Pre());
+        RotationManager.update();
     }
 
     @Inject(method = "tick", at = @At("RETURN"))

common/src/main/java/com/lambda/mixin/client/sound/SoundSystemMixin.java

@@ -0,0 +1,20 @@
+package com.lambda.mixin.client.sound;
+
+import com.lambda.event.EventFlow;
+import com.lambda.event.events.ClientEvent;
+import net.minecraft.client.sound.SoundInstance;
+import net.minecraft.client.sound.SoundSystem;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(SoundSystem.class)
+public class SoundSystemMixin {
+    @Inject(method = "play(Lnet/minecraft/client/sound/SoundInstance;)V", at = @At(value = "HEAD"), cancellable = true)
+    public void onPlay(SoundInstance sound, CallbackInfo ci) {
+        if (EventFlow.post(new ClientEvent.Sound(sound)).isCanceled()) {
+            ci.cancel();
+        }
+    }
+}

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

@@ -1,10 +1,13 @@
 package com.lambda.mixin.entity;
 
 import com.lambda.event.EventFlow;
+import com.lambda.event.events.AttackEvent;
 import com.lambda.event.events.InteractionEvent;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.network.ClientPlayerInteractionManager;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
@@ -15,6 +18,7 @@
 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.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(ClientPlayerInteractionManager.class)
@@ -33,6 +37,16 @@ public void interactBlockHead(final ClientPlayerEntity player, final Hand hand,
         EventFlow.post(new InteractionEvent.Block(client.world, hitResult));
     }
 
+    @Inject(method = "attackEntity", at = @At("HEAD"), cancellable = true)
+    void onAttackPre(PlayerEntity player, Entity target, CallbackInfo ci) {
+        if (EventFlow.post(new AttackEvent.Pre(target)).isCanceled()) ci.cancel();
+    }
+
+    @Inject(method = "attackEntity", at = @At("TAIL"))
+    void onAttackPost(PlayerEntity player, Entity target, CallbackInfo ci) {
+        EventFlow.post(new AttackEvent.Post(target));
+    }
+
     @Inject(method = "attackBlock", at = @At("HEAD"), cancellable = true)
     public void onAttackBlock(BlockPos pos, Direction side, CallbackInfoReturnable<Boolean> cir) {
         if (EventFlow.post(new InteractionEvent.BlockAttack.Pre(pos, side)).isCanceled()) cir.cancel();

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

@@ -4,6 +4,7 @@
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.EntityEvent;
 import com.lambda.event.events.MovementEvent;
+import com.lambda.event.events.TickEvent;
 import com.lambda.interaction.PlayerPacketManager;
 import com.lambda.interaction.RotationManager;
 import net.minecraft.client.input.Input;
@@ -57,6 +58,7 @@ void onMove(MovementType movementType, Vec3d movement, CallbackInfo ci) {
     @Redirect(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/input/Input;tick(ZF)V"))
     void processMovement(Input input, boolean slowDown, float slowDownFactor) {
         input.tick(slowDown, slowDownFactor);
+        RotationManager.BaritoneProcessor.processPlayerMovement(input, slowDown, slowDownFactor);
         EventFlow.post(new MovementEvent.InputUpdate(input, slowDown, slowDownFactor));
     }
 
@@ -72,6 +74,16 @@ void sendBegin(CallbackInfo ci) {
         autoJumpEnabled = Lambda.getMc().options.getAutoJump().getValue();
     }
 
+    @Inject(method = "tick", at = @At(value = "HEAD"))
+    void onTickPre(CallbackInfo ci) {
+        EventFlow.post(new TickEvent.Player.Pre());
+    }
+
+    @Inject(method = "tick", at = @At(value = "RETURN"))
+    void onTickPost(CallbackInfo ci) {
+        EventFlow.post(new TickEvent.Player.Post());
+    }
+
     @Redirect(method = "tickNewAi", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;getYaw()F"))
     float fixHeldItemYaw(ClientPlayerEntity instance) {
         return Objects.requireNonNullElse(RotationManager.getHandYaw(), instance.getYaw());

common/src/main/java/com/lambda/mixin/entity/LivingEntityMixin.java

@@ -45,6 +45,22 @@ void onJump(CallbackInfo ci) {
         self.velocityDirty = true;
     }
 
+    @Inject(method = "travel", at = @At("HEAD"), cancellable = true)
+    void onTravelPre(Vec3d movementInput, CallbackInfo ci) {
+        LivingEntity self = (LivingEntity) (Object) this;
+        if (self != Lambda.getMc().player) return;
+
+        if (EventFlow.post(new MovementEvent.Travel.Pre()).isCanceled()) ci.cancel();
+    }
+
+    @Inject(method = "travel", at = @At("TAIL"))
+    void onTravelPost(Vec3d movementInput, CallbackInfo ci) {
+        LivingEntity self = (LivingEntity) (Object) this;
+        if (self != Lambda.getMc().player) return;
+
+        EventFlow.post(new MovementEvent.Travel.Post());
+    }
+
     @Redirect(method = "travel", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;getPitch()F"))
     private float hookModifyFallFlyingPitch(LivingEntity entity) {
         Float pitch = RotationManager.getMovementPitch();

common/src/main/java/com/lambda/mixin/entity/PlayerEntityMixin.java

@@ -28,4 +28,14 @@ private float injectHeadYaw(PlayerEntity instance) {
         Float yaw = RotationManager.getRenderYaw();
         return (yaw != null) ? yaw : instance.getYaw();
     }
+
+    @Redirect(method = "attack", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;getYaw()F"))
+    private float injectAttackFix(PlayerEntity instance) {
+        if ((Object) this != MinecraftClient.getInstance().player) {
+            return instance.getYaw();
+        }
+
+        Float yaw = RotationManager.getMovementYaw();
+        return (yaw != null) ? yaw : instance.getYaw();
+    }
 }

common/src/main/java/com/lambda/mixin/input/KeyBindingMixin.java

@@ -2,6 +2,7 @@
 
 import com.lambda.module.modules.movement.Speed;
 import com.lambda.module.modules.movement.Sprint;
+import com.lambda.module.modules.movement.TargetStrafe;
 import net.minecraft.client.option.KeyBinding;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -19,5 +20,6 @@ void autoSprint(CallbackInfoReturnable<Boolean> cir) {
 
         if (Sprint.INSTANCE.isEnabled()) cir.setReturnValue(true);
         if (Speed.INSTANCE.isEnabled() && Speed.getMode() == Speed.Mode.GRIM_STRAFE) cir.setReturnValue(true);
+        if (TargetStrafe.INSTANCE.isEnabled() && TargetStrafe.isActive()) cir.setReturnValue(true);
     }
 }