libreforge-updater

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) }
+        registerSpecificHolderProvider<Player> {
-        registerPlayerRefreshFunction { ReforgeLookup.clearCache(it) }
+            ReforgeLookup.provideReforges(it)
+        }
+
+        registerSpecificRefreshFunction<Player> {
+            ReforgeLookup.clearCache(it)
+        }
     }
 
     override fun loadListeners(): List<Listener> {

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<NoCompileData>("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<Player>() ?: return false
+
         return ReforgeLookup.provideReforges(player)
             .map { it.holder }
             .filterIsInstance<Reforge>()

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,

gradle.properties

@@ -1,5 +1,5 @@
 #libreforge-updater
-#Sun Nov 19 14:13:53 GMT 2023
+#Thu Nov 23 13:21:00 GMT 2023
 kotlin.code.style=official
-libreforge-version=4.43.1
+libreforge-version=4.45.0
-version=6.43.1
+version=6.45.0