Add knocback reduction for fast attacks

Author: ZsoltMolnarrr

CHANGELOG.md

@@ -1,9 +1,10 @@
 # 1.5.5
 - Add attack speed cap
+- Add knockback reduction for fast attacks (configurable)
 - Improve back to back animation overlapping
 - Fix offhand arm invisible while 2H animations
 - Rework feinting
-- Update `staff` and `battlestaff` persets
+- Update `staff` and `battlestaff` presets
 
 # 1.5.4
 - Fix attacking hostile mounts/vehicles (Thanks to Emily Darrow)

common/src/main/java/net/bettercombat/config/ServerConfig.java

@@ -36,6 +36,8 @@ public class ServerConfig implements ConfigData {
     public boolean movement_speed_applied_smoothly = true;
     @Comment("Determines whether or not to apply movement speed reduction while attacking mounted")
     public boolean movement_speed_effected_while_mounting = false;
+    @Comment("Attacks faster than a vanilla sword will do smaller knockback, proportionally.")
+    public boolean knockback_reduced_for_fast_attacks = true;
     @Comment("Multiplier for `attack_range`, during target lookup on both sides. " +
             "Large sized entities may be colliding with weapon hitbox, but center of entities can have bigger distance than `attack_range`")
     public float target_search_range_multiplier = 2F;

common/src/main/java/net/bettercombat/logic/WeaponAttributesFallback.java

@@ -1,6 +1,7 @@
 package net.bettercombat.logic;
 
 import net.bettercombat.BetterCombat;
+import net.bettercombat.utils.PatternMatching;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.attribute.EntityAttribute;
 import net.minecraft.entity.attribute.EntityAttributes;

common/src/main/java/net/bettercombat/logic/knockback/ConfigurableKnockback.java

@@ -0,0 +1,5 @@
+package net.bettercombat.logic.knockback;
+
+public interface ConfigurableKnockback {
+    void setKnockbackMultiplier_BetterCombat(float strength);
+}

common/src/main/java/net/bettercombat/mixin/LivingEntityInject.java common/src/main/java/net/bettercombat/mixin/LivingEntityMixin.java

@@ -2,16 +2,18 @@
 
 import net.bettercombat.logic.PlayerAttackHelper;
 import net.bettercombat.logic.PlayerAttackProperties;
+import net.bettercombat.logic.knockback.ConfigurableKnockback;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.attribute.EntityAttribute;
 import net.minecraft.entity.player.PlayerEntity;
 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.ModifyVariable;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(LivingEntity.class)
-public class LivingEntityInject {
+public class LivingEntityMixin implements ConfigurableKnockback {
 
     // FEATURE: Dual wielded attacking - Client side weapon cooldown for offhand
 
@@ -32,4 +34,17 @@ public void getAttributeValue_Inject(EntityAttribute attribute, CallbackInfoRetu
             }
         }
     }
+
+    // MARK: ConfigurableKnockback
+    private float customKnockbackMultiplier_BetterCombat = 1;
+
+    @Override
+    public void setKnockbackMultiplier_BetterCombat(float value) {
+        customKnockbackMultiplier_BetterCombat = value;
+    }
+
+    @ModifyVariable(method = "takeKnockback", at = @At("HEAD"), ordinal = 0, argsOnly = true)
+    public double takeKnockback_HEAD_changeStrength(double knockbackStrength) {
+        return knockbackStrength * customKnockbackMultiplier_BetterCombat;
+    }
 }

common/src/main/java/net/bettercombat/mixin/client/MinecraftClientInject.java

@@ -14,6 +14,7 @@
 import net.bettercombat.config.ClientConfigWrapper;
 import net.bettercombat.logic.*;
 import net.bettercombat.network.Packets;
+import net.bettercombat.utils.PatternMatching;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.minecraft.block.BlockState;

common/src/main/java/net/bettercombat/network/ServerNetwork.java

@@ -9,7 +9,9 @@
 import net.bettercombat.logic.PlayerAttackProperties;
 import net.bettercombat.logic.TargetHelper;
 import net.bettercombat.logic.WeaponRegistry;
+import net.bettercombat.logic.knockback.ConfigurableKnockback;
 import net.bettercombat.mixin.LivingEntityAccessor;
+import net.bettercombat.utils.MathHelp;
 import net.bettercombat.utils.SoundHelper;
 import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
 import net.fabricmc.fabric.api.networking.v1.PlayerLookup;
@@ -23,7 +25,6 @@
 import net.minecraft.entity.attribute.EntityAttributeModifier;
 import net.minecraft.entity.attribute.EntityAttributes;
 import net.minecraft.entity.decoration.ArmorStandEntity;
-import net.minecraft.entity.mob.HostileEntity;
 import net.minecraft.entity.projectile.PersistentProjectileEntity;
 import net.minecraft.network.PacketByteBuf;
 import net.minecraft.network.packet.c2s.play.PlayerInteractEntityC2SPacket;
@@ -114,6 +115,10 @@ public static void initializeHandlers() {
                     SoundHelper.playSound(world, player, attack.swingSound());
                 }
 
+                var attackCooldown = PlayerAttackHelper.getAttackCooldownTicksCapped(player);
+                var knockbackMultiplier = BetterCombat.config.knockback_reduced_for_fast_attacks
+                        ? MathHelp.clamp(attackCooldown / 12.5F, 0.1F, 1F)
+                        : 1F;
                 var lastAttackedTicks = ((LivingEntityAccessor)player).getLastAttackedTicks();
                 if (!useVanillaPacket) {
                     player.setSneaking(request.isSneaking());
@@ -133,8 +138,13 @@ public static void initializeHandlers() {
                             || (entity instanceof ArmorStandEntity && ((ArmorStandEntity)entity).isMarker())) {
                         continue;
                     }
-                    if (BetterCombat.config.allow_fast_attacks && entity instanceof LivingEntity) {
-                        ((LivingEntity)entity).timeUntilRegen = 0;
+                    if (entity instanceof LivingEntity livingEntity) {
+                        if (BetterCombat.config.allow_fast_attacks) {
+                            livingEntity.timeUntilRegen = 0;
+                        }
+                        if (knockbackMultiplier != 1F) {
+                            ((ConfigurableKnockback)livingEntity).setKnockbackMultiplier_BetterCombat(knockbackMultiplier);
+                        }
                     }
                     ((LivingEntityAccessor) player).setLastAttackedTicks(lastAttackedTicks);
                     // System.out.println("Server - Attacking hand: " + (hand.isOffHand() ? "offhand" : "mainhand") + " CD: " + player.getAttackCooldownProgress(0));
@@ -153,6 +163,11 @@ public static void initializeHandlers() {
                             player.attack(entity);
                         }
                     }
+                    if (entity instanceof LivingEntity livingEntity) {
+                        if (knockbackMultiplier != 1F) {
+                            ((ConfigurableKnockback)livingEntity).setKnockbackMultiplier_BetterCombat(1F);
+                        }
+                    }
                 }
 
                 if (!useVanillaPacket) {

common/src/main/java/net/bettercombat/utils/MathHelp.java

@@ -0,0 +1,7 @@
+package net.bettercombat.utils;
+
+public class MathHelp {
+    public static float clamp(float value, float min, float max) {
+        return Math.max(Math.min(value, max), min);
+    }
+}

common/src/main/java/net/bettercombat/logic/PatternMatching.java common/src/main/java/net/bettercombat/utils/PatternMatching.java

@@ -1,4 +1,4 @@
-package net.bettercombat.logic;
+package net.bettercombat.utils;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

common/src/main/resources/bettercombat.mixins.json

@@ -7,7 +7,7 @@
     "EnchantmentMixin",
     "ItemStackMixin",
     "LivingEntityAccessor",
-    "LivingEntityInject",
+    "LivingEntityMixin",
     "PlayerEntityAccessor",
     "PlayerEntityMixin",
     "ServerPlayNetworkHandlerMixin",