From 77053e71f837300c3d67f5c0e3ac2498143f3d4e Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 27 Apr 2021 10:35:55 +0100 Subject: [PATCH] Added VanillaEcoEnchantWrapper --- .../ecoenchants/enchantments/EcoEnchants.java | 12 ++++++++++++ .../itemtypes/VanillaEcoEnchantWrapper.java | 18 ++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/VanillaEcoEnchantWrapper.java 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 1f3ca5e2..b981f8f9 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 @@ -236,10 +236,12 @@ import com.willfp.ecoenchants.enchantments.ecoenchants.spell.Dynamite; import com.willfp.ecoenchants.enchantments.ecoenchants.spell.Missile; import com.willfp.ecoenchants.enchantments.ecoenchants.spell.Quake; import com.willfp.ecoenchants.enchantments.ecoenchants.spell.Vitalize; +import com.willfp.ecoenchants.enchantments.itemtypes.VanillaEcoEnchantWrapper; import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; import lombok.experimental.UtilityClass; import org.bukkit.NamespacedKey; import org.bukkit.enchantments.Enchantment; +import org.bukkit.enchantments.EnchantmentWrapper; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.EnchantmentStorageMeta; import org.jetbrains.annotations.NotNull; @@ -602,4 +604,14 @@ public class EcoEnchants { BY_KEY.remove(enchant.getKey()); BY_NAME.inverse().remove(enchant); } + + static { + for (Enchantment value : Enchantment.values()) { + if (value instanceof EcoEnchant || value instanceof EnchantmentWrapper) { + continue; + } + + new VanillaEcoEnchantWrapper(value); + } + } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/VanillaEcoEnchantWrapper.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/VanillaEcoEnchantWrapper.java new file mode 100644 index 00000000..363412a8 --- /dev/null +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/VanillaEcoEnchantWrapper.java @@ -0,0 +1,18 @@ +package com.willfp.ecoenchants.enchantments.itemtypes; + +import com.willfp.ecoenchants.enchantments.EcoEnchant; +import com.willfp.ecoenchants.enchantments.meta.EnchantmentType; +import org.bukkit.enchantments.Enchantment; +import org.jetbrains.annotations.NotNull; + +@SuppressWarnings("deprecation") +public class VanillaEcoEnchantWrapper extends EcoEnchant { + /** + * Create a new Vanilla EcoEnchant Wrapper. + * + * @param enchantment The enchantment to wrap. + */ + public VanillaEcoEnchantWrapper(@NotNull final Enchantment enchantment) { + super(enchantment.getKey().getKey(), enchantment.isCursed() ? EnchantmentType.CURSE : EnchantmentType.NORMAL); + } +}