hyro/lighteco
1
0
Fork 0
mirror of https://github.com/xHyroM/lighteco.git synced 2024-11-12 18:38:07 +01:00
Code Issues Projects Releases Wiki Activity

feat: make all messages configurable

Browse source
This commit is contained in:
Jozef Steinhübl 2023-08-28 08:51:11 +02:00
parent d9e79b39dd
commit 3758d0abcc
7 changed files with 62 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/commands/GiveCommand.java
View file

@ -41,7 +41,7 @@ public class GiveCommand implements Command {
OfflinePlayer target = (OfflinePlayer) args.get("target");
BigDecimal amount = BigDecimal.valueOf(Double.parseDouble(args.getRaw("amount")));
if (!this.manager.canUse(sender)) return;
if (!this.manager.canUse(sender, currency)) return;
this.manager.plugin.getUserManager().loadUser(target.getUniqueId())
.thenAcceptAsync(result -> {

2
bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/commands/PayCommand.java
View file

@ -40,7 +40,7 @@ public class PayCommand implements Command {
OfflinePlayer target = (OfflinePlayer) args.get("target");
BigDecimal amount = BigDecimal.valueOf(Double.parseDouble(args.getRaw("amount")));
if (!this.manager.canUse(sender)) return;
if (!this.manager.canUse(sender, currency)) return;
this.manager.plugin.getUserManager().loadUser(target.getUniqueId())
.thenAcceptAsync(result -> {

2
bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/commands/SetCommand.java
View file

@ -41,7 +41,7 @@ public class SetCommand implements Command {
OfflinePlayer target = (OfflinePlayer) args.get("target");
BigDecimal amount = BigDecimal.valueOf(Double.parseDouble(args.getRaw("amount")));
if (!this.manager.canUse(sender)) return;
if (!this.manager.canUse(sender, currency)) return;
this.manager.plugin.getUserManager().loadUser(target.getUniqueId())
.thenAcceptAsync(result -> {

2
bukkit/src/main/java/dev/xhyrom/lighteco/bukkit/commands/TakeCommand.java
View file

@ -41,7 +41,7 @@ public class TakeCommand implements Command {
OfflinePlayer target = (OfflinePlayer) args.get("target");
BigDecimal amount = BigDecimal.valueOf(Double.parseDouble(args.getRaw("amount")));
if (!this.manager.canUse(sender)) return;
if (!this.manager.canUse(sender, currency)) return;
this.manager.plugin.getUserManager().loadUser(target.getUniqueId())
.thenAcceptAsync(result -> {

14
common/src/main/java/dev/xhyrom/lighteco/common/config/message/CurrencyMessageConfig.java
View file

@ -8,9 +8,17 @@ public class CurrencyMessageConfig extends OkaeriConfig {
@Variable("balance-others")
public String balanceOthers = "<currency> <dark_gray>| <gray>Balance of <yellow><target> <dark_gray>| <gray><yellow><balance> </yellow></gray>";
public String set = "<currency> <dark_gray>| <gray>Set balance of <yellow><target> <dark_gray>| <gray><yellow><balance> </yellow></gray>";
public String give = "<currency> <dark_gray>| <gray>Gave <yellow><target> <dark_gray>| <gray><yellow><balance> </yellow></gray>";
public String take = "<currency> <dark_gray>| <gray>Took <yellow><target> <dark_gray>| <gray><yellow><balance> </yellow></gray>";
public String set = "<currency> <dark_gray>| <gray>Set balance of <gold><target> <yellow>to <gold><amount>";
public String give = "<currency> <dark_gray>| <gray>Gave <gold><target> <gold><amount> <dark_gray>| <gold><balance>";
public String take = "<currency> <dark_gray>| <gray>Took <gold><amount> <yellow>from <gold><target>";
public String pay = "<currency> <dark_gray>| <gray>Paid <gold><amount> <yellow>to <gold><target> <dark_gray>(<gold><taxed_amount> <yellow>after tax)</gray>";
public String wait = "<red>Please wait a moment before using this command again.";
public String notEnoughMoney = "<red>You don't have enough money!";
public String cannotSetNegative = "<red>Cannot set negative money!";
public String cannotGiveNegative = "<red>Cannot give negative money!";
public String cannotTakeNegative = "<red>Cannot take negative money!";
public String cannotPayNegative = "<red>Cannot pay negative money!";
public String cannotPaySelf = "<red>You cannot pay yourself!";
}

58
common/src/main/java/dev/xhyrom/lighteco/common/manager/command/AbstractCommandManager.java
View file

@ -27,13 +27,15 @@ public abstract class AbstractCommandManager implements CommandManager {
}
@Override
public boolean canUse(CommandSender sender) {
public boolean canUse(CommandSender sender, Currency currency) {
// Console doesn't need to wait
if (sender.getUniqueId() == null) return true;
if (mustWait.contains(sender.getUniqueId())) {
sender.sendMessage(
miniMessage.deserialize("<red>Please wait a moment before using this command again.")
miniMessage.deserialize(
this.getConfig(currency).wait
)
);
return false;
@ -104,7 +106,7 @@ public abstract class AbstractCommandManager implements CommandManager {
target.setBalance(currency, amount);
} catch (IllegalArgumentException e) {
sender.sendMessage(
miniMessage.deserialize("<red>Cannot set negative money!")
miniMessage.deserialize(this.getConfig(currency).cannotSetNegative)
);
removeFromMustWait(target.getUniqueId(), sender.getUniqueId());
@ -112,7 +114,12 @@ public abstract class AbstractCommandManager implements CommandManager {
}
sender.sendMessage(
miniMessage.deserialize("<yellow>Set " + target.getUsername() + "'s balance to <gold>" + amount.toPlainString() + " <yellow>" + currency.getIdentifier())
miniMessage.deserialize(
this.getConfig(currency).set,
Placeholder.parsed("currency", currency.getIdentifier()),
Placeholder.parsed("target", target.getUsername()),
Placeholder.parsed("amount", amount.toPlainString())
)
);
this.plugin.getUserManager().saveUser(target)
@ -128,7 +135,7 @@ public abstract class AbstractCommandManager implements CommandManager {
target.deposit(currency, amount);
} catch (IllegalArgumentException e) {
sender.sendMessage(
miniMessage.deserialize("<red>Cannot give negative money!")
miniMessage.deserialize(this.getConfig(currency).cannotGiveNegative)
);
removeFromMustWait(target.getUniqueId(), sender.getUniqueId());
@ -136,7 +143,13 @@ public abstract class AbstractCommandManager implements CommandManager {
}
sender.sendMessage(
miniMessage.deserialize("<yellow>Gave " + target.getUsername() + " <gold>" + amount.toPlainString() + " <yellow>" + currency.getIdentifier())
miniMessage.deserialize(
this.getConfig(currency).give,
Placeholder.parsed("currency", currency.getIdentifier()),
Placeholder.parsed("target", target.getUsername()),
Placeholder.parsed("amount", amount.toPlainString()),
Placeholder.parsed("balance", target.getBalance(currency).toPlainString())
)
);
this.plugin.getUserManager().saveUser(target)
@ -152,7 +165,7 @@ public abstract class AbstractCommandManager implements CommandManager {
target.withdraw(currency, amount);
} catch (IllegalArgumentException e) {
sender.sendMessage(
miniMessage.deserialize("<red>Cannot take negative money!")
miniMessage.deserialize(this.getConfig(currency).cannotTakeNegative)
);
removeFromMustWait(target.getUniqueId(), sender.getUniqueId());
@ -160,7 +173,13 @@ public abstract class AbstractCommandManager implements CommandManager {
}
sender.sendMessage(
miniMessage.deserialize("<yellow>Took <gold>" + amount.toPlainString() + " <yellow>" + currency.getIdentifier() + " from " + target.getUsername())
miniMessage.deserialize(
this.getConfig(currency).take,
Placeholder.parsed("currency", currency.getIdentifier()),
Placeholder.parsed("target", target.getUsername()),
Placeholder.parsed("amount", amount.toPlainString()),
Placeholder.parsed("balance", target.getBalance(currency).toPlainString())
)
);
this.plugin.getUserManager().saveUser(target)
@ -171,7 +190,15 @@ public abstract class AbstractCommandManager implements CommandManager {
public void onPay(CommandSender sender, Currency currency, User target, BigDecimal amount) {
if (sender.getUniqueId() != null && (sender.getUniqueId() == target.getUniqueId())) {
sender.sendMessage(
miniMessage.deserialize("<red>You cannot pay yourself!")
miniMessage.deserialize(this.getConfig(currency).cannotPaySelf)
);
return;
}
if (amount.compareTo(BigDecimal.ZERO) < 0) {
sender.sendMessage(
miniMessage.deserialize(this.getConfig(currency).cannotPayNegative)
);
return;
@ -183,7 +210,7 @@ public abstract class AbstractCommandManager implements CommandManager {
if (user.getBalance(currency).compareTo(amount) < 0) {
sender.sendMessage(
miniMessage.deserialize("<red>You do not have enough money!")
miniMessage.deserialize(this.getConfig(currency).notEnoughMoney)
);
return;
@ -200,9 +227,16 @@ public abstract class AbstractCommandManager implements CommandManager {
target.deposit(currency, taxedAmount);
user.withdraw(currency, amount);
// send message that will include original amount, taxed amount, tax rate - percentage amount and tax amount
sender.sendMessage(
miniMessage.deserialize("<yellow>Paid <gold>" + amount.toPlainString() + " <yellow>" + currency.getIdentifier() + " to " + target.getUsername() + " <yellow>(<gold>" + taxedAmount.toPlainString() + " <yellow>after tax)")
miniMessage.deserialize(
this.getConfig(currency).pay,
Placeholder.parsed("currency", currency.getIdentifier()),
Placeholder.parsed("target", target.getUsername()),
Placeholder.parsed("amount", amount.toPlainString()),
Placeholder.parsed("taxed_amount", taxedAmount.toPlainString()),
Placeholder.parsed("sender_balance", user.getBalance(currency).toPlainString()),
Placeholder.parsed("receiver_balance", target.getBalance(currency).toPlainString())
)
);
CompletableFuture.allOf(

2
common/src/main/java/dev/xhyrom/lighteco/common/manager/command/CommandManager.java
View file

@ -11,7 +11,7 @@ public interface CommandManager {
void registerCurrencyCommand(@NonNull Currency currency);
void registerCurrencyCommand(@NonNull Currency currency, boolean main);
boolean canUse(CommandSender sender);
boolean canUse(CommandSender sender, Currency currency);
void onBalance(CommandSender sender, Currency currency);
void onBalance(CommandSender sender, Currency currency, User target);