Merge branch 'master' into commandsonlevelup

# Conflicts:
#	Changelog.txt

Author: nossr50

Changelog.txt

@@ -1,32 +1,95 @@
 Version 2.2.055
+    Fixed Berserk reducing damage instead of boosting it on Paper 26.1.2+ (See notes)
+    Fixed Disarm, Rupture, Cripple, Momentum, Critical Strikes, Armor Impact, and Greater Impact activating far less often than intended on Paper 26.1.2+ (See notes)
+    Fixed Skull Splitter dealing far less AoE damage than intended on Paper 26.1.2+ (See notes)
     Added scoreboard support for Folia servers (Thanks albert4719) (See notes)
     Fixed the 'mcmmo.perks.xp.25percentboost' permission and its per-skill child nodes not being registered (See notes)
     Fixed Maces Cripple playing an extra anvil break sound that could not be disabled in sounds.yml (See notes)
     Fixed Super Breaker and Tree Feller mishandling durability on items with a custom max_damage component (See notes)
     Fixed Tree Feller ignoring durability damage changes made by other plugins via PlayerItemDamageEvent
+    Fixed Acrobatics Dodge exploit prevention never limiting Dodge XP from a single mob (See notes)
+    Fixed 'ExploitFix.Combat.XPCeiling.Damage_Limit' in experience.yml being ignored (See notes)
+    Fixed Salvage giving nothing back for damaged items that salvage into a single material (See notes)
+    Fixed Salvage and Repair confirmations being able to act on a different item than the one prompted (See notes)
+    Fixed armor sometimes being equipped instead of salvaged when right-clicking a salvage anvil
+    Fixed scoreboards for Salvage and Smelting not updating until the skill command was used again
+    Fixed power level tags being able to get stuck showing 0 under player names (See notes)
+    Fixed the stats scoreboard including skills hidden by missing permissions in its power level
+    Fixed localized skill commands being blocked by command whitelist plugins (See notes)
+    Fixed 'Database_Purging.Old_User_Cutoff' never purging inactive users (See notes)
+    Fixed purging powerless users removing comment lines from the flatfile database
+    Fixed inspect scoreboards not refreshing when the inspected player levels up
+    Fixed the Leaf Blower and Catalysis guides in the en_US locale showing wrong unlock levels
+    Added 'Feedback.ActionBarNotifications.SubSkillUnlocked.SendToActionBar' to advanced.yml, an opt-in to show skill rank unlock messages on the action bar (See notes)
+    Fixed /inspect not checking permissions when used on offline players (See notes)
     Improved performance when players gain skill XP (See notes)
     Improved performance when taking smelted items out of furnaces (See notes)
     Added support for running commands when players reach chosen skill levels or power levels (See notes)
     Added new config file levelupcommands.yml to set up level up commands (See notes)
+    Added /mclevelupsound command for players to toggle the level-up sound (See notes)
+    Added decimal XP rate support to /xprate, rates like 1.5 now work
+    Added a no-argument /xprate that shows the current XP rate to the sender (See notes)
+    Added 'ExploitFix.AcrobaticsDodgeXpFarming' to experience.yml (See notes)
+    Added 'Skills.Mining.BlastMining.RemoteDetonationDistance' to advanced.yml (See notes)
+    Added 'mcmmo.commands.mclevelupsound' permission node
+    Added 'mcmmo.commands.xprate.show' permission node
+    Removed the unused Leaf Blower Rank_2 and Rank_3 entries from skillranks.yml
+    Added locale entries 'Commands.xprate.current', 'Commands.xprate.invalid', 'Commands.LevelUpSound.On', 'Commands.LevelUpSound.Off', and 'Commands.Description.mclevelupsound'
+    Updated locale entries 'Commands.xprate.proper.0' and 'Commands.Description.xprate' for the /xprate changes
     (API) Added LevelUpCommandAPI so other plugins can register level up commands or their own callbacks and unregister them later (See notes)
     (API) McMMOScoreboardObjectiveEvent is only fired on non-Folia servers (See notes)
+    (API) Skill rank unlock notifications now fire McMMOPlayerNotificationEvent like other notification types
     (Codebase) Added scoreboard-library 2.8.0 as a shaded dependency for the packet-based scoreboard implementation
     (Codebase) Added ViaVersion to plugin.yml softdepend
     (Codebase) Added unit tests covering the power level cap and skill level cap checks
+    (Codebase) Added regression tests covering previously fixed bugs
 
     NOTES:
+    -- Combat abilities on Paper 26.1.2+ --
+    Paper 26.1.2 changed when the attack cooldown ticker resets during melee hits, which made the cooldown API report roughly zero while mcMMO was processing a hit. Version 2.2.053 fixed most damage bonuses, but several effects still read the cooldown directly and were silently crippled: Berserk actively reduced damage (its +50% bonus math turned negative), Skull Splitter dealt roughly a tenth of its intended AoE damage, and the on-hit activation odds for Disarm, Rupture (including Serrated Strikes), Cripple, Momentum, Critical Strikes, Armor Impact, and Greater Impact were scaled down to roughly a tenth of their configured rates. All of these now use the attack strength derived from the damage event itself. No config changes required.
+    (API) UnarmedManager#berserkDamage/disarmCheck, AxesManager#criticalHit/impactCheck/greaterImpact/skullSplitterCheck, SwordsManager#processRupture/serratedStrikes, MacesManager#processCripple, SpearsManager#potentiallyApplyMomentum, CombatUtils#applyAbilityAoE, and McMMOPlayer#getAttackStrength are deprecated in favor of overloads that take an attack strength scale.
+
+    -- Scoreboards and power level tags --
     Scoreboards on Folia (and Folia forks like Canvas) now use a packet-based implementation, since the Bukkit scoreboard API is not safe to use there. Paper and Spigot servers keep the existing Bukkit scoreboard implementation and are unaffected.
     If a Folia server runs a newer Minecraft version than this mcMMO build supports for packet scoreboards (currently the 26.2.x line), scoreboards are disabled with a startup warning until mcMMO updates.
     (API) The packet-based implementation still fires McMMOScoreboardMakeboardEvent and McMMOScoreboardRevertEvent, but there is no Bukkit Objective on Folia so McMMOScoreboardObjectiveEvent is not fired there.
+    Power level tags could get stuck showing 0 for players whose data was still loading. Servers that ran older builds with 'Power_Level_Tags' enabled could also have an old power level display saved in world data that kept showing stale numbers; leftovers are now cleaned up automatically on startup. On Minecraft 26.1 clients the power level can still render on holograms and pets due to a client bug that Mojang fixed in 26.2.
+
+    -- Salvage and Repair --
+    Items that only salvage into a single material (such as wooden shovels with the default salvage.vanilla.yml) previously could not be salvaged at all unless they were at full durability. Damaged items now always return at least one material unless the item is completely broken.
+    The Salvage/Repair confirm click now has to be made with the same item that triggered the prompt; if the held item changes during the confirmation window you get a new prompt instead of the new item being instantly salvaged or repaired. While a confirmation is pending the prompted item also can't be used, which stops vanilla armor quick-swap from equipping or swapping armor mid-confirmation.
+
+    -- XP and exploit fixes --
     The mcmmo.perks.xp.25percentboost permission family now behaves like the 10, 50, and 150 percent variants; previously only mcmmo.perks.xp.25percentboost.all had any effect.
-    Gaining XP now does much less repeated work per gain, which reduces mcMMO's share of server thread time on busy servers; no behavior or config changes are involved.
-    Taking smelted items out of a furnace no longer searches the full server recipe list every time.
+    Dodge XP farming prevention now has its own 'ExploitFix.AcrobaticsDodgeXpFarming' setting in experience.yml; it is enabled by default and existing config files do not need to be updated. A single mob stops handing out Dodge XP after a handful of dodges, and the limit clears once that mob has gone about a minute without being dodged. 'ExploitFix.Acrobatics' continues to control the Roll anti-exploit checks.
+    'ExploitFix.Combat.XPCeiling.Damage_Limit' in experience.yml now works; before this fix the combat XP damage ceiling was always 100 no matter what the config said. Servers that customized this value will see it take effect after updating, no config changes are needed.
+
+    -- Commands --
+    Localized skill commands (for example /faustkampf for /unarmed on a German locale) are now handed to other plugins in a way that lets command whitelist and command blocking plugins see the command exactly as the player typed it. If you use such a plugin, whitelist the localized command name.
+    Using /inspect on offline players now requires the 'mcmmo.commands.inspect.far' permission, the same node that gates inspecting far away players. If non-op players on your server relied on inspecting offline players, grant them that node.
+    The /mclevelupsound toggle (alias /levelupsound) only affects the level-up sound, not level-up messages. Like /mcnotify, the toggle lasts until the player logs out.
+    /xprate without arguments shows the current XP rate. Players get this through the new 'mcmmo.commands.xprate.show' node, which is granted by default since the rate is already broadcast at event start and shown on join.
+
+    -- Sounds and abilities --
     Cripple now plays a single sound which can be adjusted or disabled with the CRIPPLE entry in sounds.yml.
     Items with a custom maximum durability (set through the max_damage item component by data packs or item plugins) previously could make super abilities stop working or appear to restore durability; ability durability loss now always uses the item's own maximum.
+
+    -- Level up commands --
     Level up commands are configured in the new levelupcommands.yml file; each entry lists the commands to run plus a trigger, either skills with levels or power_levels, and an optional run_as of CONSOLE (default) or PLAYER. The shipped example entries are disabled by default.
     Level up commands support placeholders: {@player}, {@skill}, {@level}, {@power_level}, and current-level placeholders like {@mining_level}. Commands run once per milestone reached, even when several levels are gained at once.
     (API) LevelUpCommandAPI registrations return an id that can be used to unregister them later; registrations made by other plugins survive mcMMO config reloads.
 
+    -- Config --
+    Skill rank unlock messages can now be shown on the action bar by setting 'Feedback.ActionBarNotifications.SubSkillUnlocked.SendToActionBar' to true in advanced.yml, with 'SendCopyOfMessageToChat' deciding whether the chat still gets a copy. This is a deliberate opt-in and nothing changes unless you enable it; unlock messages stay in chat by default. Unlike the other action bar sections this one is controlled by 'SendToActionBar' instead of 'Enabled', because configs from older versions already contain 'Enabled: true' for SubSkillUnlocked from back when the setting had no effect; that key is ignored for this section so updating cannot silently change behavior. advanced.yml auto-updates on startup, so the new key is added automatically.
+    'Skills.Mining.BlastMining.RemoteDetonationDistance' in advanced.yml controls how far away Blast Mining can remotely detonate TNT. It defaults to 100, which matches the old fixed distance, and advanced.yml auto-updates on startup so no manual config changes are needed.
+
+    -- Database --
+    'Database_Purging.Old_User_Cutoff' now actually removes inactive users on both FlatFile and SQL databases. If you have purging enabled, expect the first purge after updating to remove old users that should have been purged before. Users whose last login can't be determined are kept.
+
+    -- Performance --
+    Gaining XP now does much less repeated work per gain, which reduces mcMMO's share of server thread time on busy servers; no behavior or config changes are involved.
+    Taking smelted items out of a furnace no longer searches the full server recipe list every time.
+
 Version 2.2.054
     Added compatibility for new blocks and items from Chaos Cubed (Minecraft 26.2) to mcMMO
     Fixed party/admin chat allowing players to use color codes without the 'mcmmo.chat.colors' permission

src/main/java/com/gmail/nossr50/commands/McLevelUpSoundCommand.java

@@ -0,0 +1,45 @@
+package com.gmail.nossr50.commands;
+
+import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
+import com.gmail.nossr50.util.commands.CommandUtils;
+import com.gmail.nossr50.util.player.UserManager;
+import com.google.common.collect.ImmutableList;
+import java.util.List;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.TabExecutor;
+import org.bukkit.entity.Player;
+import org.jetbrains.annotations.NotNull;
+
+public class McLevelUpSoundCommand implements TabExecutor {
+    @Override
+    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
+            @NotNull String label, String[] args) {
+        if (CommandUtils.noConsoleUsage(sender)) {
+            return true;
+        }
+
+        if (args.length == 0) {
+            final McMMOPlayer mmoPlayer = UserManager.getPlayer((Player) sender);
+
+            //Not Loaded yet
+            if (mmoPlayer == null) {
+                sender.sendMessage(LocaleLoader.getString("Profile.PendingLoad"));
+                return true;
+            }
+
+            sender.sendMessage(LocaleLoader.getString(
+                    "Commands.LevelUpSound." + (mmoPlayer.useLevelUpSounds() ? "Off" : "On")));
+            mmoPlayer.toggleLevelUpSounds();
+            return true;
+        }
+        return false;
+    }
+
+    @Override
+    public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command,
+            @NotNull String alias, String[] args) {
+        return ImmutableList.of();
+    }
+}

src/main/java/com/gmail/nossr50/commands/XprateCommand.java

@@ -9,8 +9,11 @@
 import com.gmail.nossr50.util.player.NotificationManager;
 import com.gmail.nossr50.util.text.StringUtils;
 import com.google.common.collect.ImmutableList;
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -19,13 +22,37 @@
 import org.jetbrains.annotations.NotNull;
 
 public class XprateCommand implements TabExecutor {
+    // Matches how MessageFormat renders doubles in locale strings: no trailing ".0" on
+    // whole numbers, grouping separators, up to three decimal places
+    private static final String XP_RATE_FORMAT_PATTERN = "#,##0.###";
+
     private final double ORIGINAL_XP_RATE = ExperienceConfig.getInstance()
             .getExperienceGainsGlobalMultiplier();
 
+    /**
+     * Formats an XP rate for display. Creates a new format per call because DecimalFormat is
+     * not thread safe and regionized servers run player commands on multiple threads.
+     */
+    static String formatXpRate(double xpRate) {
+        return new DecimalFormat(XP_RATE_FORMAT_PATTERN,
+                DecimalFormatSymbols.getInstance(Locale.US)).format(xpRate);
+    }
+
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command,
             @NotNull String label, String[] args) {
         switch (args.length) {
+            case 0:
+                if (!Permissions.xprateShow(sender)) {
+                    sender.sendMessage(command.getPermissionMessage());
+                    return true;
+                }
+
+                sender.sendMessage(LocaleLoader.getString("Commands.xprate.current",
+                        formatXpRate(ExperienceConfig.getInstance()
+                                .getExperienceGainsGlobalMultiplier())));
+                return true;
+
             case 1:
                 if (!args[0].equalsIgnoreCase("reset") && !args[0].equalsIgnoreCase("clear")) {
                     return false;
@@ -63,7 +90,7 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
                 return true;
 
             case 2:
-                if (CommandUtils.isInvalidInteger(sender, args[0])) {
+                if (CommandUtils.isInvalidDouble(sender, args[0])) {
                     return true;
                 }
 
@@ -72,6 +99,20 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
                     return true;
                 }
 
+                final double newXpRate = Double.parseDouble(args[0]);
+
+                if (newXpRate < 0) {
+                    sender.sendMessage(
+                            ChatColor.RED + LocaleLoader.getString("Commands.NegativeNumberWarn"));
+                    return true;
+                }
+
+                if (newXpRate == 0 || !Double.isFinite(newXpRate)) {
+                    sender.sendMessage(
+                            ChatColor.RED + LocaleLoader.getString("Commands.xprate.invalid"));
+                    return true;
+                }
+
                 if (CommandUtils.shouldDisableToggle(args[1])) {
                     mcMMO.p.setXPEventEnabled(false);
                 } else if (CommandUtils.shouldEnableToggle(args[1])) {
@@ -80,33 +121,27 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
                     return false;
                 }
 
-                int newXpRate = Integer.parseInt(args[0]);
-
-                if (newXpRate < 0) {
-                    sender.sendMessage(
-                            ChatColor.RED + LocaleLoader.getString("Commands.NegativeNumberWarn"));
-                    return true;
-                }
-
                 ExperienceConfig.getInstance().setExperienceGainsGlobalMultiplier(newXpRate);
 
+                final String displayRate = formatXpRate(newXpRate);
+
                 if (mcMMO.p.getAdvancedConfig().useTitlesForXPEvent()) {
                     NotificationManager.broadcastTitle(mcMMO.p.getServer(),
                             LocaleLoader.getString("Commands.Event.Start"),
-                            LocaleLoader.getString("Commands.Event.XP", newXpRate),
+                            LocaleLoader.getString("Commands.Event.XP", displayRate),
                             10, 10 * 20, 20);
                 }
 
                 if (mcMMO.p.getGeneralConfig().broadcastEventMessages()) {
                     mcMMO.p.getServer()
                             .broadcastMessage(LocaleLoader.getString("Commands.Event.Start"));
                     mcMMO.p.getServer().broadcastMessage(
-                            LocaleLoader.getString("Commands.Event.XP", newXpRate));
+                            LocaleLoader.getString("Commands.Event.XP", displayRate));
                 }
 
                 //Admin notification
                 NotificationManager.processSensitiveCommandNotification(sender,
-                        SensitiveCommandType.XPRATE_MODIFY, String.valueOf(newXpRate));
+                        SensitiveCommandType.XPRATE_MODIFY, displayRate);
 
                 return true;
 
@@ -120,7 +155,7 @@ public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Comman
             @NotNull String alias, String[] args) {
         switch (args.length) {
             case 1:
-                if (StringUtils.isInt(args[0])) {
+                if (StringUtils.isDouble(args[0])) {
                     return ImmutableList.of();
                 }