From 58819037061c63a7b68a94bdba15b1bbde06b796 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Mon, 12 Jul 2021 14:38:43 +0200 Subject: [PATCH] Deprecated EcoEnchants.getFromEnchantment and replaced with typecasts --- .../proxy/v1_16_R1/enchants/EcoCraftEnchantment.java | 4 ++-- .../proxy/v1_16_R2/enchants/EcoCraftEnchantment.java | 4 ++-- .../proxy/v1_16_R3/enchants/EcoCraftEnchantment.java | 4 ++-- .../proxy/v1_17_R1/enchants/EcoCraftEnchantment.java | 4 ++-- .../ecoenchants/command/CommandEnchantinfo.java | 11 ++++++----- .../ecoenchants/command/CommandRandomenchant.java | 3 +-- .../willfp/ecoenchants/display/EnchantDisplay.java | 5 +---- .../willfp/ecoenchants/display/EnchantmentCache.java | 4 +--- .../willfp/ecoenchants/enchantments/EcoEnchants.java | 8 +++++--- .../support/merging/anvil/AnvilMerge.java | 6 +++--- .../support/merging/grindstone/GrindstoneMerge.java | 7 ++----- .../support/obtaining/EnchantingListeners.java | 3 +-- .../enchantments/support/obtaining/LootPopulator.java | 2 +- .../support/obtaining/VillagerListeners.java | 2 +- .../ecoenchants/enchantments/util/EnchantChecks.java | 4 +--- .../enchantments/util/ItemConversions.java | 4 +--- .../sprintartifacts/SprintArtifactsListener.java | 3 +-- 17 files changed, 33 insertions(+), 45 deletions(-) diff --git a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/enchants/EcoCraftEnchantment.java b/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/enchants/EcoCraftEnchantment.java index 8768d61a..93d3c49d 100644 --- a/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/enchants/EcoCraftEnchantment.java +++ b/eco-core/core-nms/v1_16_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R1/enchants/EcoCraftEnchantment.java @@ -1,6 +1,6 @@ package com.willfp.ecoenchants.proxy.v1_16_R1.enchants; -import com.willfp.ecoenchants.enchantments.EcoEnchants; +import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.support.vanilla.VanillaEnchantmentMetadata; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import net.minecraft.server.v1_16_R1.Enchantment; @@ -23,7 +23,7 @@ public class EcoCraftEnchantment extends CraftEnchantment { @Override public boolean conflictsWith(@NotNull final org.bukkit.enchantments.Enchantment other) { - return EcoEnchants.getFromEnchantment(other) == null ? super.conflictsWith(other) : other.conflictsWith(this); + return other instanceof EcoEnchant ? other.conflictsWith(this) : super.conflictsWith(other); } public void register() { diff --git a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/enchants/EcoCraftEnchantment.java b/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/enchants/EcoCraftEnchantment.java index 8cb0def6..eee7a3f6 100644 --- a/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/enchants/EcoCraftEnchantment.java +++ b/eco-core/core-nms/v1_16_R2/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R2/enchants/EcoCraftEnchantment.java @@ -1,6 +1,6 @@ package com.willfp.ecoenchants.proxy.v1_16_R2.enchants; -import com.willfp.ecoenchants.enchantments.EcoEnchants; +import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.support.vanilla.VanillaEnchantmentMetadata; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import net.minecraft.server.v1_16_R2.Enchantment; @@ -23,7 +23,7 @@ public class EcoCraftEnchantment extends CraftEnchantment { @Override public boolean conflictsWith(@NotNull final org.bukkit.enchantments.Enchantment other) { - return EcoEnchants.getFromEnchantment(other) == null ? super.conflictsWith(other) : other.conflictsWith(this); + return other instanceof EcoEnchant ? other.conflictsWith(this) : super.conflictsWith(other); } public void register() { diff --git a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/enchants/EcoCraftEnchantment.java b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/enchants/EcoCraftEnchantment.java index e421cd51..c7fd2c36 100644 --- a/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/enchants/EcoCraftEnchantment.java +++ b/eco-core/core-nms/v1_16_R3/src/main/java/com/willfp/ecoenchants/proxy/v1_16_R3/enchants/EcoCraftEnchantment.java @@ -1,6 +1,6 @@ package com.willfp.ecoenchants.proxy.v1_16_R3.enchants; -import com.willfp.ecoenchants.enchantments.EcoEnchants; +import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.support.vanilla.VanillaEnchantmentMetadata; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import net.minecraft.server.v1_16_R3.Enchantment; @@ -23,7 +23,7 @@ public class EcoCraftEnchantment extends CraftEnchantment { @Override public boolean conflictsWith(@NotNull final org.bukkit.enchantments.Enchantment other) { - return EcoEnchants.getFromEnchantment(other) == null ? super.conflictsWith(other) : other.conflictsWith(this); + return other instanceof EcoEnchant ? other.conflictsWith(this) : super.conflictsWith(other); } public void register() { diff --git a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_17_R1/enchants/EcoCraftEnchantment.java b/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_17_R1/enchants/EcoCraftEnchantment.java index b82b943e..b3da0b84 100644 --- a/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_17_R1/enchants/EcoCraftEnchantment.java +++ b/eco-core/core-nms/v1_17_R1/src/main/java/com/willfp/ecoenchants/proxy/v1_17_R1/enchants/EcoCraftEnchantment.java @@ -1,6 +1,6 @@ package com.willfp.ecoenchants.proxy.v1_17_R1.enchants; -import com.willfp.ecoenchants.enchantments.EcoEnchants; +import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.support.vanilla.VanillaEnchantmentMetadata; import com.willfp.ecoenchants.enchantments.util.EnchantmentUtils; import net.minecraft.world.item.enchantment.Enchantment; @@ -23,7 +23,7 @@ public class EcoCraftEnchantment extends CraftEnchantment { @Override public boolean conflictsWith(@NotNull final org.bukkit.enchantments.Enchantment other) { - return EcoEnchants.getFromEnchantment(other) == null ? super.conflictsWith(other) : other.conflictsWith(this); + return other instanceof EcoEnchant ? other.conflictsWith(this) : super.conflictsWith(other); } public void register() { diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/CommandEnchantinfo.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/CommandEnchantinfo.java index ddccb4a1..14e62675 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/CommandEnchantinfo.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/CommandEnchantinfo.java @@ -80,15 +80,16 @@ public class CommandEnchantinfo extends PluginCommand { Set conflicts = enchantment.getConflicts(); new HashSet<>(conflicts).forEach(enchantment1 -> { - EcoEnchant ecoEnchant = EcoEnchants.getFromEnchantment(enchantment1); - if (ecoEnchant != null && !ecoEnchant.isEnabled()) { - conflicts.remove(enchantment1); + if (enchantment1 instanceof EcoEnchant ecoEnchant) { + if (!ecoEnchant.isEnabled()) { + conflicts.remove(enchantment1); + } } }); conflicts.forEach((enchantment1 -> { - if (EcoEnchants.getFromEnchantment(enchantment1) != null) { - conflictNames.add(EcoEnchants.getFromEnchantment(enchantment1).getDisplayName()); + if (enchantment1 instanceof EcoEnchant enchant) { + conflictNames.add(enchant.getDisplayName()); } else { conflictNames.add(this.getPlugin().getLangYml().getString("enchantments." + enchantment1.getKey().getKey() + ".name")); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/CommandRandomenchant.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/CommandRandomenchant.java index a45c254a..ef436703 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/CommandRandomenchant.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/command/CommandRandomenchant.java @@ -81,8 +81,7 @@ public class CommandRandomenchant extends Subcommand { if (!onItem.contains(ecoEnchant)) { boolean conflicts = false; for (Enchantment enchantment : onItem) { - if (EcoEnchants.getFromEnchantment(enchantment) != null) { - EcoEnchant ecoEnchantOnItem = EcoEnchants.getFromEnchantment(enchantment); + if (enchantment instanceof EcoEnchant ecoEnchantOnItem) { if (ecoEnchantOnItem.getType().equals(ecoEnchant.getType()) && ecoEnchantOnItem.getType().isSingular()) { conflicts = true; } 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 da86b298..5e12c6a4 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 @@ -8,7 +8,6 @@ import com.willfp.eco.core.display.DisplayPriority; import com.willfp.eco.util.NumberUtils; import com.willfp.ecoenchants.display.options.DisplayOptions; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentTarget; import com.willfp.ecoenchants.proxy.proxies.FastGetEnchantsProxy; import com.willfp.ecoenchants.util.ProxyUtils; @@ -129,12 +128,10 @@ public class EnchantDisplay extends DisplayModule { unsorted.forEach(enchantment -> enchantments.put(enchantment, tempEnchantments.get(enchantment))); enchantments.forEach((enchantment, level) -> { - if (EcoEnchants.getFromEnchantment(enchantment) == null) { + if (!(enchantment instanceof EcoEnchant ecoEnchant)) { return; } - EcoEnchant ecoEnchant = EcoEnchants.getFromEnchantment(enchantment); - if (!ecoEnchant.isEnabled()) { forRemoval.add(enchantment); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java index 0bda3d61..0de1bff3 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantmentCache.java @@ -5,7 +5,6 @@ import com.willfp.eco.core.config.ConfigUpdater; import com.willfp.eco.core.display.Display; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.meta.EnchantmentRarity; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import lombok.Getter; @@ -100,8 +99,7 @@ public class EnchantmentCache { EnchantmentType type; EnchantmentRarity rarity; List description; - if (EcoEnchants.getFromEnchantment(enchantment) != null) { - EcoEnchant ecoEnchant = EcoEnchants.getFromEnchantment(enchantment); + if (enchantment instanceof EcoEnchant ecoEnchant) { description = ecoEnchant.getWrappedDescription(); name = ecoEnchant.getDisplayName(); type = ecoEnchant.getType(); 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 6f9a967f..6d36a710 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 @@ -524,9 +524,11 @@ public class EcoEnchants { * * @param enchantment The enchantment. * @return The matching {@link EcoEnchant}, or null if not found. + * @deprecated Use a typecast. */ + @Deprecated public static EcoEnchant getFromEnchantment(@NotNull final Enchantment enchantment) { - return getByKey(enchantment.getKey()); + return enchantment instanceof EcoEnchant ? (EcoEnchant) enchantment : null; } /** @@ -573,13 +575,13 @@ public class EcoEnchants { if (item.getItemMeta() instanceof EnchantmentStorageMeta) { ((EnchantmentStorageMeta) item.getItemMeta()).getStoredEnchants().forEach(((enchantment, integer) -> { - if (getFromEnchantment(enchantment) != null && getFromEnchantment(enchantment).getType().equals(type)) { + if (enchantment instanceof EcoEnchant ecoEnchant && ecoEnchant.getType().equals(type)) { hasOfType.set(true); } })); } else { item.getEnchantments().forEach((enchantment, integer) -> { - if (getFromEnchantment(enchantment) != null && (getFromEnchantment(enchantment).getType().equals(type))) { + if (enchantment instanceof EcoEnchant ecoEnchant && ecoEnchant.getType().equals(type)) { hasOfType.set(true); } }); diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilMerge.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilMerge.java index c928ff49..9370a73a 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilMerge.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/anvil/AnvilMerge.java @@ -165,7 +165,7 @@ public class AnvilMerge { AtomicBoolean doesConflict = new AtomicBoolean(false); EnchantmentType.values().forEach(enchantmentType -> { - EcoEnchant enchant = EcoEnchants.getFromEnchantment(enchantment); + EcoEnchant enchant = (EcoEnchant) enchantment; if (enchant == null) { return; } @@ -258,12 +258,12 @@ public class AnvilMerge { AtomicInteger inEnchantLevels = new AtomicInteger(); outEnchants.forEach(((enchantment, integer) -> { - if (EcoEnchants.getFromEnchantment(enchantment) != null) { + if (enchantment instanceof EcoEnchant) { outEnchantLevels.addAndGet(integer); } })); leftEnchants.forEach(((enchantment, integer) -> { - if (EcoEnchants.getFromEnchantment(enchantment) != null) { + if (enchantment instanceof EcoEnchant) { outEnchantLevels.addAndGet(integer); } })); diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/grindstone/GrindstoneMerge.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/grindstone/GrindstoneMerge.java index 66ade936..2d18d3aa 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/grindstone/GrindstoneMerge.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/merging/grindstone/GrindstoneMerge.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.enchantments.support.merging.grindstone; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchants; import lombok.experimental.UtilityClass; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; @@ -46,8 +45,7 @@ public class GrindstoneMerge { } bottomEnchants.forEach(((enchantment, integer) -> { - if (EcoEnchants.getFromEnchantment(enchantment) != null) { - EcoEnchant ecoEnchant = EcoEnchants.getFromEnchantment(enchantment); + if (enchantment instanceof EcoEnchant ecoEnchant) { if (!ecoEnchant.isGrindstoneable()) { toKeep.putIfAbsent(enchantment, integer); } @@ -58,8 +56,7 @@ public class GrindstoneMerge { } })); topEnchants.forEach(((enchantment, integer) -> { - if (EcoEnchants.getFromEnchantment(enchantment) != null) { - EcoEnchant ecoEnchant = EcoEnchants.getFromEnchantment(enchantment); + if (enchantment instanceof EcoEnchant ecoEnchant) { if (!ecoEnchant.isGrindstoneable()) { toKeep.putIfAbsent(enchantment, integer); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/EnchantingListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/EnchantingListeners.java index 12c17e58..82b39bb8 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/EnchantingListeners.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/EnchantingListeners.java @@ -147,8 +147,7 @@ public class EnchantingListeners extends PluginDependent implements L anyConflicts.set(true); } - if (EcoEnchants.getFromEnchantment(enchant) != null) { - EcoEnchant ecoEnchant = EcoEnchants.getFromEnchantment(enchant); + if (enchant instanceof EcoEnchant ecoEnchant) { if (enchantment.getType().equals(ecoEnchant.getType()) && ecoEnchant.getType().isSingular()) { anyConflicts.set(true); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/LootPopulator.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/LootPopulator.java index e91d1bb4..c77fcff2 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/LootPopulator.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/LootPopulator.java @@ -120,7 +120,7 @@ public class LootPopulator extends BlockPopulator { anyConflicts.set(true); } - EcoEnchant ecoEnchant = EcoEnchants.getFromEnchantment(enchant); + EcoEnchant ecoEnchant = (EcoEnchant) enchant; if (enchantment.getType().equals(ecoEnchant.getType()) && ecoEnchant.getType().isSingular()) { anyConflicts.set(true); } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/VillagerListeners.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/VillagerListeners.java index e29e9473..53eb1584 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/VillagerListeners.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/support/obtaining/VillagerListeners.java @@ -179,7 +179,7 @@ public class VillagerListeners extends PluginDependent implements Lis anyConflicts.set(true); } - EcoEnchant ecoEnchant = EcoEnchants.getFromEnchantment(enchant); + EcoEnchant ecoEnchant = enchant; if (enchantment.getType().equals(ecoEnchant.getType()) && ecoEnchant.getType().isSingular()) { anyConflicts.set(true); diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantChecks.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantChecks.java index fee7eb24..a1c3502e 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantChecks.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantChecks.java @@ -3,7 +3,6 @@ package com.willfp.ecoenchants.enchantments.util; import com.willfp.eco.util.DurabilityUtils; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.proxy.proxies.FastGetEnchantsProxy; import com.willfp.ecoenchants.util.ProxyUtils; import lombok.experimental.UtilityClass; @@ -77,8 +76,7 @@ public class EnchantChecks { Map ecoEnchants = new HashMap<>(); for (Map.Entry enchantmentIntegerEntry : PROXY.getEnchantmentsOnItem(item).entrySet()) { - EcoEnchant enchant = EcoEnchants.getFromEnchantment(enchantmentIntegerEntry.getKey()); - if (enchant != null) { + if (enchantmentIntegerEntry.getKey() instanceof EcoEnchant enchant) { ecoEnchants.put(enchant, enchantmentIntegerEntry.getValue()); } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/ItemConversions.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/ItemConversions.java index 7addf40e..dd3943c0 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/ItemConversions.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/ItemConversions.java @@ -347,9 +347,7 @@ public class ItemConversions extends PluginDependent implements Liste EcoEnchant illegalEnchant = null; for (Enchantment enchantment : meta.getEnchants().keySet()) { - if (EcoEnchants.getFromEnchantment(enchantment) != null) { - EcoEnchant enchant = EcoEnchants.getFromEnchantment(enchantment); - + if (enchantment instanceof EcoEnchant enchant) { if (!enchant.getTargetMaterials().contains(itemStack.getType())) { illegal = true; illegalEnchant = enchant; diff --git a/eco-extensions/sprint-artifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsListener.java b/eco-extensions/sprint-artifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsListener.java index 44531a8d..3947e99a 100644 --- a/eco-extensions/sprint-artifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsListener.java +++ b/eco-extensions/sprint-artifacts/src/main/java/com/willfp/ecoenchants/sprintartifacts/SprintArtifactsListener.java @@ -1,7 +1,6 @@ package com.willfp.ecoenchants.sprintartifacts; import com.willfp.ecoenchants.enchantments.EcoEnchant; -import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.itemtypes.Artifact; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; @@ -40,7 +39,7 @@ public class SprintArtifactsListener implements Listener { } Optional matching = bootsMeta.getEnchants().keySet().stream() - .map(EcoEnchants::getFromEnchantment) + .map(enchant -> (EcoEnchant) enchant) .filter(Objects::nonNull) .filter(enchantment -> enchantment.getType().equals(EnchantmentType.ARTIFACT)) .findFirst();