Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 28 additions & 19 deletions src/main/java/fr/openmc/core/features/economy/BankManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,10 @@
import fr.openmc.core.utils.text.messages.MessageType;
import fr.openmc.core.utils.text.messages.MessagesManager;
import fr.openmc.core.utils.text.messages.Prefix;
import fr.openmc.core.utils.text.messages.TranslationManager;
import lombok.Getter;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.entity.Player;
Expand Down Expand Up @@ -108,7 +110,7 @@ public static void deposit(UUID playerUUID, String input) {
OfflinePlayer offlinePlayer = CacheOfflinePlayer.getOfflinePlayer(playerUUID);

if (!InputUtils.isInputMoney(input)) {
MessagesManager.sendMessage(offlinePlayer, Component.text("Veuillez mettre une entrée correcte"),
MessagesManager.sendMessage(offlinePlayer, TranslationManager.translation("messages.global.invalid_input"),
Prefix.BANK, MessageType.ERROR, true);
return;
}
Expand All @@ -118,7 +120,7 @@ public static void deposit(UUID playerUUID, String input) {

if (city == null || city.getLevel() < 2) {
MessagesManager.sendMessage(offlinePlayer,
Component.text("Pour avoir une banque personnelle, vous devez appartenir à une ville de niveau 2 minimum !"),
TranslationManager.translation("feature.economy.bank.deposit.need_city_level_2"),
Prefix.BANK, MessageType.ERROR, false);
return;
}
Expand All @@ -128,17 +130,16 @@ public static void deposit(UUID playerUUID, String input) {

if (currentBalance >= limit) {
MessagesManager.sendMessage(offlinePlayer,
Component.text("Vous avez atteint la limite de votre plafond qui est de " +
EconomyManager.getFormattedNumber(limit) +
". Améliorez votre ville au niveau supérieur !"),
TranslationManager.translation("feature.economy.bank.deposit.limit_reached",
Component.text(EconomyManager.getFormattedNumber(limit)).color(NamedTextColor.LIGHT_PURPLE)),
Prefix.BANK, MessageType.ERROR, false);
return;
}

double allowedAmount = Math.min(amount, limit - currentBalance);

if (!EconomyManager.withdrawBalance(playerUUID, allowedAmount)) {
MessagesManager.sendMessage(offlinePlayer, Component.text("Vous n'avez pas assez d'argent"),
MessagesManager.sendMessage(offlinePlayer, TranslationManager.translation("feature.economy.bank.deposit.not_enough_money"),
Prefix.BANK, MessageType.ERROR, false);
return;
}
Expand All @@ -147,13 +148,17 @@ public static void deposit(UUID playerUUID, String input) {

if (allowedAmount < amount) {
MessagesManager.sendMessage(offlinePlayer,
Component.text("Seulement " + EconomyManager.getFormattedNumber(allowedAmount) +
" ont été déposés (plafond atteint)."),
TranslationManager.translation(
"feature.economy.bank.deposit.partial",
Component.text(EconomyManager.getFormattedNumber(allowedAmount)).color(NamedTextColor.LIGHT_PURPLE)
),
Prefix.BANK, MessageType.ERROR, false);
} else {
MessagesManager.sendMessage(offlinePlayer,
Component.text("Vous avez déposé " +
EconomyManager.getFormattedNumber(allowedAmount) + "."),
TranslationManager.translation(
"feature.economy.bank.deposit.success",
Component.text(EconomyManager.getFormattedNumber(allowedAmount)).color(NamedTextColor.LIGHT_PURPLE)
),
Prefix.BANK, MessageType.SUCCESS, false);
}
}
Expand All @@ -162,25 +167,26 @@ public static void withdraw(UUID playerUUID, String input) {
OfflinePlayer offlinePlayer = CacheOfflinePlayer.getOfflinePlayer(playerUUID);

if (!InputUtils.isInputMoney(input)) {
MessagesManager.sendMessage(offlinePlayer, Component.text("Veuillez mettre une entrée correcte"),
MessagesManager.sendMessage(offlinePlayer, TranslationManager.translation("messages.global.invalid_input"),
Prefix.BANK, MessageType.ERROR, true);
return;
}

double amount = InputUtils.convertToMoneyValue(input);

if (!withdraw(playerUUID, amount)) {
MessagesManager.sendMessage(offlinePlayer,
Component.text("Tu n'as pas assez d'argent en banque"),
Prefix.BANK, MessageType.ERROR, false);
MessagesManager.sendMessage(offlinePlayer, TranslationManager.translation("feature.economy.bank.withdraw.not_enough"), Prefix.BANK, MessageType.ERROR, false);
return;
}

EconomyManager.addBalance(playerUUID, amount, "Retrait banque personnelle");

MessagesManager.sendMessage(offlinePlayer,
Component.text("§d" + EconomyManager.getFormattedSimplifiedNumber(amount) + "§r"
+ EconomyManager.getEconomyIcon() + " ont été transférés à votre compte"),
TranslationManager.translation(
"feature.economy.bank.withdraw.transferred",
Component.text(EconomyManager.getFormattedSimplifiedNumber(amount)).color(NamedTextColor.LIGHT_PURPLE),
Component.text(EconomyManager.getEconomyIcon())
),
Prefix.BANK, MessageType.SUCCESS, false);
}

Expand Down Expand Up @@ -228,9 +234,12 @@ public static void applyPlayerInterest(UUID playerUUID) {
Player sender = Bukkit.getPlayer(playerUUID);
if (sender != null)
MessagesManager.sendMessage(sender,
Component.text("Vous venez de percevoir §d" + interest * 100 + "% §rd'intérêt, soit §d"
+ EconomyManager.getFormattedSimplifiedNumber(allowedAmount) + "§r"
+ EconomyManager.getEconomyIcon()),
TranslationManager.translation(
"feature.economy.bank.interest.received",
Component.text(interest * 100 + "%").color(NamedTextColor.LIGHT_PURPLE),
Component.text(EconomyManager.getFormattedSimplifiedNumber(allowedAmount)).color(NamedTextColor.LIGHT_PURPLE),
Component.text(EconomyManager.getEconomyIcon())
),
Prefix.CITY, MessageType.SUCCESS, false);
}

Expand Down
28 changes: 17 additions & 11 deletions src/main/java/fr/openmc/core/features/economy/Transaction.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
import com.j256.ormlite.field.DatabaseField;
import com.j256.ormlite.table.DatabaseTable;
import fr.openmc.core.utils.cache.CacheOfflinePlayer;
import fr.openmc.core.utils.text.messages.TranslationManager;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;

import java.util.List;
import java.util.Objects;
import java.util.UUID;

Expand Down Expand Up @@ -49,31 +51,35 @@ public ItemStack toItemStack(UUID player) {
if (!Objects.equals(this.recipient, player.toString())) {
itemstack = new ItemStack(Material.RED_CONCRETE, 1);
itemmeta = itemstack.getItemMeta();
itemmeta.setDisplayName("Transaction sortante");
itemmeta.displayName(TranslationManager.translation("feature.economy.transaction.outgoing.name"));

String recipient = "CONSOLE";
if (!this.recipient.equals("CONSOLE")) {
recipient = CacheOfflinePlayer.getOfflinePlayer(UUID.fromString(this.recipient)).getName();
}

itemmeta.setLore(List.of(
"§r§6Destination :§f " + recipient,
"§r§6Montant :§f " + this.amount,
"§r§6Raison :§f " + reason));
itemmeta.lore(TranslationManager.translationLore(
"feature.economy.transaction.outgoing.lore",
Component.text(recipient).color(NamedTextColor.WHITE),
Component.text(this.amount).color(NamedTextColor.WHITE),
Component.text(reason).color(NamedTextColor.WHITE)
));
} else {
itemstack = new ItemStack(Material.LIME_CONCRETE, 1);
itemmeta = itemstack.getItemMeta();
itemmeta.setDisplayName("Transaction entrante");
itemmeta.displayName(TranslationManager.translation("feature.economy.transaction.incoming.name"));

String senderName = "CONSOLE";
if (!this.sender.equals("CONSOLE")) {
senderName = CacheOfflinePlayer.getOfflinePlayer(UUID.fromString(this.sender)).getName();
}

itemmeta.setLore(List.of(
"§r§6Envoyeur :§f " + senderName,
"§r§6Montant :§f " + this.amount,
"§r§6Raison :§f " + reason));
itemmeta.lore(TranslationManager.translationLore(
"feature.economy.transaction.incoming.lore",
Component.text(senderName).color(NamedTextColor.WHITE),
Component.text(this.amount).color(NamedTextColor.WHITE),
Component.text(reason).color(NamedTextColor.WHITE)
));
}

itemstack.setItemMeta(itemmeta);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
import fr.openmc.core.utils.text.messages.MessageType;
import fr.openmc.core.utils.text.messages.MessagesManager;
import fr.openmc.core.utils.text.messages.Prefix;
import fr.openmc.core.utils.text.messages.TranslationManager;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.NamedTextColor;
import org.bukkit.entity.Player;
import revxrsal.commands.annotation.*;
import revxrsal.commands.bukkit.annotation.CommandPermission;
Expand All @@ -23,7 +25,12 @@ public class BankCommands {
public static void openBankMenu(Player player) {
City playerCity = CityManager.getPlayerCity(player.getUniqueId());
if (playerCity == null || !FeaturesRewards.hasUnlockFeature(playerCity, FeaturesRewards.Feature.PLAYER_BANK)) {
MessagesManager.sendMessage(player, Component.text("Vous n'avez pas débloqué cette feature ! Veuillez améliorer votre ville au niveau " + FeaturesRewards.getFeatureUnlockLevel(FeaturesRewards.Feature.PLAYER_BANK) + "!"), Prefix.CITY, MessageType.ERROR, false);
MessagesManager.sendMessage(player,
TranslationManager.translation(
"feature.economy.bank.command.not_unlocked",
Component.text(FeaturesRewards.getFeatureUnlockLevel(FeaturesRewards.Feature.PLAYER_BANK)).color(NamedTextColor.YELLOW)
),
Prefix.CITY, MessageType.ERROR, false);
return;
}

Expand All @@ -38,7 +45,12 @@ void deposit(
) {
City playerCity = CityManager.getPlayerCity(player.getUniqueId());
if (playerCity == null || !FeaturesRewards.hasUnlockFeature(playerCity, FeaturesRewards.Feature.PLAYER_BANK)) {
MessagesManager.sendMessage(player, Component.text("Vous n'avez pas débloqué cette feature ! Veuillez améliorer votre ville au niveau " + FeaturesRewards.getFeatureUnlockLevel(FeaturesRewards.Feature.PLAYER_BANK) + "!"), Prefix.CITY, MessageType.ERROR, false);
MessagesManager.sendMessage(player,
TranslationManager.translation(
"feature.economy.bank.command.not_unlocked",
Component.text(FeaturesRewards.getFeatureUnlockLevel(FeaturesRewards.Feature.PLAYER_BANK)).color(NamedTextColor.YELLOW)
),
Prefix.CITY, MessageType.ERROR, false);
return;
}

Expand All @@ -53,7 +65,12 @@ void withdraw(
) {
City playerCity = CityManager.getPlayerCity(player.getUniqueId());
if (playerCity == null || !FeaturesRewards.hasUnlockFeature(playerCity, FeaturesRewards.Feature.PLAYER_BANK)) {
MessagesManager.sendMessage(player, Component.text("Vous n'avez pas débloqué cette feature ! Veuillez améliorer votre ville au niveau " + FeaturesRewards.getFeatureUnlockLevel(FeaturesRewards.Feature.PLAYER_BANK) + "!"), Prefix.CITY, MessageType.ERROR, false);
MessagesManager.sendMessage(player,
TranslationManager.translation(
"feature.economy.bank.command.not_unlocked",
Component.text(FeaturesRewards.getFeatureUnlockLevel(FeaturesRewards.Feature.PLAYER_BANK)).color(NamedTextColor.YELLOW)
),
Prefix.CITY, MessageType.ERROR, false);
return;
}

Expand All @@ -69,16 +86,22 @@ void withdraw(Player player) {
}

double balance = BankManager.getBankBalance(player.getUniqueId());
MessagesManager.sendMessage(player, Component.text("Il y a §d" + EconomyManager.getFormattedSimplifiedNumber(balance) + "§r" + EconomyManager.getEconomyIcon() + " dans ta banque"), Prefix.BANK, MessageType.INFO, false);
MessagesManager.sendMessage(player,
TranslationManager.translation(
"feature.economy.bank.command.balance",
Component.text(EconomyManager.getFormattedSimplifiedNumber(balance)).color(NamedTextColor.LIGHT_PURPLE),
Component.text(EconomyManager.getEconomyIcon())
),
Prefix.BANK, MessageType.INFO, false);
}

@Subcommand("admin interest apply")
@Description("Distribue les intérèts à tout les joueurs et a toute les villes")
@CommandPermission("omc.admins.commands.bank.interest.apply")
void applyInterest(Player player) {
MessagesManager.sendMessage(player, Component.text("Distribution des intérêts en cours..."), Prefix.BANK, MessageType.INFO, false);
MessagesManager.sendMessage(player, TranslationManager.translation("feature.economy.bank.interest.apply.start"), Prefix.BANK, MessageType.INFO, false);
BankManager.applyAllPlayerInterests();
CityBankManager.applyAllCityInterests();
MessagesManager.sendMessage(player, Component.text("Distribution des intérêts réussie."), Prefix.BANK, MessageType.SUCCESS, false);
MessagesManager.sendMessage(player, TranslationManager.translation("feature.economy.bank.interest.apply.success"), Prefix.BANK, MessageType.SUCCESS, false);
}
}
Loading
Loading