libreforge-updater

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/EcoPetsPlugin.kt

@@ -30,7 +30,9 @@ import com.willfp.libreforge.filters.Filters
 import com.willfp.libreforge.loader.LibreforgePlugin
 import com.willfp.libreforge.loader.configs.ConfigCategory
 import com.willfp.libreforge.registerHolderProvider
+import com.willfp.libreforge.registerSpecificHolderProvider
 import com.willfp.libreforge.triggers.Triggers
+import org.bukkit.entity.Player
 import org.bukkit.event.Listener
 
 class EcoPetsPlugin : LibreforgePlugin() {
@@ -55,10 +57,10 @@ class EcoPetsPlugin : LibreforgePlugin() {
         Triggers.register(TriggerGainPetXp)
         Triggers.register(TriggerLevelUpPet)
         Filters.register(FilterPet)
-        
-        registerHolderProvider {
-            it.activePetLevel?.let { l ->
-                listOf(SimpleProvidedHolder(l))
+
+        registerSpecificHolderProvider<Player> {
+            it.activePetLevel?.let { p ->
+                listOf(SimpleProvidedHolder(p))
             } ?: emptyList()
         }
 

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/libreforge/ConditionHasActivePet.kt

@@ -3,9 +3,12 @@ package com.willfp.ecopets.libreforge
 import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.ecopets.api.EcoPetsAPI
 import com.willfp.ecopets.pets.Pets
+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 org.bukkit.entity.Player
 
 object ConditionHasActivePet : Condition<NoCompileData>("has_active_pet") {
@@ -13,11 +16,14 @@ object ConditionHasActivePet : Condition<NoCompileData>("has_active_pet") {
         require("pet", "You must specify the pet!")
     }
 
-    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 EcoPetsAPI.instance.getActivePet(player) == Pets.getByID(config.getString("pet").lowercase())
-//        return EcoPetsAPI.instance.hasPet(
-//            player,
-//            Pets.getByID(config.getString("pet").lowercase()) ?: return false
-//        )
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/libreforge/ConditionHasPet.kt

@@ -3,12 +3,22 @@ package com.willfp.ecopets.libreforge
 import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.ecopets.api.EcoPetsAPI
 import com.willfp.ecopets.pets.Pets
+import com.willfp.libreforge.Dispatcher
 import com.willfp.libreforge.NoCompileData
+import com.willfp.libreforge.ProvidedHolder
 import com.willfp.libreforge.conditions.Condition
+import com.willfp.libreforge.get
 import org.bukkit.entity.Player
 
 object ConditionHasPet : Condition<NoCompileData>("has_pet") {
-    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 EcoPetsAPI.instance.hasPet(
             player,
             Pets.getByID(config.getString("pet").lowercase()) ?: return false

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/libreforge/ConditionHasPetLevel.kt

@@ -4,9 +4,13 @@ import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.ecopets.api.EcoPetsAPI
 import com.willfp.ecopets.api.event.PlayerPetLevelUpEvent
 import com.willfp.ecopets.pets.Pets
+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.libreforge.toDispatcher
 import com.willfp.libreforge.updateEffects
 import org.bukkit.entity.Player
 import org.bukkit.event.EventHandler
@@ -20,10 +24,17 @@ object ConditionHasPetLevel : Condition<NoCompileData>("has_pet_level") {
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
     fun handle(event: PlayerPetLevelUpEvent) {
-        event.player.updateEffects()
+        event.player.toDispatcher().updateEffects()
     }
 
-    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 EcoPetsAPI.instance.getPetLevel(
             player,
             Pets.getByID(config.getString("pet").lowercase()) ?: return false

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/libreforge/EffectPetXpMultiplier.kt

@@ -4,6 +4,7 @@ import com.willfp.ecopets.api.event.PlayerPetExpGainEvent
 import com.willfp.ecopets.pets.Pet
 import com.willfp.ecopets.pets.Pets
 import com.willfp.libreforge.effects.templates.MultiMultiplierEffect
+import com.willfp.libreforge.toDispatcher
 import org.bukkit.event.EventHandler
 
 object EffectPetXpMultiplier : MultiMultiplierEffect<Pet>("pet_xp_multiplier") {
@@ -21,6 +22,6 @@ object EffectPetXpMultiplier : MultiMultiplierEffect<Pet>("pet_xp_multiplier") {
     fun handle(event: PlayerPetExpGainEvent) {
         val player = event.player
 
-        event.amount *= getMultiplier(player, event.pet)
+        event.amount *= getMultiplier(player.toDispatcher(), event.pet)
     }
 }

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/libreforge/TriggerGainPetXp.kt

@@ -1,6 +1,7 @@
 package com.willfp.ecopets.libreforge
 
 import com.willfp.ecopets.api.event.PlayerPetExpGainEvent
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.Trigger
 import com.willfp.libreforge.triggers.TriggerData
 import com.willfp.libreforge.triggers.TriggerParameter
@@ -18,7 +19,7 @@ object TriggerGainPetXp : Trigger("gain_pet_xp") {
         val player = event.player
 
         this.dispatch(
-            player,
+            player.toDispatcher(),
             TriggerData(
                 player = player,
                 location = player.location,

eco-core/core-plugin/src/main/kotlin/com/willfp/ecopets/libreforge/TriggerLevelUpPet.kt

@@ -1,6 +1,7 @@
 package com.willfp.ecopets.libreforge
 
 import com.willfp.ecopets.api.event.PlayerPetLevelUpEvent
+import com.willfp.libreforge.toDispatcher
 import com.willfp.libreforge.triggers.Trigger
 import com.willfp.libreforge.triggers.TriggerData
 import com.willfp.libreforge.triggers.TriggerParameter
@@ -18,7 +19,7 @@ object TriggerLevelUpPet : Trigger("level_up_pet") {
         val player = event.player
 
         this.dispatch(
-            player,
+            player.toDispatcher(),
             TriggerData(
                 player = player,
                 location = player.location,

eco-core/core-plugin/src/main/resources/paper-plugin.yml

@@ -1,83 +0,0 @@
-name: ${pluginName}
-version: ${version}
-main: com.willfp.ecopets.EcoPetsPlugin
-api-version: 1.19
-
-dependencies:
-  - name: eco
-    required: true
-    bootstrap: false
-
-  - name: libreforge
-    required: false
-    bootstrap: false
-
-load-after:
-  - name: eco
-    bootstrap: false
-
-
-permissions:
-  ecopets.*:
-    description: All ecopets permissions
-    default: op
-    children:
-      ecopets.command.*: true
-  ecopets.command.*:
-    description: All commands
-    default: op
-    children:
-      ecopets.command.ecopets: true
-      ecopets.command.reload: true
-      ecopets.command.pets: true
-      ecopets.command.give: true
-      ecopets.command.giveegg: true
-      ecopets.command.givexp: true
-      ecopets.command.givecurrentxp: true
-      ecopets.command.reset: true
-      ecopets.command.activate: true
-      ecopets.command.deactivate: true
-
-  ecopets.command.reload:
-    description: Allows reloading the config
-    default: op
-  ecopets.command.ecopets:
-    description: Allows the use of /ecopets.
-    default: true
-  ecopets.command.pets:
-    description: Allows the use of /pets.
-    default: true
-  ecopets.command.give:
-    description: Allows the use of /ecopets give.
-    default: op
-  ecopets.command.giveegg:
-    description: Allows the use of /ecopets giveegg.
-    default: op
-  ecopets.command.givexp:
-    description: Allows the use of /ecopets givexp.
-    default: op
-  ecopets.command.givecurrentxp:
-    description: Allows the use of /ecopets givecurrentxp.
-    default: op
-  ecopets.command.reset:
-    description: Allows the use of /ecopets reset.
-    default: op
-  ecopets.command.activate:
-    description: Allows the use of /pets activate.
-    default: true
-  ecopets.command.deactivate:
-    description: Allows the use of /pets deactivate.
-    default: true
-
-  ecopets.xpmultiplier.50percent:
-    description: Gives the player 50% more skill experience
-    default: false
-  ecopets.xpmultiplier.double:
-    description: Gives the player 2x skill experience
-    default: false
-  ecopets.xpmultiplier.triple:
-    description: Gives the player 3x skill experience
-    default: false
-  ecopets.xpmultiplier.quadruple:
-    description: Gives the player 4x skill experience
-    default: false

gradle.properties

@@ -1,5 +1,5 @@
 #libreforge-updater
-#Fri Nov 17 19:02:39 GMT 2023
+#Sun Dec 03 15:59:57 GMT 2023
 kotlin.code.style=official
-libreforge-version=4.43.0
-version=2.43.0
+libreforge-version=4.48.0
+version=2.48.0