Merge remote-tracking branch 'origin/master'

# Conflicts:
#	gradle.properties

build.gradle

@@ -47,7 +47,7 @@ allprojects {
     }
 
     dependencies {
-        compileOnly 'com.willfp:eco:4.0.0'
+        compileOnly 'com.willfp:eco:4.2.0'
 
         compileOnly 'org.jetbrains:annotations:19.0.0'
 

eco-core/core-plugin/src/main/java/com/willfp/talismans/display/TalismanDisplay.java

@@ -25,7 +25,8 @@ public class TalismanDisplay extends DisplayModule {
     }
 
     @Override
-    protected void display(@NotNull final ItemStack itemStack) {
+    protected void display(@NotNull final ItemStack itemStack,
+                           @NotNull final Object... args) {
         if (!TalismanUtils.isTalismanMaterial(itemStack.getType())) {
             return;
         }
@@ -66,19 +67,4 @@ public class TalismanDisplay extends DisplayModule {
         meta.setLore(lore);
         itemStack.setItemMeta(meta);
     }
-
-    @Override
-    protected void revert(@NotNull final ItemStack itemStack) {
-        if (itemStack.getItemMeta() == null) {
-            return;
-        }
-
-        ItemMeta meta = itemStack.getItemMeta();
-        List<String> itemLore = meta.getLore() == null ? new ArrayList<>() : meta.getLore();
-
-        itemLore.removeIf(s -> s.startsWith("§z"));
-
-        meta.setLore(itemLore);
-        itemStack.setItemMeta(meta);
-    }
 }

eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java

@@ -1,7 +1,6 @@
 package com.willfp.talismans.talismans.util;
 
 import com.google.common.collect.Sets;
-import com.willfp.eco.util.TridentUtils;
 import com.willfp.eco.util.integrations.antigrief.AntigriefManager;
 import com.willfp.eco.util.integrations.mcmmo.McmmoManager;
 import com.willfp.eco.util.internal.PluginDependent;
@@ -23,7 +22,6 @@ import org.bukkit.event.entity.EntityShootBowEvent;
 import org.bukkit.event.entity.ProjectileHitEvent;
 import org.bukkit.event.entity.ProjectileLaunchEvent;
 import org.bukkit.event.player.PlayerMoveEvent;
-import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffectType;
 import org.jetbrains.annotations.NotNull;
 
@@ -587,7 +585,6 @@ public class WatcherTriggers extends PluginDependent implements Listener {
 
         Trident trident = (Trident) event.getEntity();
         Player shooter = (Player) trident.getShooter();
-        ItemStack item = TridentUtils.getItemStack(trident);
 
         TalismanChecks.getTalismansOnPlayer(shooter).forEach(talisman -> {
             if (event.isCancelled()) {