Skip to content

Commit 6017554

Browse files
committed
move all Vault code to its own class
1 parent ec36879 commit 6017554

File tree

2 files changed

+400
-422
lines changed

2 files changed

+400
-422
lines changed

src/main/java/pro/cloudnode/smp/bankaccounts/BankAccounts.java

Lines changed: 1 addition & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,12 @@
44
import com.google.gson.JsonParser;
55
import com.zaxxer.hikari.HikariConfig;
66
import com.zaxxer.hikari.HikariDataSource;
7-
import net.milkbowl.vault.economy.Economy;
87
import org.bukkit.NamespacedKey;
98
import org.bukkit.OfflinePlayer;
109
import org.bukkit.command.CommandExecutor;
1110
import org.bukkit.command.CommandSender;
1211
import org.bukkit.command.PluginCommand;
1312
import org.bukkit.event.Listener;
14-
import org.bukkit.plugin.RegisteredServiceProvider;
15-
import org.bukkit.plugin.ServicePriority;
1613
import org.bukkit.plugin.java.JavaPlugin;
1714
import org.bukkit.scheduler.BukkitTask;
1815
import org.jetbrains.annotations.NotNull;
@@ -64,50 +61,6 @@ public final class BankAccounts extends JavaPlugin {
6461
return dbSource;
6562
}
6663

67-
/**
68-
* Check if vault plugin is present
69-
*/
70-
public boolean vaultEnabled() {
71-
return config().integrationsVaultEnabled() && getServer().getPluginManager().getPlugin("Vault") != null;
72-
}
73-
74-
private @Nullable Economy economy;
75-
76-
public boolean hasEconomy() {
77-
return economy != null;
78-
}
79-
80-
public @NotNull Economy getEconomy() {
81-
if (!hasEconomy()) throw new IllegalStateException("Vault is not initialized");
82-
if (!vaultEnabled()) throw new IllegalStateException("Vault integration is not enabled");
83-
return economy;
84-
}
85-
86-
public void setupVault() {
87-
if (!vaultEnabled()) {
88-
getLogger().log(Level.WARNING, "Vault not found or not enabled, Vault integration will not work.");
89-
return;
90-
}
91-
92-
final @NotNull Optional<@NotNull RegisteredServiceProvider<@NotNull Economy>> rsp = Optional.ofNullable(getServer().getServicesManager().getRegistration(Economy.class));
93-
if (rsp.isPresent()) {
94-
final @NotNull Economy foreignEconomy = rsp.get().getProvider();
95-
getLogger().log(Level.WARNING, "Economy already registered by " + rsp.get().getPlugin().getName());
96-
getServer().getServicesManager().unregister(foreignEconomy);
97-
getLogger().log(Level.WARNING, "Unregistered economy provider " + rsp.get().getPlugin().getName());
98-
}
99-
100-
try {
101-
getLogger().log(Level.INFO, "Vault found. Enabling integration.");
102-
this.economy = new VaultIntegration();
103-
getServer().getServicesManager().register(Economy.class, getEconomy(), this, ServicePriority.Normal);
104-
}
105-
catch (final @NotNull Exception e) {
106-
getLogger().log(Level.WARNING, "Failed to register vault economy.", e);
107-
}
108-
109-
}
110-
11164
@Override
11265
public void onEnable() {
11366
saveDefaultConfig();
@@ -146,11 +99,7 @@ public void onEnable() {
14699
getLogger().log(Level.INFO, "PlaceholderAPI not found. Skipping integration.");
147100
}
148101

149-
150-
if (getInstance().vaultEnabled())
151-
getServer().getScheduler().scheduleSyncDelayedTask(this, () -> {
152-
getInstance().setupVault();
153-
});
102+
VaultIntegration.setup();
154103
}
155104

156105
@Override

0 commit comments

Comments
 (0)