diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobits/EcoBitsPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobits/EcoBitsPlugin.kt index 54a92f9..00933c3 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobits/EcoBitsPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobits/EcoBitsPlugin.kt @@ -1,8 +1,11 @@ package com.willfp.ecobits +import com.sun.tools.javac.jvm.ByteCodes.ret import com.willfp.eco.core.EcoPlugin import com.willfp.eco.core.command.impl.PluginCommand +import com.willfp.eco.core.integrations.IntegrationLoader import com.willfp.ecobits.commands.CommandEcoBits +import com.willfp.ecobits.integrations.IntegrationVault import org.bukkit.event.Listener class EcoBitsPlugin : EcoPlugin() { @@ -20,6 +23,12 @@ class EcoBitsPlugin : EcoPlugin() { ) } + override fun loadIntegrationLoaders(): List { + return listOf( + IntegrationLoader("Vault") { IntegrationVault.isVaultPresent = true } + ) + } + companion object { @JvmStatic lateinit var instance: EcoBitsPlugin diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobits/currencies/Currency.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobits/currencies/Currency.kt index 7446a46..d83ee64 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobits/currencies/Currency.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobits/currencies/Currency.kt @@ -83,7 +83,7 @@ class Currency( Prices.registerPriceFactory(PriceFactoryCurrency(this)) - if (isRegisteredWithVault) { + if (isRegisteredWithVault && IntegrationVault.isVaultPresent) { Bukkit.getServer().servicesManager.register( Economy::class.java, IntegrationVault(this), diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobits/integrations/IntegrationVault.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobits/integrations/IntegrationVault.kt index 92bd5bd..825ee86 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobits/integrations/IntegrationVault.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/ecobits/integrations/IntegrationVault.kt @@ -8,7 +8,6 @@ import net.milkbowl.vault.economy.Economy import net.milkbowl.vault.economy.EconomyResponse import org.bukkit.Bukkit import org.bukkit.OfflinePlayer -import java.math.BigDecimal @Suppress("DEPRECATION") class IntegrationVault( @@ -337,4 +336,9 @@ class IntegrationVault( override fun getBanks(): MutableList { return mutableListOf() } + + companion object { + var isVaultPresent: Boolean = false + internal set + } } diff --git a/eco-core/core-plugin/src/main/resources/config.yml b/eco-core/core-plugin/src/main/resources/config.yml index efb44df..8381e07 100644 --- a/eco-core/core-plugin/src/main/resources/config.yml +++ b/eco-core/core-plugin/src/main/resources/config.yml @@ -21,5 +21,4 @@ currencies: max: -1 # The maximum balance, set to -1 if no max. payable: false # If players should be able to use /ecobits pay to pay other players decimal: true # If decimal amounts are allowed rather than just integer amounts - - vault: true # If this currency should be registered with vault + vault: false # If this currency should be registered with vault