From 3a0044a3dc59babacac32443818ae77573ba97c4 Mon Sep 17 00:00:00 2001
From: PikaMug <2267126+PikaMug@users.noreply.github.com>
Date: Wed, 11 Sep 2024 02:08:06 -0400
Subject: [PATCH] Add moot attribute for item flags, part 3

---
 .../java/org/browsit/milkgui/item/Item.java   | 63 ++++++++-----------
 1 file changed, 26 insertions(+), 37 deletions(-)

diff --git a/src/main/java/org/browsit/milkgui/item/Item.java b/src/main/java/org/browsit/milkgui/item/Item.java
index 0c6ab1b..f85ca13 100644
--- a/src/main/java/org/browsit/milkgui/item/Item.java
+++ b/src/main/java/org/browsit/milkgui/item/Item.java
@@ -25,11 +25,13 @@
 package org.browsit.milkgui.item;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 import org.browsit.milkgui.MilkGUI;
@@ -71,15 +73,9 @@ public Item(final ItemBuilder builder) {
                     meta.addEnchant(ie.getEnchantment(), ie.getLevel(), ie.isUnsafe());
                 }
             }
-            // Hide flags by default then remove as specified
-            if (Material.getMaterial("ARMADILLO_SCUTE") != null) {
-                // This is necessary to use flags as of 1.20.6
-                meta.addAttributeModifier(Attribute.GENERIC_ATTACK_DAMAGE,
-                        new AttributeModifier("foo", 0, AttributeModifier.Operation.MULTIPLY_SCALAR_1));
-            }
-            meta.addItemFlags(ItemFlag.values());
+            this.addItemFlags(ItemFlag.values());
             if (builder.flags != null) {
-                meta.removeItemFlags(builder.flags);
+                this.removeItemFlags(builder.flags);
             }
         }
         item.setItemMeta(meta);
@@ -88,37 +84,19 @@ public Item(final ItemBuilder builder) {
     public Item(final Material type) {
         item = new ItemStack(type);
         meta = item.getItemMeta();
-        // Hide flags by default
-        if (Material.getMaterial("ARMADILLO_SCUTE") != null) {
-            // This is necessary to use flags as of 1.20.6
-            meta.addAttributeModifier(Attribute.GENERIC_ATTACK_DAMAGE,
-                    new AttributeModifier("foo", 0, AttributeModifier.Operation.MULTIPLY_SCALAR_1));
-        }
-        meta.addItemFlags(ItemFlag.values());
+        this.addItemFlags(ItemFlag.values());
     }
     
     public Item(final String type) {
         item = new ItemStack(getMaterialFromName(type));
         meta = item.getItemMeta();
-        // Hide flags by default
-        if (Material.getMaterial("ARMADILLO_SCUTE") != null) {
-            // This is necessary to use flags as of 1.20.6
-            meta.addAttributeModifier(Attribute.GENERIC_ATTACK_DAMAGE,
-                    new AttributeModifier("foo", 0, AttributeModifier.Operation.MULTIPLY_SCALAR_1));
-        }
-        meta.addItemFlags(ItemFlag.values());
+        this.addItemFlags(ItemFlag.values());
     }
     
     public Item(final ItemStack itemStack) {
         item = itemStack;
         meta = item.getItemMeta();
-        // Hide flags by default
-        if (Material.getMaterial("ARMADILLO_SCUTE") != null) {
-            // This is necessary to use flags as of 1.20.6
-            meta.addAttributeModifier(Attribute.GENERIC_ATTACK_DAMAGE,
-                    new AttributeModifier("foo", 0, AttributeModifier.Operation.MULTIPLY_SCALAR_1));
-        }
-        meta.addItemFlags(ItemFlag.values());
+        this.addItemFlags(ItemFlag.values());
     }
 
     @SuppressWarnings({ "unchecked", "deprecation" })
@@ -170,15 +148,10 @@ public Item(final Map<String, Object> data) {
                 meta.addEnchant(e.getKey(), e.getValue(), true);
             }
         }
-        // Hide flags by default then remove as specified
-        if (Material.getMaterial("ARMADILLO_SCUTE") != null) {
-            // This is necessary to use flags as of 1.20.6
-            meta.addAttributeModifier(Attribute.GENERIC_ATTACK_DAMAGE,
-                    new AttributeModifier("foo", 0, AttributeModifier.Operation.MULTIPLY_SCALAR_1));
-        }
-        meta.addItemFlags(ItemFlag.values());
+
+        this.addItemFlags(ItemFlag.values());
         if (data.get("itemflags") != null) {
-            meta.removeItemFlags((ItemFlag[]) data.get("itemflags"));
+            this.removeItemFlags((ItemFlag[]) data.get("itemflags"));
         }
         item.setItemMeta(meta);
     }
@@ -244,6 +217,12 @@ public Item removeEnchant(final Enchantment ench) {
     
     public Item addItemFlags(final ItemFlag...itemFlags) {
         if (meta != null) {
+            // Hide flags by default then remove as specified
+            if (Material.getMaterial("ARMADILLO_SCUTE") != null) {
+                // This is necessary to use flags as of 1.20.6
+                meta.addAttributeModifier(Attribute.GENERIC_ATTACK_DAMAGE,
+                        new AttributeModifier("foo", 0, AttributeModifier.Operation.MULTIPLY_SCALAR_1));
+            }
             meta.addItemFlags(itemFlags);
             item.setItemMeta(meta);
         }
@@ -252,6 +231,16 @@ public Item addItemFlags(final ItemFlag...itemFlags) {
     
     public Item removeItemFlags(final ItemFlag...itemFlags) {
         if (meta != null) {
+            // Hide flags by default then remove as specified
+            if (Material.getMaterial("ARMADILLO_SCUTE") != null) {
+                // This is necessary to use flags as of 1.20.6
+                final Collection<AttributeModifier> modifiers = meta.getAttributeModifiers(Attribute.GENERIC_ATTACK_DAMAGE);
+                if (modifiers != null) {
+                    for (final AttributeModifier modifier : modifiers) {
+                        meta.removeAttributeModifier(Attribute.GENERIC_ATTACK_DAMAGE, modifier);
+                    }
+                }
+            }
             meta.removeItemFlags(itemFlags);
             item.setItemMeta(meta);
         }