From 4fcd6174adfc877bf96371e57657feaae07a7e35 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sat, 16 Dec 2017 18:29:12 +0100 Subject: [PATCH] Removed Vault dependency --- plugin.yml | 1 - pom.xml | 9 ------ .../us/tastybento/bskyblock/BSkyBlock.java | 10 +++---- .../bskyblock/util/VaultHelper.java | 30 ------------------- 4 files changed, 4 insertions(+), 46 deletions(-) delete mode 100755 src/main/java/us/tastybento/bskyblock/util/VaultHelper.java diff --git a/plugin.yml b/plugin.yml index a35fde2eb..21ca8796f 100755 --- a/plugin.yml +++ b/plugin.yml @@ -4,7 +4,6 @@ version: ${version} authors: [tastybento, Poslovitch] -depend: [Vault] softdepend: [Herochat, DeluxeChat, PlaceholderAPI, MVdWPlaceholderAPI] load: startup diff --git a/pom.xml b/pom.xml index f66a94e86..22dc53c2c 100644 --- a/pom.xml +++ b/pom.xml @@ -83,20 +83,11 @@ ${server.jars}/library-1.12.jar 1.12 - - net.milkbowl.vault - VaultAPI - LATEST - spigot-repo https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - vault-repo - http://nexus.hc.to/content/repositories/pub_releases - diff --git a/src/main/java/us/tastybento/bskyblock/BSkyBlock.java b/src/main/java/us/tastybento/bskyblock/BSkyBlock.java index 790108cb1..fba4d362f 100755 --- a/src/main/java/us/tastybento/bskyblock/BSkyBlock.java +++ b/src/main/java/us/tastybento/bskyblock/BSkyBlock.java @@ -27,7 +27,6 @@ import us.tastybento.bskyblock.listeners.protection.IslandGuard1_9; import us.tastybento.bskyblock.listeners.protection.NetherEvents; import us.tastybento.bskyblock.managers.CommandsManager; import us.tastybento.bskyblock.util.Util; -import us.tastybento.bskyblock.util.VaultHelper; import us.tastybento.bskyblock.util.nms.NMSAbstraction; /** @@ -60,15 +59,14 @@ public class BSkyBlock extends JavaPlugin implements BSModule { playersManager = new PlayersManager(this); islandsManager = new IslandsManager(this); + // Only load metrics if set to true in config + if(Settings.metrics) { metrics = new Metrics(plugin); - registerCustomCharts(); - } - if (Settings.useEconomy && !VaultHelper.setupEconomy()) { - getLogger().warning("Could not set up economy! - Running without an economy."); - Settings.useEconomy = false; + registerCustomCharts(); + } // Set up commands diff --git a/src/main/java/us/tastybento/bskyblock/util/VaultHelper.java b/src/main/java/us/tastybento/bskyblock/util/VaultHelper.java deleted file mode 100755 index 096aa4b94..000000000 --- a/src/main/java/us/tastybento/bskyblock/util/VaultHelper.java +++ /dev/null @@ -1,30 +0,0 @@ -package us.tastybento.bskyblock.util; - -import org.bukkit.Bukkit; -import org.bukkit.World; -import org.bukkit.entity.Player; -import org.bukkit.plugin.RegisteredServiceProvider; - -import net.milkbowl.vault.economy.Economy; -import net.milkbowl.vault.permission.Permission; - -/** - * Helper class for Vault Economy and Permissions - */ -public class VaultHelper { - public static Economy econ = null; - - /** - * Sets up the economy instance - * - * @return true if successful - */ - public static boolean setupEconomy() { - RegisteredServiceProvider economyProvider = Bukkit.getServer().getServicesManager() - .getRegistration(net.milkbowl.vault.economy.Economy.class); - if (economyProvider != null) { - econ = economyProvider.getProvider(); - } - return econ != null; - } -}