From f851aed9bb5c0ee3c5af2b423ef7d5cf50d4ba37 Mon Sep 17 00:00:00 2001 From: Glare Date: Tue, 18 Jun 2024 13:06:58 -0500 Subject: [PATCH] feat: remove legacy itemflag for hiding potion effects --- .../deluxemenus/config/DeluxeMenusConfig.java | 2 -- .../com/extendedclip/deluxemenus/menu/MenuItem.java | 4 ---- .../deluxemenus/menu/options/MenuItemOptions.java | 13 ------------- 3 files changed, 19 deletions(-) diff --git a/src/main/java/com/extendedclip/deluxemenus/config/DeluxeMenusConfig.java b/src/main/java/com/extendedclip/deluxemenus/config/DeluxeMenusConfig.java index 038747a..586d13c 100644 --- a/src/main/java/com/extendedclip/deluxemenus/config/DeluxeMenusConfig.java +++ b/src/main/java/com/extendedclip/deluxemenus/config/DeluxeMenusConfig.java @@ -739,7 +739,6 @@ private Map> loadMenuItems(FileConfiguration .hideAttributes(c.getBoolean(currentPath + "hide_attributes", false)) .hideUnbreakable(c.getBoolean(currentPath + "hide_unbreakable", false)) .hideEnchants(c.getBoolean(currentPath + "hide_enchantments", false)) - .hidePotionEffects(c.getBoolean(currentPath + "hide_effects", false)) .nbtString(c.getString(currentPath + "nbt_string", null)) .nbtInt(c.getString(currentPath + "nbt_int", null)) .nbtStrings(c.getStringList(currentPath + "nbt_strings")) @@ -863,7 +862,6 @@ private Map> loadMenuItems(FileConfiguration if (!bannerMeta.isEmpty()) { builder.bannerMeta(bannerMeta); - builder.hidePotionEffects(true); } } diff --git a/src/main/java/com/extendedclip/deluxemenus/menu/MenuItem.java b/src/main/java/com/extendedclip/deluxemenus/menu/MenuItem.java index cf399b3..e081d9f 100644 --- a/src/main/java/com/extendedclip/deluxemenus/menu/MenuItem.java +++ b/src/main/java/com/extendedclip/deluxemenus/menu/MenuItem.java @@ -269,10 +269,6 @@ public ItemStack getItemStack(@NotNull final MenuHolder holder) { itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS); } - if (this.options.hidePotionEffects()) { - itemMeta.addItemFlags(ItemFlag.HIDE_POTION_EFFECTS); - } - if (this.options.unbreakable()) { itemMeta.setUnbreakable(true); } diff --git a/src/main/java/com/extendedclip/deluxemenus/menu/options/MenuItemOptions.java b/src/main/java/com/extendedclip/deluxemenus/menu/options/MenuItemOptions.java index 4d490ef..237b797 100644 --- a/src/main/java/com/extendedclip/deluxemenus/menu/options/MenuItemOptions.java +++ b/src/main/java/com/extendedclip/deluxemenus/menu/options/MenuItemOptions.java @@ -43,7 +43,6 @@ public class MenuItemOptions { private final boolean unbreakable; private final boolean hideAttributes; private final boolean hideEnchants; - private final boolean hidePotionEffects; private final boolean hideUnbreakable; private final boolean displayNameHasPlaceholders; @@ -99,7 +98,6 @@ private MenuItemOptions(final @NotNull MenuItemOptionsBuilder builder) { this.unbreakable = builder.unbreakable; this.hideAttributes = builder.hideAttributes; this.hideEnchants = builder.hideEnchants; - this.hidePotionEffects = builder.hidePotionEffects; this.hideUnbreakable = builder.hideUnbreakable; this.displayNameHasPlaceholders = builder.displayNameHasPlaceholders; this.loreHasPlaceholders = builder.loreHasPlaceholders; @@ -217,10 +215,6 @@ public boolean hideEnchants() { return hideEnchants; } - public boolean hidePotionEffects() { - return hidePotionEffects; - } - public boolean hideUnbreakable() { return hideUnbreakable; } @@ -346,7 +340,6 @@ public boolean updatePlaceholders() { .unbreakable(this.unbreakable) .hideAttributes(this.hideAttributes) .hideEnchants(this.hideEnchants) - .hidePotionEffects(this.hidePotionEffects) .hideUnbreakable(this.hideUnbreakable) .nbtString(this.nbtString) .nbtInt(this.nbtInt) @@ -396,7 +389,6 @@ public static class MenuItemOptionsBuilder { private boolean unbreakable; private boolean hideAttributes; private boolean hideEnchants; - private boolean hidePotionEffects; private boolean hideUnbreakable; private boolean displayNameHasPlaceholders; @@ -540,11 +532,6 @@ public MenuItemOptionsBuilder hideEnchants(final boolean hideEnchants) { return this; } - public MenuItemOptionsBuilder hidePotionEffects(final boolean hidePotionEffects) { - this.hidePotionEffects = hidePotionEffects; - return this; - } - public MenuItemOptionsBuilder hideUnbreakable(final boolean hideUnbreakable) { this.hideUnbreakable = hideUnbreakable; return this;