diff --git a/build.gradle.kts b/build.gradle.kts index 780f68051..c4cc1ccb5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -81,9 +81,6 @@ allprojects { // LibsDisguises maven("https://repo.md-5.net/content/groups/public/") - // UltraEconomy - maven("https://repo.techscode.com/repository/maven-releases/") - // PlayerPoints maven("https://repo.rosewooddev.io/repository/public/") diff --git a/eco-core/core-plugin/build.gradle.kts b/eco-core/core-plugin/build.gradle.kts index 40fd34971..47f4a1cec 100644 --- a/eco-core/core-plugin/build.gradle.kts +++ b/eco-core/core-plugin/build.gradle.kts @@ -51,7 +51,6 @@ dependencies { compileOnly("com.github.Gypopo:EconomyShopGUI-API:1.4.6") compileOnly("com.github.N0RSKA:ScytherAPI:55a") compileOnly("com.ticxo.modelengine:api:R3.0.1") - compileOnly("me.TechsCode:UltraEconomyAPI:2.6.4") compileOnly("org.black_ixx:playerpoints:3.2.5") compileOnly("com.github.Ssomar-Developement:SCore:3.4.7") compileOnly("io.lumine:Mythic:5.3.5") diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt index 676640437..519b6ae34 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/EcoSpigotPlugin.kt @@ -48,8 +48,8 @@ import com.willfp.eco.internal.items.ArgParserFlag import com.willfp.eco.internal.items.ArgParserHead import com.willfp.eco.internal.items.ArgParserName import com.willfp.eco.internal.items.ArgParserTexture -import com.willfp.eco.internal.items.ArgParserUnbreakable import com.willfp.eco.internal.items.ArgParserTrim +import com.willfp.eco.internal.items.ArgParserUnbreakable import com.willfp.eco.internal.lookup.SegmentParserGroup import com.willfp.eco.internal.lookup.SegmentParserUseIfPresent import com.willfp.eco.internal.particle.ParticleFactoryRGB @@ -389,7 +389,7 @@ abstract class EcoSpigotPlugin : EcoPlugin() { override fun loadListeners(): List { val listeners = mutableListOf( ArmorListener(), - EntityDeathByEntityListeners, + EntityDeathByEntityListeners(this), CraftingRecipeListener(this), StackedRecipeListener(this), GUIListener(this), diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/price/PriceFactoryUltraEconomy.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/price/PriceFactoryUltraEconomy.kt index 9b350097d..f1a371d08 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/price/PriceFactoryUltraEconomy.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/price/PriceFactoryUltraEconomy.kt @@ -32,15 +32,15 @@ class PriceFactoryUltraEconomy(private val currency: Currency) : PriceFactory { get() = api.accounts.uuid(this.uniqueId).orElse(null) override fun canAfford(player: Player, multiplier: Double): Boolean { - return (player.account?.getBalance(currency)?.onHand ?: 0f) >= getValue(player, multiplier) + return (player.account?.getBalance(currency)?.onHand ?: 0.0) >= getValue(player, multiplier) } override fun pay(player: Player, multiplier: Double) { - player.account?.getBalance(currency)?.removeHand(getValue(player, multiplier).toFloat()) + player.account?.getBalance(currency)?.removeHand(getValue(player, multiplier)) } override fun giveTo(player: Player, multiplier: Double) { - player.account?.getBalance(currency)?.addHand(getValue(player, multiplier).toFloat()) + player.account?.getBalance(currency)?.addHand(getValue(player, multiplier)) } override fun getValue(player: Player, multiplier: Double): Double { diff --git a/lib/UltraEconomyAPI-2.6.4-all.jar b/lib/UltraEconomyAPI-2.6.4-all.jar new file mode 100644 index 000000000..9356d211d Binary files /dev/null and b/lib/UltraEconomyAPI-2.6.4-all.jar differ