From 5ae4b03d30edee110450eecf8f1e676ccbf64adf Mon Sep 17 00:00:00 2001 From: NotAlexNoyle Date: Mon, 9 Mar 2026 09:55:36 -0400 Subject: [PATCH] Formatting --- README.md | 4 ++-- .../command/bounty/BountyTopCmd.java | 10 +++------- .../tcoded/playerbountiesplus/gui/MainBountyGui.java | 3 +-- .../listener/BountyHeadListener.java | 11 ++++------- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 2a64821..24ec640 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ PlayerBounties-OG is a hard fork of [PlayerBountiesPlus](https://github.com/Tech - Inventory GUI for viewing bounties. - Customizable odds for receiving player head from bounty victim. - Localized messages in multiple languages. -- Integrates [DiamondBank-OG](https://github.com/true-og/DiamondBank-OG) for currency. -- Integrates [SimpleClans](https://github.com/true-og/SimpleClans) for team detection. - Integrates [CoreProtect-OG](https://github.com/true-og/CoreProtect-OG) for player head rollback injection. +- Integrates [DiamondBank-OG](https://github.com/true-og/DiamondBank-OG) for currency. - Integrates [LuckPerms](https://github.com/true-og/LuckPerms) for player name and rank formatting. +- Integrates [SimpleClans](https://github.com/true-og/SimpleClans) for team detection. ## Commands - `/bounty set ` – set a bounty on a player diff --git a/src/main/java/com/tcoded/playerbountiesplus/command/bounty/BountyTopCmd.java b/src/main/java/com/tcoded/playerbountiesplus/command/bounty/BountyTopCmd.java index 16751fb..92ab4bf 100644 --- a/src/main/java/com/tcoded/playerbountiesplus/command/bounty/BountyTopCmd.java +++ b/src/main/java/com/tcoded/playerbountiesplus/command/bounty/BountyTopCmd.java @@ -124,10 +124,8 @@ public class BountyTopCmd { private static String sanitizeDisplay(String formatted, String fallbackName) { - final String cleaned = StringUtils.trimToEmpty(formatted) - .replaceAll("(?i)(?:\\s*(?:|[&§]r))+$", "") - .replaceAll("\\s+>", " >") - .replaceAll("\\s*>$", ""); + final String cleaned = StringUtils.trimToEmpty(formatted).replaceAll("(?i)(?:\\s*(?:|[&§]r))+$", "") + .replaceAll("\\s+>", " >").replaceAll("\\s*>$", ""); if (cleaned.isBlank()) { @@ -162,9 +160,7 @@ public class BountyTopCmd { } - return input.replaceAll("(?i)[&§][0-9A-FK-ORX]", "") - .replaceAll("<[^>]+>", "") - .trim(); + return input.replaceAll("(?i)[&§][0-9A-FK-ORX]", "").replaceAll("<[^>]+>", "").trim(); } diff --git a/src/main/java/com/tcoded/playerbountiesplus/gui/MainBountyGui.java b/src/main/java/com/tcoded/playerbountiesplus/gui/MainBountyGui.java index 23c8c36..2a03a54 100644 --- a/src/main/java/com/tcoded/playerbountiesplus/gui/MainBountyGui.java +++ b/src/main/java/com/tcoded/playerbountiesplus/gui/MainBountyGui.java @@ -254,8 +254,7 @@ public class MainBountyGui extends GUIBase { final GUIItem item; if (entry.targetName() != null && !entry.targetName().isBlank()) { - item = new GUIItem(Material.PLAYER_HEAD, 1, " &f#" + rank + " " + displayName, - entry.targetName()); + item = new GUIItem(Material.PLAYER_HEAD, 1, " &f#" + rank + " " + displayName, entry.targetName()); } else { diff --git a/src/main/java/com/tcoded/playerbountiesplus/listener/BountyHeadListener.java b/src/main/java/com/tcoded/playerbountiesplus/listener/BountyHeadListener.java index bf92560..b1ea1dd 100644 --- a/src/main/java/com/tcoded/playerbountiesplus/listener/BountyHeadListener.java +++ b/src/main/java/com/tcoded/playerbountiesplus/listener/BountyHeadListener.java @@ -273,8 +273,8 @@ public class BountyHeadListener implements Listener { final CachedMetaData meta = user.getCachedData().getMetaData(); final String prefix = StringUtils.trim(StringUtils.defaultString(meta.getPrefix()).replace('§', '&')); final String suffix = StringUtils.trim(StringUtils.defaultString(meta.getSuffix()).replace('§', '&')); - final boolean metaContainsName = containsVisibleName(prefix, playerName) || containsVisibleName(suffix, - playerName); + final boolean metaContainsName = containsVisibleName(prefix, playerName) + || containsVisibleName(suffix, playerName); final StringBuilder out = new StringBuilder(); if (!prefix.isBlank()) { @@ -301,8 +301,7 @@ public class BountyHeadListener implements Listener { private static String sanitizeDisplay(String formatted, String fallbackName) { - final String cleaned = StringUtils.trimToEmpty(formatted) - .replaceAll("(?i)(?:\\s*(?:|[&§]r))+$", "") + final String cleaned = StringUtils.trimToEmpty(formatted).replaceAll("(?i)(?:\\s*(?:|[&§]r))+$", "") .replaceAll("\\s*>$", ""); if (cleaned.isBlank()) { @@ -338,9 +337,7 @@ public class BountyHeadListener implements Listener { } - return input.replaceAll("(?i)[&§][0-9A-FK-ORX]", "") - .replaceAll("<[^>]+>", "") - .trim(); + return input.replaceAll("(?i)[&§][0-9A-FK-ORX]", "").replaceAll("<[^>]+>", "").trim(); }