From a9781e8cbccdc6fb2a2cf3ec743b40908aae267a Mon Sep 17 00:00:00 2001 From: R00tB33rMan Date: Thu, 4 Sep 2025 19:06:40 -0400 Subject: [PATCH 1/5] Folia Support (wasn't super difficult) --- pom.xml | 8 ++++-- .../coinsengine/CoinsEnginePlugin.java | 2 +- .../coinsengine/api/CoinsEngineAPI.java | 9 ------ .../coinsengine/api/currency/Currency.java | 1 - .../command/currency/CurrencyCommands.java | 1 - .../nightexpress/coinsengine/config/Lang.java | 28 ------------------- .../coinsengine/currency/CurrencyLogger.java | 1 - .../coinsengine/currency/CurrencyManager.java | 2 +- .../currency/CurrencyOperations.java | 8 ------ .../coinsengine/hook/PlaceholderAPIHook.java | 28 +++++-------------- .../hook/vault/CurrencyEconomy.java | 14 ---------- .../migration/MigrationManager.java | 2 +- .../coinsengine/tops/menu/TopMenu.java | 22 +++++++-------- src/main/resources/plugin.yml | 3 +- 14 files changed, 27 insertions(+), 102 deletions(-) diff --git a/pom.xml b/pom.xml index cc42cb1..6487973 100644 --- a/pom.xml +++ b/pom.xml @@ -71,7 +71,9 @@ su.nightexpress.nightcore main - 2.7.8 + 2.7.15 + shaded + provided @@ -107,7 +109,7 @@ org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 attach-sources @@ -120,4 +122,4 @@ - \ No newline at end of file + diff --git a/src/main/java/su/nightexpress/coinsengine/CoinsEnginePlugin.java b/src/main/java/su/nightexpress/coinsengine/CoinsEnginePlugin.java index 038c949..597ca57 100644 --- a/src/main/java/su/nightexpress/coinsengine/CoinsEnginePlugin.java +++ b/src/main/java/su/nightexpress/coinsengine/CoinsEnginePlugin.java @@ -58,7 +58,7 @@ public void enable() { } if (Plugins.isInstalled(HookId.DELUXE_COINFLIP)) { - this.runTask(task -> DeluxeCoinflipHook.setup(this)); + this.runTask(() -> DeluxeCoinflipHook.setup(this)); } } diff --git a/src/main/java/su/nightexpress/coinsengine/api/CoinsEngineAPI.java b/src/main/java/su/nightexpress/coinsengine/api/CoinsEngineAPI.java index eddf76c..3a2f33e 100644 --- a/src/main/java/su/nightexpress/coinsengine/api/CoinsEngineAPI.java +++ b/src/main/java/su/nightexpress/coinsengine/api/CoinsEngineAPI.java @@ -67,8 +67,6 @@ public static void regsiterCurrency(@NotNull Currency currency) { getCurrencyManager().registerCurrency(currency); } - - public static double getBalance(@NotNull UUID playerId, @NotNull String currencyName) { Currency currency = getCurrency(currencyName); @@ -85,8 +83,6 @@ public static double getBalance(@NotNull Player player, @NotNull Currency curren return getUserData(player).getBalance(currency); } - - public static boolean addBalance(@NotNull UUID playerId, @NotNull String currencyName, double amount) { Currency currency = getCurrency(currencyName); return currency != null && addBalance(playerId, currency, amount); @@ -100,8 +96,6 @@ public static void addBalance(@NotNull Player player, @NotNull Currency currency editBalance(player, CoinsEngineAPI::getUserData, user -> CurrencyOperations.forAddSilently(currency, amount, user)); } - - public static boolean setBalance(@NotNull UUID playerId, @NotNull String currencyName, double amount) { Currency currency = getCurrency(currencyName); return currency != null && setBalance(playerId, currency, amount); @@ -115,8 +109,6 @@ public static void setBalance(@NotNull Player player, @NotNull Currency currency editBalance(player, CoinsEngineAPI::getUserData, user -> CurrencyOperations.forSetSilently(currency, amount, user)); } - - public static boolean removeBalance(@NotNull UUID playerId, @NotNull String currencyName, double amount) { Currency currency = getCurrency(currencyName); return currency != null && removeBalance(playerId, currency, amount); @@ -138,7 +130,6 @@ private static boolean editBalance(@NotNull T nameOrId, @NotNull Function"); public static final LangText ERROR_COMMAND_ARGUMENT_INVALID_CURRENCY = LangText.of("Currency.Error.Invalid", diff --git a/src/main/java/su/nightexpress/coinsengine/currency/CurrencyLogger.java b/src/main/java/su/nightexpress/coinsengine/currency/CurrencyLogger.java index f5a77b6..57cb191 100644 --- a/src/main/java/su/nightexpress/coinsengine/currency/CurrencyLogger.java +++ b/src/main/java/su/nightexpress/coinsengine/currency/CurrencyLogger.java @@ -16,7 +16,6 @@ public class CurrencyLogger { - //private final CoinsEnginePlugin plugin; private final BlockingQueue queue; private final DateTimeFormatter timeFormatter; private final BufferedWriter writer; diff --git a/src/main/java/su/nightexpress/coinsengine/currency/CurrencyManager.java b/src/main/java/su/nightexpress/coinsengine/currency/CurrencyManager.java index d4063d4..acc4513 100644 --- a/src/main/java/su/nightexpress/coinsengine/currency/CurrencyManager.java +++ b/src/main/java/su/nightexpress/coinsengine/currency/CurrencyManager.java @@ -281,7 +281,7 @@ public void resetBalances(@NotNull CommandSender sender, @Nullable Currency curr return; } - this.plugin.runTaskAsync(task -> { + this.plugin.runTaskAsync(() -> { this.disableOperations(); if (currency == null) { Lang.RESET_ALL_STARTED_GLOBAL.getMessage().send(sender); diff --git a/src/main/java/su/nightexpress/coinsengine/currency/CurrencyOperations.java b/src/main/java/su/nightexpress/coinsengine/currency/CurrencyOperations.java index 1df71df..267238d 100644 --- a/src/main/java/su/nightexpress/coinsengine/currency/CurrencyOperations.java +++ b/src/main/java/su/nightexpress/coinsengine/currency/CurrencyOperations.java @@ -26,8 +26,6 @@ private static T silent(@NotNull T operation) { return operation; } - - @NotNull public static AddOperation forAddSilently(@NotNull Currency currency, double amount, @NotNull CoinsUser user) { return createSilently(currency, amount, user, AddOperation::new); @@ -43,8 +41,6 @@ public static AddOperation forAdd(@NotNull Currency currency, double amount, @No return create(currency, amount, user, sender, AddOperation::new); } - - @NotNull public static SetOperation forSetSilently(@NotNull Currency currency, double amount, @NotNull CoinsUser user) { return createSilently(currency, amount, user, SetOperation::new); @@ -60,8 +56,6 @@ public static SetOperation forSet(@NotNull Currency currency, double amount, @No return create(currency, amount, user, sender, SetOperation::new); } - - @NotNull public static RemoveOperation forRemoveSilently(@NotNull Currency currency, double amount, @NotNull CoinsUser user) { return createSilently(currency, amount, user, RemoveOperation::new); @@ -77,8 +71,6 @@ public static RemoveOperation forRemove(@NotNull Currency currency, double amoun return create(currency, amount, user, sender, RemoveOperation::new); } - - @NotNull private static T createSilently(@NotNull Currency currency, double amount, @NotNull CoinsUser user, @NotNull OperationProvider provider) { return silent(create(currency, amount, user, provider)); diff --git a/src/main/java/su/nightexpress/coinsengine/hook/PlaceholderAPIHook.java b/src/main/java/su/nightexpress/coinsengine/hook/PlaceholderAPIHook.java index ca46f35..1c8f890 100644 --- a/src/main/java/su/nightexpress/coinsengine/hook/PlaceholderAPIHook.java +++ b/src/main/java/su/nightexpress/coinsengine/hook/PlaceholderAPIHook.java @@ -109,33 +109,19 @@ private void loadTopPlaceholders() { } private void loadPlayerPlaceholders() { - this.playerPlaceholders.put("server_balance_short_clean", (player, user, currency) -> { - return NightMessage.stripTags(currency.formatCompact(plugin.getTopManager().orElseThrow().getTotalBalance(currency))); - }); + this.playerPlaceholders.put("server_balance_short_clean", (player, user, currency) -> NightMessage.stripTags(currency.formatCompact(plugin.getTopManager().orElseThrow().getTotalBalance(currency)))); - this.playerPlaceholders.put("server_balance_short_legacy", (player, user, currency) -> { - return NightMessage.asLegacy(currency.formatCompact(plugin.getTopManager().orElseThrow().getTotalBalance(currency))); - }); + this.playerPlaceholders.put("server_balance_short_legacy", (player, user, currency) -> NightMessage.asLegacy(currency.formatCompact(plugin.getTopManager().orElseThrow().getTotalBalance(currency)))); - this.playerPlaceholders.put("server_balance_short", (player, user, currency) -> { - return currency.formatCompact(plugin.getTopManager().orElseThrow().getTotalBalance(currency)); - }); + this.playerPlaceholders.put("server_balance_short", (player, user, currency) -> currency.formatCompact(plugin.getTopManager().orElseThrow().getTotalBalance(currency))); - this.playerPlaceholders.put("server_balance_clean", (player, user, currency) -> { - return NightMessage.stripTags(currency.format(plugin.getTopManager().orElseThrow().getTotalBalance(currency))); - }); + this.playerPlaceholders.put("server_balance_clean", (player, user, currency) -> NightMessage.stripTags(currency.format(plugin.getTopManager().orElseThrow().getTotalBalance(currency)))); - this.playerPlaceholders.put("server_balance_legacy", (player, user, currency) -> { - return NightMessage.asLegacy(currency.format(plugin.getTopManager().orElseThrow().getTotalBalance(currency))); - }); + this.playerPlaceholders.put("server_balance_legacy", (player, user, currency) -> NightMessage.asLegacy(currency.format(plugin.getTopManager().orElseThrow().getTotalBalance(currency)))); - this.playerPlaceholders.put("server_balance_raw", (player, user, currency) -> { - return RAW_FORMAT.format(plugin.getTopManager().orElseThrow().getTotalBalance(currency)); - }); + this.playerPlaceholders.put("server_balance_raw", (player, user, currency) -> RAW_FORMAT.format(plugin.getTopManager().orElseThrow().getTotalBalance(currency))); - this.playerPlaceholders.put("server_balance", (player, user, currency) -> { - return currency.format(plugin.getTopManager().orElseThrow().getTotalBalance(currency)); - }); + this.playerPlaceholders.put("server_balance", (player, user, currency) -> currency.format(plugin.getTopManager().orElseThrow().getTotalBalance(currency))); this.playerPlaceholders.put("payments_state", (player, user, currency) -> NightMessage.asLegacy(Lang.getEnabledOrDisabled(user.getSettings(currency).isPaymentsEnabled()))); diff --git a/src/main/java/su/nightexpress/coinsengine/hook/vault/CurrencyEconomy.java b/src/main/java/su/nightexpress/coinsengine/hook/vault/CurrencyEconomy.java index fcdeb97..3ab607e 100644 --- a/src/main/java/su/nightexpress/coinsengine/hook/vault/CurrencyEconomy.java +++ b/src/main/java/su/nightexpress/coinsengine/hook/vault/CurrencyEconomy.java @@ -60,8 +60,6 @@ public String currencyNameSingular() { return this.currency.getName(); } - - @Override public boolean createPlayerAccount(OfflinePlayer player) { return false; @@ -82,8 +80,6 @@ public boolean createPlayerAccount(String playerName) { return false; } - - @Override public double getBalance(OfflinePlayer player, String world) { return this.getBalance(player); @@ -110,8 +106,6 @@ private double getBalance(@Nullable CoinsUser user) { return user == null ? 0D : user.getBalance(this.currency); } - - @Override public boolean hasAccount(OfflinePlayer player, String worldName) { return this.hasAccount(player); @@ -132,8 +126,6 @@ public boolean hasAccount(String playerName) { return this.plugin.getDataHandler().isUserExists(playerName); } - - @Override public boolean has(OfflinePlayer player, String worldName, double amount) { return this.has(player, amount); @@ -160,8 +152,6 @@ private boolean has(@Nullable CoinsUser user, double amount) { return user != null && user.hasEnough(this.currency, amount); } - - @Override public EconomyResponse depositPlayer(OfflinePlayer player, String worldName, double amount) { return this.depositPlayer(player, amount); @@ -198,8 +188,6 @@ private EconomyResponse depositUser(@Nullable CoinsUser user, double amount) { return new EconomyResponse(amount, user.getBalance(this.currency), EconomyResponse.ResponseType.SUCCESS, null); } - - @Override public EconomyResponse withdrawPlayer(OfflinePlayer player, String worldName, double amount) { return this.withdrawPlayer(player, amount); @@ -242,8 +230,6 @@ private EconomyResponse withdrawUser(@Nullable CoinsUser user, double amount) { return new EconomyResponse(amount, lookup.balance(), EconomyResponse.ResponseType.SUCCESS, null); } - - @Override public EconomyResponse createBank(String name, String player) { return NO_BANKS; diff --git a/src/main/java/su/nightexpress/coinsengine/migration/MigrationManager.java b/src/main/java/su/nightexpress/coinsengine/migration/MigrationManager.java index ab2b46f..2c3f122 100644 --- a/src/main/java/su/nightexpress/coinsengine/migration/MigrationManager.java +++ b/src/main/java/su/nightexpress/coinsengine/migration/MigrationManager.java @@ -71,7 +71,7 @@ public boolean startMigration(@NotNull CommandSender sender, @NotNull String nam return false; } - this.plugin.runTaskAsync(task -> { + this.plugin.runTaskAsync(() -> { this.plugin.getCurrencyManager().disableOperations(); Lang.MIGRATION_STARTED.getMessage().send(sender, replacer -> replacer.replace(Placeholders.GENERIC_NAME, migrator.getName())); this.migrate(migrator, currency); diff --git a/src/main/java/su/nightexpress/coinsengine/tops/menu/TopMenu.java b/src/main/java/su/nightexpress/coinsengine/tops/menu/TopMenu.java index 7a6cc4d..4a518a3 100644 --- a/src/main/java/su/nightexpress/coinsengine/tops/menu/TopMenu.java +++ b/src/main/java/su/nightexpress/coinsengine/tops/menu/TopMenu.java @@ -51,18 +51,16 @@ public MenuFiller createFiller(@NotNull MenuViewer viewer) { return MenuFiller.builder(this) .setSlots(this.entrySlots) .setItems(this.topManager.getTopEntries(currency)) - .setItemCreator(entry -> { - return NightItem.fromType(Material.PLAYER_HEAD) - .hideAllComponents() - .setDisplayName(this.entryName) - .setLore(this.entryLore) - .setPlayerProfile(Players.createProfile(entry.getPlayerId(), entry.getName())) - .replacement(replacer -> replacer - .replace(GENERIC_POS, entry.getPosition()) - .replace(PLAYER_NAME, entry.getName()) - .replace(GENERIC_BALANCE, currency.format(entry.getBalance())) - ); - }) + .setItemCreator(entry -> NightItem.fromType(Material.PLAYER_HEAD) + .hideAllComponents() + .setDisplayName(this.entryName) + .setLore(this.entryLore) + .setPlayerProfile(Players.createProfile(entry.getPlayerId(), entry.getName())) + .replacement(replacer -> replacer + .replace(GENERIC_POS, entry.getPosition()) + .replace(PLAYER_NAME, entry.getName()) + .replace(GENERIC_BALANCE, currency.format(entry.getBalance())) + )) .build(); } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 8889d1e..42a0ca0 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -10,4 +10,5 @@ softdepend: - PlayerPoints - DeluxeCoinflip load: STARTUP -api-version: 1.20 \ No newline at end of file +api-version: 1.20 +folia-supported: true From 3f0a3f30fd2d431c38b403a944b6386c33ff783a Mon Sep 17 00:00:00 2001 From: r00tb33rman Date: Wed, 1 Oct 2025 10:39:06 -0400 Subject: [PATCH 2/5] Rebase --- pom.xml | 4 ++-- .../java/su/nightexpress/coinsengine/tops/menu/TopMenu.java | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 6487973..88c05c3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ su.nightexpress.coinsengine CoinsEngine - 2.5.0 + 2.5.1 21 @@ -71,7 +71,7 @@ su.nightexpress.nightcore main - 2.7.15 + 2.8.0 shaded provided diff --git a/src/main/java/su/nightexpress/coinsengine/tops/menu/TopMenu.java b/src/main/java/su/nightexpress/coinsengine/tops/menu/TopMenu.java index 4a518a3..158247f 100644 --- a/src/main/java/su/nightexpress/coinsengine/tops/menu/TopMenu.java +++ b/src/main/java/su/nightexpress/coinsengine/tops/menu/TopMenu.java @@ -20,7 +20,6 @@ import su.nightexpress.nightcore.ui.menu.item.MenuItem; import su.nightexpress.nightcore.ui.menu.type.LinkedMenu; import su.nightexpress.nightcore.util.Lists; -import su.nightexpress.nightcore.util.Players; import su.nightexpress.nightcore.util.bukkit.NightItem; import java.util.List; @@ -55,7 +54,7 @@ public MenuFiller createFiller(@NotNull MenuViewer viewer) { .hideAllComponents() .setDisplayName(this.entryName) .setLore(this.entryLore) - .setPlayerProfile(Players.createProfile(entry.getPlayerId(), entry.getName())) + .setPlayerProfile(entry.getProfile()) .replacement(replacer -> replacer .replace(GENERIC_POS, entry.getPosition()) .replace(PLAYER_NAME, entry.getName()) From 642738a60bae41d9b332425672ea11ed485e35b7 Mon Sep 17 00:00:00 2001 From: r00tb33rman Date: Wed, 1 Oct 2025 18:05:05 -0400 Subject: [PATCH 3/5] Migrate Folia supported tag --- src/main/resources/paper-plugin.yml | 3 ++- src/main/resources/plugin.yml | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/paper-plugin.yml b/src/main/resources/paper-plugin.yml index eced60a..de899fc 100644 --- a/src/main/resources/paper-plugin.yml +++ b/src/main/resources/paper-plugin.yml @@ -1,9 +1,10 @@ main: su.nightexpress.coinsengine.CoinsEnginePlugin version: '${project.version}' +api-version: 1.21 +folia-supported: true name: CoinsEngine author: NightExpress desciption: Unlimited virtual currencies and server economy. -api-version: 1.21 dependencies: server: nightcore: diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 42a0ca0..531a761 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,6 @@ main: su.nightexpress.coinsengine.CoinsEnginePlugin version: '${project.version}' +api-version: 1.20 name: CoinsEngine author: NightExpress desciption: Unlimited virtual currencies and server economy. @@ -10,5 +11,3 @@ softdepend: - PlayerPoints - DeluxeCoinflip load: STARTUP -api-version: 1.20 -folia-supported: true From 323d8e51a153beb81eeca34202ee1458c782f54b Mon Sep 17 00:00:00 2001 From: R00tB33rMan Date: Wed, 15 Oct 2025 16:03:44 -0400 Subject: [PATCH 4/5] Rebase --- pom.xml | 4 ++-- .../java/su/nightexpress/coinsengine/tops/menu/TopMenu.java | 4 +++- src/main/resources/paper-plugin.yml | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 02a7734..07f4e5f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ su.nightexpress.coinsengine CoinsEngine - 2.5.2 + 2.5.3 21 @@ -71,7 +71,7 @@ su.nightexpress.nightcore main - 2.8.0 + 2.9.0 shaded provided diff --git a/src/main/java/su/nightexpress/coinsengine/tops/menu/TopMenu.java b/src/main/java/su/nightexpress/coinsengine/tops/menu/TopMenu.java index 158247f..db81549 100644 --- a/src/main/java/su/nightexpress/coinsengine/tops/menu/TopMenu.java +++ b/src/main/java/su/nightexpress/coinsengine/tops/menu/TopMenu.java @@ -41,6 +41,8 @@ public TopMenu(@NotNull CoinsEnginePlugin plugin, @NotNull TopManager topManager this.topManager = topManager; } + // TODO Limit to 10 entries only. + @Override @NotNull public MenuFiller createFiller(@NotNull MenuViewer viewer) { @@ -54,7 +56,7 @@ public MenuFiller createFiller(@NotNull MenuViewer viewer) { .hideAllComponents() .setDisplayName(this.entryName) .setLore(this.entryLore) - .setPlayerProfile(entry.getProfile()) + .setPlayerProfile(entry.getProfile().query()) .replacement(replacer -> replacer .replace(GENERIC_POS, entry.getPosition()) .replace(PLAYER_NAME, entry.getName()) diff --git a/src/main/resources/paper-plugin.yml b/src/main/resources/paper-plugin.yml index de899fc..913d293 100644 --- a/src/main/resources/paper-plugin.yml +++ b/src/main/resources/paper-plugin.yml @@ -5,6 +5,7 @@ folia-supported: true name: CoinsEngine author: NightExpress desciption: Unlimited virtual currencies and server economy. +load: STARTUP dependencies: server: nightcore: From 8bf9b9a1e050726f7b7bb6fdd96b412df894a691 Mon Sep 17 00:00:00 2001 From: r00tb33rman Date: Wed, 22 Oct 2025 18:19:03 -0400 Subject: [PATCH 5/5] Rebase --- pom.xml | 5 +++-- .../coinsengine/CoinsEnginePlugin.java | 2 +- .../coinsengine/api/CoinsEngineAPI.java | 5 ----- .../nightexpress/coinsengine/config/Lang.java | 17 ----------------- .../coinsengine/migration/MigrationManager.java | 2 +- src/main/resources/paper-plugin.yml | 2 +- 6 files changed, 6 insertions(+), 27 deletions(-) diff --git a/pom.xml b/pom.xml index 83730d8..1aa14f0 100644 --- a/pom.xml +++ b/pom.xml @@ -72,6 +72,7 @@ su.nightexpress.nightcore main 2.9.4 + shaded provided @@ -108,7 +109,7 @@ org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 attach-sources @@ -121,4 +122,4 @@ - \ No newline at end of file + diff --git a/src/main/java/su/nightexpress/coinsengine/CoinsEnginePlugin.java b/src/main/java/su/nightexpress/coinsengine/CoinsEnginePlugin.java index de2575d..6bf6a9b 100644 --- a/src/main/java/su/nightexpress/coinsengine/CoinsEnginePlugin.java +++ b/src/main/java/su/nightexpress/coinsengine/CoinsEnginePlugin.java @@ -66,7 +66,7 @@ public void enable() { } if (Plugins.isInstalled(HookPlugin.DELUXE_COINFLIP)) { - this.runTask(task -> DeluxeCoinflipHook.setup(this)); + this.runTask(() -> DeluxeCoinflipHook.setup(this)); } } diff --git a/src/main/java/su/nightexpress/coinsengine/api/CoinsEngineAPI.java b/src/main/java/su/nightexpress/coinsengine/api/CoinsEngineAPI.java index 3164761..c19d180 100644 --- a/src/main/java/su/nightexpress/coinsengine/api/CoinsEngineAPI.java +++ b/src/main/java/su/nightexpress/coinsengine/api/CoinsEngineAPI.java @@ -90,8 +90,6 @@ public static void unregsiterCurrency(@NotNull Currency currency) { getCurrencyManager().unregisterCurrency(currency); } - - public static double getBalance(@NotNull UUID playerId, @NotNull String currencyName) { Currency currency = getCurrency(currencyName); @@ -108,8 +106,6 @@ public static double getBalance(@NotNull Player player, @NotNull Currency curren return getUserData(player).getBalance(currency); } - - public static boolean addBalance(@NotNull UUID playerId, @NotNull String currencyName, double amount) { Currency currency = getCurrency(currencyName); return currency != null && addBalance(playerId, currency, amount); @@ -188,7 +184,6 @@ private static OperationContext operationContext() { return OperationContext.custom("API").silentFor(NotificationTarget.USER, NotificationTarget.EXECUTOR, NotificationTarget.CONSOLE_LOGGER); } - @NotNull public static CoinsUser getUserData(@NotNull Player player) { return getUserManager().getOrFetch(player); diff --git a/src/main/java/su/nightexpress/coinsengine/config/Lang.java b/src/main/java/su/nightexpress/coinsengine/config/Lang.java index ada3e28..0798ee3 100644 --- a/src/main/java/su/nightexpress/coinsengine/config/Lang.java +++ b/src/main/java/su/nightexpress/coinsengine/config/Lang.java @@ -38,8 +38,6 @@ public class Lang implements LangContainer { public static final MessageLocale COMMAND_SYNTAX_INVALID_CURRENCY = LangEntry.builder("Command.Syntax.InvalidCurrency").chatMessage( GRAY.wrap(SOFT_RED.wrap(GENERIC_INPUT) + " is not a valid currency!")); - - public static final MessageLocale CURRENCY_OPERATION_DISABLED = LangEntry.builder("Currency.Operation.Disabled").chatMessage( SOFT_RED.wrap("Currency operations are temporarily disabled.") ); @@ -50,8 +48,6 @@ public class Lang implements LangContainer { public static final MessageLocale CURRENCY_OPERATION_RESET_NOTIFY = LangEntry.builder("Currency.Operation.Reset.Notify").chatMessage( GRAY.wrap("Your balance has been reset to " + SOFT_YELLOW.wrap(GENERIC_BALANCE) + ".")); - - public static final MessageLocale MIGRATION_START_BLOCKED = LangEntry.builder("Migration.Start.Blocked").chatMessage( SOFT_RED.wrap("Could not start migration due to background tasks already running!")); @@ -83,8 +79,6 @@ public class Lang implements LangContainer { DARK_GRAY.wrap(STRIKETHROUGH.wrap("-".repeat(32))) ); - - public static final MessageLocale RESET_ALL_START_BLOCKED = LangEntry.builder("ResetAll.Start.Blocked").chatMessage( SOFT_RED.wrap("Could not start balance reset due to background tasks already running!")); @@ -145,33 +139,28 @@ public class Lang implements LangContainer { GRAY.wrap("Created new currency: " + GREEN.wrap(CURRENCY_NAME) + " (ID: " + WHITE.wrap(CURRENCY_ID) + ")") ); - public static final MessageLocale COMMAND_CURRENCY_GIVE_DONE = LangEntry.builder("Command.Currency.Give.Done").chatMessage( GRAY.wrap("Added " + SOFT_YELLOW.wrap(GENERIC_AMOUNT) + " to " + SOFT_YELLOW.wrap(PLAYER_NAME) + "'s balance. New balance: " + SOFT_YELLOW.wrap(GENERIC_BALANCE) + ".")); public static final MessageLocale COMMAND_CURRENCY_GIVE_NOTIFY = LangEntry.builder("Command.Currency.Give.Notify").chatMessage( GRAY.wrap(SOFT_YELLOW.wrap(GENERIC_AMOUNT) + " has been added to your account!")); - public static final MessageLocale COMMAND_CURRENCY_GIVE_ALL_DONE = LangEntry.builder("Command.Currency.GiveAll.Done").chatMessage( GRAY.wrap("Added " + SOFT_YELLOW.wrap(GENERIC_AMOUNT) + " to " + SOFT_YELLOW.wrap("All Online") + " players.") ); - public static final MessageLocale COMMAND_CURRENCY_TAKE_DONE = LangEntry.builder("Command.Currency.Take.Done").chatMessage( GRAY.wrap("Taken " + SOFT_YELLOW.wrap(GENERIC_AMOUNT) + " from " + SOFT_YELLOW.wrap(PLAYER_NAME) + "'s balance. New balance: " + SOFT_YELLOW.wrap(GENERIC_BALANCE) + ".")); public static final MessageLocale COMMAND_CURRENCY_TAKE_NOTIFY = LangEntry.builder("Command.Currency.Take.Notify").chatMessage( GRAY.wrap(SOFT_YELLOW.wrap(GENERIC_AMOUNT) + " has been taken from your account!")); - public static final MessageLocale COMMAND_CURRENCY_SET_DONE = LangEntry.builder("Command.Currency.Set.Done").chatMessage( GRAY.wrap("Set " + SOFT_YELLOW.wrap(PLAYER_NAME) + "'s " + SOFT_YELLOW.wrap(CURRENCY_NAME) + " balance to " + SOFT_YELLOW.wrap(GENERIC_BALANCE) + ".")); public static final MessageLocale COMMAND_CURRENCY_SET_NOTIFY = LangEntry.builder("Command.Currency.Set.Notify").chatMessage( GRAY.wrap("Your " + SOFT_YELLOW.wrap(CURRENCY_NAME) + " balance has been set to " + SOFT_YELLOW.wrap(GENERIC_AMOUNT) + ".")); - public static final MessageLocale CURRENCY_SEND_ERROR_NOT_ENOUGH = LangEntry.builder("Command.Currency.Send.Error.NotEnough").chatMessage( GRAY.wrap("You don't have enough " + SOFT_RED.wrap(CURRENCY_NAME) + "!")); @@ -187,7 +176,6 @@ public class Lang implements LangContainer { public static final MessageLocale CURRENCY_SEND_DONE_NOTIFY = LangEntry.builder("Command.Currency.Send.Done.Notify").chatMessage( GRAY.wrap("You received " + SOFT_YELLOW.wrap(GENERIC_AMOUNT) + " from " + SOFT_YELLOW.wrap(PLAYER_NAME) + "!")); - public static final MessageLocale COMMAND_CURRENCY_PAYMENTS_TOGGLE = LangEntry.builder("Command.Currency.Payments.Toggle").chatMessage( GRAY.wrap(SOFT_YELLOW.wrap(CURRENCY_NAME) + " payments acception: " + SOFT_YELLOW.wrap(GENERIC_STATE) + ".")); @@ -234,14 +222,12 @@ public class Lang implements LangContainer { SHOW_TEXT.with(GRAY.wrap("There are no more pages.")).wrap(GRAY.wrap("[←]")) ); - public static final MessageLocale CURRENCY_BALANCE_DISPLAY_OWN = LangEntry.builder("Currency.Balance.Display.Own").chatMessage( GRAY.wrap("Balance: " + SOFT_YELLOW.wrap(GENERIC_BALANCE) + ".")); public static final MessageLocale CURRENCY_BALANCE_DISPLAY_OTHERS = LangEntry.builder("Currency.Balance.Display.Others").chatMessage( GRAY.wrap(SOFT_YELLOW.wrap(PLAYER_NAME) + "'s balance: " + SOFT_YELLOW.wrap(GENERIC_BALANCE) + ".")); - public static final MessageLocale CURRENCY_WALLET_OWN = LangEntry.builder("Currency.Wallet.Own").message( MessageData.CHAT_NO_PREFIX, DARK_GRAY.wrap(STRIKETHROUGH.wrap("-".repeat(32))), @@ -264,7 +250,6 @@ public class Lang implements LangContainer { YELLOW.wrap("•") + " " + WHITE.wrap(CURRENCY_NAME + ":") + " " + GREEN.wrap(GENERIC_BALANCE) ); - public static final MessageLocale CURRENCY_EXCHANGE_ERROR_DISABLED = LangEntry.builder("Currency.Exchange.Error.Disabled").chatMessage( GRAY.wrap(SOFT_RED.wrap(CURRENCY_NAME) + " can not be exchanged!")); @@ -283,10 +268,8 @@ public class Lang implements LangContainer { public static final MessageLocale CURRENCY_EXCHANGE_SUCCESS = LangEntry.builder("Currency.Exchange.Success").chatMessage( GRAY.wrap("You exchanged " + SOFT_YELLOW.wrap(GENERIC_BALANCE) + " for " + SOFT_YELLOW.wrap(GENERIC_AMOUNT) + "!")); - public static final TextLocale ECONOMY_ERROR_INVALID_PLAYER = LangEntry.builder("VaultEconomy.Error.InvalidPlayer").text("Player not found."); public static final TextLocale ECONOMY_ERROR_INSUFFICIENT_FUNDS = LangEntry.builder("VaultEconomy.Error.InsufficientFunds").text("Insufficient Funds!"); - public static final TextLocale OTHER_NO_TOP_ENTRY = LangEntry.builder("Other.NoTopEntry").text(""); } diff --git a/src/main/java/su/nightexpress/coinsengine/migration/MigrationManager.java b/src/main/java/su/nightexpress/coinsengine/migration/MigrationManager.java index 6f24569..60653d8 100644 --- a/src/main/java/su/nightexpress/coinsengine/migration/MigrationManager.java +++ b/src/main/java/su/nightexpress/coinsengine/migration/MigrationManager.java @@ -96,7 +96,7 @@ public boolean startMigration(@NotNull CommandSender sender, @NotNull String nam return false; } - this.plugin.runTaskAsync(task -> { + this.plugin.runTaskAsync(() -> { this.currencyManager.disableOperations(); Lang.MIGRATION_STARTED.message().send(sender, replacer -> replacer.replace(Placeholders.GENERIC_NAME, migrator.getName())); this.migrate(migrator, currency); diff --git a/src/main/resources/paper-plugin.yml b/src/main/resources/paper-plugin.yml index 913d293..eea3e55 100644 --- a/src/main/resources/paper-plugin.yml +++ b/src/main/resources/paper-plugin.yml @@ -18,4 +18,4 @@ dependencies: PlayerPoints: required: false DeluxeCoinflip: - required: false \ No newline at end of file + required: false