From 7f4ff2a3a7fee357c51761f82c8f135814321b61 Mon Sep 17 00:00:00 2001 From: "Connor W." Date: Thu, 5 Sep 2024 00:17:05 +0200 Subject: [PATCH 1/3] Update BalanceCommand.java Add {name} placeholder replace --- .../me/hsgamer/bettereconomy/command/BalanceCommand.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/hsgamer/bettereconomy/command/BalanceCommand.java b/src/main/java/me/hsgamer/bettereconomy/command/BalanceCommand.java index e563570..303ba66 100644 --- a/src/main/java/me/hsgamer/bettereconomy/command/BalanceCommand.java +++ b/src/main/java/me/hsgamer/bettereconomy/command/BalanceCommand.java @@ -42,7 +42,11 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String commandLab MessageUtils.sendMessage(sender, instance.get(MessageConfig.class).getPlayerNotFound()); return false; } - MessageUtils.sendMessage(sender, instance.get(MessageConfig.class).getBalanceOutput().replace("{balance}", instance.get(MainConfig.class).format(instance.get(EconomyHandlerProvider.class).getEconomyHandler().get(uuid)))); + MessageUtils.sendMessage(sender, + instance.get(MessageConfig.class).getBalanceOutput() + .replace("{balance}", instance.get(MainConfig.class).format(instance.get(EconomyHandlerProvider.class).getEconomyHandler().get(uuid))) + .replace("{name}", Optional.ofNullable(args[0]).orElse(uuid.toString())) + ); return true; } } From 3a0bc9e62b3a7eb08c6b8f5e3c57cb0192cafbd7 Mon Sep 17 00:00:00 2001 From: "Connor W." Date: Thu, 5 Sep 2024 01:16:49 +0200 Subject: [PATCH 2/3] Initial Commit Add balance-other key to message config, Implement balance-other key to balance command. --- .../bettereconomy/command/BalanceCommand.java | 17 ++++++++++++----- .../bettereconomy/config/MessageConfig.java | 5 +++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/main/java/me/hsgamer/bettereconomy/command/BalanceCommand.java b/src/main/java/me/hsgamer/bettereconomy/command/BalanceCommand.java index 303ba66..641cdf8 100644 --- a/src/main/java/me/hsgamer/bettereconomy/command/BalanceCommand.java +++ b/src/main/java/me/hsgamer/bettereconomy/command/BalanceCommand.java @@ -13,10 +13,13 @@ import org.jetbrains.annotations.NotNull; import java.util.Collections; +import java.util.Objects; +import java.util.Optional; import java.util.UUID; public class BalanceCommand extends Command { private final BetterEconomy instance; + private String output; public BalanceCommand(BetterEconomy instance) { super("balance", "Get the balance of a player", "/balance [player]", Collections.singletonList("bal")); @@ -41,12 +44,16 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String commandLab if (!instance.get(EconomyHandlerProvider.class).getEconomyHandler().hasAccount(uuid)) { MessageUtils.sendMessage(sender, instance.get(MessageConfig.class).getPlayerNotFound()); return false; + } - MessageUtils.sendMessage(sender, - instance.get(MessageConfig.class).getBalanceOutput() - .replace("{balance}", instance.get(MainConfig.class).format(instance.get(EconomyHandlerProvider.class).getEconomyHandler().get(uuid))) - .replace("{name}", Optional.ofNullable(args[0]).orElse(uuid.toString())) + + MessageConfig messageConfig = instance.get(MessageConfig.class); + if (uuid.equals(((Player) sender).getUniqueId())) { output = messageConfig.getBalanceOutput(); } else { output = messageConfig.getBalanceOther(); } + + MessageUtils.sendMessage(sender, output + .replace("{balance}", instance.get(MainConfig.class).format(instance.get(EconomyHandlerProvider.class).getEconomyHandler().get(uuid))) + .replace("{name}", Objects.requireNonNull(Utils.getOfflinePlayer(uuid).getName())) ); - return true; + return false; } } diff --git a/src/main/java/me/hsgamer/bettereconomy/config/MessageConfig.java b/src/main/java/me/hsgamer/bettereconomy/config/MessageConfig.java index eff0d9c..92cea8d 100644 --- a/src/main/java/me/hsgamer/bettereconomy/config/MessageConfig.java +++ b/src/main/java/me/hsgamer/bettereconomy/config/MessageConfig.java @@ -23,6 +23,11 @@ default String getEmptyPlayerSelector() { return "&cNo player is selected"; } + @ConfigPath("balance-other") + default String getBalanceOther() { + return "&eBalance of {name}: &f{balance}"; + } + @ConfigPath("balance-output") default String getBalanceOutput() { return "&eBalance: &f{balance}"; From 0964958f5a5e9f90502ad40eb9e6732b064ae90f Mon Sep 17 00:00:00 2001 From: "Connor W." Date: Thu, 5 Sep 2024 01:25:31 +0200 Subject: [PATCH 3/3] Code cleanup Remove unused import Convert variable --- .../java/me/hsgamer/bettereconomy/command/BalanceCommand.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/me/hsgamer/bettereconomy/command/BalanceCommand.java b/src/main/java/me/hsgamer/bettereconomy/command/BalanceCommand.java index 641cdf8..dd52996 100644 --- a/src/main/java/me/hsgamer/bettereconomy/command/BalanceCommand.java +++ b/src/main/java/me/hsgamer/bettereconomy/command/BalanceCommand.java @@ -14,12 +14,10 @@ import java.util.Collections; import java.util.Objects; -import java.util.Optional; import java.util.UUID; public class BalanceCommand extends Command { private final BetterEconomy instance; - private String output; public BalanceCommand(BetterEconomy instance) { super("balance", "Get the balance of a player", "/balance [player]", Collections.singletonList("bal")); @@ -46,7 +44,7 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String commandLab return false; } - + String output; MessageConfig messageConfig = instance.get(MessageConfig.class); if (uuid.equals(((Player) sender).getUniqueId())) { output = messageConfig.getBalanceOutput(); } else { output = messageConfig.getBalanceOther(); }