feat(Animations): more blocking animations & add swing animations

src/main/java/net/ccbluex/liquidbounce/injection/mixins/minecraft/entity/MixinLivingEntity.java

@@ -28,7 +28,7 @@
 import net.ccbluex.liquidbounce.features.module.modules.combat.elytratarget.ModuleElytraTarget;
 import net.ccbluex.liquidbounce.features.module.modules.movement.*;
 import net.ccbluex.liquidbounce.features.module.modules.render.DoRender;
-import net.ccbluex.liquidbounce.features.module.modules.render.ModuleAnimations;
+import net.ccbluex.liquidbounce.features.module.modules.render.animations.ModuleAnimations;
 import net.ccbluex.liquidbounce.features.module.modules.render.ModuleAntiBlind;
 import net.ccbluex.liquidbounce.features.module.modules.render.hitfx.ModuleHitFX;
 import net.ccbluex.liquidbounce.features.module.modules.world.scaffold.ModuleScaffold;

src/main/java/net/ccbluex/liquidbounce/injection/mixins/minecraft/item/MixinItemInHandRenderer.java

@@ -25,8 +25,9 @@
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Axis;
 import net.ccbluex.liquidbounce.features.module.modules.combat.ModuleSwordBlock;
-import net.ccbluex.liquidbounce.features.module.modules.render.ModuleAnimations;
+import net.ccbluex.liquidbounce.features.module.modules.render.animations.ModuleAnimations;
 import net.ccbluex.liquidbounce.features.module.modules.render.ModuleSilentHotbar;
+import net.ccbluex.liquidbounce.features.module.modules.render.animations.SwingAnimations;
 import net.ccbluex.liquidbounce.utils.client.SilentHotbar;
 import net.ccbluex.liquidbounce.utils.item.ItemCategorizationsKt;
 import net.ccbluex.liquidbounce.utils.render.FirstPersonShieldTint;
@@ -37,6 +38,7 @@
 import net.minecraft.client.renderer.item.ItemStackRenderState;
 import net.minecraft.core.component.DataComponents;
 import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.HumanoidArm;
 import net.minecraft.world.entity.LivingEntity;
 import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
@@ -46,10 +48,7 @@
 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.ModifyArg;
-import org.spongepowered.asm.mixin.injection.Slice;
+import org.spongepowered.asm.mixin.injection.*;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
@@ -82,6 +81,34 @@ private void hookFirstPersonShieldTint(
         original.call(instance, poseStack, submitNodeCollector, lightCoords, overlayCoords, outlineColor);
     }
 
+    @Inject(
+        method = "swingArm",
+        at = @At("HEAD"),
+        cancellable = true
+    )
+    private void cancelVanillaSwing(
+        float attack,
+        PoseStack poseStack,
+        int invert,
+        HumanoidArm arm,
+        CallbackInfo ci
+    ) {
+        AbstractClientPlayer player = Minecraft.getInstance().player;
+
+        if (player == null || !ModuleAnimations.INSTANCE.getRunning() || !SwingAnimations.INSTANCE.getEnabled() || ModuleSwordBlock.shouldAnimateSwordBlock(player)) {
+            return;
+        }
+
+        SwingAnimations.INSTANCE.onRenderItem(
+            player,
+            InteractionHand.MAIN_HAND,
+            attack,
+            poseStack
+        );
+
+        ci.cancel();
+    }
+
     @Inject(method = "submitArmWithItem", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/PoseStack;pushPose()V", shift = At.Shift.AFTER))
     private void hookRenderFirstPersonItem(
         AbstractClientPlayer player, float frameInterp, float xRot, InteractionHand hand, float attack, ItemStack itemStack, float inverseArmHeight, PoseStack poseStack, SubmitNodeCollector submitNodeCollector, int lightCoords, CallbackInfo ci) {
@@ -246,7 +273,6 @@ private int hookItemUseItem(int original, @Local(argsOnly = true, name = "player
         if (ModuleSwordBlock.shouldAnimateSwordBlock(player)) {
             return 7200;
         }
-
         return original;
     }
 

src/main/kotlin/net/ccbluex/liquidbounce/features/module/ModuleManager.kt

@@ -184,7 +184,7 @@ import net.ccbluex.liquidbounce.features.module.modules.player.cheststealer.Modu
 import net.ccbluex.liquidbounce.features.module.modules.player.invcleaner.ModuleInventoryCleaner
 import net.ccbluex.liquidbounce.features.module.modules.player.nofall.ModuleNoFall
 import net.ccbluex.liquidbounce.features.module.modules.player.offhand.ModuleOffhand
-import net.ccbluex.liquidbounce.features.module.modules.render.ModuleAnimations
+import net.ccbluex.liquidbounce.features.module.modules.render.animations.ModuleAnimations
 import net.ccbluex.liquidbounce.features.module.modules.render.ModuleAntiBlind
 import net.ccbluex.liquidbounce.features.module.modules.render.ModuleAspect
 import net.ccbluex.liquidbounce.features.module.modules.render.ModuleAutoF5

src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/ModuleAnimations.kt → src/main/kotlin/net/ccbluex/liquidbounce/features/module/modules/render/animations/ModuleAnimations.kt

@@ -16,7 +16,8 @@
  * You should have received a copy of the GNU General Public License
  * along with LiquidBounce. If not, see <https://www.gnu.org/licenses/>.
  */
-package net.ccbluex.liquidbounce.features.module.modules.render
+
+package net.ccbluex.liquidbounce.features.module.modules.render.animations
 
 import com.mojang.blaze3d.vertex.PoseStack
 import com.mojang.math.Axis
@@ -28,9 +29,10 @@ import net.ccbluex.liquidbounce.event.events.PlayerStrideEvent
 import net.ccbluex.liquidbounce.event.handler
 import net.ccbluex.liquidbounce.features.module.ClientModule
 import net.ccbluex.liquidbounce.features.module.ModuleCategories
-import net.ccbluex.liquidbounce.features.module.modules.combat.ModuleSwordBlock
+import net.ccbluex.liquidbounce.utils.math.toRadians
 import net.minecraft.util.Mth
 import net.minecraft.world.entity.HumanoidArm
+import org.joml.Quaternionf
 
 /**
  * Animations module
@@ -48,6 +50,7 @@ object ModuleAnimations : ClientModule("Animations", ModuleCategories.RENDER, al
         tree(MainHand)
         tree(OffHand)
         tree(EquipOffset)
+        tree(SwingAnimations)
     }
 
     object MainHand : ToggleableValueGroup(this, "MainHand", false) {
@@ -75,10 +78,16 @@ object ModuleAnimations : ClientModule("Animations", ModuleCategories.RENDER, al
      * of a sword.
      * This choice is only used when the [ModuleSwordBlock] module is enabled.
      */
+
+    val swingAnimation = SwingAnimations
     val blockAnimationChoice = choices(
         "BlockingAnimation", OneSevenAnimation, arrayOf(
             OneSevenAnimation,
-            PushdownAnimation
+            PushdownAnimation,
+            SigmaAnimation,
+            ExhibitionAnimation,
+            AvatarAnimation,
+            DortwareAnimation
         )
     )
 
@@ -116,6 +125,8 @@ object ModuleAnimations : ClientModule("Animations", ModuleCategories.RENDER, al
     /**
      * A choice that aims to transform the held item transformation during the swing progress.
      */
+
+
     abstract class AnimationMode(name: String) : Mode(name) {
 
         override val parent: ModeValueGroup<*>
@@ -176,4 +187,136 @@ object ModuleAnimations : ClientModule("Animations", ModuleCategories.RENDER, al
 
     }
 
+    object SigmaAnimation : AnimationMode("Sigma") {
+
+        private val translateY by float("Y", 0.1f, 0.05f..0.3f)
+
+        override fun transform(matrices: PoseStack, arm: HumanoidArm, equipProgress: Float, swingProgress: Float) {
+
+            val sine = Mth.sin(Mth.sqrt(swingProgress) * Math.PI)
+            val sideM = if (arm == HumanoidArm.RIGHT) 1.0f else -1.0f
+
+            val rot = Quaternionf().rotationAxis(
+                (-sine * 27.5f * sideM).toRadians(),
+                -8.0f * sideM,
+                0.0f,
+                9.0f
+            ).rotateAxis(
+                (-sine * 45.0f * sideM).toRadians(),
+                1.0f * sideM,
+                sine / 2.0f,
+                0.0f
+            )
+            matrices.mulPose(rot)
+
+            matrices.translate(0.0f, translateY, 0.0f)
+            applySwingOffset(matrices, arm, 0f)
+        }
+    }
+
+    object ExhibitionAnimation : AnimationMode("Exhibition") {
+
+        private val translateY by float("Y", 0.1f, 0.05f..0.3f)
+
+        override fun transform(matrices: PoseStack, arm: HumanoidArm, equipProgress: Float, swingProgress: Float) {
+
+            val sine = Mth.sin(Mth.sqrt(swingProgress) * Math.PI)
+            val sideM = if (arm == HumanoidArm.RIGHT) 1.0f else -1.0f
+
+            matrices.translate(0.0, -0.1, 0.0)
+
+            applySwingOffset(matrices, arm, 0f)
+
+            matrices.translate(0.1F, 0.4F, -0.1F)
+
+            val rot = Quaternionf().rotationAxis(
+                (-sine * 30.0F * sideM).toRadians(),
+                sine.div(2F),
+                0.0F,
+                9.0F
+            ).rotateAxis(
+                (-sine * 50.0F * sideM).toRadians(),
+                0.8F * sideM,
+                sine.div(2F),
+                0F
+            )
+            matrices.mulPose(rot)
+
+            matrices.translate(0.0f, translateY - 0.2f, 0.0f)
+
+        }
+
+    }
+
+    object AvatarAnimation : AnimationMode("Avatar") {
+
+        private val translateY by float("Y", 0.1f, 0.05f..0.3f)
+
+        override fun transform(matrices: PoseStack, arm: HumanoidArm, equipProgress: Float, swingProgress: Float) {
+
+            val sine = Mth.sin(Mth.sqrt(swingProgress) * Math.PI)
+            val sine1 = Mth.sin(swingProgress * swingProgress * Math.PI)
+            val sideM = if (arm == HumanoidArm.RIGHT) 1.0f else -1.0f
+
+            matrices.translate(0.2F * sideM, translateY, 0F)
+
+            val rot = Quaternionf().rotationAxis(
+                (0.0F * sideM).toRadians(),
+                0.0F,
+                1.0F,
+                0.0F
+            ).rotateY(
+                (sine1 * -20.0F * sideM).toRadians()
+            ).rotateZ(
+                (sine * -20.0F * sideM).toRadians()
+            ).rotateAxis(
+                (sine * -40.0F * sideM).toRadians(),
+                1.0F * sideM,
+                0.0F,
+                0.0F
+            )
+            matrices.mulPose(rot)
+
+            applySwingOffset(matrices, arm, 0f)
+        }
+    }
+
+    object DortwareAnimation : AnimationMode("Dortware") {
+
+        private val translateY by float("Y", 0.1f, 0.05f..0.3f)
+
+        override fun transform(matrices: PoseStack, arm: HumanoidArm, equipProgress: Float, swingProgress: Float) {
+
+            val sine = Mth.sin(Mth.sqrt(swingProgress) * Math.PI)
+            val sqrtSwing = Mth.sqrt(swingProgress)
+            val altSine = Mth.sin(sqrtSwing * Math.PI - 3)
+
+            val rot = Quaternionf().rotationAxis(
+                (-sine * 10).toRadians(),
+                0.0f,
+                15.0f,
+                200.0f
+            ).rotateAxis(
+                (-sine * 10f).toRadians(),
+                300.0f,
+                sine.div(2f),
+                1.0f
+            )
+            matrices.mulPose(rot)
+
+            matrices.translate(3.4, 0.3, -0.4)
+            matrices.translate(-2.10f, -0.2f, 0.1f)
+
+            val rot1 = Quaternionf().rotationAxis(
+                (altSine * 13.0f).toRadians(),
+                -10.0f,
+                -1.4f,
+                -10.0f
+            )
+            matrices.mulPose(rot1)
+
+            matrices.translate(if(arm == HumanoidArm.RIGHT) -1f else -2f, translateY, 0f)
+
+        }
+    }
 }