LEGACY: Add animation SwingSpeed option (CCBlueX#1792)

mems01 · Jan 14, 2024 · 9f3206d · 9f3206d
1 parent 2e2d62f
commit 9f3206d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/src/main/java/net/ccbluex/liquidbounce/features/module/modules/render/Animations.kt b/src/main/java/net/ccbluex/liquidbounce/features/module/modules/render/Animations.kt
@@ -11,6 +11,7 @@ import net.ccbluex.liquidbounce.features.module.modules.render.Animations.animat
 import net.ccbluex.liquidbounce.features.module.modules.render.Animations.defaultAnimation
 import net.ccbluex.liquidbounce.utils.MinecraftInstance
 import net.ccbluex.liquidbounce.value.BoolValue
+import net.ccbluex.liquidbounce.value.IntegerValue
 import net.ccbluex.liquidbounce.value.ListValue
 import net.minecraft.client.entity.AbstractClientPlayer
 import net.minecraft.client.renderer.GlStateManager.*
@@ -49,6 +50,8 @@ object Animations : Module("Animations", ModuleCategory.RENDER, gameDetecting =
 
     private val animationMode by ListValue("Mode", animations.map { it.name }.toTypedArray(), "Pushdown")
     val oddSwing by BoolValue("OddSwing", false)
+    val swingSpeed by IntegerValue("SwingSpeed", 15, 0..20)
+
 
     fun getAnimation() = animations.firstOrNull { it.name == animationMode }
 

diff --git a/...in/java/net/ccbluex/liquidbounce/injection/forge/mixins/entity/MixinEntityLivingBase.java b/...in/java/net/ccbluex/liquidbounce/injection/forge/mixins/entity/MixinEntityLivingBase.java
@@ -7,10 +7,12 @@
 
 import net.ccbluex.liquidbounce.event.EventManager;
 import net.ccbluex.liquidbounce.event.JumpEvent;
+import net.ccbluex.liquidbounce.features.module.ModuleManager;
 import net.ccbluex.liquidbounce.features.module.modules.movement.AirJump;
 import net.ccbluex.liquidbounce.features.module.modules.movement.LiquidWalk;
 import net.ccbluex.liquidbounce.features.module.modules.movement.NoJumpDelay;
 import net.ccbluex.liquidbounce.features.module.modules.movement.Sprint;
+import net.ccbluex.liquidbounce.features.module.modules.render.Animations;
 import net.ccbluex.liquidbounce.features.module.modules.render.AntiBlind;
 import net.ccbluex.liquidbounce.features.module.modules.render.Rotations;
 import net.ccbluex.liquidbounce.utils.MovementUtils;
@@ -170,4 +172,14 @@ private float hookBodyRotationsB(EntityLivingBase instance) {
 
         return instance instanceof EntityPlayerSP && Rotations.INSTANCE.shouldUseRealisticMode() && rotation != null ? rotation.getYaw() : instance.rotationYaw;
     }
+
+    /**
+     * @author SuperSkidder
+     * @reason Animations swing speed
+     */
+    @Overwrite
+    public int getArmSwingAnimationEnd(){
+        int speed = ModuleManager.INSTANCE.getModule(Animations.class).getState() ? (int) (2 + (20 - Animations.INSTANCE.getSwingSpeed())) : 6;
+        return this.isPotionActive(Potion.digSpeed) ? speed - (1 + this.getActivePotionEffect(Potion.digSpeed).getAmplifier()) : (this.isPotionActive(Potion.digSlowdown) ? speed + (1 + this.getActivePotionEffect(Potion.digSlowdown).getAmplifier()) * 2 : speed);
+    }
 }