Merge pull request #1042 from JasperLorelai/fake-glint

Apply enchantment glint override

Author: TonytheMacaroni

core/src/main/java/com/nisovin/magicspells/spells/command/ScrollSpell.java

@@ -222,7 +222,7 @@ public ItemStack createScroll(Spell spell, int uses, ItemStack item) {
 			meta.lore(Collections.singletonList(lore));
 		}
 
-		ItemUtil.addFakeEnchantment(meta);
+		meta.setEnchantmentGlintOverride(true);
 		meta.getPersistentDataContainer().set(KEY, PersistentDataType.STRING, spell.getInternalName() + (uses > 0 ? "," + uses : ""));
 		item.setItemMeta(meta);
 

core/src/main/java/com/nisovin/magicspells/util/ItemUtil.java

@@ -1,25 +1,11 @@
 package com.nisovin.magicspells.util;
 
-import org.bukkit.inventory.ItemFlag;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
-import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.meta.Damageable;
 
 public class ItemUtil {
 
-	public static void addFakeEnchantment(ItemMeta meta) {
-		if (meta == null) return;
-		meta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
-		meta.addEnchant(Enchantment.FROST_WALKER, -1, true);
-	}
-
-	public static boolean hasFakeEnchantment(ItemMeta meta) {
-		return meta.hasItemFlag(ItemFlag.HIDE_ENCHANTS)
-			&& meta.hasEnchant(Enchantment.FROST_WALKER)
-			&& meta.getEnchantLevel(Enchantment.FROST_WALKER) == 65535;
-	}
-
 	public static int getDurability(ItemStack item) {
 		return item.getItemMeta() instanceof Damageable damageable ? damageable.getDamage() : 0;
 	}

core/src/main/java/com/nisovin/magicspells/util/magicitems/MagicItems.java

@@ -18,7 +18,6 @@
 
 import com.nisovin.magicspells.util.Util;
 import com.nisovin.magicspells.MagicSpells;
-import com.nisovin.magicspells.util.ItemUtil;
 import com.nisovin.magicspells.util.itemreader.*;
 import com.nisovin.magicspells.handlers.DebugHandler;
 import com.nisovin.magicspells.handlers.EnchantmentHandler;
@@ -134,23 +133,19 @@ private static MagicItemData getMagicItemDataFromItemStackInternal(ItemStack ite
 		// author, title, pages
 		WrittenBookHandler.processMagicItemData(meta, data);
 
-		// enchantments
-		Map<Enchantment, Integer> enchants = new HashMap<>(meta.getEnchants());
-		if (ItemUtil.hasFakeEnchantment(meta)) {
-			enchants.remove(Enchantment.FROST_WALKER);
-
+		if (meta.hasEnchantmentGlintOverride() && meta.getEnchantmentGlintOverride())
 			data.setAttribute(FAKE_GLINT, true);
-		}
-		if (!enchants.isEmpty()) data.setAttribute(ENCHANTS, enchants);
+
+		// enchantments
+		if (meta.hasEnchants())
+			data.setAttribute(ENCHANTS, meta.getEnchants());
 
 		// attributes
 		AttributeHandler.processMagicItemData(meta, data);
 
 		// lore
-		if (meta.hasLore()) {
-			List<Component> lore = meta.lore();
-			if (lore != null && !lore.isEmpty()) data.setAttribute(LORE, lore);
-		}
+		if (meta.hasLore())
+			data.setAttribute(LORE, meta.lore());
 
 		// patterns
 		BannerHandler.processMagicItemData(meta, data);
@@ -218,13 +213,8 @@ public static MagicItem getMagicItemFromData(MagicItemData data) {
 			}
 		}
 
-		if (data.hasAttribute(FAKE_GLINT)) {
-			boolean fakeGlint = (boolean) data.getAttribute(FAKE_GLINT);
-
-			if (fakeGlint && !meta.hasEnchants()) {
-				ItemUtil.addFakeEnchantment(meta);
-			}
-		}
+		if (data.hasAttribute(FAKE_GLINT) && (boolean) data.getAttribute(FAKE_GLINT))
+			meta.setEnchantmentGlintOverride(true);
 
 		// Armor color
 		LeatherArmorHandler.processItemMeta(meta, data);
@@ -412,13 +402,9 @@ public static MagicItem getMagicItemFromSection(ConfigurationSection section) {
 				}
 			}
 
-			if (section.isBoolean("fake-glint")) {
-				boolean fakeGlint = section.getBoolean("fake-glint");
-
-				if (fakeGlint && !meta.hasEnchants()) {
-					ItemUtil.addFakeEnchantment(meta);
-					itemData.setAttribute(FAKE_GLINT, true);
-				}
+			if (section.getBoolean("fake-glint")) {
+				meta.setEnchantmentGlintOverride(true);
+				itemData.setAttribute(FAKE_GLINT, true);
 			}
 
 			// Armor color