diff --git a/build.gradle b/build.gradle index ab158b26e..bd1433aa6 100644 --- a/build.gradle +++ b/build.gradle @@ -28,26 +28,34 @@ group = 'fr.openmc' repositories { mavenCentral() + // * PlaceholderAPI maven { url "https://repo.extendedclip.com/content/repositories/placeholderapi/" } + // * WorldGuard & WorldEdit maven { url "https://maven.enginehub.org/repo/" } + // * FancyNpc maven { url "https://repo.fancyinnovations.com/releases" } + // * PaperMC maven { url = "https://repo.papermc.io/repository/maven-public/" } + // * GeyserMC + maven { + url "https://repo.opencollab.dev/main/" + } + // * ItemsAdder maven { url "https://maven.devs.beer/" } + // * ProtocolLib maven { url "https://repo.dmulloy2.net/repository/public/" } - // * GeyserMC - //maven {url "https://repo.opencollab.dev/main/"} maven { url "https://jitpack.io" // Toujours à la fin } @@ -71,9 +79,9 @@ dependencies { compileOnly "net.dmulloy2:ProtocolLib:${protocolLibVersion}" // Bedrock Dependencies - //compileOnly files("libs/RiftEngine-${riftEngineVersion}.jar") - //compileOnly "org.geysermc.geyser:api:${geyserApiVersion}" - //compileOnly "org.geysermc.floodgate:api:${floodgateApiVersion}" + compileOnly files("libs/RiftEngine-${riftEngineVersion}.jar") + compileOnly "org.geysermc.geyser:api:${geyserApiVersion}" + compileOnly "org.geysermc.floodgate:api:${floodgateApiVersion}" implementation "org.jetbrains:annotations:${jetbrainsAnnotationsVersion}" implementation "io.github.revxrsal:lamp.common:${revxrsalLampVersion}" diff --git a/src/main/java/fr/openmc/core/OMCPlugin.java b/src/main/java/fr/openmc/core/OMCPlugin.java index 4c3fee7c0..09e034d0a 100644 --- a/src/main/java/fr/openmc/core/OMCPlugin.java +++ b/src/main/java/fr/openmc/core/OMCPlugin.java @@ -221,11 +221,11 @@ public void loadAfterItemsAdder() { ItemsAddersListener.setLoaded(true); // todo: a rewrite lors registre hook et features -// try { -// new BedrockHook().startInit(); -// } catch (NoClassDefFoundError e) { -// OMCLogger.error("Hook BedrockHook désactivé (package non trouvé) " + e.getMessage()); -// } + try { + new BedrockHook().startInit(); + } catch (NoClassDefFoundError e) { + OMCLogger.error("Hook BedrockHook désactivé (package non trouvé) " + e.getMessage()); + } /* LOAD ITEMS ADDER CONTENTS */ ItemsAdderHook.loadContents(); diff --git a/src/main/java/fr/openmc/core/features/bits/BitsManager.java b/src/main/java/fr/openmc/core/features/bits/BitsManager.java index 14ebb9cba..a57e2ece1 100644 --- a/src/main/java/fr/openmc/core/features/bits/BitsManager.java +++ b/src/main/java/fr/openmc/core/features/bits/BitsManager.java @@ -14,6 +14,7 @@ import fr.openmc.core.features.bits.commands.BitsCommands; import fr.openmc.core.features.bits.models.BitsPlayer; import fr.openmc.core.features.city.sub.bank.CityBankManager; +import fr.openmc.core.features.economy.EconomyManager; import fr.openmc.core.hooks.github.GitHubHook; import fr.openmc.core.hooks.github.models.ContributorStats; import fr.openmc.core.hooks.itemsadder.ItemsAdderHook; @@ -21,9 +22,7 @@ import org.bukkit.Bukkit; import org.bukkit.scheduler.BukkitTask; -import java.math.BigDecimal; import java.sql.SQLException; -import java.text.NumberFormat; import java.util.*; @Credit(developers = {"iambibi_"}) @@ -117,13 +116,7 @@ public static BitsPlayer getBitsPlayer(UUID playerUUID) { } public static String getFormattedBits(UUID playerUUID) { - String balance = String.valueOf(getBits(playerUUID)); - Currency currency = Currency.getInstance(Locale.FRANCE); - NumberFormat format = NumberFormat.getCurrencyInstance(Locale.FRANCE); - format.setCurrency(currency); - BigDecimal bd = new BigDecimal(balance); - return format.format(bd).replace(NumberFormat.getCurrencyInstance(Locale.FRANCE).getCurrency().getSymbol(), - getBitsIcon()); + return EconomyManager.getFormattedNumber(getBits(playerUUID)); } public static String getBitsIcon() { diff --git a/src/main/java/fr/openmc/core/features/city/menu/CityTopMenu.java b/src/main/java/fr/openmc/core/features/city/menu/CityTopMenu.java index f037be95b..fddc3665a 100644 --- a/src/main/java/fr/openmc/core/features/city/menu/CityTopMenu.java +++ b/src/main/java/fr/openmc/core/features/city/menu/CityTopMenu.java @@ -90,7 +90,7 @@ public List getItems() { Component membersCurrent = Component.text(city.getMembers().size()).color(NamedTextColor.GREEN); Component membersLimit = Component.text(MemberLimitRewards.getMemberLimit(city.getLevel())).color(NamedTextColor.GREEN); Component areaComponent = Component.text(city.getChunks().size()).color(NamedTextColor.GOLD); - Component wealthComponent = Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance())).color(NamedTextColor.GOLD); + Component wealthComponent = Component.text(EconomyManager.getFormattedNumber(city.getBalance())).color(NamedTextColor.GOLD); Component wealthIcon = Component.text(EconomyManager.getEconomyIcon()).color(NamedTextColor.GOLD); Component powerComponent = Component.text(city.getPowerPoints()).color(NamedTextColor.RED); diff --git a/src/main/java/fr/openmc/core/features/city/menu/list/CityListDetailsMenu.java b/src/main/java/fr/openmc/core/features/city/menu/list/CityListDetailsMenu.java index ea01d3e67..e247f544d 100644 --- a/src/main/java/fr/openmc/core/features/city/menu/list/CityListDetailsMenu.java +++ b/src/main/java/fr/openmc/core/features/city/menu/list/CityListDetailsMenu.java @@ -158,7 +158,7 @@ public void onInventoryClick(InventoryClickEvent inventoryClickEvent) { map.put(22, new ItemMenuBuilder(this, new ItemStack(Material.DIAMOND), itemMeta -> itemMeta.displayName(TranslationManager.translation( "feature.city.menus.list.details.wealth", - Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance())).color(NamedTextColor.GOLD), + Component.text(EconomyManager.getFormattedNumber(city.getBalance())).color(NamedTextColor.GOLD), Component.text(EconomyManager.getEconomyIcon()).color(NamedTextColor.GOLD) )))); diff --git a/src/main/java/fr/openmc/core/features/city/menu/list/CityListMenu.java b/src/main/java/fr/openmc/core/features/city/menu/list/CityListMenu.java index d73b43143..c55feddb8 100644 --- a/src/main/java/fr/openmc/core/features/city/menu/list/CityListMenu.java +++ b/src/main/java/fr/openmc/core/features/city/menu/list/CityListMenu.java @@ -87,7 +87,7 @@ public List getItems() { Component membersLimit = Component.text(MemberLimitRewards.getMemberLimit(city.getLevel())).color(NamedTextColor.GREEN); Component membersSuffix = Component.text(city.getMembers().size() > 1 ? "s" : ""); Component typeComponent = city.getType().getDisplayName(); - Component wealthComponent = Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance())).color(NamedTextColor.GOLD); + Component wealthComponent = Component.text(EconomyManager.getFormattedNumber(city.getBalance())).color(NamedTextColor.GOLD); Component wealthIcon = Component.text(EconomyManager.getEconomyIcon()).color(NamedTextColor.GOLD); if (MayorManager.phaseMayor == 2 && FeaturesRewards.hasUnlockFeature(city, FeaturesRewards.Feature.MAYOR)) { Component mayorCity = city.getMayor() == null diff --git a/src/main/java/fr/openmc/core/features/city/menu/main/buttons/NotationsButton.java b/src/main/java/fr/openmc/core/features/city/menu/main/buttons/NotationsButton.java index 1c0fa881e..e83e7c7c7 100644 --- a/src/main/java/fr/openmc/core/features/city/menu/main/buttons/NotationsButton.java +++ b/src/main/java/fr/openmc/core/features/city/menu/main/buttons/NotationsButton.java @@ -47,7 +47,7 @@ private static List getDynamicLore(City city, CityNotation notation) "feature.city.menus.main.notation.lore", Component.text(Math.floor(notation.getTotalNote())).color(NamedTextColor.BLUE), Component.text(NotationNote.getMaxTotalNote()).color(NamedTextColor.BLUE), - Component.text(EconomyManager.getFormattedSimplifiedNumber(notation.getMoney())).color(NamedTextColor.GOLD), + Component.text(EconomyManager.getFormattedNumber(notation.getMoney())).color(NamedTextColor.GOLD), Component.text(EconomyManager.getEconomyIcon()).color(NamedTextColor.GOLD) ); } else { diff --git a/src/main/java/fr/openmc/core/features/city/sub/bank/CityBankManager.java b/src/main/java/fr/openmc/core/features/city/sub/bank/CityBankManager.java index 82560b5e0..6b04fae0a 100644 --- a/src/main/java/fr/openmc/core/features/city/sub/bank/CityBankManager.java +++ b/src/main/java/fr/openmc/core/features/city/sub/bank/CityBankManager.java @@ -104,7 +104,7 @@ public static void withdrawCityBank(City city, Player player, String input) { MessagesManager.sendMessage(player, TranslationManager.translation( "feature.city.bank.withdraw.success", - Component.text(EconomyManager.getFormattedSimplifiedNumber(amount)).color(NamedTextColor.LIGHT_PURPLE), + Component.text(EconomyManager.getFormattedNumber(amount)).color(NamedTextColor.LIGHT_PURPLE), Component.text(EconomyManager.getEconomyIcon()).color(NamedTextColor.LIGHT_PURPLE) ), Prefix.CITY, MessageType.SUCCESS, false); diff --git a/src/main/java/fr/openmc/core/features/city/sub/bank/menu/CityBankDepositMenu.java b/src/main/java/fr/openmc/core/features/city/sub/bank/menu/CityBankDepositMenu.java index 83009dd08..fc7434d6e 100644 --- a/src/main/java/fr/openmc/core/features/city/sub/bank/menu/CityBankDepositMenu.java +++ b/src/main/java/fr/openmc/core/features/city/sub/bank/menu/CityBankDepositMenu.java @@ -69,7 +69,7 @@ public void onInventoryClick(InventoryClickEvent click) { if (hasPermissionMoneyGive) { loreBankDepositAll = TranslationManager.translationLore( "feature.city.bank.menu.deposit.all.lore", - Component.text(EconomyManager.getFormattedSimplifiedNumber(moneyPlayer)).color(NamedTextColor.LIGHT_PURPLE), + Component.text(EconomyManager.getFormattedNumber(moneyPlayer)).color(NamedTextColor.LIGHT_PURPLE), Component.text(EconomyManager.getEconomyIcon()).color(NamedTextColor.LIGHT_PURPLE) ); } else { @@ -90,7 +90,7 @@ public void onInventoryClick(InventoryClickEvent click) { if (hasPermissionMoneyGive) { loreBankDepositHalf = TranslationManager.translationLore( "feature.city.bank.menu.deposit.half.lore", - Component.text(EconomyManager.getFormattedSimplifiedNumber(halfMoneyPlayer)).color(NamedTextColor.LIGHT_PURPLE), + Component.text(EconomyManager.getFormattedNumber(halfMoneyPlayer)).color(NamedTextColor.LIGHT_PURPLE), Component.text(EconomyManager.getEconomyIcon()).color(NamedTextColor.LIGHT_PURPLE) ); } else { diff --git a/src/main/java/fr/openmc/core/features/city/sub/bank/menu/CityBankMenu.java b/src/main/java/fr/openmc/core/features/city/sub/bank/menu/CityBankMenu.java index b83f93ea3..22048c06c 100644 --- a/src/main/java/fr/openmc/core/features/city/sub/bank/menu/CityBankMenu.java +++ b/src/main/java/fr/openmc/core/features/city/sub/bank/menu/CityBankMenu.java @@ -91,7 +91,7 @@ public void onInventoryClick(InventoryClickEvent click) { itemMeta.itemName(TranslationManager.translation("feature.city.bank.menu.balance.title")); itemMeta.lore(TranslationManager.translationLore( "feature.city.bank.menu.balance.lore", - Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance())).color(NamedTextColor.LIGHT_PURPLE), + Component.text(EconomyManager.getFormattedNumber(city.getBalance())).color(NamedTextColor.LIGHT_PURPLE), Component.text(EconomyManager.getEconomyIcon()).color(NamedTextColor.LIGHT_PURPLE), Component.text(city.calculateCityInterest() * 100 + "%").color(NamedTextColor.AQUA), Component.text(DateUtils.convertSecondToTime(BankManager.getSecondsUntilInterest())).color(NamedTextColor.AQUA) diff --git a/src/main/java/fr/openmc/core/features/city/sub/bank/menu/CityBankWithdrawMenu.java b/src/main/java/fr/openmc/core/features/city/sub/bank/menu/CityBankWithdrawMenu.java index eecccdf65..7a9b793df 100644 --- a/src/main/java/fr/openmc/core/features/city/sub/bank/menu/CityBankWithdrawMenu.java +++ b/src/main/java/fr/openmc/core/features/city/sub/bank/menu/CityBankWithdrawMenu.java @@ -69,7 +69,7 @@ public void onInventoryClick(InventoryClickEvent click) { if (hasPermissionMoneyTake) { loreBankWithdrawAll = TranslationManager.translationLore( "feature.city.bank.menu.withdraw.all.lore", - Component.text(EconomyManager.getFormattedSimplifiedNumber(moneyBankCity)).color(NamedTextColor.LIGHT_PURPLE), + Component.text(EconomyManager.getFormattedNumber(moneyBankCity)).color(NamedTextColor.LIGHT_PURPLE), Component.text(EconomyManager.getEconomyIcon()).color(NamedTextColor.LIGHT_PURPLE) ); } else { @@ -89,7 +89,7 @@ public void onInventoryClick(InventoryClickEvent click) { if (hasPermissionMoneyTake) { loreBankWithdrawHalf = TranslationManager.translationLore( "feature.city.bank.menu.withdraw.half.lore", - Component.text(EconomyManager.getFormattedSimplifiedNumber(halfMoneyBankCity)).color(NamedTextColor.LIGHT_PURPLE), + Component.text(EconomyManager.getFormattedNumber(halfMoneyBankCity)).color(NamedTextColor.LIGHT_PURPLE), Component.text(EconomyManager.getEconomyIcon()).color(NamedTextColor.LIGHT_PURPLE) ); } else { diff --git a/src/main/java/fr/openmc/core/features/city/sub/milestone/CityLevels.java b/src/main/java/fr/openmc/core/features/city/sub/milestone/CityLevels.java index 2c8b9ec57..beb2471a5 100644 --- a/src/main/java/fr/openmc/core/features/city/sub/milestone/CityLevels.java +++ b/src/main/java/fr/openmc/core/features/city/sub/milestone/CityLevels.java @@ -127,7 +127,7 @@ public enum CityLevels { return TranslationManager.translation( "feature.city.levels.requirements.bank.progress", Component.text("5k"), - Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance())) + Component.text(EconomyManager.getFormattedNumber(city.getBalance())) ); } ), @@ -214,7 +214,7 @@ public enum CityLevels { return TranslationManager.translation( "feature.city.levels.requirements.bank.progress", Component.text("15k"), - Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance())) + Component.text(EconomyManager.getFormattedNumber(city.getBalance())) ); } ), @@ -294,7 +294,7 @@ public enum CityLevels { return TranslationManager.translation( "feature.city.levels.requirements.bank.progress", Component.text("20k"), - Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance())) + Component.text(EconomyManager.getFormattedNumber(city.getBalance())) ); } ), @@ -364,7 +364,7 @@ public enum CityLevels { return TranslationManager.translation( "feature.city.levels.requirements.bank.progress", Component.text("30k"), - Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance())) + Component.text(EconomyManager.getFormattedNumber(city.getBalance())) ); } ), @@ -455,7 +455,7 @@ public enum CityLevels { return TranslationManager.translation( "feature.city.levels.requirements.bank.progress", Component.text("40k"), - Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance())) + Component.text(EconomyManager.getFormattedNumber(city.getBalance())) ); } ), @@ -528,7 +528,7 @@ public enum CityLevels { return TranslationManager.translation( "feature.city.levels.requirements.bank.progress", Component.text("60k"), - Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance())) + Component.text(EconomyManager.getFormattedNumber(city.getBalance())) ); } ), @@ -620,7 +620,7 @@ public enum CityLevels { return TranslationManager.translation( "feature.city.levels.requirements.bank.progress", Component.text("80k"), - Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance())) + Component.text(EconomyManager.getFormattedNumber(city.getBalance())) ); } ), @@ -700,7 +700,7 @@ public enum CityLevels { return TranslationManager.translation( "feature.city.levels.requirements.bank.progress", Component.text("200k"), - Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance())) + Component.text(EconomyManager.getFormattedNumber(city.getBalance())) ); } ), diff --git a/src/main/java/fr/openmc/core/features/city/sub/war/WarManager.java b/src/main/java/fr/openmc/core/features/city/sub/war/WarManager.java index 9c79f2939..791c4b011 100644 --- a/src/main/java/fr/openmc/core/features/city/sub/war/WarManager.java +++ b/src/main/java/fr/openmc/core/features/city/sub/war/WarManager.java @@ -332,14 +332,14 @@ public static void broadcastWarResult(War war, City winner, City loser, WinReaso Component rewardMoney = bonusMoney > 0 ? TranslationManager.translation( "feature.city.war.result.reward.money_bonus", - Component.text(EconomyManager.getFormattedSimplifiedNumber(amountStolen) + EconomyManager.getEconomyIcon()) + Component.text(EconomyManager.getFormattedNumber(amountStolen) + EconomyManager.getEconomyIcon()) .color(NamedTextColor.GOLD), - Component.text(EconomyManager.getFormattedSimplifiedNumber(bonusMoney) + EconomyManager.getEconomyIcon()) + Component.text(EconomyManager.getFormattedNumber(bonusMoney) + EconomyManager.getEconomyIcon()) .color(NamedTextColor.GOLD) ) : TranslationManager.translation( "feature.city.war.result.reward.money", - Component.text(EconomyManager.getFormattedSimplifiedNumber(amountStolen) + EconomyManager.getEconomyIcon()) + Component.text(EconomyManager.getFormattedNumber(amountStolen) + EconomyManager.getEconomyIcon()) .color(NamedTextColor.GOLD) ); Component rewardClaims = TranslationManager.translation( @@ -378,7 +378,7 @@ public static void broadcastWarResult(War war, City winner, City loser, WinReaso ); Component lossMoney = TranslationManager.translation( "feature.city.war.result.loss.money", - Component.text(EconomyManager.getFormattedSimplifiedNumber(amountStolen) + EconomyManager.getEconomyIcon()) + Component.text(EconomyManager.getFormattedNumber(amountStolen) + EconomyManager.getEconomyIcon()) .color(NamedTextColor.RED) ); Component lossClaims = TranslationManager.translation( diff --git a/src/main/java/fr/openmc/core/features/city/sub/war/menu/main/MainWarMenu.java b/src/main/java/fr/openmc/core/features/city/sub/war/menu/main/MainWarMenu.java index d80364bf5..fd6943c6c 100644 --- a/src/main/java/fr/openmc/core/features/city/sub/war/menu/main/MainWarMenu.java +++ b/src/main/java/fr/openmc/core/features/city/sub/war/menu/main/MainWarMenu.java @@ -132,7 +132,7 @@ public List getItems() { loreCity.add(TranslationManager.translation( "feature.city.war.menu.main.wealth", - Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance()) + EconomyManager.getEconomyIcon()) + Component.text(EconomyManager.getFormattedNumber(city.getBalance()) + EconomyManager.getEconomyIcon()) .color(NamedTextColor.GOLD) ).color(NamedTextColor.GRAY)); diff --git a/src/main/java/fr/openmc/core/features/city/sub/war/menu/main/WarCityDetailsMenu.java b/src/main/java/fr/openmc/core/features/city/sub/war/menu/main/WarCityDetailsMenu.java index 44ffff6c6..08442549c 100644 --- a/src/main/java/fr/openmc/core/features/city/sub/war/menu/main/WarCityDetailsMenu.java +++ b/src/main/java/fr/openmc/core/features/city/sub/war/menu/main/WarCityDetailsMenu.java @@ -124,7 +124,7 @@ public void onInventoryClick(InventoryClickEvent inventoryClickEvent) { map.put(22, new ItemMenuBuilder(this, new ItemStack(Material.DIAMOND), itemMeta -> itemMeta.displayName(TranslationManager.translation( "feature.city.war.menu.details.wealth", - Component.text(EconomyManager.getFormattedSimplifiedNumber(city.getBalance()) + " " + EconomyManager.getEconomyIcon()) + Component.text(EconomyManager.getFormattedNumber(city.getBalance()) + " " + EconomyManager.getEconomyIcon()) .color(NamedTextColor.GOLD) ).color(NamedTextColor.GRAY)))); diff --git a/src/main/java/fr/openmc/core/features/displays/scoreboards/sb/MainScoreboard.java b/src/main/java/fr/openmc/core/features/displays/scoreboards/sb/MainScoreboard.java index f953efcde..f69407f62 100644 --- a/src/main/java/fr/openmc/core/features/displays/scoreboards/sb/MainScoreboard.java +++ b/src/main/java/fr/openmc/core/features/displays/scoreboards/sb/MainScoreboard.java @@ -96,9 +96,9 @@ public void update(Player player, SternalBoard board) { } public static List getDefaultLines(Player player, boolean inWar) { - Component rank = LuckPermsHook.isEnable() - ? Component.text(LuckPermsHook.getFormattedPAPIPrefix(player)) - : TranslationManager.translation("feature.displays.scoreboard.rank.none", true).color(TextColor.color(0xFF1FCC)); + String rank = LuckPermsHook.isEnable() + ? LuckPermsHook.getFormattedPAPIPrefix(player) + : null; City city = CityManager.getPlayerCity(player.getUniqueId()); @@ -118,11 +118,13 @@ public static List getDefaultLines(Player player, boolean inWar) { lines.add(MiniMessage.miniMessage().deserialize( "%s".formatted( player.getName())).decoration(TextDecoration.BOLD, true)); - lines.add(text(" " + CharRemplacementUtils.getPointChar(player) + " ", NamedTextColor.DARK_GRAY) - .append(TranslationManager.translation(player, "feature.displays.scoreboard.rank.label", true).color(NamedTextColor.GRAY)) - .appendSpace() - .append(rank) - ); + if (rank != null) { + lines.add(text(" " + CharRemplacementUtils.getPointChar(player) + " ", NamedTextColor.DARK_GRAY) + .append(TranslationManager.translation(player, "feature.displays.scoreboard.rank.label", true).color(NamedTextColor.GRAY)) + .appendSpace() + .append(Component.text(rank)) + ); + } lines.add(text(" " + CharRemplacementUtils.getPointChar(player) + " ", NamedTextColor.DARK_GRAY) .append(TranslationManager.translation(player, "feature.displays.scoreboard.city.label", true).color(NamedTextColor.GRAY)) .appendSpace() @@ -142,7 +144,7 @@ public static List getDefaultLines(Player player, boolean inWar) { lines.add(text(" " + CharRemplacementUtils.getPointChar(player) + " ", NamedTextColor.DARK_GRAY) .append(TranslationManager.translation(player, "feature.displays.scoreboard.bits.label", true).color(NamedTextColor.GRAY)) .appendSpace() - .append(toSmall(player, EconomyManager.getFormattedSimplifiedNumber(bits)).color(TextColor.color(0x07A0F5))) + .append(toSmall(player, EconomyManager.getFormattedNumber(bits)).color(TextColor.color(0x07A0F5))) .appendSpace() .append(text(BitsManager.getBitsIcon())) ); @@ -160,7 +162,7 @@ public static List getDefaultLines(Player player, boolean inWar) { if (npcManager != null) halloweenNPC = npcManager.getNpc("halloween_pumpkin_deposit_npc"); if (halloweenNPC != null) { - String pumpkinCount = EconomyManager.getFormattedSimplifiedNumber(HalloweenManager.getPumpkinCount(player.getUniqueId())); + String pumpkinCount = EconomyManager.getFormattedNumber(HalloweenManager.getPumpkinCount(player.getUniqueId())); lines.add(text(" " + CharRemplacementUtils.getPointChar(player) + " ", NamedTextColor.DARK_GRAY) .append(TranslationManager.translation(player, "feature.displays.scoreboard.pumpkins.label", true).color(NamedTextColor.GRAY)) .appendSpace() diff --git a/src/main/java/fr/openmc/core/features/economy/BankManager.java b/src/main/java/fr/openmc/core/features/economy/BankManager.java index 1664ff486..ce95f0fcb 100644 --- a/src/main/java/fr/openmc/core/features/economy/BankManager.java +++ b/src/main/java/fr/openmc/core/features/economy/BankManager.java @@ -188,7 +188,7 @@ public static void withdraw(UUID playerUUID, String input) { MessagesManager.sendMessage(offlinePlayer, TranslationManager.translation( "feature.economy.bank.withdraw.transferred", - Component.text(EconomyManager.getFormattedSimplifiedNumber(amount)).color(NamedTextColor.LIGHT_PURPLE), + Component.text(EconomyManager.getFormattedNumber(amount)).color(NamedTextColor.LIGHT_PURPLE), Component.text(EconomyManager.getEconomyIcon()) ), Prefix.BANK, MessageType.SUCCESS, false); @@ -241,7 +241,7 @@ public static void applyPlayerInterest(UUID playerUUID) { 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.getFormattedNumber(allowedAmount)).color(NamedTextColor.LIGHT_PURPLE), Component.text(EconomyManager.getEconomyIcon()) ), Prefix.CITY, MessageType.SUCCESS, false); diff --git a/src/main/java/fr/openmc/core/features/economy/EconomyManager.java b/src/main/java/fr/openmc/core/features/economy/EconomyManager.java index e704c1f8a..a62b76f6a 100644 --- a/src/main/java/fr/openmc/core/features/economy/EconomyManager.java +++ b/src/main/java/fr/openmc/core/features/economy/EconomyManager.java @@ -20,10 +20,8 @@ import org.jetbrains.annotations.NotNull; import javax.annotation.Nullable; -import java.math.BigDecimal; import java.sql.SQLException; import java.text.DecimalFormat; -import java.text.NumberFormat; import java.util.*; @Credit(developers = {"Axeno", "Piquel Chips", "PuppyTransGirl", "Gyro"}) @@ -161,7 +159,7 @@ public static void setBalance(UUID playerUUID, double amount) { public static String getMiniBalance(UUID playerUUID) { double balance = getBalance(playerUUID); - return getFormattedSimplifiedNumber(balance); + return getFormattedNumber(balance); } public static EconomyPlayer getPlayerBank(UUID playerUUID) { @@ -197,25 +195,10 @@ public static Map loadAllBalances() { } public static String getFormattedBalance(UUID playerUUID) { - String balance = String.valueOf(getBalance(playerUUID)); - Currency currency = Currency.getInstance(Locale.FRANCE); - NumberFormat format = NumberFormat.getCurrencyInstance(Locale.FRANCE); - format.setCurrency(currency); - BigDecimal bd = new BigDecimal(balance); - return format.format(bd).replace(NumberFormat.getCurrencyInstance(Locale.FRANCE).getCurrency().getSymbol(), - getEconomyIcon()); + return getFormattedNumber(getBalance(playerUUID)); } - public static String getFormattedNumber(double number) { - Currency currency = Currency.getInstance(Locale.FRANCE); - NumberFormat format = NumberFormat.getCurrencyInstance(Locale.FRANCE); - format.setCurrency(currency); - BigDecimal bd = new BigDecimal(number); - return format.format(bd).replace(NumberFormat.getCurrencyInstance(Locale.FRANCE).getCurrency().getSymbol(), - getEconomyIcon()); - } - - public static String getFormattedSimplifiedNumber(double balance) { + public static String getFormattedNumber(double balance) { if (balance == 0) { return "0"; } diff --git a/src/main/java/fr/openmc/core/features/economy/commands/BankCommands.java b/src/main/java/fr/openmc/core/features/economy/commands/BankCommands.java index 881d76b5d..14b9a1e51 100644 --- a/src/main/java/fr/openmc/core/features/economy/commands/BankCommands.java +++ b/src/main/java/fr/openmc/core/features/economy/commands/BankCommands.java @@ -87,7 +87,7 @@ void withdraw(OMCPlayer player) { player.message().sendInfo( TranslationManager.translation( "feature.economy.bank.command.balance", - Component.text(EconomyManager.getFormattedSimplifiedNumber(balance)).color(NamedTextColor.LIGHT_PURPLE), + Component.text(EconomyManager.getFormattedNumber(balance)).color(NamedTextColor.LIGHT_PURPLE), Component.text(EconomyManager.getEconomyIcon()) ), Prefix.BANK diff --git a/src/main/java/fr/openmc/core/features/economy/menu/PersonalBankDepositMenu.java b/src/main/java/fr/openmc/core/features/economy/menu/PersonalBankDepositMenu.java index e1f487a5b..8cf8f0c0f 100644 --- a/src/main/java/fr/openmc/core/features/economy/menu/PersonalBankDepositMenu.java +++ b/src/main/java/fr/openmc/core/features/economy/menu/PersonalBankDepositMenu.java @@ -59,7 +59,7 @@ public void onInventoryClick(InventoryClickEvent click) { List loreBankDepositAll = TranslationManager.translationLore( "feature.economy.bank.deposit.all.lore", - Component.text(EconomyManager.getFormattedSimplifiedNumber(moneyPlayer)).color(NamedTextColor.LIGHT_PURPLE), + Component.text(EconomyManager.getFormattedNumber(moneyPlayer)).color(NamedTextColor.LIGHT_PURPLE), Component.text(EconomyManager.getEconomyIcon()).decoration(TextDecoration.ITALIC, false) ); @@ -74,7 +74,7 @@ public void onInventoryClick(InventoryClickEvent click) { List loreBankDepositHalf = TranslationManager.translationLore( "feature.economy.bank.deposit.half.lore", - Component.text(EconomyManager.getFormattedSimplifiedNumber(halfMoneyPlayer)).color(NamedTextColor.LIGHT_PURPLE), + Component.text(EconomyManager.getFormattedNumber(halfMoneyPlayer)).color(NamedTextColor.LIGHT_PURPLE), Component.text(EconomyManager.getEconomyIcon()).decoration(TextDecoration.ITALIC, false) ); diff --git a/src/main/java/fr/openmc/core/features/economy/menu/PersonalBankMenu.java b/src/main/java/fr/openmc/core/features/economy/menu/PersonalBankMenu.java index 76b734063..58e653d75 100644 --- a/src/main/java/fr/openmc/core/features/economy/menu/PersonalBankMenu.java +++ b/src/main/java/fr/openmc/core/features/economy/menu/PersonalBankMenu.java @@ -83,9 +83,9 @@ public void onInventoryClick(InventoryClickEvent click) { itemMeta.itemName(TranslationManager.translation("feature.economy.bank.menu.balance.name")); itemMeta.lore(TranslationManager.translationLore( "feature.economy.bank.menu.balance.lore", - Component.text(EconomyManager.getFormattedSimplifiedNumber(BankManager.getBankBalance(player.getUniqueId()))).color(NamedTextColor.LIGHT_PURPLE), + Component.text(EconomyManager.getFormattedNumber(BankManager.getBankBalance(player.getUniqueId()))).color(NamedTextColor.LIGHT_PURPLE), Component.text(EconomyManager.getEconomyIcon()).decoration(TextDecoration.ITALIC, false), - Component.text(EconomyManager.getFormattedSimplifiedNumber(PlayerBankLimitRewards.getBankBalanceLimit(playerCity.getLevel()))).color(NamedTextColor.LIGHT_PURPLE), + Component.text(EconomyManager.getFormattedNumber(PlayerBankLimitRewards.getBankBalanceLimit(playerCity.getLevel()))).color(NamedTextColor.LIGHT_PURPLE), Component.text(EconomyManager.getEconomyIcon()).decoration(TextDecoration.ITALIC, false), Component.text(BankManager.calculatePlayerInterest(player.getUniqueId()) * 100 + "%").color(NamedTextColor.AQUA), Component.text(DateUtils.convertSecondToTime(BankManager.getSecondsUntilInterest())).color(NamedTextColor.AQUA) diff --git a/src/main/java/fr/openmc/core/features/economy/menu/PersonalBankWithdrawMenu.java b/src/main/java/fr/openmc/core/features/economy/menu/PersonalBankWithdrawMenu.java index 22eb007be..20ed7479f 100644 --- a/src/main/java/fr/openmc/core/features/economy/menu/PersonalBankWithdrawMenu.java +++ b/src/main/java/fr/openmc/core/features/economy/menu/PersonalBankWithdrawMenu.java @@ -59,7 +59,7 @@ public void onInventoryClick(InventoryClickEvent click) { List loreBankWithdrawAll = TranslationManager.translationLore( "feature.economy.bank.withdraw.all.lore", - Component.text(EconomyManager.getFormattedSimplifiedNumber(moneyBankPlayer)).color(NamedTextColor.LIGHT_PURPLE), + Component.text(EconomyManager.getFormattedNumber(moneyBankPlayer)).color(NamedTextColor.LIGHT_PURPLE), Component.text(EconomyManager.getEconomyIcon()).decoration(TextDecoration.ITALIC, false) ); @@ -73,7 +73,7 @@ public void onInventoryClick(InventoryClickEvent click) { List loreBankWithdrawHalf = TranslationManager.translationLore( "feature.economy.bank.withdraw.half.lore", - Component.text(EconomyManager.getFormattedSimplifiedNumber(halfMoneyBankPlayer)).color(NamedTextColor.LIGHT_PURPLE), + Component.text(EconomyManager.getFormattedNumber(halfMoneyBankPlayer)).color(NamedTextColor.LIGHT_PURPLE), Component.text(EconomyManager.getEconomyIcon()).decoration(TextDecoration.ITALIC, false) ); diff --git a/src/main/java/fr/openmc/core/features/leaderboards/LeaderboardManager.java b/src/main/java/fr/openmc/core/features/leaderboards/LeaderboardManager.java index e570a856d..86716f3cd 100644 --- a/src/main/java/fr/openmc/core/features/leaderboards/LeaderboardManager.java +++ b/src/main/java/fr/openmc/core/features/leaderboards/LeaderboardManager.java @@ -488,7 +488,7 @@ public static void updatePlayerMoneyMap() { .limit(10) .toList()) { String playerName = CachePlayerName.getName(entry.getKey()); - String formattedBalance = EconomyManager.getFormattedSimplifiedNumber(entry.getValue()); + String formattedBalance = EconomyManager.getFormattedNumber(entry.getValue()); newMap.put(rank++, new AbstractMap.SimpleEntry<>(playerName, formattedBalance)); } @@ -506,7 +506,7 @@ public static void updateCityMoneyMap() { .limit(10) .toList()) { String cityName = city.getName(); - String cityBalance = EconomyManager.getFormattedSimplifiedNumber(city.getBalance()); + String cityBalance = EconomyManager.getFormattedNumber(city.getBalance()); newMap.put(rank++, new AbstractMap.SimpleEntry<>(cityName, cityBalance)); } villeMoneyMap = newMap; @@ -545,7 +545,7 @@ public static void updatePumpkinCountMap() { .limit(10) .toList()) { String playerName = CachePlayerName.getName(entry.getKey()); - String formattedPumpkinCount = EconomyManager.getFormattedSimplifiedNumber(entry.getValue().getPumpkinCount()); + String formattedPumpkinCount = EconomyManager.getFormattedNumber(entry.getValue().getPumpkinCount()); newMap.put(rank++, new AbstractMap.SimpleEntry<>(playerName, formattedPumpkinCount)); } pumpkinCountMap = newMap; diff --git a/src/main/java/fr/openmc/core/features/quests/menus/QuestsMenu.java b/src/main/java/fr/openmc/core/features/quests/menus/QuestsMenu.java index 8873b1a54..f541e53c2 100644 --- a/src/main/java/fr/openmc/core/features/quests/menus/QuestsMenu.java +++ b/src/main/java/fr/openmc/core/features/quests/menus/QuestsMenu.java @@ -246,7 +246,7 @@ private void createItems(Quest quest, ItemStack item, ItemMeta meta) { .decoration(TextDecoration.ITALIC, false)); } else if (reward instanceof QuestMoneyReward(double amount)) { lore.add(Component.text(" - ", NamedTextColor.DARK_GRAY) - .append(Component.text(EconomyManager.getFormattedSimplifiedNumber(amount), NamedTextColor.GOLD)) + .append(Component.text(EconomyManager.getFormattedNumber(amount), NamedTextColor.GOLD)) .append(Component.space()) .append(Component.text(EconomyManager.getEconomyIcon(), NamedTextColor.WHITE)) .decoration(TextDecoration.ITALIC, false)); @@ -272,7 +272,7 @@ private void createItems(Quest quest, ItemStack item, ItemMeta meta) { .decoration(TextDecoration.ITALIC, false)); } else if (reward instanceof QuestMoneyReward(double amount)) { lore.add(Component.text(" - ", NamedTextColor.DARK_GRAY) - .append(Component.text(EconomyManager.getFormattedSimplifiedNumber(amount), NamedTextColor.GOLD)) + .append(Component.text(EconomyManager.getFormattedNumber(amount), NamedTextColor.GOLD)) .append(Component.space()) .append(Component.text(EconomyManager.getEconomyIcon(), NamedTextColor.WHITE)) .decoration(TextDecoration.ITALIC, false)); diff --git a/src/main/java/fr/openmc/core/features/quests/rewards/QuestMoneyReward.java b/src/main/java/fr/openmc/core/features/quests/rewards/QuestMoneyReward.java index 948627b11..82c8ad89e 100644 --- a/src/main/java/fr/openmc/core/features/quests/rewards/QuestMoneyReward.java +++ b/src/main/java/fr/openmc/core/features/quests/rewards/QuestMoneyReward.java @@ -24,7 +24,7 @@ public record QuestMoneyReward(double amount) implements QuestReward { @Override public void giveReward(Player player) { EconomyManager.addBalance(player.getUniqueId(), amount, "Récompense de quête"); - Component amountComponent = Component.text(EconomyManager.getFormattedSimplifiedNumber(amount) + " " + EconomyManager.getEconomyIcon()) + Component amountComponent = Component.text(EconomyManager.getFormattedNumber(amount) + " " + EconomyManager.getEconomyIcon()) .color(NamedTextColor.YELLOW); Component message = TranslationManager.translation("feature.quests.message.money_reward", amountComponent) .color(NamedTextColor.GREEN); diff --git a/src/main/java/fr/openmc/core/hooks/BedrockHook.java b/src/main/java/fr/openmc/core/hooks/BedrockHook.java index d0631c4be..a4d6d949e 100644 --- a/src/main/java/fr/openmc/core/hooks/BedrockHook.java +++ b/src/main/java/fr/openmc/core/hooks/BedrockHook.java @@ -1,15 +1,18 @@ package fr.openmc.core.hooks; import fr.openmc.core.bootstrap.hooks.Hooks; +import fr.openmc.riftengine.core.RiftRegistry; +import fr.openmc.riftengine.core.registry.glyphs.Glyph; +import lombok.Getter; import org.bukkit.entity.Player; -//import org.geysermc.floodgate.api.FloodgateApi; -//import org.geysermc.geyser.api.GeyserApi; +import org.geysermc.floodgate.api.FloodgateApi; +import org.geysermc.geyser.api.GeyserApi; import java.util.Set; public class BedrockHook extends Hooks { public static boolean isEnabled() { - return false; // return Hooks.isEnabled(FancyNpcsHook.class); + return Hooks.isEnabled(FancyNpcsHook.class); } @Override @@ -17,15 +20,15 @@ protected Set getPluginsName() { return Set.of("Geyser-Spigot", "floodgate", "RiftEngine"); } -// @Getter -// private static GeyserApi geyserApi; -// @Getter -// private static FloodgateApi floodgateApi; + @Getter + private static GeyserApi geyserApi; + @Getter + private static FloodgateApi floodgateApi; @Override public void init() { -// floodgateApi = FloodgateApi.getInstance(); -// geyserApi = GeyserApi.api(); + floodgateApi = FloodgateApi.getInstance(); + geyserApi = GeyserApi.api(); } /** @@ -35,15 +38,13 @@ public void init() { */ public static boolean isBedrockPlayer(Player player) { if (!isEnabled()) return false; - return false; -// return floodgateApi.isFloodgatePlayer(player.getUniqueId()); + return floodgateApi.isFloodgatePlayer(player.getUniqueId()); } public static Character getGlyph(String namespacedId) { -// Glyph glyph = RiftRegistry.GLYPHS.get(namespacedId).orElse(null); -// if (glyph == null) return null; -// -// return glyph.getBedrockChar(); - return null; + Glyph glyph = RiftRegistry.GLYPHS.get(namespacedId).orElse(null); + if (glyph == null) return null; + + return glyph.getBedrockChar(); } } diff --git a/src/main/java/fr/openmc/core/hooks/LuckPermsHook.java b/src/main/java/fr/openmc/core/hooks/LuckPermsHook.java index ebf7173b9..ea3ef51fc 100644 --- a/src/main/java/fr/openmc/core/hooks/LuckPermsHook.java +++ b/src/main/java/fr/openmc/core/hooks/LuckPermsHook.java @@ -55,10 +55,10 @@ public static String getPrefix(Player player) { } public static String getFormattedPAPIPrefix(Player player) { - if (!isEnable()) return ""; + if (!isEnable()) return null; String prefix = getPrefix(player); - if (prefix == null || prefix.isEmpty()) return ""; + if (prefix == null || prefix.isEmpty()) return null; String formattedPrefix = prefix.replace("&", "§"); if (ItemsAdderHook.isEnable()) { diff --git a/src/main/java/fr/openmc/core/listeners/AsyncChatListener.java b/src/main/java/fr/openmc/core/listeners/AsyncChatListener.java index 60ff29faa..e4fd2b9b8 100644 --- a/src/main/java/fr/openmc/core/listeners/AsyncChatListener.java +++ b/src/main/java/fr/openmc/core/listeners/AsyncChatListener.java @@ -34,9 +34,10 @@ public void onChat(AsyncChatEvent event) { final Player player = event.getPlayer(); final CachedMetaData metaData = this.luckperms.getPlayerAdapter(Player.class).getMetaData(player); + String prefix = LuckPermsHook.getFormattedPAPIPrefix(player); String message = PlainTextComponentSerializer.plainText().serialize(event.message()); String rawMessage = plugin.getConfig().getString("chat.message", "{prefix}{name}§7: {message}") - .replace("{prefix}", LuckPermsHook.getFormattedPAPIPrefix(player)) + .replace("{prefix}", prefix != null ? prefix : "") .replace("{suffix}", metaData.getSuffix() != null ? metaData.getSuffix() : "") .replace("{name}", player.getName()) .replace("{message}", message); diff --git a/src/main/java/fr/openmc/core/listeners/JoinQuitMessageListener.java b/src/main/java/fr/openmc/core/listeners/JoinQuitMessageListener.java index e47919b36..d09ae3598 100644 --- a/src/main/java/fr/openmc/core/listeners/JoinQuitMessageListener.java +++ b/src/main/java/fr/openmc/core/listeners/JoinQuitMessageListener.java @@ -45,6 +45,7 @@ public void onPlayerJoin(PlayerJoinEvent event) { MessagesManager.sendMessage(player, TranslationManager.translation("core.player.join.welcome"), Prefix.OPENMC, MessageType.INFO, false); TabList.updateTabList(player); + String prefix = LuckPermsHook.getFormattedPAPIPrefix(player); FriendManager.getFriendsAsync(player.getUniqueId()).thenAccept(friendsUUIDS -> { for (UUID friendUUID : friendsUUIDS) { @@ -52,7 +53,7 @@ public void onPlayerJoin(PlayerJoinEvent event) { if (friend != null && friend.isOnline() && !friend.hasMetadata(OMCPlugin.VANISH_META_KEY)) { MessagesManager.sendMessage(friend, TranslationManager.translation( "core.player.join.friend_online", - Component.text(LuckPermsHook.getFormattedPAPIPrefix(player) + player.getName()).color(NamedTextColor.GREEN) + Component.text((prefix != null ? prefix : "") + player.getName()).color(NamedTextColor.GREEN) ), Prefix.FRIEND, MessageType.NONE, true); } } @@ -68,23 +69,22 @@ public void onPlayerJoin(PlayerJoinEvent event) { continue; int pendingRewardsNumber = quest.getPendingRewardTiers(player.getUniqueId()).size(); - Bukkit.getScheduler().runTask(OMCPlugin.getInstance(), () -> { - MessagesManager.sendMessage(player, - TranslationManager.translation("core.player.join.quest_reward", Component.text(pendingRewardsNumber)) - .append(Component.text(" ")) - .append(TranslationManager.translation("core.player.join.quest_reward_click")) - .clickEvent(ClickEvent.runCommand("/quest")), - Prefix.QUEST, - MessageType.INFO, - true); - }); + Bukkit.getScheduler().runTask(OMCPlugin.getInstance(), () -> + MessagesManager.sendMessage(player, + TranslationManager.translation("core.player.join.quest_reward", Component.text(pendingRewardsNumber)) + .append(Component.text(" ")) + .append(TranslationManager.translation("core.player.join.quest_reward_click")) + .clickEvent(ClickEvent.runCommand("/quest")), + Prefix.QUEST, + MessageType.INFO, + true)); } GitHubHook.refreshContributorId(player.getUniqueId()); }); if (!player.hasMetadata(OMCPlugin.VANISH_META_KEY)) - event.joinMessage(Component.text(JOIN_MESSAGE.formatted(LuckPermsHook.getFormattedPAPIPrefix(player), player.getName()))); + event.joinMessage(Component.text(JOIN_MESSAGE.formatted(prefix != null ? prefix : "", player.getName()))); // Adjust player's spawn location if (!player.hasPlayedBefore()) { @@ -111,13 +111,14 @@ public void onPlayerQuit(PlayerQuitEvent event) { Bukkit.getScheduler().runTaskAsynchronously(OMCPlugin.getInstance(), () -> QuestsManager.saveQuests(player.getUniqueId())); + String prefix = LuckPermsHook.getFormattedPAPIPrefix(player); FriendManager.getFriendsAsync(player.getUniqueId()).thenAccept(friendsUUIDS -> { for (UUID friendUUID : friendsUUIDS) { final Player friend = player.getServer().getPlayer(friendUUID); if (friend != null && friend.isOnline() && !friend.hasMetadata(OMCPlugin.VANISH_META_KEY)) { MessagesManager.sendMessage(friend, TranslationManager.translation( "core.player.quit.friend_offline", - Component.text(LuckPermsHook.getFormattedPAPIPrefix(player) + player.getName()).color(NamedTextColor.YELLOW) + Component.text((prefix != null ? prefix : "") + player.getName()).color(NamedTextColor.YELLOW) ), Prefix.FRIEND, MessageType.NONE, true); } } @@ -128,11 +129,13 @@ public void onPlayerQuit(PlayerQuitEvent event) { if (TPAManager.requesterHasPendingRequest(player)) { Player targetTPA = TPAManager.getTargetByRequester(player); - TPAManager.removeRequest(player, targetTPA); - MessagesManager.sendMessage(targetTPA, TranslationManager.translation( - "core.player.tpa.expired_target", - Component.text(player.getName()).color(NamedTextColor.GOLD) - ), Prefix.OPENMC, MessageType.INFO, true); + if (targetTPA != null) { + TPAManager.removeRequest(player, targetTPA); + MessagesManager.sendMessage(targetTPA, TranslationManager.translation( + "core.player.tpa.expired_target", + Component.text(player.getName()).color(NamedTextColor.GOLD) + ), Prefix.OPENMC, MessageType.INFO, true); + } } else if (TPAManager.hasPendingRequest(player)) { for (Player requester : TPAManager.getRequesters(player)) { TPAManager.removeRequest(requester, player); @@ -144,7 +147,7 @@ public void onPlayerQuit(PlayerQuitEvent event) { } if (!player.hasMetadata(OMCPlugin.VANISH_META_KEY)) - event.quitMessage(Component.text(QUIT_MESSAGE.formatted(LuckPermsHook.getFormattedPAPIPrefix(player), player.getName()))); + event.quitMessage(Component.text(QUIT_MESSAGE.formatted(prefix != null ? prefix : "", player.getName()))); } } diff --git a/src/main/java/fr/openmc/core/listeners/PlayerDeathListener.java b/src/main/java/fr/openmc/core/listeners/PlayerDeathListener.java index 66d21a6d5..7b71e357e 100644 --- a/src/main/java/fr/openmc/core/listeners/PlayerDeathListener.java +++ b/src/main/java/fr/openmc/core/listeners/PlayerDeathListener.java @@ -30,8 +30,8 @@ public void onPlayerDead(PlayerDeathEvent event) { withdrawBalance(player.getUniqueId(), balance * LOSS_MONEY); MessagesManager.sendMessage(player, TranslationManager.translation( "core.player.death.message", - Component.text(getFormattedSimplifiedNumber(balance) + EconomyManager.getEconomyIcon()).color(NamedTextColor.GOLD), - Component.text(getFormattedSimplifiedNumber(balance * LOSS_MONEY) + EconomyManager.getEconomyIcon()).color(NamedTextColor.GOLD) + Component.text(getFormattedNumber(balance) + EconomyManager.getEconomyIcon()).color(NamedTextColor.GOLD), + Component.text(getFormattedNumber(balance * LOSS_MONEY) + EconomyManager.getEconomyIcon()).color(NamedTextColor.GOLD) ), Prefix.OPENMC, MessageType.INFO, false); } diff --git a/src/main/java/fr/openmc/core/utils/text/fonts/SmallCapsUtils.java b/src/main/java/fr/openmc/core/utils/text/fonts/SmallCapsUtils.java index ccc30bc38..28f98dc4c 100644 --- a/src/main/java/fr/openmc/core/utils/text/fonts/SmallCapsUtils.java +++ b/src/main/java/fr/openmc/core/utils/text/fonts/SmallCapsUtils.java @@ -13,7 +13,7 @@ public class SmallCapsUtils { public final static Key SMALL_CAPS_FONT = Key.key("omc_fonts", "small_caps"); public static Component toSmall(Player player, String text){ - Component component = Component.text(text.toLowerCase()); + Component component = Component.text(text); return BedrockHook.isBedrockPlayer(player) ? component : component.font(SMALL_CAPS_FONT); } diff --git a/src/main/resources/contents/omc_dream/items.yml b/src/main/resources/contents/omc_dream/items.yml index beca51b6a..4afadbdba 100644 --- a/src/main/resources/contents/omc_dream/items.yml +++ b/src/main/resources/contents/omc_dream/items.yml @@ -6,7 +6,7 @@ items: resource: material: {dream_item_material:corrupted_sculk} generate: false - model_path: "minecraft:item/sculk" + model_path: "minecraft:block/sculk" lore: - tooltip_style: "{dream_rarity:corrupted_sculk}" diff --git a/src/main/resources/paper-plugin.yml b/src/main/resources/paper-plugin.yml index 9fc4f692d..9c063effe 100644 --- a/src/main/resources/paper-plugin.yml +++ b/src/main/resources/paper-plugin.yml @@ -30,15 +30,15 @@ dependencies: FastAsyncWorldEdit: load: BEFORE required: false -# Geyser-Spigot: -# load: BEFORE -# required: false -# floodgate: -# load: BEFORE -# required: false -# RiftEngine: -# load: AFTER -# required: false + Geyser-Spigot: + load: BEFORE + required: false + floodgate: + load: BEFORE + required: false + RiftEngine: + load: AFTER + required: false prefix: OMC authors: [ La communauté ] diff --git a/src/test/java/fr/openmc/core/features/economy/EconomyFormattingTest.java b/src/test/java/fr/openmc/core/features/economy/EconomyFormattingTest.java index c0443cd71..205694a39 100644 --- a/src/test/java/fr/openmc/core/features/economy/EconomyFormattingTest.java +++ b/src/test/java/fr/openmc/core/features/economy/EconomyFormattingTest.java @@ -17,50 +17,50 @@ static void setUpLocale() { @Test @DisplayName("Format zero balance") void testFormat_Zero() { - Assertions.assertEquals("0", EconomyManager.getFormattedSimplifiedNumber(0)); + Assertions.assertEquals("0", EconomyManager.getFormattedNumber(0)); } @Test @DisplayName("Format small number without suffix") void testFormat_SmallNumber() { - Assertions.assertEquals("500", EconomyManager.getFormattedSimplifiedNumber(500)); + Assertions.assertEquals("500", EconomyManager.getFormattedNumber(500)); } @Test @DisplayName("Format thousands with k suffix") void testFormat_Thousands() { - String result = EconomyManager.getFormattedSimplifiedNumber(1500); + String result = EconomyManager.getFormattedNumber(1500); Assertions.assertEquals("1.5k", result); } @Test @DisplayName("Format exact thousand") void testFormat_ExactThousand() { - Assertions.assertEquals("1k", EconomyManager.getFormattedSimplifiedNumber(1000)); + Assertions.assertEquals("1k", EconomyManager.getFormattedNumber(1000)); } @Test @DisplayName("Format millions with M suffix") void testFormat_Millions() { - Assertions.assertEquals("3M", EconomyManager.getFormattedSimplifiedNumber(3_000_000)); + Assertions.assertEquals("3M", EconomyManager.getFormattedNumber(3_000_000)); } @Test @DisplayName("Format billions with B suffix") void testFormat_Billions() { - Assertions.assertEquals("1B", EconomyManager.getFormattedSimplifiedNumber(1_000_000_000)); + Assertions.assertEquals("1B", EconomyManager.getFormattedNumber(1_000_000_000)); } @Test @DisplayName("Format with decimal truncation") void testFormat_Decimal() { - String result = EconomyManager.getFormattedSimplifiedNumber(2_500_000); + String result = EconomyManager.getFormattedNumber(2_500_000); Assertions.assertEquals("2.5M", result); } @Test @DisplayName("Format number under 1000") void testFormat_Under1000() { - Assertions.assertEquals("999", EconomyManager.getFormattedSimplifiedNumber(999)); + Assertions.assertEquals("999", EconomyManager.getFormattedNumber(999)); } }