From 10449f4a803c0f166b79e999c9a28f05546d1085 Mon Sep 17 00:00:00 2001 From: Teriuihi Date: Sat, 22 Mar 2025 19:12:28 +0100 Subject: [PATCH] Refactor message-sending to use sendRichMessage API. Replaced all instances of sendMiniMessage with sendRichMessage for improved readability and consistency across the codebase. This change ensures better handling of message formatting and placeholders. --- build.gradle.kts | 2 +- settings.gradle.kts | 2 +- .../commands/PlayerUtilsCommand.java | 10 +++++----- .../commands/playerutils_subcommands/Glow.java | 18 +++++++++--------- .../commands/playerutils_subcommands/Key.java | 10 +++++----- .../playerutils_subcommands/Reload.java | 2 +- .../playerutils_subcommands/RotateBlock.java | 6 +++--- .../playerutils_subcommands/XPCalc.java | 2 +- .../playerutils_subcommands/XPCheque.java | 14 +++++++------- .../event_listeners/XpBottleEvent.java | 2 +- 10 files changed, 34 insertions(+), 34 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9799a74..4dc6247 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,4 +41,4 @@ dependencies { compileOnly("com.alttd:Galaxy-API:1.21-R0.1-SNAPSHOT") { isChanging = true } -} \ No newline at end of file +} diff --git a/settings.gradle.kts b/settings.gradle.kts index dec28fd..cd52506 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -14,4 +14,4 @@ pluginManagement { repositories { gradlePluginPortal() } -} \ No newline at end of file +} diff --git a/src/main/java/com/alttd/playerutils/commands/PlayerUtilsCommand.java b/src/main/java/com/alttd/playerutils/commands/PlayerUtilsCommand.java index 0220570..8f19bd2 100644 --- a/src/main/java/com/alttd/playerutils/commands/PlayerUtilsCommand.java +++ b/src/main/java/com/alttd/playerutils/commands/PlayerUtilsCommand.java @@ -41,10 +41,10 @@ public class PlayerUtilsCommand implements CommandExecutor, TabExecutor { @Override public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command command, @NotNull String cmd, @NotNull String[] args) { if (args.length == 0) { - commandSender.sendMiniMessage(Messages.HELP.HELP_MESSAGE_WRAPPER.replaceAll("", subCommands.stream() + commandSender.sendRichMessage(Messages.HELP.HELP_MESSAGE_WRAPPER.replaceAll("", subCommands.stream() .filter(subCommand -> commandSender.hasPermission(subCommand.getPermission())) .map(SubCommand::getHelpMessage) - .collect(Collectors.joining("\n"))), null); + .collect(Collectors.joining("\n")))); return true; } @@ -53,13 +53,13 @@ public class PlayerUtilsCommand implements CommandExecutor, TabExecutor { return false; if (!commandSender.hasPermission(subCommand.getPermission())) { - commandSender.sendMiniMessage(Messages.GENERIC.NO_PERMISSION, Placeholder.parsed("permission", subCommand.getPermission())); + commandSender.sendRichMessage(Messages.GENERIC.NO_PERMISSION, Placeholder.parsed("permission", subCommand.getPermission())); return true; } boolean executedCorrectly = subCommand.onCommand(commandSender, args); if (!executedCorrectly) { - commandSender.sendMiniMessage(subCommand.getHelpMessage(), null); + commandSender.sendRichMessage(subCommand.getHelpMessage()); } return true; } @@ -102,4 +102,4 @@ public class PlayerUtilsCommand implements CommandExecutor, TabExecutor { } subCommands.add(subCommand); } -} \ No newline at end of file +} diff --git a/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Glow.java b/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Glow.java index c131f15..5dc5108 100644 --- a/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Glow.java +++ b/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Glow.java @@ -54,7 +54,7 @@ public class Glow extends SubCommand { Optional any = Arrays.stream(DyeColor.values()).filter(chatColor -> chatColor.name().equalsIgnoreCase(args[1])).findAny(); if (any.isEmpty()) { - commandSender.sendMiniMessage(getHelpMessage(), null); + commandSender.sendRichMessage(getHelpMessage()); return true; } @@ -75,36 +75,36 @@ public class Glow extends SubCommand { private Optional getTargetPlayer(CommandSender commandSender, String[] args) { if (args.length == 2) { if (!(commandSender instanceof Player commandPlayer)) { - commandSender.sendMiniMessage(Messages.GENERIC.PLAYER_ONLY, null); + commandSender.sendRichMessage(Messages.GENERIC.PLAYER_ONLY); return Optional.empty(); } return Optional.of(commandPlayer); } if (!commandSender.hasPermission(getPermission() + ".other")) { - commandSender.sendMiniMessage(Messages.GENERIC.NO_PERMISSION, Placeholder.parsed("permission", getPermission() + ".other")); + commandSender.sendRichMessage(Messages.GENERIC.NO_PERMISSION, Placeholder.parsed("permission", getPermission() + ".other")); return Optional.empty(); } Optional any = Bukkit.getOnlinePlayers().stream().filter(offlinePlayer -> offlinePlayer.getName().equalsIgnoreCase(args[2])).findAny(); if (any.isPresent()) { return Optional.of(any.get()); } else { - commandSender.sendMiniMessage(Messages.GENERIC.PLAYER_NOT_FOUND, Placeholder.parsed("player", args[2])); + commandSender.sendRichMessage(Messages.GENERIC.PLAYER_NOT_FOUND, Placeholder.parsed("player", args[2])); return Optional.empty(); } } private void turnOffGlow(CommandSender commandSender, Player player, boolean otherPlayer) { - player.sendMiniMessage(Messages.GLOW.GLOW_OFF, null); + player.sendRichMessage(Messages.GLOW.GLOW_OFF); player.setGlowing(false); if (otherPlayer) { - commandSender.sendMiniMessage(Messages.GLOW.GLOW_OFF_FOR_PLAYER, Placeholder.component("player", player.name())); + commandSender.sendRichMessage(Messages.GLOW.GLOW_OFF_FOR_PLAYER, Placeholder.component("player", player.name())); } } private void turnOnGlow(CommandSender commandSender, Player player, Team team, DyeColor dyeColor, boolean otherPlayer) { if (team.getScoreboard() == null) { - commandSender.sendMiniMessage(Messages.GLOW.UNABLE_TO_GET_SCOREBOARD, null); + commandSender.sendRichMessage(Messages.GLOW.UNABLE_TO_GET_SCOREBOARD); logger.warning("Unable to get scoreboard for team"); return; } @@ -114,9 +114,9 @@ public class Glow extends SubCommand { player.setScoreboard(team.getScoreboard()); player.setGlowing(true); - player.sendMiniMessage(Messages.GLOW.GLOW_ON, Placeholder.parsed("color", dyeColor.name())); + player.sendRichMessage(Messages.GLOW.GLOW_ON, Placeholder.parsed("color", dyeColor.name())); if (otherPlayer) { - commandSender.sendMiniMessage(Messages.GLOW.GLOW_ON_FOR_PLAYER, TagResolver.resolver( + commandSender.sendRichMessage(Messages.GLOW.GLOW_ON_FOR_PLAYER, TagResolver.resolver( Placeholder.parsed("color", dyeColor.name()), Placeholder.component("player", player.name()) )); diff --git a/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Key.java b/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Key.java index 536b490..7daf569 100644 --- a/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Key.java +++ b/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Key.java @@ -26,7 +26,7 @@ public class Key extends SubCommand { @Override public boolean onCommand(CommandSender commandSender, String[] args) { if (!(commandSender instanceof Player player)) { - commandSender.sendMiniMessage(Messages.GENERIC.PLAYER_ONLY, null); + commandSender.sendRichMessage(Messages.GENERIC.PLAYER_ONLY); return true; } @@ -36,7 +36,7 @@ public class Key extends SubCommand { String crate = args[1].toLowerCase(); if (!Config.KEY.CRATES.containsKey(crate)) { - commandSender.sendMiniMessage(Messages.KEY.CRATE_NOT_EXIST, Placeholder.parsed("crate", crate)); + commandSender.sendRichMessage(Messages.KEY.CRATE_NOT_EXIST, Placeholder.parsed("crate", crate)); return true; } @@ -45,7 +45,7 @@ public class Key extends SubCommand { int totalKeys = Config.KEY.CRATES.getOrDefault(crate, 0); int keys = crateMap.getOrDefault(uuid, 0); if (keys >= totalKeys) { - commandSender.sendMiniMessage(Messages.KEY.RETRIEVED_ALL_KEYS, TagResolver.resolver( + commandSender.sendRichMessage(Messages.KEY.RETRIEVED_ALL_KEYS, TagResolver.resolver( Placeholder.parsed("crate", crate), Placeholder.parsed("keys", String.valueOf(keys)))); return true; @@ -55,11 +55,11 @@ public class Key extends SubCommand { logger.info(String.format("Gave %s one key for %s", player.getName(), crate)); commandSender.getServer().dispatchCommand(Bukkit.getConsoleSender(), String.format("crate give v %s 1 %s", crate, player.getName())); if (keys + 1 == totalKeys) { - commandSender.sendMiniMessage(Messages.KEY.GAVE_FINAL_KEY, TagResolver.resolver( + commandSender.sendRichMessage(Messages.KEY.GAVE_FINAL_KEY, TagResolver.resolver( Placeholder.parsed("crate", crate), Placeholder.parsed("keys", String.valueOf(keys + 1)))); } else { - commandSender.sendMiniMessage(Messages.KEY.GAVE_KEY, TagResolver.resolver( + commandSender.sendRichMessage(Messages.KEY.GAVE_KEY, TagResolver.resolver( Placeholder.parsed("crate", crate), Placeholder.parsed("keys", String.valueOf(keys + 1)), Placeholder.parsed("total_keys", String.valueOf(totalKeys)))); diff --git a/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Reload.java b/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Reload.java index c4b11c6..f4f5013 100644 --- a/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Reload.java +++ b/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/Reload.java @@ -18,7 +18,7 @@ public class Reload extends SubCommand { @Override public boolean onCommand(CommandSender commandSender, String[] args) { playerUtils.reloadConfigs(); - commandSender.sendMiniMessage(Messages.RELOAD.RELOADED, null); + commandSender.sendRichMessage(Messages.RELOAD.RELOADED); return true; } diff --git a/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/RotateBlock.java b/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/RotateBlock.java index a93da1b..5c8bee3 100644 --- a/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/RotateBlock.java +++ b/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/RotateBlock.java @@ -19,15 +19,15 @@ public class RotateBlock extends SubCommand { @Override public boolean onCommand(CommandSender commandSender, String[] args) { if (!(commandSender instanceof Player player)) { - commandSender.sendMiniMessage(Messages.GENERIC.PLAYER_ONLY, null); + commandSender.sendRichMessage(Messages.GENERIC.PLAYER_ONLY); return true; } boolean enabled = rotateBlockEvent.toggleRotate(player.getUniqueId()); if (enabled) - commandSender.sendMiniMessage(Messages.ROTATE_BLOCK.ENABLED, null); + commandSender.sendRichMessage(Messages.ROTATE_BLOCK.ENABLED); else - commandSender.sendMiniMessage(Messages.ROTATE_BLOCK.DISABLED, null); + commandSender.sendRichMessage(Messages.ROTATE_BLOCK.DISABLED); return true; } diff --git a/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/XPCalc.java b/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/XPCalc.java index a973f89..f274dd5 100644 --- a/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/XPCalc.java +++ b/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/XPCalc.java @@ -34,7 +34,7 @@ public class XPCalc extends SubCommand { startingLevel++; } - commandSender.sendMiniMessage(Messages.XP_CALC.XP_NEEDED, Placeholder.parsed("xp_needed", String.valueOf(totalXpNeeded))); + commandSender.sendRichMessage(Messages.XP_CALC.XP_NEEDED, Placeholder.parsed("xp_needed", String.valueOf(totalXpNeeded))); return true; } diff --git a/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/XPCheque.java b/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/XPCheque.java index 14ce595..ab6c9e1 100644 --- a/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/XPCheque.java +++ b/src/main/java/com/alttd/playerutils/commands/playerutils_subcommands/XPCheque.java @@ -31,7 +31,7 @@ public class XPCheque extends SubCommand { @Override public boolean onCommand(CommandSender commandSender, String[] args) { if (!(commandSender instanceof Player player)) { - commandSender.sendMiniMessage(Messages.GENERIC.PLAYER_ONLY, null); + commandSender.sendRichMessage(Messages.GENERIC.PLAYER_ONLY); return true; } @@ -48,7 +48,7 @@ public class XPCheque extends SubCommand { } if (amount > 64 || amount < 1) { - commandSender.sendMiniMessage(Messages.XP_CHEQUE.INVALID_AMOUNT, null); + commandSender.sendRichMessage(Messages.XP_CHEQUE.INVALID_AMOUNT); return true; } @@ -60,24 +60,24 @@ public class XPCheque extends SubCommand { } if ((xpValue <= 0)) { - commandSender.sendMiniMessage(Messages.XP_CHEQUE.NEGATIVE, null); + commandSender.sendRichMessage(Messages.XP_CHEQUE.NEGATIVE); return true; } int totalExperience = player.getTotalExperience(); if (totalExperience < (xpValue * amount)) { - commandSender.sendMiniMessage(Messages.XP_CHEQUE.NOT_ENOUGH_XP, Placeholder.parsed("xp", String.valueOf(totalExperience))); + commandSender.sendRichMessage(Messages.XP_CHEQUE.NOT_ENOUGH_XP, Placeholder.parsed("xp", String.valueOf(totalExperience))); return true; } ItemStack heldItem = player.getInventory().getItemInMainHand(); if (!heldItem.getType().equals(Material.GLASS_BOTTLE)) { - commandSender.sendMiniMessage(Messages.XP_CHEQUE.NOT_HOLDING_BOTTLE, null); + commandSender.sendRichMessage(Messages.XP_CHEQUE.NOT_HOLDING_BOTTLE); return true; } if (heldItem.getAmount() < amount) { - commandSender.sendMiniMessage(Messages.XP_CHEQUE.NOT_ENOUGH_BOTTLE, Placeholder.parsed("amount", String.valueOf(amount))); + commandSender.sendRichMessage(Messages.XP_CHEQUE.NOT_ENOUGH_BOTTLE, Placeholder.parsed("amount", String.valueOf(amount))); return true; } @@ -122,7 +122,7 @@ public class XPCheque extends SubCommand { NamespacedKey customXp = NamespacedKey.fromString("custom_xp", playerUtils); if (customXp == null) { - player.sendMiniMessage(Messages.XP_CHEQUE.FAILED_STORAGE, null); + player.sendRichMessage(Messages.XP_CHEQUE.FAILED_STORAGE); return Optional.empty(); } persistentDataContainer.set(customXp, PersistentDataType.INTEGER, xpValue); diff --git a/src/main/java/com/alttd/playerutils/event_listeners/XpBottleEvent.java b/src/main/java/com/alttd/playerutils/event_listeners/XpBottleEvent.java index 6a525cb..2b4b595 100644 --- a/src/main/java/com/alttd/playerutils/event_listeners/XpBottleEvent.java +++ b/src/main/java/com/alttd/playerutils/event_listeners/XpBottleEvent.java @@ -103,7 +103,7 @@ public class XpBottleEvent implements Listener { NamespacedKey customXp = NamespacedKey.fromString("custom_xp", playerUtils); if (customXp == null) { - player.sendMiniMessage(Messages.XP_CHEQUE.FAILED_STORAGE, null); + player.sendRichMessage(Messages.XP_CHEQUE.FAILED_STORAGE); return Optional.empty(); } persistentDataContainer.set(customXp, PersistentDataType.INTEGER, xpValue);