From e080bfff87a944518f39bcc356428a34ab57e67d Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 21 Nov 2023 22:41:33 +0000 Subject: [PATCH] libreforge-updater --- .../main/kotlin/com/willfp/boosters/BoostersPlugin.kt | 6 +++++- .../boosters/libreforge/ConditionIsBoosterActive.kt | 9 ++++++++- gradle.properties | 6 +++--- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoostersPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoostersPlugin.kt index 72ebbf2..fe25d0a 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoostersPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/BoostersPlugin.kt @@ -11,7 +11,9 @@ import com.willfp.libreforge.SimpleProvidedHolder import com.willfp.libreforge.conditions.Conditions import com.willfp.libreforge.loader.LibreforgePlugin import com.willfp.libreforge.loader.configs.ConfigCategory +import com.willfp.libreforge.registerGenericHolderProvider import com.willfp.libreforge.registerHolderProvider +import com.willfp.libreforge.registerSpecificHolderProvider import org.bukkit.Bukkit class BoostersPlugin : LibreforgePlugin() { @@ -24,7 +26,9 @@ class BoostersPlugin : LibreforgePlugin() { override fun handleEnable() { Conditions.register(ConditionIsBoosterActive) - registerHolderProvider { Bukkit.getServer().activeBoosters.map { it.booster }.map { SimpleProvidedHolder(it) } } + registerGenericHolderProvider { + Bukkit.getServer().activeBoosters.map { it.booster }.map { SimpleProvidedHolder(it) } + } } override fun handleReload() { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/libreforge/ConditionIsBoosterActive.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/libreforge/ConditionIsBoosterActive.kt index c50860b..9db8d41 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/libreforge/ConditionIsBoosterActive.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/boosters/libreforge/ConditionIsBoosterActive.kt @@ -2,7 +2,9 @@ package com.willfp.boosters.libreforge import com.willfp.boosters.boosters.Boosters import com.willfp.eco.core.config.interfaces.Config +import com.willfp.libreforge.Dispatcher import com.willfp.libreforge.NoCompileData +import com.willfp.libreforge.ProvidedHolder import com.willfp.libreforge.arguments import com.willfp.libreforge.conditions.Condition import org.bukkit.entity.Player @@ -12,7 +14,12 @@ object ConditionIsBoosterActive : Condition("is_booster_active") require("booster", "You must specify the booster!") } - override fun isMet(player: Player, config: Config, compileData: NoCompileData): Boolean { + override fun isMet( + dispatcher: Dispatcher<*>, + config: Config, + holder: ProvidedHolder, + compileData: NoCompileData + ): Boolean { return Boosters.getByID(config.getString("booster"))?.active != null } } diff --git a/gradle.properties b/gradle.properties index ff96c97..e4f5c15 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ #libreforge-updater -#Sun Nov 19 14:14:17 GMT 2023 +#Tue Nov 21 22:41:33 GMT 2023 kotlin.code.style=official -libreforge-version=4.43.1 -version=5.42.1 +libreforge-version=4.44.0 +version=5.43.0