điều chỉnh logic itemflags

minevn · Feb 3, 2025 · bd4fa02 · bd4fa02
1 parent 695174f
commit bd4fa02
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/minevnlib-bukkit/src/main/java/net/minevn/guiapi/GuiIcon.kt b/minevnlib-bukkit/src/main/java/net/minevn/guiapi/GuiIcon.kt
@@ -2,9 +2,9 @@ package net.minevn.guiapi
 
 import com.cryptomorin.xseries.XMaterial
 import net.minevn.libs.bukkit.color
+import net.minevn.libs.bukkit.hideAll
 import org.bukkit.configuration.ConfigurationSection
 import org.bukkit.enchantments.Enchantment
-import org.bukkit.inventory.ItemFlag
 import org.bukkit.inventory.ItemStack
 
 class GuiIcon(
@@ -24,7 +24,7 @@ class GuiIcon(
             if (glow) {
                 addEnchant(Enchantment.DURABILITY, 1, true)
             }
-            addItemFlags(ItemFlag.HIDE_ENCHANTS, ItemFlag.HIDE_ATTRIBUTES)
+            hideAll()
         }
     }
 
@@ -49,4 +49,4 @@ class GuiIcon(
 
         fun ConfigurationSection.getGuiIcon(path: String) = fromConfig(getConfigurationSection(path)!!)
     }
-}
+}
diff --git a/minevnlib-bukkit/src/main/java/net/minevn/guiapi/GuiItemStack.java b/minevnlib-bukkit/src/main/java/net/minevn/guiapi/GuiItemStack.java
@@ -66,7 +66,7 @@ public GuiItemStack(Material material, byte data, int amount, boolean glow, Stri
         if (glow) {
             im.addEnchant(Enchantment.DURABILITY, 1, true);
         }
-        im.addItemFlags(ItemFlag.HIDE_UNBREAKABLE, ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_ENCHANTS);
+        hideAll(im);
         item.setItemMeta(im);
     }
 
@@ -85,7 +85,7 @@ public GuiItemStack(Material material, short data, int amount, boolean glow, Str
             im.addEnchant(Enchantment.DURABILITY, 1, true);
         }
         im.setUnbreakable(true);
-        im.addItemFlags(ItemFlag.HIDE_UNBREAKABLE, ItemFlag.HIDE_ATTRIBUTES, ItemFlag.HIDE_ENCHANTS);
+        hideAll(im);
         item.setItemMeta(im);
     }
 
@@ -108,7 +108,7 @@ public GuiItemStack(ItemStack item, String name, String... lores) {
         if (lores != null && lores.length > 0)
             im.setLore(Arrays.asList(lores));
         im.setUnbreakable(true);
-        im.addItemFlags(ItemFlag.HIDE_UNBREAKABLE, ItemFlag.HIDE_ATTRIBUTES);
+        hideAll(im);
         item.setItemMeta(im);
     }
 
@@ -128,4 +128,10 @@ public GuiItemStack onClick(ClickAction action) {
     public ItemStack getItem() {
         return item;
     }
+
+    private static void hideAll(ItemMeta itemMeta) {
+        for (ItemFlag flag : ItemFlag.values()) {
+            itemMeta.addItemFlags(flag);
+        }
+    }
 }
diff --git a/minevnlib-bukkit/src/main/java/net/minevn/libs/bukkit/Utils.kt b/minevnlib-bukkit/src/main/java/net/minevn/libs/bukkit/Utils.kt
@@ -4,6 +4,8 @@ import org.bukkit.Bukkit
 import org.bukkit.ChatColor
 import org.bukkit.Location
 import org.bukkit.entity.Player
+import org.bukkit.inventory.ItemFlag
+import org.bukkit.inventory.meta.ItemMeta
 
 fun List<String>.color() = map { it.color() }
 
@@ -74,3 +76,7 @@ fun String.asLocation() = split(",").let {
     val pitch = it[5].toFloat()
     Location(world, x, y, z, yaw, pitch)
 }
+
+fun ItemMeta.hideAll() {
+    ItemFlag.entries.forEach { addItemFlags(it) }
+}