swing duration, swing progress, no swing delay settings and refactors / small fixes

Author: beanbag44

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

@@ -21,15 +21,14 @@
 import com.lambda.event.EventFlow;
 import com.lambda.event.events.MovementEvent;
 import com.lambda.interaction.request.rotation.RotationManager;
+import com.lambda.module.modules.render.ViewModel;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 import org.spongepowered.asm.mixin.Mixin;
 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.Slice;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.*;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(LivingEntity.class)
@@ -38,6 +37,9 @@ public abstract class LivingEntityMixin extends EntityMixin {
     @Shadow
     protected abstract float getJumpVelocity();
 
+    @Unique
+    private final LivingEntity lambda$instance = (LivingEntity) (Object) this;
+
     /**
      * Overwrites the jump function to use our rotation and movements
      * <pre>{@code
@@ -55,7 +57,7 @@ public abstract class LivingEntityMixin extends EntityMixin {
      */
     @Inject(method = "jump", at = @At("HEAD"), cancellable = true)
     void onJump(CallbackInfo ci) {
-        LivingEntity self = (LivingEntity) (Object) this;
+        LivingEntity self = lambda$instance;
         if (self != Lambda.getMc().player) return;
         ci.cancel();
 
@@ -78,15 +80,14 @@ void onJump(CallbackInfo ci) {
 
     @Inject(method = "travel", at = @At("HEAD"), cancellable = true)
     void onTravelPre(Vec3d movementInput, CallbackInfo ci) {
-        LivingEntity entity = (LivingEntity) (Object) this;
-        if (EventFlow.post(new MovementEvent.Entity.Pre(entity, movementInput)).isCanceled()) {
+        if (EventFlow.post(new MovementEvent.Entity.Pre(lambda$instance, movementInput)).isCanceled()) {
             ci.cancel();
         }
     }
 
     @Inject(method = "travel", at = @At("TAIL"))
     void onTravelPost(Vec3d movementInput, CallbackInfo ci) {
-        EventFlow.post(new MovementEvent.Entity.Post((LivingEntity) (Object) this, movementInput));
+        EventFlow.post(new MovementEvent.Entity.Post(lambda$instance, movementInput));
     }
 
     /**
@@ -123,7 +124,7 @@ private float hookModifyFallFlyingPitch(LivingEntity entity) {
      */
     @Redirect(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;getYaw()F"), slice = @Slice(to = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;getYaw()F", ordinal = 1)))
     private float rotBody(LivingEntity entity) {
-        if ((Object) this != Lambda.getMc().player) {
+        if (lambda$instance != Lambda.getMc().player) {
             return entity.getYaw();
         }
 
@@ -154,11 +155,18 @@ private float rotBody(LivingEntity entity) {
      */
     @Redirect(method = "turnHead", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/LivingEntity;getYaw()F"))
     private float rotHead(LivingEntity entity) {
-        if ((Object) this != Lambda.getMc().player) {
+        if (lambda$instance != Lambda.getMc().player) {
             return entity.getYaw();
         }
 
         Float yaw = RotationManager.getRenderYaw();
         return (yaw == null) ? entity.getYaw() : yaw;
     }
+
+    @ModifyConstant(method = "getHandSwingDuration", constant = @Constant(intValue = 6))
+    private int getHandSwingDuration(int constant) {
+        if (lambda$instance != Lambda.getMc().player || ViewModel.INSTANCE.isDisabled()) return constant;
+
+        return ViewModel.INSTANCE.getSwingDuration();
+    }
 }

common/src/main/java/com/lambda/mixin/render/HeldItemRendererMixin.java

@@ -1,5 +1,7 @@
 package com.lambda.mixin.render;
 
+import com.google.common.base.MoreObjects;
+import com.lambda.Lambda;
 import com.lambda.module.modules.render.ViewModel;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
@@ -14,6 +16,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.ModifyArg;
+import org.spongepowered.asm.mixin.injection.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(HeldItemRenderer.class)
@@ -44,26 +47,42 @@ private float modifyEquipProgressMainHand(float value) {
 
         ViewModel config = ViewModel.INSTANCE;
         ItemStack currentStack = client.player.getMainHandStack();
-        if (!config.getSwapAnimation()) {
+        if (config.getOldAnimations() && !config.getSwapAnimation()) {
             mainHand = currentStack;
         }
 
-        float progress = config.getOldAnimations() || !config.getSwapAnimation() ? 1 : (float) Math.pow(client.player.getAttackCooldownProgress(1), 3);
+        float progress = config.getOldAnimations() ? 1 : (float) Math.pow(client.player.getAttackCooldownProgress(1), 3);
 
         return (ItemStack.areEqual(mainHand, currentStack) ? progress : 0) - equipProgressMainHand;
     }
 
     @ModifyArg(method = "updateHeldItems", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/math/MathHelper;clamp(FFF)F", ordinal = 3), index = 0)
-    private float modifyEquipProgressOffhand(float value) {
+    private float modifyEquipProgressOffHand(float value) {
         if (client.player == null || ViewModel.INSTANCE.isDisabled()) return value;
 
         ViewModel config = ViewModel.INSTANCE;
 
         ItemStack currentStack = client.player.getOffHandStack();
-        if (!config.getSwapAnimation()) {
+        if (config.getOldAnimations() && !config.getSwapAnimation()) {
             offHand = currentStack;
         }
 
-        return (ItemStack.areEqual(offHand, currentStack) || !config.getSwapAnimation() ? 1 : 0) - equipProgressOffHand;
+        return (ItemStack.areEqual(offHand, currentStack) ? 1 : 0) - equipProgressOffHand;
+    }
+
+    @ModifyVariable(method = "renderItem(FLnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider$Immediate;Lnet/minecraft/client/network/ClientPlayerEntity;I)V", at = @At(value = "STORE", ordinal = 0), index = 6)
+    private float modifySwing(float swingProgress) {
+        ViewModel config = ViewModel.INSTANCE;
+        MinecraftClient mc = Lambda.getMc();
+        if (config.isDisabled() || mc.player == null) return swingProgress;
+        Hand hand = MoreObjects.firstNonNull(mc.player.preferredHand, Hand.MAIN_HAND);
+
+        if (hand == Hand.MAIN_HAND) {
+            return swingProgress + config.getMainSwingProgress();
+        } else if (hand == Hand.OFF_HAND) {
+            return swingProgress + config.getOffhandSwingProgress();
+        }
+
+        return swingProgress;
     }
 }