libreforge-updater

build.gradle

@@ -48,7 +48,7 @@ allprojects {
 
     dependencies {
         compileOnly 'com.willfp:eco:6.37.1'
-        implementation 'com.willfp:libreforge:3.68.0'
+        implementation 'com.willfp:libreforge:3.69.0'
         implementation 'org.joml:joml:1.10.4'
 
         compileOnly 'org.jetbrains:annotations:23.0.0'

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

@@ -107,7 +107,7 @@ class Pet(
                 "${this.id}_spawn_egg",
                 egg,
                 config.getStrings("spawn-egg.recipe"),
-                config.getString("spawn-egg.recipe-permission")
+                config.getStringOrNull("spawn-egg.recipe-permission")
             )
         }
     }
@@ -157,7 +157,8 @@ class Pet(
         trigger to PetXPGain(
             trigger,
             multiplier,
-            conditions
+            conditions,
+            it.getSubsection("filters")
         )
     }.toMap()
 

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

@@ -1,7 +1,9 @@
 package com.willfp.ecopets.pets
 
+import com.willfp.eco.core.config.interfaces.Config
 import com.willfp.libreforge.conditions.ConfiguredCondition
 import com.willfp.libreforge.events.TriggerPreProcessEvent
+import com.willfp.libreforge.filters.ConfiguredFilter
 import com.willfp.libreforge.triggers.Trigger
 import org.bukkit.event.EventHandler
 import org.bukkit.event.Listener
@@ -9,7 +11,8 @@ import org.bukkit.event.Listener
 data class PetXPGain(
     val trigger: Trigger,
     val multiplier: Double,
-    val conditions: Iterable<ConfiguredCondition>
+    val conditions: Iterable<ConfiguredCondition>,
+    val filters: Config
 )
 
 object PetTriggerXPGainListener : Listener {
@@ -18,6 +21,7 @@ object PetTriggerXPGainListener : Listener {
         val player = event.player
         val trigger = event.trigger
         val value = event.value
+        val data = event.data
 
         val pet = event.player.activePet ?: return
 
@@ -27,6 +31,10 @@ object PetTriggerXPGainListener : Listener {
             return
         }
 
+        if (!ConfiguredFilter(xpGain.filters).matches(data)) {
+            return
+        }
+
         player.givePetExperience(
             pet,
             value * xpGain.multiplier

gradle.properties

@@ -1,4 +1,4 @@
 #libreforge-updater
-#Wed Jun 22 12:43:42 BST 2022
-version=1.6.0
+#Wed Jun 22 22:25:32 BST 2022
+version=1.7.0
 plugin-name=EcoPets