From 4d0eac235e4e49e15ed7251b4b53e22f3a9b8d03 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 26 Feb 2021 10:14:55 +0000 Subject: [PATCH] Fixed display and sweep artifact not being registered --- .../java/com/willfp/ecoenchants/display/EnchantDisplay.java | 5 +++++ .../com/willfp/ecoenchants/enchantments/EcoEnchants.java | 2 ++ 2 files changed, 7 insertions(+) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java index 9c13e38c..03928565 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java @@ -209,10 +209,15 @@ public class EnchantDisplay extends DisplayModule { return new Object[0]; } boolean hideEnchants = false; + if (meta.hasItemFlag(ItemFlag.HIDE_ENCHANTS) || meta.hasItemFlag(ItemFlag.HIDE_POTION_EFFECTS)) { hideEnchants = true; } + if (Display.isFinalized(itemStack)) { + hideEnchants = false; + } + return new Object[]{hideEnchants}; } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java index 2f42eda9..dc176eb9 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java @@ -33,6 +33,7 @@ import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.SnowArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.SoulArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.SoulFireArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.SparkleArtifact; +import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.SweepArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.TearArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.TotemArtifact; import com.willfp.ecoenchants.enchantments.ecoenchants.artifact.VillagerArtifact; @@ -484,6 +485,7 @@ public class EcoEnchants { public static final EcoEnchant VILLAGER_ARTIFACT = new VillagerArtifact(); public static final EcoEnchant ANGER_ARTIFACT = new AngerArtifact(); public static final EcoEnchant NAUTILUS_ARTIFACT = new NautilusArtifact(); + public static final EcoEnchant SWEEP_ARTIFACT = new SweepArtifact(); /** * Get all registered {@link EcoEnchant}s.