Merge branch '1.19.3' into 1.19.2

Author: ZsoltMolnarrr

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 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` presets
+
 # 1.5.4
 - Fix attacking hostile mounts/vehicles (Thanks to Emily Darrow)
 - Fix cleaving for decoration items (such as Item Frames)

README.md

@@ -165,19 +165,19 @@ A fitting preset for a big two handed sword is the `claymore` from Better Combat
 }
 ```
 
-You can check out all available presets [here](/common/src/main/resources/data/bettercombat/weapon_attributes).
+You can check out all available presets [here](common/src/main/resources/data/bettercombat/weapon_attributes).
 
-You can check out how presets are used to add compatibility for Vanilla weapons [here](/common/src/main/resources/data/minecraft/weapon_attributes).
+You can check out how presets are used to add compatibility for Vanilla weapons [here](common/src/main/resources/data/minecraft/weapon_attributes).
 
 You can make and reference your own presets the same way.
 
 ## Custom attributes
 
 If you want unique behaviour for your weapon, you can create attributes from scratch.
 
-The content of your weapon attributes JSON file is parsed into an [AttributesContainer](https://github.com/ZsoltMolnarrr/BetterCombat/blob/main/src/main/java/net/bettercombat/api/AttributesContainer.java) object. (Check out the inline java documentation of [AttributesContainer](https://github.com/ZsoltMolnarrr/BetterCombat/blob/main/src/main/java/net/bettercombat/api/AttributesContainer.java) for details.)
+The content of your weapon attributes JSON file is parsed into an [AttributesContainer](common/src/main/java/net/bettercombat/api/AttributesContainer.java) object. (Check out the inline java documentation of [AttributesContainer](common/src/main/java/net/bettercombat/api/AttributesContainer.java) for details.)
 
-When no parent is specified, the value for `"attributes"` key must be a full json object that can be parsed into [WeaponAttributes](https://github.com/ZsoltMolnarrr/BetterCombat/blob/main/src/main/java/net/bettercombat/api/WeaponAttributes.java) object.
+When no parent is specified, the value for `"attributes"` key must be a full json object that can be parsed into [WeaponAttributes](common/src/main/java/net/bettercombat/api/WeaponAttributes.java) object.
 
 ```
 {
@@ -193,7 +193,7 @@ If you need more details, the java documentation of [WeaponAttributes](common/sr
 
 ---
 
-When `"parent"` and `"attributes"` are both specified, you can customize attributes by partially (or fully) overriding the properties. Make sure the inheritance results in fully parsable [WeaponAttributes](https://github.com/ZsoltMolnarrr/BetterCombat/blob/main/src/main/java/net/bettercombat/api/WeaponAttributes.java) object.
+When `"parent"` and `"attributes"` are both specified, you can customize attributes by partially (or fully) overriding the properties. Make sure the inheritance results in fully parsable [WeaponAttributes](common/src/main/java/net/bettercombat/api/WeaponAttributes.java) object.
 
 (Attributes are merged in parent -> child order. So parent properties are copied and overridden with child. The chain of inheritance can be any length.)
 ```

common/src/main/java/net/bettercombat/api/animation/FirstPersonAnimation.java

@@ -1,14 +1,14 @@
 package net.bettercombat.api.animation;
 
 import dev.kosmx.playerAnim.api.layered.ModifierLayer;
-import net.bettercombat.client.animation.FirstPersonAnimator;
-import net.bettercombat.client.animation.FirstPersonRenderHelper;
+import net.bettercombat.client.animation.first_person.FirstPersonAnimator;
+import net.bettercombat.client.animation.first_person.FirstPersonRenderHelper;
 import net.minecraft.client.network.AbstractClientPlayerEntity;
 
 public class FirstPersonAnimation {
     // Adding the given layer will make it visible in first person while it is actively playing
     public static void addLayer(AbstractClientPlayerEntity player, ModifierLayer layer) {
-        ((FirstPersonAnimator)player).addLayer(layer);
+        ((FirstPersonAnimator)player).addFirstPersonAnimationLayer(layer);
     }
 
     public static boolean isRenderingAttackAnimationInFirstPerson() {

common/src/main/java/net/bettercombat/client/BetterCombatClient.java

@@ -6,6 +6,7 @@
 import net.bettercombat.BetterCombat;
 import net.bettercombat.Platform;
 import net.bettercombat.PlatformClient;
+import net.bettercombat.client.animation.AnimationRegistry;
 import net.bettercombat.config.ClientConfig;
 import net.bettercombat.config.ClientConfigWrapper;
 import net.fabricmc.api.ClientModInitializer;

common/src/main/java/net/bettercombat/client/ClientNetwork.java

@@ -1,6 +1,7 @@
 package net.bettercombat.client;
 
 import net.bettercombat.BetterCombat;
+import net.bettercombat.client.animation.PlayerAttackAnimatable;
 import net.bettercombat.logic.WeaponRegistry;
 import net.bettercombat.network.Packets;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
@@ -17,9 +18,9 @@ public static void initializeHandlers() {
                 var entity = client.world.getEntityById(packet.playerId());
                 if (entity instanceof PlayerEntity) {
                     if (packet.animationName().equals(Packets.AttackAnimation.StopSymbol)) {
-                        ((PlayerAttackAnimatable)entity).stopAttackAnimation();
+                        ((PlayerAttackAnimatable)entity).stopAttackAnimation(packet.length());
                     } else {
-                        ((PlayerAttackAnimatable)entity).playAttackAnimation(packet.animationName(), packet.isOffHand(), packet.length(), packet.upswing());
+                        ((PlayerAttackAnimatable)entity).playAttackAnimation(packet.animationName(), packet.animatedHand(), packet.length(), packet.upswing());
                     }
                 }
             });

common/src/main/java/net/bettercombat/client/PlayerAttackAnimatable.java

@@ -1,4 +1,4 @@
-package net.bettercombat.client;
+package net.bettercombat.client.animation;
 
 import com.mojang.logging.LogUtils;
 import dev.kosmx.playerAnim.core.data.KeyframeAnimation;

common/src/main/java/net/bettercombat/client/AnimationRegistry.java common/src/main/java/net/bettercombat/client/animation/AnimationRegistry.java

@@ -3,13 +3,17 @@
 import dev.kosmx.playerAnim.api.layered.ModifierLayer;
 import dev.kosmx.playerAnim.api.layered.modifier.AbstractModifier;
 import dev.kosmx.playerAnim.api.layered.modifier.MirrorModifier;
+import net.bettercombat.client.animation.modifier.AdjustmentModifier;
+import net.bettercombat.client.animation.modifier.TransmissionSpeedModifier;
 
 public class AttackAnimationSubStack {
     public final TransmissionSpeedModifier speed = new TransmissionSpeedModifier();
     public final MirrorModifier mirror = new MirrorModifier();
     public final ModifierLayer base = new ModifierLayer(null);
+    public final AdjustmentModifier adjustmentModifier;
 
-    public AttackAnimationSubStack(AbstractModifier adjustmentModifier) {
+    public AttackAnimationSubStack(AdjustmentModifier adjustmentModifier) {
+        this.adjustmentModifier = adjustmentModifier;
         mirror.setEnabled(false);
         base.addModifier(adjustmentModifier, 0);
         base.addModifier(speed, 0);

common/src/main/java/net/bettercombat/client/animation/AttackAnimationSubStack.java

@@ -0,0 +1,12 @@
+package net.bettercombat.client.animation;
+
+import dev.kosmx.playerAnim.api.layered.IAnimation;
+import net.bettercombat.logic.AnimatedHand;
+
+import java.util.Optional;
+
+public interface PlayerAttackAnimatable {
+    void updateAnimationsOnTick();
+    void playAttackAnimation(String name, AnimatedHand hand, float length, float upswing);
+    void stopAttackAnimation(float length);
+}

common/src/main/java/net/bettercombat/client/animation/FirstPersonAnimator.java

@@ -6,6 +6,7 @@
 import dev.kosmx.playerAnim.api.layered.modifier.MirrorModifier;
 import dev.kosmx.playerAnim.core.data.KeyframeAnimation;
 import dev.kosmx.playerAnim.core.util.Ease;
+import net.bettercombat.client.animation.first_person.CustomAnimationPlayer;
 
 import javax.annotation.Nullable;
 import java.util.function.Consumer;

common/src/main/java/net/bettercombat/client/animation/FirstPersonRenderHelper.java

@@ -1,4 +1,4 @@
-package net.bettercombat.client.animation;
+package net.bettercombat.client.animation.first_person;
 
 import dev.kosmx.playerAnim.api.layered.KeyframeAnimationPlayer;
 import dev.kosmx.playerAnim.core.data.KeyframeAnimation;
@@ -13,13 +13,13 @@ public CustomAnimationPlayer(KeyframeAnimation emote, int t) {
         super(emote, t);
     }
 
-    public boolean isWindingDown() {
+    public boolean isWindingDown(float tickDelta) {
         var windDownStart = getData().endTick + ((getData().stopTick - getData().endTick) / 4);
-        return (getTick() > windDownStart);
+        return ((getTick() + tickDelta) > (windDownStart + 0.5F)); // + 0.5 for smoother transition
     }
 
     @Override
-    public boolean isActiveInFirstPerson() {
-        return isActive() && !isWindingDown();
+    public boolean isActiveInFirstPerson(float tickDelta) {
+        return isActive() && !isWindingDown(tickDelta);
     }
 }

common/src/main/java/net/bettercombat/client/animation/IExtendedAnimation.java

@@ -0,0 +1,11 @@
+package net.bettercombat.client.animation.first_person;
+
+import dev.kosmx.playerAnim.api.layered.IAnimation;
+import dev.kosmx.playerAnim.api.layered.ModifierLayer;
+
+import java.util.Optional;
+
+public interface FirstPersonAnimator {
+    void addFirstPersonAnimationLayer(ModifierLayer layer);
+    Optional<IAnimation> getActiveFirstPersonAnimation(float tickDelta);
+}

common/src/main/java/net/bettercombat/client/animation/PlayerAttackAnimatable.java

@@ -0,0 +1,18 @@
+package net.bettercombat.client.animation.first_person;
+
+import net.bettercombat.logic.AnimatedHand;
+
+public class FirstPersonRenderHelper {
+    public static boolean isRenderingFirstPersonPlayerModel = false;
+//    public static boolean isAttackingWithOffHand = false;
+
+
+    public static AnimationProperties current = AnimationProperties.defaults;
+    public static void resetProperties() {
+        current = AnimationProperties.defaults;
+    }
+
+    public record AnimationProperties(AnimatedHand hand) {
+        public static AnimationProperties defaults = new AnimationProperties(AnimatedHand.MAIN_HAND);
+    }
+}

common/src/main/java/net/bettercombat/client/animation/PoseSubStack.java

@@ -0,0 +1,5 @@
+package net.bettercombat.client.animation.first_person;
+
+public interface IExtendedAnimation {
+    boolean isActiveInFirstPerson(float tickDelta);
+}

common/src/main/java/net/bettercombat/client/animation/CustomAnimationPlayer.java common/src/main/java/net/bettercombat/client/animation/first_person/CustomAnimationPlayer.java

@@ -1,4 +1,4 @@
-package net.bettercombat.client.animation;
+package net.bettercombat.client.animation.modifier;
 
 import dev.kosmx.playerAnim.api.TransformType;
 import dev.kosmx.playerAnim.api.layered.KeyframeAnimationPlayer;
@@ -32,8 +32,34 @@ private float getFadeIn(float delta) {
         return fadeIn;
     }
 
+    @Override
+    public void tick() {
+        super.tick();
+
+        if (remainingFadeout > 0) {
+            remainingFadeout -= 1;
+            if(remainingFadeout <= 0) {
+                instructedFadeout = 0;
+            }
+        }
+    }
+
+    private int instructedFadeout = 0;
+    private int remainingFadeout = 0;
+
+    public void fadeOut(int fadeOut) {
+        instructedFadeout = fadeOut;
+        remainingFadeout = fadeOut + 1;
+    }
+
     private float getFadeOut(float delta) {
         float fadeOut = 1;
+        if(remainingFadeout > 0 && instructedFadeout > 0) {
+            float current = Math.max(remainingFadeout - delta , 0);
+            fadeOut = current / ((float)instructedFadeout);
+            Math.min(fadeOut, 1F);
+            return fadeOut;
+        }
         if(this.getAnim() instanceof KeyframeAnimationPlayer player) {
             float currentTick = player.getTick() + delta;
 
@@ -71,7 +97,7 @@ private Vec3f transformVector(Vec3f vector, TransformType type, PartModifier par
                 return vector.add(partModifier.offset);
             }
             case ROTATION -> {
-                 return vector.add(partModifier.rotation.scale(fade));
+                return vector.add(partModifier.rotation.scale(fade));
             }
             case BEND -> {
                 // Nothing to do here...

common/src/main/java/net/bettercombat/client/animation/first_person/FirstPersonAnimator.java

@@ -1,4 +1,4 @@
-package net.bettercombat.client.animation;
+package net.bettercombat.client.animation.modifier;
 
 import dev.kosmx.playerAnim.api.layered.modifier.SpeedModifier;
 

common/src/main/java/net/bettercombat/client/animation/first_person/FirstPersonRenderHelper.java

@@ -19,6 +19,8 @@ public class ServerConfig implements ConfigData {
     public boolean allow_fast_attacks = true;
     @Comment("Allows client-side target search and server-side attack request execution against currently mounted entity of the player")
     public boolean allow_attacking_mount = false;
+    @Comment("The minimum number of ticks between two attacks")
+    public int attack_interval_cap = 2;
     @Comment("""
             Blacklist for entities that are acting as vehicle but should not be treated as protected mounts.
             Classical example is an alexsmobs:crocodile attempting a death spin.
@@ -34,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/client/animation/first_person/IExtendedAnimation.java

@@ -0,0 +1,19 @@
+package net.bettercombat.logic;
+
+public enum AnimatedHand {
+    MAIN_HAND, OFF_HAND, TWO_HANDED;
+
+    public static AnimatedHand from(boolean isOffHand, boolean isTwoHanded) {
+        if (isTwoHanded) {
+            return TWO_HANDED;
+        }
+        if (isOffHand) {
+            return OFF_HAND;
+        }
+        return MAIN_HAND;
+    }
+
+    public boolean isOffHand() {
+        return this == OFF_HAND;
+    }
+}

common/src/main/java/net/bettercombat/client/animation/AdjustmentModifier.java common/src/main/java/net/bettercombat/client/animation/modifier/AdjustmentModifier.java

@@ -40,6 +40,11 @@ public static boolean isTwoHandedWielding(PlayerEntity player) {
         return false;
     }
 
+    public static float getAttackCooldownTicksCapped(PlayerEntity player) {
+        // `getAttackCooldownProgressPerTick` should be called `getAttackCooldownLengthTicks`
+        return Math.max(player.getAttackCooldownProgressPerTick(), BetterCombat.config.attack_interval_cap);
+    }
+
     public static AttackHand getCurrentAttack(PlayerEntity player, int comboCount) {
         if (isDualWielding(player)) {
             boolean isOffHand = shouldAttackWithOffHand(player,comboCount);

common/src/main/java/net/bettercombat/client/animation/TransmissionSpeedModifier.java common/src/main/java/net/bettercombat/client/animation/modifier/TransmissionSpeedModifier.java

@@ -33,7 +33,9 @@ public static Relation getRelation(PlayerEntity attacker, Entity target) {
                 return getRelation(attacker, owner);
             }
         }
-
+        if (target instanceof AbstractDecorationEntity) {
+            return Relation.NEUTRAL;
+        }
         var config = BetterCombat.config;
         var casterTeam = attacker.getScoreboardTeam();
         var targetTeam = target.getScoreboardTeam();
@@ -50,9 +52,6 @@ public static Relation getRelation(PlayerEntity attacker, Entity target) {
             if (target instanceof HostileEntity) {
                 return Relation.coalesce(config.player_relation_to_hostiles, Relation.HOSTILE);
             }
-            if (target instanceof AbstractDecorationEntity) {
-                return Relation.NEUTRAL;
-            }
             return Relation.coalesce(config.player_relation_to_other, Relation.HOSTILE);
         } else {
             return attacker.isTeammate(target) ? Relation.FRIENDLY : Relation.HOSTILE;

common/src/main/java/net/bettercombat/config/ServerConfig.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/AnimatedHand.java

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