Merge branch '1.21.8' into 1.21.11

Author: ZsoltMolnarrr

.github/workflows/publish.yml

@@ -20,9 +20,9 @@ on:
         type: choice
         description: Release type
         options: 
-        - alpha
-        - beta
         - release
+        - beta
+        - alpha
 
 permissions:
   contents: read

CHANGELOG.md

@@ -1,3 +1,13 @@
+# 3.0.1
+
+- Adjusted windup time and animation for vanilla Mace, to be more instant-like
+- Adjusted windup time for vanilla axes
+- Fixed being unable to attack after dying during the windup phase of an attack, #548
+- Fixed crashing on invalid particle config #568
+- Added mine with weapons whitelist config #574
+- Improved Friend or Foe logic on FTB Teams membership, thanks to LeDok #571
+- Copper golems are now considered neutral
+
 # 3.0.0
 
 - Support Minecraft 1.21.11

animations/one_handed_slam_instant.blend

@@ -104,9 +104,12 @@ public static List<ParticlePlacement> trailParticlesFromAttack(AttackHand attack
             return attackHand.attack().trailParticles();
         }
         var config = BetterCombatMod.trailConfig.value;
-        var animationSpecific = config.animation_based.get(attackHand.attack().animation());
-        if (animationSpecific != null) {
-            return animationSpecific;
+        var animations = config.animation_based;
+        if (animations != null) {
+            var animationSpecific = animations.get(attackHand.attack().animation());
+            if (animationSpecific != null) {
+                return animationSpecific;
+            }
         }
         return List.of();
     }

common/src/main/java/net/bettercombat/client/particle/SlashParticleUtil.java

@@ -1,6 +1,7 @@
 package net.bettercombat.compat;
 
 import dev.ftb.mods.ftbteams.api.FTBTeamsAPI;
+import dev.ftb.mods.ftbteams.api.Team;
 import dev.ftb.mods.ftbteams.api.client.KnownClientPlayer;
 import net.bettercombat.Platform;
 import net.bettercombat.logic.TargetHelper;
@@ -31,19 +32,36 @@ private static TargetHelper.TeamRelation checkClientTeamRelation(PlayerEntity at
         var manager = FTBTeamsAPI.api().getClientManager();
 
         Optional<KnownClientPlayer> attackerKnownPlayerOpt = manager.getKnownPlayer(attackerPlayer.getUuid());
-        Optional<KnownClientPlayer> targetKnownPlayerOpt = manager.getKnownPlayer(targetPlayer.getUuid());
+        if (attackerKnownPlayerOpt.isEmpty()) {
+            return null;
+        }
 
-        if (attackerKnownPlayerOpt.isEmpty() || targetKnownPlayerOpt.isEmpty()) {
+        Optional<KnownClientPlayer> targetKnownPlayerOpt = manager.getKnownPlayer(targetPlayer.getUuid());
+        if (targetKnownPlayerOpt.isEmpty()) {
             return null;
         }
 
         KnownClientPlayer attackerKnownPlayer = attackerKnownPlayerOpt.get();
         KnownClientPlayer targetKnownPlayer = targetKnownPlayerOpt.get();
 
+        // 1. Check if players are in the same effective team (party).
         if (attackerKnownPlayer.teamId().equals(targetKnownPlayer.teamId())) {
             return new TargetHelper.TeamRelation(true, false);
         }
 
+        // 2. Check for a mutual, two-way alliance to prevent abuse.
+        Optional<Team> attackerTeamOpt = manager.getTeamByID(attackerKnownPlayer.teamId());
+        Optional<Team> targetTeamOpt = manager.getTeamByID(targetKnownPlayer.teamId());
+
+        if (attackerTeamOpt.isPresent() && targetTeamOpt.isPresent()) {
+            boolean attackerSeesAlly = attackerTeamOpt.get().getRankForPlayer(targetPlayer.getUuid()).isAllyOrBetter();
+            boolean targetSeesAlly = targetTeamOpt.get().getRankForPlayer(attackerPlayer.getUuid()).isAllyOrBetter();
+
+            if (attackerSeesAlly && targetSeesAlly) {
+                return new TargetHelper.TeamRelation(true, false);
+            }
+        }
+
         return null;
     }
 
@@ -53,8 +71,25 @@ private static TargetHelper.TeamRelation checkServerTeamRelation(PlayerEntity at
         }
         var manager = FTBTeamsAPI.api().getManager();
 
-        if (manager.arePlayersInSameTeam(attackerPlayer.getUuid(), targetPlayer.getUuid())) {
-            return new TargetHelper.TeamRelation(true, false);
+        Optional<Team> attackerTeamOpt = manager.getTeamForPlayerID(attackerPlayer.getUuid());
+        Optional<Team> targetTeamOpt = manager.getTeamForPlayerID(targetPlayer.getUuid());
+
+        if (attackerTeamOpt.isPresent() && targetTeamOpt.isPresent()) {
+            Team attackerTeam = attackerTeamOpt.get();
+            Team targetTeam = targetTeamOpt.get();
+
+            // 1. Check if players are in the same effective team (party).
+            if (attackerTeam.getTeamId().equals(targetTeam.getTeamId())) {
+                return new TargetHelper.TeamRelation(true, false);
+            }
+
+            // 2. Check for a mutual, two-way alliance to prevent abuse.
+            boolean attackerSeesAlly = attackerTeam.getRankForPlayer(targetPlayer.getUuid()).isAllyOrBetter();
+            boolean targetSeesAlly = targetTeam.getRankForPlayer(attackerPlayer.getUuid()).isAllyOrBetter();
+
+            if (attackerSeesAlly && targetSeesAlly) {
+                return new TargetHelper.TeamRelation(true, false);
+            }
         }
 
         return null;

common/src/main/java/net/bettercombat/compat/FTBTeamsCompat.java

@@ -43,6 +43,8 @@ public class ClientConfig implements ConfigData {
     @ConfigEntry.Gui.Tooltip
     public String mineWithWeaponBlacklist = "";
     @ConfigEntry.Gui.Tooltip
+    public String mineWithWeaponWhitelist = "";
+    @ConfigEntry.Gui.Tooltip
     public TriStateAuto firstPersonAnimations = TriStateAuto.AUTO;
     @ConfigEntry.Gui.Tooltip
     public float legAnimationThreshold = 0;

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

@@ -93,6 +93,7 @@ public enum Curve { LINEAR, SQUARE, HALF_SQUARE }
         put("minecraft:player", TargetHelper.Relation.NEUTRAL);
         put("minecraft:villager", TargetHelper.Relation.NEUTRAL);
         put("minecraft:iron_golem", TargetHelper.Relation.NEUTRAL);
+        put("minecraft:copper_golem", TargetHelper.Relation.NEUTRAL);
         put("guardvillagers:guard", TargetHelper.Relation.NEUTRAL);
     }};
     public LinkedHashMap<String, TargetHelper.Relation> player_relation_tags = new LinkedHashMap<>() {{

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

@@ -12,4 +12,7 @@ public int upswingTicksLeft(int time) {
     public int durationTicks() {
         return Math.round(duration);
     }
+    public boolean isValid(int time) {
+        return time >= startedAt && time <= startedAt + (durationTicks() + 1); // +1 for padding
+    }
 }

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

@@ -145,7 +145,8 @@ public void playAttackAnimation(String name, AnimatedHand animatedHand, float le
             if(isLeftHanded()) {
                 mirror = !mirror;
             }
-            float upswingSpeed = speed / BetterCombatMod.config.getUpswingMultiplier();
+            var trueUpswingRatio = upswing / BetterCombatMod.config.getUpswingMultiplier();
+            float upswingSpeed = speed / trueUpswingRatio;
             float downwindSpeed = (float) (speed *
                     MathHelper.lerp(Math.max(BetterCombatMod.config.getUpswingMultiplier() - 0.5, 0) / 0.5, // Choosing value :D
                             (1F - upswing),                     // Use this value at config `0.5`

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

@@ -134,7 +134,16 @@ private void pre_doItemUse(CallbackInfo ci) {
 
     private boolean isTargetingMineableBlock() {
         if (!BetterCombatClientMod.config.isMiningWithWeaponsEnabled) {
-            return false;
+            var whitelist = BetterCombatClientMod.config.mineWithWeaponWhitelist;
+            if (whitelist == null || whitelist.isEmpty()) {
+                return false;
+            }
+            var itemStack = player.getMainHandStack();
+            var id = Registries.ITEM.getId(itemStack.getItem()).toString();
+            if (!PatternMatching.matches(id, whitelist)) {
+                return false;
+            }
+            // Weapon is whitelisted — fall through to continue checks
         }
         var regex = BetterCombatClientMod.config.mineWithWeaponBlacklist;
         if (regex != null && !regex.isEmpty()) {
@@ -329,9 +338,14 @@ private void pre_Tick(CallbackInfo ci) {
         lastAttacked += 1;
 
         if (ongoingSwing != null) {
-            if (ongoingSwing.ticksLeft(currentTime()) <= 0) {
+            var time = currentTime();
+            var swing = ongoingSwing; // Store in local for further checks
+            if (swing.ticksLeft(time) <= 0) {
                 ongoingSwing = null;
             }
+            if (!player.isAlive() || !swing.isValid(time)) {
+                cancelWeaponSwing();
+            }
         }
         cancelSwingIfNeeded();
         attackFromUpswingIfNeeded();