diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/ReforgesPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/ReforgesPlugin.kt index f2ec39a..9bd6899 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/ReforgesPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/ReforgesPlugin.kt @@ -9,6 +9,8 @@ import com.willfp.libreforge.loader.LibreforgePlugin import com.willfp.libreforge.loader.configs.ConfigCategory import com.willfp.libreforge.registerHolderProvider import com.willfp.libreforge.registerPlayerRefreshFunction +import com.willfp.libreforge.registerSpecificHolderProvider +import com.willfp.libreforge.registerSpecificRefreshFunction import com.willfp.reforges.commands.CommandReforge import com.willfp.reforges.commands.CommandReforges import com.willfp.reforges.config.TargetYml @@ -20,6 +22,7 @@ import com.willfp.reforges.reforges.util.ReforgeArgParser import com.willfp.reforges.util.AntiPlaceListener import com.willfp.reforges.util.DiscoverRecipeListener import com.willfp.reforges.util.ReforgeLookup +import org.bukkit.entity.Player import org.bukkit.event.Listener class ReforgesPlugin : LibreforgePlugin() { @@ -41,8 +44,13 @@ class ReforgesPlugin : LibreforgePlugin() { Items.registerArgParser(ReforgeArgParser) - registerHolderProvider { ReforgeLookup.provideReforges(it) } - registerPlayerRefreshFunction { ReforgeLookup.clearCache(it) } + registerSpecificHolderProvider { + ReforgeLookup.provideReforges(it) + } + + registerSpecificRefreshFunction { + ReforgeLookup.clearCache(it) + } } override fun loadListeners(): List { diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/libreforge/ConditionHasReforge.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/libreforge/ConditionHasReforge.kt index 4191952..b9e1b93 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/libreforge/ConditionHasReforge.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/libreforge/ConditionHasReforge.kt @@ -2,9 +2,12 @@ package com.willfp.reforges.libreforge import com.willfp.eco.core.config.interfaces.Config import com.willfp.eco.util.containsIgnoreCase +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 com.willfp.libreforge.get import com.willfp.reforges.reforges.Reforge import com.willfp.reforges.util.ReforgeLookup import org.bukkit.entity.Player @@ -14,7 +17,14 @@ object ConditionHasReforge : Condition("has_reforge") { require("reforge", "You must specify the reforge!") } - override fun isMet(player: Player, config: Config, compileData: NoCompileData): Boolean { + override fun isMet( + dispatcher: Dispatcher<*>, + config: Config, + holder: ProvidedHolder, + compileData: NoCompileData + ): Boolean { + val player = dispatcher.get() ?: return false + return ReforgeLookup.provideReforges(player) .map { it.holder } .filterIsInstance() diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/Reforge.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/Reforge.kt index 955391b..41cf822 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/Reforge.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/reforges/reforges/Reforge.kt @@ -15,6 +15,7 @@ import com.willfp.libreforge.ItemProvidedHolder import com.willfp.libreforge.ViolationContext import com.willfp.libreforge.conditions.Conditions import com.willfp.libreforge.effects.Effects +import com.willfp.libreforge.toDispatcher import com.willfp.libreforge.triggers.TriggerData import com.willfp.reforges.ReforgesPlugin import com.willfp.reforges.util.reforgeStone @@ -108,7 +109,7 @@ class Reforge( fun runOnReforgeEffects(player: Player, item: ItemStack) { onReforgeEffects?.trigger( - player, + player.toDispatcher(), TriggerData( holder = ItemProvidedHolder(this, item), player = player, diff --git a/gradle.properties b/gradle.properties index d65bc2b..fa4c1ed 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ #libreforge-updater -#Sun Nov 19 14:13:53 GMT 2023 +#Tue Nov 21 22:41:08 GMT 2023 kotlin.code.style=official -libreforge-version=4.43.1 -version=6.43.1 +libreforge-version=4.44.0 +version=6.44.0