diff --git a/bukkit/src/main/java/me/lokka30/treasury/plugin/bukkit/TreasuryBukkit.java b/bukkit/src/main/java/me/lokka30/treasury/plugin/bukkit/TreasuryBukkit.java index 1d565e60..e6cd9ed8 100644 --- a/bukkit/src/main/java/me/lokka30/treasury/plugin/bukkit/TreasuryBukkit.java +++ b/bukkit/src/main/java/me/lokka30/treasury/plugin/bukkit/TreasuryBukkit.java @@ -12,7 +12,6 @@ package me.lokka30.treasury.plugin.bukkit; -import me.lokka30.treasury.api.economy.currency.conversion.CurrencyConverter; import me.lokka30.treasury.api.economy.misc.EconomyAPIVersion; import me.lokka30.treasury.plugin.bukkit.command.TreasuryCommand; import me.lokka30.treasury.plugin.bukkit.vendor.BukkitVendor; @@ -42,9 +41,6 @@ public class TreasuryBukkit extends JavaPlugin { */ @NotNull public static final EconomyAPIVersion ECONOMY_API_VERSION = EconomyAPIVersion.VERSION_1; - @NotNull private final CurrencyConverter currencyConverter = new CurrencyConverter(); - @NotNull public CurrencyConverter getCurrencyConverter() { return currencyConverter; } - private BukkitTreasuryPlugin treasuryPlugin; /** diff --git a/core/src/main/java/me/lokka30/treasury/plugin/core/command/subcommand/InfoSubcommand.java b/core/src/main/java/me/lokka30/treasury/plugin/core/command/subcommand/InfoSubcommand.java index 91a018f8..0b0aae50 100644 --- a/core/src/main/java/me/lokka30/treasury/plugin/core/command/subcommand/InfoSubcommand.java +++ b/core/src/main/java/me/lokka30/treasury/plugin/core/command/subcommand/InfoSubcommand.java @@ -70,7 +70,7 @@ public void execute(@NotNull CommandSource sender, @NotNull String label, @NotNu placeholder("api-version", provider.getSupportedAPIVersion()), placeholder("supports-bank-accounts", Utils.getYesNoStateMessage(provider.hasBankAccountSupport())), placeholder("supports-transaction-events", Utils.getYesNoStateMessage(provider.hasTransactionEventSupport())), - placeholder("primary-currency", provider.getPrimaryCurrency().getCurrencyName())) + placeholder("primary-currency", provider.getPrimaryCurrency().getPrimaryCurrencyName())) ); } diff --git a/core/src/main/java/me/lokka30/treasury/plugin/core/command/subcommand/migrate/AccountMigrator.java b/core/src/main/java/me/lokka30/treasury/plugin/core/command/subcommand/migrate/AccountMigrator.java index ac6f2dc9..91721b66 100644 --- a/core/src/main/java/me/lokka30/treasury/plugin/core/command/subcommand/migrate/AccountMigrator.java +++ b/core/src/main/java/me/lokka30/treasury/plugin/core/command/subcommand/migrate/AccountMigrator.java @@ -65,7 +65,7 @@ public void phaseFail(@NotNull EconomyException exception) { migration.debug(() -> String.format( "Failed to recover from an issue transferring %s %s from %s, currency will be deleted!", balance, - fromCurrency.getCurrencyName(), + fromCurrency.getPrimaryCurrencyName(), fromAccount.getUniqueId())); })); }); diff --git a/pom.xml b/pom.xml index 13e317ac..72e640db 100644 --- a/pom.xml +++ b/pom.xml @@ -42,12 +42,11 @@ 1.17.1-R0.1-SNAPSHOT 22.0.0 - 4.13.1 + 5.8.2 2.8.0 21.0 2.2.1 2.1.0-SNAPSHOT - 5.8.2