Merge remote-tracking branch 'origin/master'

core/common/src/main/kotlin/com/willfp/libreforge/LibreforgeSpigotPlugin.kt

@@ -19,9 +19,9 @@ import com.willfp.libreforge.integrations.auraskills.AuraSkillsIntegration
 import com.willfp.libreforge.integrations.aureliumskills.AureliumSkillsIntegration
 import com.willfp.libreforge.integrations.axenvoy.AxEnvoyIntegration
 import com.willfp.libreforge.integrations.citizens.CitizensIntegration
-import com.willfp.libreforge.integrations.votifier.VotifierIntegration
 import com.willfp.libreforge.integrations.custombiomes.impl.CustomBiomesTerra
 import com.willfp.libreforge.integrations.custombiomes.impl.CustomBiomesTerraformGenerator
+import com.willfp.libreforge.integrations.fancynpcs.FancyNPCsIntegration
 import com.willfp.libreforge.integrations.jobs.JobsIntegration
 import com.willfp.libreforge.integrations.levelledmobs.LevelledMobsIntegration
 import com.willfp.libreforge.integrations.mcmmo.McMMOIntegration
@@ -31,6 +31,7 @@ import com.willfp.libreforge.integrations.scyther.ScytherIntegration
 import com.willfp.libreforge.integrations.tab.TabIntegration
 import com.willfp.libreforge.integrations.tmmobcoins.TMMobcoinsIntegration
 import com.willfp.libreforge.integrations.vault.VaultIntegration
+import com.willfp.libreforge.integrations.votifier.VotifierIntegration
 import com.willfp.libreforge.integrations.worldguard.WorldGuardIntegration
 import com.willfp.libreforge.levels.LevelTypes
 import com.willfp.libreforge.levels.placeholder.*
@@ -195,8 +196,9 @@ class LibreforgeSpigotPlugin : EcoPlugin() {
             IntegrationLoader("Terra") { CustomBiomesTerra.load(this) },
             IntegrationLoader("TerraformGenerator") { CustomBiomesTerraformGenerator.load(this) },
             IntegrationLoader("AxEnvoy") { AxEnvoyIntegration.load(this) },
-            IntegrationLoader("Votifier") { VotifierIntegration.load(this)},
-            IntegrationLoader("ModelEngine") { ModelEngineIntegration.load(this) }
+            IntegrationLoader("Votifier") { VotifierIntegration.load(this) },
+            IntegrationLoader("ModelEngine") { ModelEngineIntegration.load(this) },
+            IntegrationLoader("FancyNpcs") { FancyNPCsIntegration.load(this) }
         )
     }
 

core/common/src/main/kotlin/com/willfp/libreforge/integrations/axenvoy/impl/FilterEnvoyType.kt

@@ -13,8 +13,8 @@ object FilterEnvoyType : Filter<NoCompileData, Collection<String>>("envoy_type")
 
     override fun isMet(data: TriggerData, value: Collection<String>, compileData: NoCompileData): Boolean {
         val event = data.event as? EnvoyCrateCollectEvent ?: return true
-
         val crateType = event.crate?.handle?.name ?: return true
+
         return value.contains(crateType)
     }
 }

core/common/src/main/kotlin/com/willfp/libreforge/integrations/fancynpcs/FancyNPCsIntegration.kt

@@ -0,0 +1,21 @@
+package com.willfp.libreforge.integrations.fancynpcs
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.libreforge.filters.Filters
+import com.willfp.libreforge.integrations.LoadableIntegration
+import com.willfp.libreforge.integrations.fancynpcs.impl.FilterNPC
+import com.willfp.libreforge.integrations.fancynpcs.impl.TriggerLeftClickNPC
+import com.willfp.libreforge.integrations.fancynpcs.impl.TriggerRightClickNPC
+import com.willfp.libreforge.triggers.Triggers
+
+object FancyNPCsIntegration : LoadableIntegration {
+    override fun load(plugin: EcoPlugin) {
+        Triggers.register(TriggerLeftClickNPC)
+        Triggers.register(TriggerRightClickNPC)
+        Filters.register(FilterNPC)
+    }
+
+    override fun getPluginName(): String {
+        return "FancyNpcs"
+    }
+}

core/common/src/main/kotlin/com/willfp/libreforge/integrations/fancynpcs/impl/FilterNPC.kt

@@ -0,0 +1,19 @@
+package com.willfp.libreforge.integrations.fancynpcs.impl
+
+import com.willfp.eco.core.config.interfaces.Config
+import com.willfp.libreforge.NoCompileData
+import com.willfp.libreforge.filters.Filter
+import com.willfp.libreforge.triggers.TriggerData
+import de.oliver.fancynpcs.api.events.NpcInteractEvent
+
+object FilterNPC : Filter<NoCompileData, Collection<String>>("npc") {
+    override fun getValue(config: Config, data: TriggerData?, key: String): Collection<String> {
+        return config.getStrings(key)
+    }
+
+    override fun isMet(data: TriggerData, value: Collection<String>, compileData: NoCompileData): Boolean {
+        val event = data.event as? NpcInteractEvent ?: return true
+
+        return value.contains(event.npc.data.id)
+    }
+}

core/common/src/main/kotlin/com/willfp/libreforge/integrations/fancynpcs/impl/TriggerLeftClickNPC.kt

@@ -0,0 +1,31 @@
+package com.willfp.libreforge.integrations.fancynpcs.impl
+
+import com.willfp.libreforge.toDispatcher
+import com.willfp.libreforge.triggers.Trigger
+import com.willfp.libreforge.triggers.TriggerData
+import com.willfp.libreforge.triggers.TriggerParameter
+import de.oliver.fancynpcs.api.actions.ActionTrigger
+import de.oliver.fancynpcs.api.events.NpcInteractEvent
+import org.bukkit.event.EventHandler
+
+object TriggerLeftClickNPC : Trigger("left_click_npc") {
+    override val parameters = setOf(
+        TriggerParameter.PLAYER,
+        TriggerParameter.EVENT
+    )
+
+    @EventHandler(ignoreCancelled = true)
+    fun handle(event: NpcInteractEvent) {
+        if (event.interactionType == ActionTrigger.LEFT_CLICK) {
+            val player = event.player ?: return
+
+            this.dispatch(
+                player.toDispatcher(),
+                TriggerData(
+                    player = player,
+                    event = event
+                )
+            )
+        }
+    }
+}

core/common/src/main/kotlin/com/willfp/libreforge/integrations/fancynpcs/impl/TriggerRightClickNPC.kt

@@ -0,0 +1,31 @@
+package com.willfp.libreforge.integrations.fancynpcs.impl
+
+import com.willfp.libreforge.toDispatcher
+import com.willfp.libreforge.triggers.Trigger
+import com.willfp.libreforge.triggers.TriggerData
+import com.willfp.libreforge.triggers.TriggerParameter
+import de.oliver.fancynpcs.api.actions.ActionTrigger
+import de.oliver.fancynpcs.api.events.NpcInteractEvent
+import org.bukkit.event.EventHandler
+
+object TriggerRightClickNPC : Trigger("right_click_npc") {
+    override val parameters = setOf(
+        TriggerParameter.PLAYER,
+        TriggerParameter.EVENT
+    )
+
+    @EventHandler(ignoreCancelled = true)
+    fun handle(event: NpcInteractEvent) {
+        if (event.interactionType == ActionTrigger.RIGHT_CLICK) {
+            val player = event.player ?: return
+
+            this.dispatch(
+                player.toDispatcher(),
+                TriggerData(
+                    player = player,
+                    event = event
+                )
+            )
+        }
+    }
+}

core/common/src/main/kotlin/com/willfp/libreforge/integrations/votifier/impl/FilterVoteService.kt

@@ -13,8 +13,8 @@ object FilterVoteService : Filter<NoCompileData, Collection<String>>("vote_servi
 
     override fun isMet(data: TriggerData, value: Collection<String>, compileData: NoCompileData): Boolean {
         val event = data.event as? VotifierEvent ?: return true
-
         val service = event.vote.serviceName ?: return true
+
         return value.contains(service)
     }
 }

core/common/src/main/kotlin/com/willfp/libreforge/triggers/impl/TriggerHeadshot.kt

@@ -38,7 +38,8 @@ object TriggerHeadshot : Trigger("headshot") {
                 location = victim.location,
                 event = event,
                 velocity = projectile.velocity,
-                value = event.finalDamage
+                value = event.finalDamage,
+                projectile = projectile
             )
         )
     }

core/common/src/main/resources/plugin.yml

@@ -28,6 +28,7 @@ softdepend:
   - ModelEngine
   - AxEnvoy
   - Votifier
+  - FancyNpcs
 
 commands:
   lrcdb: