From d686b572866e6bf2c36a34b20f8f230f53f86a32 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 27 Mar 2021 18:16:28 +0000 Subject: [PATCH 1/2] Improved display --- build.gradle | 2 +- .../talismans/display/TalismanDisplay.java | 18 ++---------------- .../talismans/util/WatcherTriggers.java | 3 --- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/build.gradle b/build.gradle index f2824e2..0292099 100644 --- a/build.gradle +++ b/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' diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/TalismanDisplay.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/TalismanDisplay.java index 4c57b10..f12eb89 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/display/TalismanDisplay.java +++ b/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 itemLore = meta.getLore() == null ? new ArrayList<>() : meta.getLore(); - - itemLore.removeIf(s -> s.startsWith("§z")); - - meta.setLore(itemLore); - itemStack.setItemMeta(meta); - } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java b/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java index dba615c..7f7a6b3 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/talismans/talismans/util/WatcherTriggers.java +++ b/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()) { From 5d25c536558d0b5eee7a44cb12609f5949f6be4a Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 27 Mar 2021 18:16:41 +0000 Subject: [PATCH 2/2] Updated to 1.16.3 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index ecfe794..37e4304 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -version = 1.16.2 +version = 1.16.3 plugin-name = Talismans \ No newline at end of file