Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2024-12-25 20:17:38 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleaned up EnchantDisplay to work with eco 5.3.0

Browse Source
This commit is contained in:
Auxilor 2021-04-20 21:37:31 +01:00
parent 5af185d9e7
commit 2f3e210b64
1 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java
View File

@ -88,7 +88,22 @@ public class EnchantDisplay extends DisplayModule {
assert meta != null; assert meta != null;
boolean hide = (boolean) args[0]; boolean hideEnchants = false;
if (meta.hasItemFlag(ItemFlag.HIDE_ENCHANTS) || meta.hasItemFlag(ItemFlag.HIDE_POTION_EFFECTS)) {
hideEnchants = true;
}
if (meta.getPersistentDataContainer().has(legacyV, PersistentDataType.INTEGER)
|| (options.isUsingExperimentalHideFixer() && options.isUsingForceHideFixer())) {
hideEnchants = false;
}
if (options.isUsingExperimentalHideFixer() && meta.hasItemFlag(ItemFlag.HIDE_ENCHANTS) && meta.hasItemFlag(ItemFlag.HIDE_POTION_EFFECTS)) {
hideEnchants = false;
}
boolean hide = hideEnchants;
List<String> itemLore = null; List<String> itemLore = null;
@ -219,35 +234,4 @@ public class EnchantDisplay extends DisplayModule {
meta.getPersistentDataContainer().remove(keySkip); meta.getPersistentDataContainer().remove(keySkip);
itemStack.setItemMeta(meta); itemStack.setItemMeta(meta);
} }
@Override
protected Object[] generateVarArgs(@NotNull final ItemStack itemStack) {
ItemMeta meta = itemStack.getItemMeta();
if (meta == null) {
return new Object[]{false};
}
boolean hideEnchants = false;
if (meta.hasItemFlag(ItemFlag.HIDE_ENCHANTS) || meta.hasItemFlag(ItemFlag.HIDE_POTION_EFFECTS)) {
hideEnchants = true;
}
if (meta.getPersistentDataContainer().has(legacyV, PersistentDataType.INTEGER)) {
hideEnchants = false;
}
if (Display.isFinalized(itemStack)) {
hideEnchants = false;
}
if (options.isUsingExperimentalHideFixer() && options.isUsingForceHideFixer()) {
hideEnchants = false;
}
if (options.isUsingExperimentalHideFixer() && meta.hasItemFlag(ItemFlag.HIDE_ENCHANTS) && meta.hasItemFlag(ItemFlag.HIDE_POTION_EFFECTS)) {
hideEnchants = false;
}
return new Object[]{hideEnchants};
}
} }