Merge remote-tracking branch 'origin/master'

# Conflicts:
#	eco-api/src/main/kotlin/com/willfp/libreforge/effects/effects/EffectCritMultiplier.kt

build.gradle

@@ -63,3 +63,4 @@ java.sourceCompatibility = JavaVersion.VERSION_16
 compileJava.options.encoding = 'UTF-8'
 
 build.dependsOn shadowJar
+build.dependsOn publishToMavenLocal

eco-api/build.gradle

@@ -1,7 +1,7 @@
 dependencies {
     compileOnly 'io.papermc.paper:paper-api:1.17.1-R0.1-SNAPSHOT'
 
-    compileOnly 'com.willfp:EcoSkills:1.4.0'
+    compileOnly 'com.willfp:EcoSkills:1.11.8'
     compileOnly 'com.github.Archy-X:AureliumSkills:Beta1.2.4'
 }
 

eco-api/src/main/kotlin/com/willfp/libreforge/ConfigurableProperty.kt

@@ -2,7 +2,7 @@ package com.willfp.libreforge
 
 import com.willfp.eco.core.config.interfaces.JSONConfig
 import com.willfp.libreforge.effects.Effect
-import java.util.Objects
+import java.util.*
 
 abstract class ConfigurableProperty(
     val id: String
@@ -49,4 +49,4 @@ abstract class ConfigurableProperty(
     override fun hashCode(): Int {
         return Objects.hash(this.id)
     }
-}
+}

eco-api/src/main/kotlin/com/willfp/libreforge/provider/Holder.kt → eco-api/src/main/kotlin/com/willfp/libreforge/Holder.kt

@@ -1,9 +1,9 @@
-package com.willfp.libreforge.provider
+package com.willfp.libreforge
 
 import com.willfp.libreforge.conditions.ConfiguredCondition
 import com.willfp.libreforge.effects.ConfiguredEffect
 
 interface Holder {
     val effects: Set<ConfiguredEffect>
     val conditions: Set<ConfiguredCondition>
-}
+}

eco-api/src/main/kotlin/com/willfp/libreforge/provider/HolderProvider.kt → eco-api/src/main/kotlin/com/willfp/libreforge/HolderProvider.kt

@@ -1,7 +1,7 @@
-package com.willfp.libreforge.provider
+package com.willfp.libreforge
 
 import org.bukkit.entity.Player
 
 interface HolderProvider {
     fun providerHolders(player: Player): Iterable<Holder>
-}
+}

eco-api/src/main/kotlin/com/willfp/libreforge/LibReforge.kt

@@ -6,16 +6,15 @@ import com.willfp.eco.core.EcoPlugin
 import com.willfp.eco.core.integrations.IntegrationLoader
 import com.willfp.eco.util.ListUtils
 import com.willfp.libreforge.conditions.Conditions
+import com.willfp.libreforge.effects.Effects
 import com.willfp.libreforge.integrations.aureliumskills.AureliumSkillsIntegration
 import com.willfp.libreforge.integrations.ecoskills.EcoSkillsIntegration
-import com.willfp.libreforge.provider.Holder
-import com.willfp.libreforge.provider.HolderProvider
 import com.willfp.libreforge.triggers.Triggers
-import com.willfp.libreforge.triggers.triggers.WatcherTriggers
 import org.apache.commons.lang.StringUtils
+import org.bukkit.Bukkit
 import org.bukkit.entity.Player
-import java.util.UUID
-import java.util.WeakHashMap
+import org.bukkit.event.Listener
+import java.util.*
 
 private val holderProviders = mutableSetOf<HolderProvider>()
 private val previousStates: MutableMap<UUID, Iterable<Holder>> = WeakHashMap()
@@ -41,15 +40,36 @@ object LibReforge {
 
     @JvmStatic
     fun enable(plugin: EcoPlugin) {
-        plugin.eventManager.registerListener(WatcherTriggers(plugin))
+        plugin.eventManager.registerListener(TridentHolderDataAttacher(plugin))
         for (condition in Conditions.values()) {
             plugin.eventManager.registerListener(condition)
         }
+        for (effect in Effects.values()) {
+            if (effect is Listener) {
+                plugin.eventManager.registerListener(effect)
+            }
+        }
         for (trigger in Triggers.values()) {
             plugin.eventManager.registerListener(trigger)
         }
     }
 
+    @JvmStatic
+    @Suppress("UNUSED_PARAMETER")
+    fun disable(plugin: EcoPlugin) {
+        for (player in Bukkit.getOnlinePlayers()) {
+            try {
+                for (holder in player.getHolders()) {
+                    for ((effect) in holder.effects) {
+                        effect.disableForPlayer(player)
+                    }
+                }
+            } catch (e: Exception) {
+                Bukkit.getLogger().warning("Error disabling effects, not important - do not report this")
+            }
+        }
+    }
+
     @JvmStatic
     fun getIntegrationLoaders(): List<IntegrationLoader> {
         return listOf(
@@ -63,10 +83,13 @@ object LibReforge {
         holderProviders.add(provider)
     }
 
-    fun logViolation(id: String, context: String, violation: com.willfp.libreforge.ConfigViolation) {
-        LibReforge.plugin.logger.warning("Invalid configuration for $id in context $context:")
-        LibReforge.plugin.logger.warning("(Cause) Argument ${violation.param}")
-        LibReforge.plugin.logger.warning("(Reason) ${violation.message}")
+    @JvmStatic
+    fun logViolation(id: String, context: String, violation: ConfigViolation) {
+        plugin.logger.warning("")
+        plugin.logger.warning("Invalid configuration for $id in context $context:")
+        plugin.logger.warning("(Cause) Argument '${violation.param}'")
+        plugin.logger.warning("(Reason) ${violation.message}")
+        plugin.logger.warning("")
     }
 }
 

eco-api/src/main/kotlin/com/willfp/libreforge/TridentHolderDataAttacher.kt

@@ -0,0 +1,45 @@
+package com.willfp.libreforge
+
+import com.willfp.eco.core.EcoPlugin
+import com.willfp.eco.core.integrations.mcmmo.McmmoManager
+import org.bukkit.entity.Player
+import org.bukkit.entity.Trident
+import org.bukkit.event.EventHandler
+import org.bukkit.event.Listener
+import org.bukkit.event.entity.ProjectileLaunchEvent
+
+class TridentHolderDataAttacher(
+    private val plugin: EcoPlugin
+) : Listener {
+    @EventHandler(ignoreCancelled = true)
+    fun onProjectileLaunch(event: ProjectileLaunchEvent) {
+        if (McmmoManager.isFake(event)) {
+            return
+        }
+
+        val shooter = event.entity.shooter
+
+        if (shooter !is Player) {
+            return
+        }
+
+        val trident = event.entity
+
+        if (trident !is Trident) {
+            return
+        }
+
+        trident.setMetadata(
+            "${plugin.name.lowercase()}_trident_holders",
+            plugin.metadataValueFactory.create(
+                shooter.getHolders()
+            )
+        )
+    }
+}
+
+fun Trident.getAttachedHolders(): Iterable<Holder> {
+    @Suppress("UNCHECKED_CAST")
+    return this.getMetadata("${LibReforge.plugin.name.lowercase()}_trident_holders")
+        .firstOrNull() as? Iterable<Holder> ?: emptyList()
+}