Update ClientPlayerEntityMixin.java

Author: emyfops

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2024 Lambda
+ * Copyright 2025 Lambda
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,13 +26,10 @@
 import com.lambda.interaction.request.rotation.RotationManager;
 import com.lambda.module.modules.player.PortalGui;
 import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.gui.screen.DeathScreen;
 import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.screen.ingame.HandledScreen;
 import net.minecraft.client.input.Input;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.MovementType;
-import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.util.Hand;
 import net.minecraft.util.math.Vec3d;
 import org.spongepowered.asm.mixin.Final;
@@ -49,8 +46,6 @@
 @Mixin(value = ClientPlayerEntity.class, priority = Integer.MAX_VALUE)
 public abstract class ClientPlayerEntityMixin extends EntityMixin {
 
-    @Shadow
-    public Input input;
     @Shadow
     private boolean autoJumpEnabled;
 
@@ -82,11 +77,11 @@ void onMove(MovementType movementType, Vec3d movement, CallbackInfo ci) {
         this.autoJump(currX - prevX, currZ - prevZ);
     }
 
-    @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));
+    @Redirect(method = "tickMovement", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/input/Input;tick()V"))
+    void processMovement(Input input) {
+        input.tick();
+        RotationManager.BaritoneProcessor.processPlayerMovement(input);
+        EventFlow.post(new MovementEvent.InputUpdate(input));
     }
 
     /**
@@ -116,7 +111,7 @@ void redirectSneaking(CallbackInfoReturnable<Boolean> cir) {
         if (self != Lambda.getMc().player) return;
 
         if (self.input == null) return;
-        cir.setReturnValue(EventFlow.post(new MovementEvent.Sneak(self.input.sneaking)).getSneak());
+        cir.setReturnValue(EventFlow.post(new MovementEvent.Sneak(self.input.playerInput.sneak())).getSneak());
     }
 
     /**
@@ -139,12 +134,12 @@ 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"))
+    @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());
     }
 
-    @Redirect(method = "tickNewAi", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/ClientPlayerEntity;getPitch()F"))
+    @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());
     }
@@ -154,24 +149,27 @@ void onSwingHandPre(Hand hand, CallbackInfo ci) {
         if (EventFlow.post(new PlayerEvent.SwingHand(hand)).isCanceled()) ci.cancel();
     }
 
-    @Inject(method = "damage", at = @At("HEAD"), cancellable = true)
-    public void damage(DamageSource source, float amount, CallbackInfoReturnable<Boolean> cir) {
-        if (EventFlow.post(new PlayerEvent.Damage(source, amount)).isCanceled()) cir.setReturnValue(false);
+    @Inject(method = "updateHealth", at = @At("HEAD"))
+    public void damage(float health, CallbackInfo ci) {
+        EventFlow.post(new PlayerEvent.Damage(health));
     }
 
     /**
      * Prevents the game from closing Guis when the player is in a nether portal
      * <pre>{@code
-     * if (this.client.currentScreen != null && !this.client.currentScreen.shouldPause() && !(this.client.currentScreen instanceof DeathScreen)) {
+     * if (this.client.currentScreen != null
+     *         && !this.client.currentScreen.shouldPause()
+     *         && !(this.client.currentScreen instanceof DeathScreen)
+     *         && !(this.client.currentScreen instanceof CreditsScreen)) {
      *     if (this.client.currentScreen instanceof HandledScreen) {
      *         this.closeHandledScreen();
      *     }
      *
-     *     this.client.setScreen((Screen)null);
+     *     this.client.setScreen(null);
      * }
      * }</pre>
      */
-    @Redirect(method = "updateNausea", at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;"))
+    @Redirect(method = "tickNausea", at = @At(value = "FIELD", target = "Lnet/minecraft/client/MinecraftClient;currentScreen:Lnet/minecraft/client/gui/screen/Screen;"))
     Screen keepScreensInPortal(MinecraftClient instance) {
         if (PortalGui.INSTANCE.isEnabled()) return null;
         else return client.currentScreen;