Skip to content

Commit

Permalink
2.115.0
Browse files Browse the repository at this point in the history
Took 5 minutes
  • Loading branch information
kiranhart committed Aug 1, 2024
1 parent 85a8634 commit 141b17e
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

<name>AuctionHouse</name>
<description>The ultimate auction solution for your server</description>
<version>2.114.0</version>
<version>2.115.0</version>
<packaging>jar</packaging>
<properties>
<author>Kiran Hart</author>
Expand Down Expand Up @@ -119,7 +119,7 @@
<dependency>
<groupId>ca.tweetzy</groupId>
<artifactId>tweetycore</artifactId>
<version>3.10.1</version>
<version>3.11.0</version>
</dependency>
<dependency>
<groupId>org.mineacademy.plugin</groupId>
Expand Down
7 changes: 6 additions & 1 deletion src/main/java/ca/tweetzy/auctionhouse/AuctionHouse.java
Original file line number Diff line number Diff line change
Expand Up @@ -184,14 +184,19 @@ public void onPluginEnable() {
dataMigrationManager.runMigrations();

// setup Vault Economy
setupEconomy(); // todo auto apply ultra economy currency if it was used.
setupEconomy();

// gui manager
this.guiManager.init();
this.banManager.load();
this.currencyManager.load();
this.paymentsManager.load();

// warn users if there is a mismatch between new economy and old
if (Settings.ECONOMY_PLUGIN.getString().toLowerCase().contains("ultraeconomy") && !Settings.CURRENCY_DEFAULT_SELECTED.getString().toLowerCase().contains("ultraeconomy")) {
getLogger().warning("You are seeing this message because there is a miss match between your old economy provider settings and the new one. While the plugin will default to Vault, if you are seeing this message it's likely because you were using UltraEconomy and you haven't set it up back under 'default selection' in the config.yml!");
}

// listeners
Bukkit.getServer().getPluginManager().registerEvents(new PlayerListeners(), this);
Bukkit.getServer().getPluginManager().registerEvents(new MeteorClientListeners(), this);
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/ca/tweetzy/auctionhouse/settings/Settings.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ public class Settings {
"You have the following supported economy plugins installed: \"" + EconomyManager.getManager().getPossiblePlugins().stream().collect(Collectors.joining("\", \"")) + "\"."
);

public static final ConfigSetting CURRENCY_DEFAULT_SELECTED = new ConfigSetting(config, "settings.currency.default selection", "Vault/Vault", "The default currency selection, PluginName/CurrencyName -> Ex. Vault/Vault or UltraEconomy/Gems etc");
public static final ConfigSetting CURRENCY_VAULT_SYMBOL = new ConfigSetting(config, "settings.currency.vault symbol", "$", "When using default/vault currency, what symbol should be used.");
public static final ConfigSetting CURRENCY_BLACKLISTED = new ConfigSetting(config, "settings.currency.black listed", Collections.singletonList("UltraEconomy:Test"), "A list of owning plugins & the currency to be blacklisted. Ex. UltraEconomy:Test");
public static final ConfigSetting CURRENCY_DEFAULT_SELECTED = new ConfigSetting(config, "economy.currency.default selection", "Vault/Vault", "The default currency selection, PluginName/CurrencyName -> Ex. Vault/Vault or UltraEconomy/Gems etc");
public static final ConfigSetting CURRENCY_VAULT_SYMBOL = new ConfigSetting(config, "economy.currency.vault symbol", "$", "When using default/vault currency, what symbol should be used.");
public static final ConfigSetting CURRENCY_BLACKLISTED = new ConfigSetting(config, "economy.currency.black listed", Collections.singletonList("UltraEconomy:Test"), "A list of owning plugins & the currency to be blacklisted. Ex. UltraEconomy:Test");


public static final ConfigSetting ALLOW_USAGE_OF_IN_GAME_EDITOR = new ConfigSetting(config, "Allow Usage Of This Menu In Game", true, "Once you set this to true, you will no longer be able to access it unless you enable it within the actual config.yml");
Expand Down

0 comments on commit 141b17e

Please sign in to comment.